[orca] Fix for bgo#607414 - When I try writing a message with Thunderbird 3.0, sometime the message edit b

[William Walker <wwalker src gnome org>]

commit 169b6101838bfab45882b20e3b712497f0496060
Author: Willie Walker <william walker sun com>
Date:   Mon Jan 25 16:32:14 2010 -0500

    Fix for bgo#607414 -  When I try writing a message with Thunderbird 3.0, sometime the message edit box is not spokened after I pressing a tab key after with the subject edit box

 src/orca/scripts/apps/Thunderbird/script.py |   31 +++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/scripts/apps/Thunderbird/script.py b/src/orca/scripts/apps/Thunderbird/script.py
index 551d39a..0266edc 100644
--- a/src/orca/scripts/apps/Thunderbird/script.py
+++ b/src/orca/scripts/apps/Thunderbird/script.py
@@ -168,8 +168,9 @@ class Script(Gecko.Script):
         # interfere with our presentation of -- a simple message being
         # composed by the user. Surely we can count on Thunderbird to
         # handle navigation in that case.
-        # 
-        if self.isEditableMessage(event.source):
+        #
+        if self.isEditableMessage(event.source) \
+           or self.isNonHTMLEntry(event.source):
             self.setCaretContext(event.source, event.detail1)
             return default.Script.onCaretMoved(self, event)
 
@@ -346,7 +347,16 @@ class Script(Gecko.Script):
                     pass
 
         if not consume:
-            Gecko.Script.onFocus(self, event)
+            # Much of the Gecko code is designed to handle Gecko's broken
+            # caret navigation. This is not needed in -- and can sometimes
+            # interfere with our presentation of -- a simple message being
+            # composed by the user. Surely we can count on Thunderbird to
+            # handle navigation in that case.
+            #
+            if self.isEditableMessage(event.source):
+                default.Script.onFocus(self, event)
+            else:
+                Gecko.Script.onFocus(self, event)
 
     def locusOfFocusChanged(self, event, oldLocusOfFocus, newLocusOfFocus):
         """Called when the visual object with focus changes.
@@ -631,6 +641,18 @@ class Script(Gecko.Script):
 
         return default.Script.toggleFlatReviewMode(self, inputEvent)
 
+    def isNonHTMLEntry(self, obj):
+        """Checks for ROLE_ENTRY areas that are not part of an HTML
+        document.  See bug #607414.
+
+        Returns True is this is something like the Subject: entry
+        """
+        result = obj and obj.getRole() == pyatspi.ROLE_ENTRY \
+            and None == self.getAncestor(obj,
+                                         [pyatspi.ROLE_DOCUMENT_FRAME],
+                                         [pyatspi.ROLE_FRAME])
+        return result
+
     def isEditableMessage(self, obj):
         """Returns True if this is a editable message."""
 
@@ -648,7 +670,8 @@ class Script(Gecko.Script):
     def useCaretNavigationModel(self, keyboardEvent):
         """Returns True if we should do our own caret navigation."""
 
-        if self.isEditableMessage(orca_state.locusOfFocus):
+        if self.isEditableMessage(orca_state.locusOfFocus) \
+           or self.isNonHTMLEntry(orca_state.locusOfFocus):
             return False
 
         return Gecko.Script.useCaretNavigationModel(self, keyboardEvent)