Changeset 2341

Timestamp:

08/06/08 23:13:42 (4 months ago)

Author:

mdcurran

Message:

Gecko ia2 virtualBuffer: allow many links in gmail to actually be activated. Its a bad idea to try going up the ancestory until accDoDefaultAction works, it seems to do some very odd things with heavily scripted pages, and greatly stuffs up gmail. Also there was a major logic error in that particular code as if accDoDefaultAction failed, it would try doing a mouse click, but from inside the while loop... I'm not too sure whether break can be called from with in an except. Now if the object has no action, or accDoDefaultAction failes, we click. No more while loop.

Files:

• trunk/source/virtualBuffers/gecko_ia2.py (modified) (1 diff)

trunk/source/virtualBuffers/gecko_ia2.py

@@ -173 +173 @@
                                 virtualBufferHandler.reportPassThrough(self)
                         else: #Just try performing the default action of the object, or of one of its ancestors
-                                while obj and obj!=self.rootNVDAObject:
+                                try:
+                                        action=obj.IAccessibleObject.accDefaultAction(obj.IAccessibleChildID)
+                                        if not action:
+                                                log.debugWarning("no default action for object")
+                                                raise RuntimeError("need an action")
                                         try:
-                                                action=obj.IAccessibleObject.accDefaultAction(obj.IAccessibleChildID)
-                                                if action:
-                                                        try:
-                                                                obj.IAccessibleObject.accDoDefaultAction(obj.IAccessibleChildID)
-                                                        except:
-                                                                l=obj.location
-                                                                if l:
-                                                                        x=(l[0]+l[2]/2)
-                                                                        y=l[1]+(l[3]/2) 
-                                                                        oldX,oldY=winUser.getCursorPos()
-                                                                        winUser.setCursorPos(x,y)
-                                                                        winUser.mouse_event(winUser.MOUSEEVENTF_LEFTDOWN,0,0,None,None)
-                                                                        winUser.mouse_event(winUser.MOUSEEVENTF_LEFTUP,0,0,None,None)
-                                                                        winuser.setCursorPos(oldX,oldY)
-                                                        break
+                                                obj.IAccessibleObject.accDoDefaultAction(obj.IAccessibleChildID)
                                         except:
-                                                pass
-                                        obj=obj.parent
-                except:
+                                                log.debugWarning("error in calling accDoDefaultAction",exc_info=True)
+                                                raise RuntimeError("error in accDoDefaultAction")
+                                except:
+                                        log.debugWarning("could not programmatically activate field, trying mouse")
+                                        l=obj.location
+                                        if l:
+                                                x=(l[0]+l[2]/2)
+                                                y=l[1]+(l[3]/2) 
+                                                oldX,oldY=winUser.getCursorPos()
+                                                winUser.setCursorPos(x,y)
+                                                winUser.mouse_event(winUser.MOUSEEVENTF_LEFTDOWN,0,0,None,None)
+                                                winUser.mouse_event(winUser.MOUSEEVENTF_LEFTUP,0,0,None,None)
+                                                winUser.setCursorPos(oldX,oldY)
+                                        else:
+                                                log.debugWarning("no location for field")
+                except:
+                        log.debugWarning("Error activating field",exc_info=True)
                         pass