[orca] Fix for bgo#591925 - Give scripts a means by which to filter out events which are no longer relevant



commit b31d0d8c6f452941ebb49e18e3ff0f91ea96f136
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Thu Jun 10 07:14:06 2010 -0400

    Fix for bgo#591925 - Give scripts a means by which to filter out events which are no longer relevant

 src/orca/focus_tracking_presenter.py |    4 +++
 src/orca/script.py                   |   40 ++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 0 deletions(-)
---
diff --git a/src/orca/focus_tracking_presenter.py b/src/orca/focus_tracking_presenter.py
index 45e4645..74b6585 100644
--- a/src/orca/focus_tracking_presenter.py
+++ b/src/orca/focus_tracking_presenter.py
@@ -834,6 +834,10 @@ class FocusTrackingPresenter(presentation_manager.PresentationManager):
             except:
                 pass
 
+            script = self.getScript(
+                event.host_application or event.source.getApplication())
+            script.eventCache[event.type] = (event, time.time())
+
         if event:
             if settings.debugEventQueue:
                 debug.println(debug.LEVEL_ALL,
diff --git a/src/orca/script.py b/src/orca/script.py
index d31b651..c7a4036 100644
--- a/src/orca/script.py
+++ b/src/orca/script.py
@@ -100,6 +100,7 @@ class Script:
         self.brailleGenerator = self.getBrailleGenerator()
         self.speechGenerator = self.getSpeechGenerator()
         self.generatorCache = {}
+        self.eventCache = {}
         self.whereAmI = self.getWhereAmI()
         self.bookmarks = self.getBookmarks()
         self.voices = settings.voices
@@ -364,6 +365,9 @@ class Script:
         if not processEvent:
             return
 
+        if self.skipObjectEvent(event):
+            return
+
         # Clear the generator cache for each event.
         #
         self.generatorCache = {}
@@ -382,6 +386,42 @@ class Script:
             if event.type.startswith(key):
                 self.listeners[key](event)
 
+    def skipObjectEvent(self, event):
+        """Gives us, and scripts, the ability to decide an event isn't
+        worth taking the time to process under the current circumstances.
+
+        Arguments:
+        - event: the Event
+
+        Returns True if we shouldn't bother processing this object event.
+        """
+
+        cachedEvent, eventTime = self.eventCache.get(event.type, [None, 0])
+        if not cachedEvent or cachedEvent == event:
+            return False
+
+        focus    = ["focus:", "object:state-changed:focused"]
+        typing   = ["object:text-changed:insert", "object:text-changed:delete"]
+        arrowing = ["object:text-caret-moved", "object:text-selection-changed",
+                    "object:selection-changed"]
+
+        skip = False
+        if (event.type in arrowing or event.type in typing) \
+           and event.source == cachedEvent.source:
+            skip = True
+            reason = "more recent event of the same type in the same object"
+        elif event.type in focus and event.source != cachedEvent.source \
+             and event.detail1 == cachedEvent.detail1:
+            skip = True
+            reason = "more recent event of the same type in a different object"
+
+        if skip:
+            debug.println(debug.LEVEL_FINE,
+                          "script.skipObjectEvent: skipped due to %s" \
+                          % reason)
+
+        return skip
+
     def checkKeyboardEventData(self, keyboardEvent):
         """Checks the data on the keyboard event.
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]