Merge 69bce04 into b203f69

jcsteh · web-flow · commit 3151475eea2e · 2023-12-22T08:43:55.000Z
diff --git a/include/liblouis b/include/liblouis
@@ -1 +1 @@
-Subproject commit 2fb1733422f789154089520305fc107a256486a7
+Subproject commit 8a0e5e4cf6be7e80d3fc68c32b60912dfe2bbc8b
diff --git a/source/keyboardHandler.py b/source/keyboardHandler.py
@@ -35,13 +35,16 @@
 import NVDAState
 from contextlib import contextmanager
 import threading
+import winKernel
 
 if typing.TYPE_CHECKING:
 	from NVDAObjects import NVDAObject  # noqa: F401
 	from watchdog import WatchdogObserver
 
 _watchdogObserver: typing.Optional["WatchdogObserver"] = None
 ignoreInjected=False
+_lastInjectedKeyUp: typing.Tuple[int, int] = None
+_injectionDoneEvent: int = None
 
 # Fake vk codes.
 # These constants should be assigned to the name that NVDA will use for the key.
@@ -285,11 +288,15 @@ def internal_keyUpEvent(vkCode,scanCode,extended,injected):
 	"""
 	try:
 		global lastNVDAModifier, lastNVDAModifierReleaseTime, bypassNVDAModifier, passKeyThroughCount, lastPassThroughKeyDown, currentModifiers
-		# Injected keys should be ignored in some cases.
-		if injected and (ignoreInjected or not config.conf['keyboard']['handleInjectedKeys']):
-			return True
-
 		keyCode = (vkCode, extended)
+		# Injected keys should be ignored in some cases.
+		if injected:
+			if not config.conf['keyboard']['handleInjectedKeys']:
+				return True
+			if ignoreInjected:
+				if keyCode == _lastInjectedKeyUp:
+					winKernel.kernel32.SetEvent(_injectionDoneEvent)
+				return True
 
 		if passKeyThroughCount >= 1:
 			if lastPassThroughKeyDown == keyCode:
@@ -567,7 +574,11 @@ def executeScript(self, script):
 		# Now actually execute the script.
 		super().executeScript(script)
 
+	#: The maximum amount of time (in ms) to wait for keys injected by NVDA to be
+	#: received by NVDA.
+	_INJECTION_WAIT_TIMEOUT: int = 10
 	def send(self):
+		global _lastInjectedKeyUp, _injectionDoneEvent
 		keys = []
 		for vk, ext in self.generalizedModifiers:
 			if vk == VK_WIN:
@@ -582,6 +593,11 @@ def send(self):
 		keys.append((self.vkCode, self.scanCode, self.isExtended))
 
 		with ignoreInjection():
+			handleInjectedKeys = config.conf['keyboard']['handleInjectedKeys']
+			if handleInjectedKeys:
+				_lastInjectedKeyUp = (keys[0][0], keys[0][2])
+				if not _injectionDoneEvent:
+					_injectionDoneEvent = winKernel.createEvent()
 			if winUser.getKeyState(self.vkCode) & 32768:
 				# This key is already down, so send a key up for it first.
 				winUser.keybd_event(self.vkCode, self.scanCode, self.isExtended + 2, 0)
@@ -592,6 +608,11 @@ def send(self):
 			# Send key up events for the keys in reverse order.
 			for vk, scan, ext in reversed(keys):
 				winUser.keybd_event(vk, scan, ext + 2, 0)
+			if handleInjectedKeys:
+				# Wait for the keys to be received by NVDA. We don't do this if
+				# handleInjectedKeys is disabled because we just ignore all injected keys
+				# in that case.
+				winKernel.waitForSingleObject(_injectionDoneEvent, self._INJECTION_WAIT_TIMEOUT)
 
 	@classmethod
 	def fromName(cls, name):
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -13,6 +13,8 @@ What's New in NVDA
 
 
 == Bug Fixes ==
+- Backspace now works correctly when using Nudi6.1 with NVDA's "Handle keys from other applications" setting enabled. (#15822, @jcsteh)
+-
 
 
 == Changes for Developers ==
