Changeset 2022

Timestamp:

05/06/08 18:32:38 (7 months ago)

Author:

mdcurran

Message:

Changes to make better use of IAccIdentity. IAccessiblehandler.getIAccIdentityString is now IAccessiblehandler.getIAccIdentity, and returns a dictionary of possible 'childID', 'objectID', 'windowHandle', and 'menuHandle'. IAccessible NVDAObject now makes use of this better by filling in event_childID, event_objectID and event_windowHandle, if one of them is still None. This now means that for objects that properly support IAccIdentity, events will definitely reach it, even if the object itself wasn't created specifically from an event.

Location:

trunk/source

Files:

• IAccessibleHandler.py (modified) (2 diffs)
• NVDAObjects/IAccessible/__init__.py (modified) (5 diffs)

trunk/source/IAccessibleHandler.py

@@ -149 +149 @@
 import itertools
 import time
+import struct
 from ctypes import *
 from ctypes.wintypes import *
@@ -935 +936 @@
 
 
-def getIAccIdentityString(pacc,childID):
-        p,s=pacc.QueryInterface(IAccIdentity).getIdentityString(childID)
-        p=cast(p,POINTER(c_char*s))
-        return p.contents.raw
+def getIAccIdentity(pacc,childID):
+        stringPtr,stringSize=pacc.QueryInterface(IAccIdentity).getIdentityString(childID)
+        stringPtr=cast(stringPtr,POINTER(c_char*stringSize))
+        s=p.contents.raw
+        fields=struct.unpack('IIII',s)
+        d={}
+        d['childID']=fields[3]
+        if fields[0]&2:
+                d['menuHandle']=fields[2]
+        else:
+                d['objectID']=fields[2]
+                d['windowHandle']=fields[1]
+        return d
 
 def findGroupboxObject(obj):

trunk/source/NVDAObjects/IAccessible/__init__.py

@@ -7 +7 @@
 import weakref
 import re
+import struct
 import os
 import tones
@@ -177 +178 @@
                 if not windowHandle:
                         windowHandle=IAccessibleHandler.windowFromAccessibleObject(IAccessibleObject)
-                if not windowHandle:
+                if not windowHandle and event_windowHandle:
+                        windowHandle=event_windowHandle
+                elif not windowHandle:
                         return None #We really do need a window handle
                 windowClassName=winUser.getClassName(windowHandle)
@@ -224 +227 @@
                 self.IAccessibleObject=IAccessibleObject
                 self.IAccessibleChildID=IAccessibleChildID
+                Identity=self.IAccessibleIdentity
+                if event_windowHandle is None and Identity and 'windowHandle' in Identity:
+                        event_windowHandle=Identity['windowHandle']
+                if event_objectID is None and Identity and 'objectID' in Identity:
+                        event_objectID=Identity['objectID']
+                if event_childID is None and Identity and 'childID' in Identity:
+                        event_childID=Identity['childID']
+                if event_childID is None:
+                        event_childID=IAccessibleChildID
                 self.event_windowHandle=event_windowHandle
                 self.event_objectID=event_objectID
@@ -291 +303 @@
                 if not super(IAccessible,self)._isEqual(other):
                         return False
-                selfIden=self.IAccessibleIdentityString
-                otherIden=other.IAccessibleIdentityString
+                selfIden=self.IAccessibleIdentity
+                otherIden=other.IAccessibleIdentity
                 if selfIden!=otherIden:
                         return False
@@ -331 +343 @@
                         self.IAccessibleObject.accDoDefaultAction()
 
-        def _get_IAccessibleIdentityString(self):
-                if not hasattr(self,'_IAccessibleIdentityString'):
+        def _get_IAccessibleIdentity(self):
+                if not hasattr(self,'_IAccessibleIdentity'):
                         try:
-                                self._IAccessibleIdentityString=IAccessibleHandler.getIAccIdentityString(self.IAccessibleObject,self.IAccessibleChildID)
+                                self._IAccessibleIdentity=IAccessibleHandler.getIAccIdentity(self.IAccessibleObject,self.IAccessibleChildID)
                         except:
-                                self._IAccessibleIdentityString=None
-                return self._IAccessibleIdentityString
+                                self._IAccessibleIdentity=None
+                return self._IAccessibleIdentity
 
         def _get_IAccessibleRole(self):