From: James Teh <jamie@jantrid.net>
Date: Tue, 24 Jan 2012 03:54:02 +0000 (+1000)
Subject: In Adobe Reader, some links are no longer treated as containing read-only editable... 
X-Git-Tag: jpdev130418~1124
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2dc1a2128f50a3189a91a9f9a1f490b761855f3b;p=nvdajp%2Fnvdajp.git

In Adobe Reader, some links are no longer treated as containing read-only editable text fields.
This was occurring because Acrobat incorrectly exposes the focusable/focused states on text nodes beneath links, so we now scrap those states if the linked state is present.
---

diff --git a/source/NVDAObjects/IAccessible/adobeAcrobat.py b/source/NVDAObjects/IAccessible/adobeAcrobat.py
index 3b44eef0a..503af789c 100644
--- a/source/NVDAObjects/IAccessible/adobeAcrobat.py
+++ b/source/NVDAObjects/IAccessible/adobeAcrobat.py
@@ -179,6 +179,15 @@ class AcrobatSDIWindowClient(IAccessible):
 		self.IAccessibleObject = acc
 		self.invalidateCache()
 
+class BadFocusStates(AcrobatNode):
+	"""An object which reports focus states when it shouldn't.
+	"""
+
+	def _get_states(self):
+		states = super(BadFocusStates, self).states
+		states.difference_update({controlTypes.STATE_FOCUSABLE, controlTypes.STATE_FOCUSED})
+		return states
+
 def findExtraOverlayClasses(obj, clsList):
 	"""Determine the most appropriate class(es) for Acrobat objects.
 	This works similarly to L{NVDAObjects.NVDAObject.findOverlayClasses} except that it never calls any other findOverlayClasses method.
@@ -193,7 +202,13 @@ def findExtraOverlayClasses(obj, clsList):
 		else:
 			clsList.append(RootNode)
 
-	elif role == controlTypes.ROLE_EDITABLETEXT and controlTypes.STATE_FOCUSABLE in obj.states:
-		clsList.append(EditableTextNode)
+	elif role == controlTypes.ROLE_EDITABLETEXT:
+		states = obj.states
+		if {controlTypes.STATE_READONLY, controlTypes.STATE_FOCUSABLE, controlTypes.STATE_LINKED} <= states:
+			# HACK: Acrobat sets focus states on text nodes beneath links,
+			# making them appear as read only editable text fields.
+			clsList.append(BadFocusStates)
+		elif controlTypes.STATE_FOCUSABLE in states:
+			clsList.append(EditableTextNode)
 
 	clsList.append(AcrobatNode)
diff --git a/source/virtualBuffers/adobeAcrobat.py b/source/virtualBuffers/adobeAcrobat.py
index 9d186856e..41692ffd9 100644
--- a/source/virtualBuffers/adobeAcrobat.py
+++ b/source/virtualBuffers/adobeAcrobat.py
@@ -28,6 +28,11 @@ class AdobeAcrobat_TextInfo(VirtualBufferTextInfo):
 
 		states=set(IAccessibleHandler.IAccessibleStatesToNVDAStates[x] for x in [1<<y for y in xrange(32)] if int(attrs.get('IAccessible::state_%s'%x,0)) and x in IAccessibleHandler.IAccessibleStatesToNVDAStates)
 
+		if role == controlTypes.ROLE_EDITABLETEXT and {controlTypes.STATE_READONLY, controlTypes.STATE_FOCUSABLE, controlTypes.STATE_LINKED} <= states:
+			# HACK: Acrobat sets focus states on text nodes beneath links,
+			# making them appear as read only editable text fields.
+			states.difference_update({controlTypes.STATE_FOCUSABLE, controlTypes.STATE_FOCUSED})
+
 		attrs['role']=role
 		attrs['states']=states
 		if level:
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
index 5feb9689e..95bee5be9 100644
--- a/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@ -52,6 +52,7 @@ Highlights of this release include features for more fluent reading of braille;
 - The report title command works correctly again in Adobe Reader.
 - With automatic focus mode for focus changes enabled, focus mode is now correctly used for focused table cells; e.g. in ARIA grids. (#1763)
 - In iTunes, position information in certain lists is now reported correctly.
+- In Adobe Reader, some links are no longer treated as containing read-only editable text fields.
 
 
 == Changes for Developers ==