Changeset 2377

Timestamp:

09/11/08 11:48:26 (2 months ago)

Author:

pvagner

Message:

* ITextDocumentTextInfo: Fixed a problem where NVDA was unable to move the review cursor to the bottom line. Added ability to detect strikedthrough font property.
* EditTextInfo? and ITextDocumentTextInfo: Introduced ability to identify links inside a richedit controls. Added _getPoint method which retrieves x and y coordinates for the current textInfo ofsset/range.
* script_moveMouseToNavigatorObject now makes use of the features listed above. When navigator object mouse is being moved to implements _getPoint in its textInfo, mouse is moved to the currently reviewed character. Otherwise mouse is moved into the center of the navigator object.

Location:

trunk/source

Files:

• NVDAObjects/IAccessible/edit.py (modified) (7 diffs)
• NVDAObjects/__init__.py (modified) (1 diff)
• appModules/_default.py (modified) (1 diff)
• speech.py (modified) (1 diff)
• textHandler.py (modified) (1 diff)

trunk/source/NVDAObjects/IAccessible/edit.py

@@ -160 +160 @@
 class EditTextInfo(NVDAObjectTextInfo):
 
+        def _getPoint(self):
+                self.expand(textHandler.UNIT_CHARACTER)
+                offset=self._startOffset
+                if self.obj.editAPIVersion==1:
+                        processHandle=self.obj.editProcessHandle
+                        internalP=winKernel.virtualAllocEx(processHandle,None,ctypes.sizeof(PointLStruct),winKernel.MEM_COMMIT,winKernel.PAGE_READWRITE)
+                        p=PointLStruct(0,0)
+                        winKernel.writeProcessMemory(processHandle,internalP,ctypes.byref(p),ctypes.sizeof(p),None)
+                        winUser.sendMessage(self.obj.windowHandle,EM_POSFROMCHAR,internalP,self._startOffset)
+                        winKernel.readProcessMemory(processHandle,internalP,ctypes.byref(p),ctypes.sizeof(p),None)
+                        winKernel.virtualFreeEx(processHandle,internalP,0,winKernel.MEM_RELEASE)
+                        point=textHandler.Point(p.x,p.y)
+                else:
+                        res=winUser.sendMessage(self.obj.windowHandle,EM_POSFROMCHAR,self._startOffset,None)
+                        point=textHandler.Point(winUser.LOWORD(res),winUser.HIWORD(res))
+                (left,top,width,height)=self.obj.location
+                if point.x and point.y:
+                        point.x=point.x+left
+                        point.y=point.y+top
+                        return point
+                else:
+                        return None
+
         def _getOffsetFromPoint(self,x,y):
                 (left,top,width,height)=self.obj.location
@@ -221 +244 @@
                 if formatConfig["reportLineNumber"]:
                         formatField["line-number"]=self._getLineNumFromOffset(offset)+1
+                if formatConfig["reportLinks"]:
+                        if charFormat is None: charFormat=self._getCharFormat(offset)
+                        formatField["link"]=bool(charFormat.dwEffects&CFM_LINK)
                 return formatField,(startOffset,endOffset)
 
@@ -387 +413 @@
 class ITextDocumentTextInfo(textHandler.TextInfo):
 
+        def _getPoint(self):
+                range=self._rangeObj.duplicate
+                range.collapse(True)
+                range.expand(comInterfaces.tom.tomCharacter)
+                p=textHandler.Point(0,0)
+                (p.x,p.y)=range.GetPoint(comInterfaces.tom.tomStart)
+                if p.x and p.y:
+                        return p
+                else:
+                        return None
+
+        def _getCharFormat(self,range):
+                oldSel=self.obj.ITextSelectionObject.duplicate
+                if not (oldSel.start==range.start and oldSel.end==range.end):
+                        self.obj.ITextSelectionObject.start=range.start
+                        self.obj.ITextSelectionObject.end=range.end
+                if self.obj.isWindowUnicode:
+                        charFormatStruct=CharFormat2WStruct
+                else:
+                        charFormatStruct=CharFormat2AStruct
+                charFormat=charFormatStruct()
+                charFormat.cbSize=ctypes.sizeof(charFormatStruct)
+                processHandle=self.obj.editProcessHandle
+                internalCharFormat=winKernel.virtualAllocEx(processHandle,None,ctypes.sizeof(charFormat),winKernel.MEM_COMMIT,winKernel.PAGE_READWRITE)
+                winKernel.writeProcessMemory(processHandle,internalCharFormat,ctypes.byref(charFormat),ctypes.sizeof(charFormat),None)
+                winUser.sendMessage(self.obj.windowHandle,EM_GETCHARFORMAT,SCF_SELECTION, internalCharFormat)
+                winKernel.readProcessMemory(processHandle,internalCharFormat,ctypes.byref(charFormat),ctypes.sizeof(charFormat),None)
+                winKernel.virtualFreeEx(processHandle,internalCharFormat,0,winKernel.MEM_RELEASE)
+                if not (oldSel.start==range.start and oldSel.end==range.end):
+                        self.obj.ITextSelectionObject.start=oldSel.start
+                        self.obj.ITextSelectionObject.end=oldSel.end
+                return charFormat
+
         def _getFormatFieldAtRange(self,range,formatConfig):
                 formatField=textHandler.FormatField()
                 fontObj=None
                 paraFormatObj=None
+                charFormat=None
                 if formatConfig["reportAlignment"]:
                         if not paraFormatObj: paraFormatObj=range.para
@@ -415 +475 @@
                         formatField["italic"]=bool(fontObj.italic)
                         formatField["underline"]=bool(fontObj.underline)
+                        formatField["strikethrough"]=bool(fontObj.StrikeThrough)
                         if fontObj.superscript:
                                 formatField["text-position"]="super"
                         elif fontObj.subscript:
                                 formatField["text-position"]="sub"
+                if formatConfig["reportLinks"]:
+                        if charFormat is None: charFormat=self._getCharFormat(range)
+                        formatField["link"]=bool(charFormat.dwEffects&CFM_LINK)
                 return formatField
 
@@ -493 +557 @@
                 elif position==textHandler.POSITION_LAST:
                         self._rangeObj=self.obj.ITextDocumentObject.range(0,0)
-                        self._rangeObj.moveEnd(comInterfaces.tom.tomStory,1)
-                        self._rangeObj.move(comInterfaces.tom.tomCharacter,-1)
+                        self._rangeObj.move(comInterfaces.tom.tomStory,1)
+                        self._rangeObj.moveStart(comInterfaces.tom.tomCharacter,-1)
                 elif isinstance(position,textHandler.Offsets):
                         self._rangeObj=self.obj.ITextDocumentObject.range(position.startOffset,position.endOffset)
@@ -626 +690 @@
                 else:
                         self.TextInfo=EditTextInfo
-                if self.TextInfo is EditTextInfo:
-                        self.editProcessHandle=winKernel.openProcess(winKernel.PROCESS_VM_OPERATION|winKernel.PROCESS_VM_READ|winKernel.PROCESS_VM_WRITE,False,self.windowProcessID)
+                self.editProcessHandle=winKernel.openProcess(winKernel.PROCESS_VM_OPERATION|winKernel.PROCESS_VM_READ|winKernel.PROCESS_VM_WRITE,False,self.windowProcessID)
 
         def __del__(self):
-                if self.TextInfo is EditTextInfo:
-                        winKernel.closeHandle(self.editProcessHandle)
+                winKernel.closeHandle(self.editProcessHandle)
 
         def _get_TextInfo(self):
@@ -681 +743 @@
         ("ExtendedLeft","moveByCharacter"),
         ("ExtendedRight","moveByCharacter"),
+        ("ExtendedPrior","moveByLine"),
+        ("ExtendedNext","moveByLine"),
         ("Control+ExtendedLeft","moveByWord"),
         ("Control+ExtendedRight","moveByWord"),

trunk/source/NVDAObjects/__init__.py

@@ -137 +137 @@
         def _getOffsetAtPoint(self,x,y):
                 raise NotImplementedError
+
+        def _getPoint(self):
+                return None
 
         def __init__(self,obj,position):

trunk/source/appModules/_default.py

@@ -162 +162 @@
         def script_moveMouseToNavigatorObject(self,keyPress):
                 speech.speakMessage(_("Move mouse to navigator"))
-                obj=api.getNavigatorObject()
-                try:
-                        (left,top,width,height)=obj.location
-                except:
-                        speech.speakMessage(_("object has no location"))
-                        return
-                winUser.setCursorPos(left+(width/2),top+(height/2))
+                obj=api.getNavigatorObject() 
+                p=globalVars.reviewPosition.copy()._getPoint()
+                if p:
+                        winUser.setCursorPos(p.x,p.y)
+                else:
+                        try:
+                                (left,top,width,height)=obj.location
+                        except:
+                                speech.speakMessage(_("object has no location"))
+                                return
+                        winUser.setCursorPos(left+(width/2),top+(height/2))
         script_moveMouseToNavigatorObject.__doc__=_("Moves the mouse pointer to the current navigator object")
 

trunk/source/speech.py

@@ -738 +738 @@
                                 text=_("align default")
                         textList.append(text)
+        if  formatConfig["reportLinks"]:
+                link=attrs.get("link")
+                oldLink=attrsCache.get("link") if attrsCache is not None else None
+                if (link or oldLink is not None) and link!=oldLink:
+                        text=_("link") if link else _("out of %s")%_("link")
+                        textList.append(text)
         if formatConfig["reportSpellingErrors"]:
                 invalidSpelling=attrs.get("invalid-spelling")

trunk/source/textHandler.py

@@ -127 +127 @@
 UNIT_SCREEN="screen"
 UNIT_STORY="story"
-UNIT_READINGCHUNK="readingChunck"
+UNIT_READINGCHUNK="readingChunk"
 
 class TextInfo(baseObject.AutoPropertyObject):