Merge 50ca6e4 into 20bdb39

school510587 · web-flow · commit db460f0346f4 · 2024-09-11T07:30:23.000Z
diff --git a/source/brailleDisplayDrivers/seikantk.py b/source/brailleDisplayDrivers/seikantk.py
@@ -308,13 +308,13 @@ def _handleKeys(self, arg: bytes):
 		gestures = []
 		if brailleDots:
 			if key in (1, 2, 3):  # bk:space+dots
+				gestures.append(InputGesture(dots=brailleDots, space=key))
 				key = 0
-				gestures.append(InputGesture(dots=brailleDots, space=True))
 			else:  # bk:dots
-				gestures.append(InputGesture(dots=brailleDots, space=False))
+				gestures.append(InputGesture(dots=brailleDots, space=0))
 		if key:
 			if key in (1, 2):  # bk:space
-				gestures.append(InputGesture(dots=0, space=True))
+				gestures.append(InputGesture(dots=0, space=key))
 			else:  # br(seikantk):XXX
 				gestures.append(InputGesture(keys=key))
 		for gesture in gestures:
@@ -391,7 +391,7 @@ def _getRoutingIndexes(routingKeyBytes: bytes) -> Set[int]:
 class InputGesture(braille.BrailleDisplayGesture, brailleInput.BrailleInputGesture):
 	source = BrailleDisplayDriver.name
 
-	def __init__(self, keys=None, dots=None, space=False, routing=None):
+	def __init__(self, keys=None, dots=None, space=0, routing=None):
 		super(braille.BrailleDisplayGesture, self).__init__()
 		# see what thumb keys are pressed:
 		names = set()
@@ -400,8 +400,8 @@ def __init__(self, keys=None, dots=None, space=False, routing=None):
 		elif dots is not None:
 			self.dots = dots
 			if space:
-				self.space = space
-				names.add(_keyNames[1])
+				self.space = bool(space)
+				names.update(_getKeyNames(space, _keyNames))
 			names.update(_getKeyNames(dots, _dotNames))
 		elif routing is not None:
 			self.routingIndex = routing
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -164,6 +164,7 @@ Please refer to [the developer guide](https://www.nvaccess.org/files/nvda/docume
 * It is now possible to redirect objects retrieved from on-screen coordinates, by using the `NVDAObject.objectFromPointRedirect` method. (#16788, @Emil-18)
 * Running SCons with the parameter `--all-cores` will automatically pick the maximum number of available CPU cores. (#16943, #16868, @LeonarddeR)
 * Developer info now includes information on app architecture (such as AMD64) for the navigator object. (#16488, @josephsl)
+* Correct internal gesture ID for Seika Notetaker. (#17047, @school510587)
 
 #### Deprecations
 
