orca r4192 - in trunk: . src/orca/scripts/apps/Thunderbird src/orca/scripts/toolkits/Gecko

[joanied svn gnome org]

Author: joanied
Date: Thu Sep 11 18:14:40 2008
New Revision: 4192
URL: http://svn.gnome.org/viewvc/orca?rev=4192&view=rev

Log:
* src/orca/scripts/toolkits/Gecko/script.py:
  src/orca/scripts/apps/Thunderbird/script.py:
  Fix for bug #535188 - Page-up and page-down not functioning when
  reading messages in Thunderbird.
  Fix for bug #547496 - Cursor navigation does not start from
  insertion carat location in Thunderbird Write window.


Modified:
   trunk/ChangeLog
   trunk/src/orca/scripts/apps/Thunderbird/script.py
   trunk/src/orca/scripts/toolkits/Gecko/script.py

Modified: trunk/src/orca/scripts/apps/Thunderbird/script.py
==============================================================================
--- trunk/src/orca/scripts/apps/Thunderbird/script.py	(original)
+++ trunk/src/orca/scripts/apps/Thunderbird/script.py	Thu Sep 11 18:14:40 2008
@@ -156,6 +156,55 @@
 
         return False
 
+    def onCaretMoved(self, event):
+        """Called whenever the caret moves.
+
+        Arguments:
+        - event: the Event
+        """
+
+        # Page_Up/Page_Down are not used by Orca. However, users report
+        # using these keys in Thunderbird without success. The default
+        # script is sometimes rejecting the resulting caret-moved events
+        # based on the locusOfFocus other times Gecko is because of the
+        # caret context.
+        #
+        updatePosition = False
+        if isinstance(orca_state.lastInputEvent, input_event.KeyboardEvent):
+            string = orca_state.lastNonModifierKeyEvent.event_string
+            updatePosition = string in ["Page_Up", "Page_Down"]
+
+        # Unlike the unpredictable wild, wild web, odds are good that a
+        # caret-moved event in a message composition window is valid. But
+        # depending upon the locusOfFocus at the time this event is issued
+        # the default Gecko toolkit script might not do the right thing.
+        #
+        if not updatePosition and event.detail1 >= 0:
+            updatePosition = \
+                event.source.getState().contains(pyatspi.STATE_EDITABLE)
+
+        if updatePosition:
+            orca.setLocusOfFocus(event, event.source, False)
+            self.setCaretContext(event.source, event.detail1)
+
+            # The Gecko script, should it be about to pass along this
+            # event to the default script, will set the locusOfFocus to
+            # the object returned by findFirstCaretContext(). If that
+            # object is not the same as the event source or the event
+            # source's parent, the default script will reject the event.
+            # As a result, if the user presses Page_Up or Page_Down and
+            # just so happens to land on an object whose sole contents
+            # is an image, we'll say nothing. Ultimately this should
+            # probably be handled elsewhere, but this close to the next
+            # major (2.24) release, I (JD) am not risking it. :-)
+            #
+            [obj, offset] = \
+                self.findFirstCaretContext(event.source, event.detail1)
+            if obj.getRole() == pyatspi.ROLE_IMAGE:
+                return default.Script.onCaretMoved(self, event)
+
+        return Gecko.Script.onCaretMoved(self, event)
+
     def onFocus(self, event):
         """ Called whenever an object gets focus.
 

Modified: trunk/src/orca/scripts/toolkits/Gecko/script.py
==============================================================================
--- trunk/src/orca/scripts/toolkits/Gecko/script.py	(original)
+++ trunk/src/orca/scripts/toolkits/Gecko/script.py	Thu Sep 11 18:14:40 2008
@@ -2566,6 +2566,9 @@
         if not self.isNavigableAria(orca_state.locusOfFocus):
             return False
 
+        if keyboardEvent.event_string in ["Page_Up", "Page_Down"]:
+            return False
+
         weHandleIt = True
         obj = orca_state.locusOfFocus
         if obj and (obj.getRole() == pyatspi.ROLE_ENTRY):
@@ -5101,9 +5104,10 @@
                 continue
 
             # If it is a "useless" image (i.e. not a link, no associated
-            # text), ignore it.
+            # text), ignore it, unless it's the only thing here.
             #
-            elif role == pyatspi.ROLE_IMAGE and self.isUselessObject(obj):
+            elif role == pyatspi.ROLE_IMAGE and self.isUselessObject(obj) \
+                 and len(contents) > 1:
                 continue
 
             # If the focused item is a checkbox or a radio button for which