Merge 7fd2e68 into fba44b4

jcsteh · web-flow · commit 0ec6e0c72bec · 2019-11-21T09:47:48.000+10:00
diff --git a/source/JABHandler.py b/source/JABHandler.py
@@ -39,6 +39,16 @@
 import core
 import textUtils
 import NVDAHelper
+import config
+
+#: The path to the user's .accessibility.properties file, used
+#: to enable JAB.
+A11Y_PROPS_PATH = os.path.expanduser(r"~\.accessibility.properties")
+#: The content of ".accessibility.properties" when JAB is enabled.
+A11Y_PROPS_CONTENT = (
+	"assistive_technologies=com.sun.java.accessibility.AccessBridge\n"
+	"screen_magnifier_present=true\n"
+)
 
 #Some utility functions to help with function defines
 
@@ -738,6 +748,21 @@ def isJavaWindow(hwnd):
 		return False
 	return bridgeDll.isJavaWindow(hwnd)
 
+def isBridgeEnabled():
+	try:
+		data = open(A11Y_PROPS_PATH, "rt").read()
+	except OSError:
+		return False
+	return data == A11Y_PROPS_CONTENT
+
+def enableBridge():
+	try:
+		props = open(A11Y_PROPS_PATH, "wt")
+		props.write(A11Y_PROPS_CONTENT)
+		log.info("Enabled Java Access Bridge for user")
+	except OSError:
+		log.warning("Couldn't enable Java Access Bridge for user", exc_info=True)
+
 def initialize():
 	global bridgeDll, isRunning
 	try:
@@ -746,6 +771,8 @@ def initialize():
 	except WindowsError:
 		raise NotImplementedError("dll not available")
 	_fixBridgeFuncs()
+	if config.isInstalledCopy() and not isBridgeEnabled():
+		enableBridge()
 	bridgeDll.Windows_run()
 	# Accept wm_copydata and any wm_user messages from other processes even if running with higher privileges
 	if not windll.user32.ChangeWindowMessageFilter(winUser.WM_COPYDATA, 1):
