Changeset 2317

Timestamp:

07/29/08 01:51:08 (4 months ago)

Author:

mdcurran

Message:

JABHandler: try and ignore duplicate focus events. Also ignore focus events for what seem to be broken java objects -- apart from NVDA saying unknown object, it also stuffs up focus ancestors quite badly. Now its a lot nicer to press f2 on a cell in Open Office Celc etc as NVDA no longer repeates lots of pointless information.

Files:

• trunk/source/JABHandler.py (modified) (2 diffs)

trunk/source/JABHandler.py

@@ -22 +22 @@
 vmIDsToWindowHandles={}
 internalFunctionQueue=Queue.Queue(1000)
+internalFunctionQueue.__name__="JABHandler.internalFunctionQueue"
+lastFocusNVDAObject=None
 
 def internalQueueFunction(func,*args,**kwargs):
@@ -261 +263 @@
 
 def event_gainFocus(vmID,accContext):
+        global lastFocusNVDAObject
         jabContext=JABContext(vmID=vmID,accContext=accContext)
         if not winUser.isDescendantWindow(winUser.getForegroundWindow(),jabContext.hwnd):
                 return
         focus=api.getFocusObject()
-        if isinstance(focus,NVDAObjects.JAB.JAB) and focus.jabContext==jabContext:
+        if (isinstance(focus,NVDAObjects.JAB.JAB) and focus.jabContext==jabContext) or (lastFocusNVDAObject and lastFocusNVDAObject.jabContext==jabContext):
                 return 
         obj=NVDAObjects.JAB.JAB(jabContext=jabContext)
+        if obj.role==controlTypes.ROLE_UNKNOWN:
+                return
         eventHandler.queueEvent("gainFocus",obj)
+        lastFocusNVDAObject=obj
         activeChild=obj.activeChild
-        if activeChild:
+        if activeChild and activeChild.role!=controlTypes.ROLE_UNKNOWN and activeChild.jabContext!=jabContext:
                 eventHandler.queueEvent("gainFocus",activeChild)
+                lastFocusNVDAObject=activeChild
 
 @CFUNCTYPE(c_voidp,c_int,c_int,c_int,c_int,c_int)