Add multi-routing to brailliantB and hidBrailleStandard, use self.idF…

…orCellCount - brailliantB: aggregate routing keys into list, support multi-press - hidBrailleStandard: collect routing keys with prefix, support multi-press producing routerSet1_multiRouterKey for simultaneous presses - Switch all drivers from braille.BrailleDisplayGesture.idForCellCount to self.idForCellCount for consistency Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
seanbudd · May 29, 2026 · Apr 22, 2026 · Apr 23, 2026 · Apr 23, 2026 · Apr 23, 2026
commit 8e0db969b7866345996990c13bf6826d1842f423
@@ -111,7 +111,7 @@ def __init__(self, keys: Set[int], name: str):
 			for rangeName, indexes in sorted(cellIndexesByRange.items()):
 				indexes.sort()
 				allIndexes.extend(indexes)
-				names.append(braille.BrailleDisplayGesture.idForCellCount(len(indexes), rangeName))
+				names.append(self.idForCellCount(len(indexes), rangeName))
 			self.cellIndexes = allIndexes
 		self.id = "+".join(names)
 		# Try to fix the first valid key press was not recognized as a gesture

@@ -561,7 +561,7 @@ def __init__(self, model, keys, brailleInput=False):
 			for rangeName, indexes in sorted(cellIndexesByRange.items()):
 				indexes.sort()
 				allIndexes.extend(indexes)
-				idName = braille.BrailleDisplayGesture.idForCellCount(len(indexes), rangeName)
+				idName = self.idForCellCount(len(indexes), rangeName)
 				names.append(idName)
 				if isNoBC640:
 					secondaryNames.append(idName)

@@ -411,7 +411,7 @@ def __init__(self, model, keysDown):
 					index for index in range(braille.handler.display.numCells) if groupKeysDown & (1 << index)
 				]
 				if self.cellIndexes:
-					names.append(braille.BrailleDisplayGesture.idForCellCount(len(self.cellIndexes)))
+					names.append(self.idForCellCount(len(self.cellIndexes)))
 			elif group == BAUM_ROUTING_KEY:
 				self.cellIndexes = [groupKeysDown - 1]
 				names.append("routing")

@@ -389,6 +389,7 @@ def __init__(self, keys):
 
 		self.keyNames = names = []
 		isBrailleInput = True
+		routingIndexes: list[int] = []
 		for key in self.keyCodes:
 			if isBrailleInput:
 				if DOT1_KEY <= key <= DOT8_KEY:
@@ -401,12 +402,15 @@ def __init__(self, keys):
 					self.dots = 0
 					self.space = False
 			if key >= FIRST_ROUTING_KEY:
-				names.append("routing")
-				self.cellIndexes = [key - FIRST_ROUTING_KEY]
+				routingIndexes.append(key - FIRST_ROUTING_KEY)
 			else:
 				try:
 					names.append(KEY_NAMES[key])
 				except KeyError:
 					log.debugWarning("Unknown key with id %d" % key)
+		if routingIndexes:
+			routingIndexes.sort()
+			self.cellIndexes = routingIndexes
+			names.append(self.idForCellCount(len(routingIndexes)))
 
 		self.id = "+".join(names)
@@ -1228,7 +1228,7 @@ def __init__(self, model, keys, isBrailleInput=False):
 		if routingIndexes:
 			routingIndexes.sort()
 			self.cellIndexes = routingIndexes
-			names.append(braille.BrailleDisplayGesture.idForCellCount(len(routingIndexes)))
+			names.append(self.idForCellCount(len(routingIndexes)))
 
 		self.id = "+".join(names)
 

@@ -320,6 +320,8 @@ def __init__(self, driver, dataIndices):
 		self.keyNames = names = []
 		namePrefix = None
 		isBrailleInput = True
+		routingIndexes: list[int] = []
+		routingNamePrefix: str | None = None
 		for index in dataIndices:
 			buttonCapsInfo = driver._inputButtonCapsByDataIndex.get(index)
 			buttonCaps = buttonCapsInfo.buttonCaps
@@ -354,14 +356,23 @@ def __init__(self, driver, dataIndices):
 				# We must assume that any input in the router set is a routing key,
 				# Because some devices expose the routing keys as 1-bit values
 				# which Windows then combines into a usage range.
-				self.cellIndexes = [buttonCapsInfo.relativeIndexInCollection]
+				routingIndexes.append(buttonCapsInfo.relativeIndexInCollection)
 				usageID = BraillePageUsageID.ROUTER_KEY
 				# Prefix the gesture name with the specific routing collection name (E.g. routerSet1)
-				namePrefix = self._usageIDToGestureName(linkUsagePage, linkUsageID)
+				routingNamePrefix = self._usageIDToGestureName(linkUsagePage, linkUsageID)
+				continue
 			name = self._usageIDToGestureName(usagePage, usageID)
 			if namePrefix:
 				name = "_".join([namePrefix, name])
 			names.append(name)
+		if routingIndexes:
+			routingIndexes.sort()
+			self.cellIndexes = routingIndexes
+			routingIdName = self._usageIDToGestureName(HID_USAGE_PAGE_BRAILLE, BraillePageUsageID.ROUTER_KEY)
+			routingIdName = self.idForCellCount(len(routingIndexes), routingIdName)
+			if routingNamePrefix:
+				routingIdName = "_".join([routingNamePrefix, routingIdName])
+			names.append(routingIdName)
 		self.id = "+".join(names)
 
 	def _usageIDToGestureName(self, usagePage: int, usageID: int):

@@ -268,7 +268,7 @@ def __init__(self, keysDown: dict[bytes, bytes]):
 					index for index in range(braille.handler.display.numCells) if groupKeysDown & (1 << index)
 				]
 				if self.cellIndexes:
-					names.append(braille.BrailleDisplayGesture.idForCellCount(len(self.cellIndexes)))
+					names.append(self.idForCellCount(len(self.cellIndexes)))
 			else:
 				for index, name in enumerate(COMMAND_RESPONSE_INFO.get(group).keys):
 					if groupKeysDown & (1 << index):

@@ -370,7 +370,7 @@ class InputGestureRouting(braille.BrailleDisplayGesture):
 	def __init__(self, indexes: list[int]):
 		super().__init__()
 		self.cellIndexes = list(indexes)
-		self.id = braille.BrailleDisplayGesture.idForCellCount(len(self.cellIndexes))
+		self.id = self.idForCellCount(len(self.cellIndexes))
 
 
 def _getKeyNames(keys: int, names: Dict[int, str]) -> Set[str]: