Merge 1587b61 into 2a13056

LeonarddeR · web-flow · commit 8b5645adde13 · 2019-08-29T09:37:21.000Z
diff --git a/source/JABHandler.py b/source/JABHandler.py
@@ -1,9 +1,8 @@
 # -*- coding: UTF-8 -*-
-#javaAccessBridgeHandler.py
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2007-2018 NV Access Limited, Peter Vágner, Renaud Paquay, Babbage B.V.
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2007-2019 NV Access Limited, Peter Vágner, Renaud Paquay, Babbage B.V.
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
 
 import queue
 from ctypes import *
@@ -258,6 +257,15 @@ class AccessibleKeyBindings(Structure):
 	_fixBridgeFunc(BOOL,'getAccessibleTextItems',c_long,JOBJECT64,POINTER(AccessibleTextItemsInfo),jint,errcheck=True)
 	_fixBridgeFunc(BOOL,'getAccessibleTextSelectionInfo',c_long,JOBJECT64,POINTER(AccessibleTextSelectionInfo),errcheck=True)
 	_fixBridgeFunc(BOOL,'getAccessibleTextAttributes',c_long,JOBJECT64,jint,POINTER(AccessibleTextAttributesInfo),errcheck=True)
+	_fixBridgeFunc(
+		BOOL,
+		'getAccessibleTextRect',
+		c_long,
+		JOBJECT64,
+		POINTER(AccessibleTextRectInfo),
+		jint,
+		errcheck=True
+	)
 	_fixBridgeFunc(BOOL,'getAccessibleTextLineBounds',c_long,JOBJECT64,jint,POINTER(jint),POINTER(jint),errcheck=True)
 	_fixBridgeFunc(BOOL,'getAccessibleTextRange',c_long,JOBJECT64,jint,jint,POINTER(c_char),c_short,errcheck=True)
 	_fixBridgeFunc(BOOL,'getCurrentAccessibleValueFromContext',c_long,JOBJECT64,POINTER(c_wchar),c_short,errcheck=True)
@@ -494,6 +502,11 @@ def getTextAttributesInRange(self, startIndex, endIndex):
 		bridgeDll.getTextAttributesInRange(self.vmID, self.accContext, startIndex, endIndex, byref(attributes), byref(length))
 		return attributes, length.value
 
+	def getAccessibleTextRect(self, index):
+		rect = AccessibleTextRectInfo()
+		bridgeDll.getAccessibleTextRect(self.vmID, self.accContext, byref(rect), index)
+		return rect
+
 	def getAccessibleRelationSet(self):
 		relations = AccessibleRelationSetInfo()
 		bridgeDll.getAccessibleRelationSet(self.vmID, self.accContext, byref(relations))
diff --git a/source/NVDAObjects/JAB/__init__.py b/source/NVDAObjects/JAB/__init__.py
@@ -97,6 +97,13 @@ def _getOffsetFromPoint(self,x,y):
 		offset=max(min(info.indexAtPoint,info.charCount-1),0)
 		return offset
 
+	def _getBoundingRectFromOffset(self,offset):
+		rect = self.obj.jabContext.getAccessibleTextRect(offset)
+		try:
+			return RectLTWH(rect.x, rect.y, rect.width, rect.height).toLTRB()
+		except ValueError:
+			raise LookupError
+
 	def _getCaretOffset(self):
 		textInfo=self.obj.jabContext.getAccessibleTextInfo(self.obj._JABAccContextInfo.x,self.obj._JABAccContextInfo.y)
 		offset=textInfo.caretIndex
diff --git a/source/core.py b/source/core.py
@@ -428,6 +428,7 @@ def handlePowerStatusChange(self):
 	log.debug("initializing Java Access Bridge support")
 	try:
 		JABHandler.initialize()
+		log.info("Java Access Bridge support initialized")
 	except NotImplementedError:
 		log.warning("Java Access Bridge not available")
 	except:
