Skip to content

Commit 90e03e4

Browse files
school510587school510587
authored
Merge 5372a9c into 4c50375 
2 parents 4c50375 + 5372a9c commit 90e03e4

1 file changed

Lines changed: 12 additions & 14 deletions

File tree

‎source/brailleDisplayDrivers/seikantk.py‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,8 @@ def _handleKeys(self, arg: bytes):
306306
brailleDots = arg[0]
307307
key = arg[1] | (arg[2] << 8)
308308
gestures = []
309-
if key:
310-
gestures.append(InputGesture(keys=key))
311-
if brailleDots:
312-
gestures.append(InputGesture(dots=brailleDots))
309+
if key or brailleDots:
310+
gestures.append(InputGesture(keys=key, dots=brailleDots))
313311
for gesture in gestures:
314312
try:
315313
inputCore.manager.executeGesture(gesture)
@@ -343,7 +341,6 @@ def _handleKeysRouting(self, arg: bytes):
343341
"kb:shift+rightArrow": ("br(seikantk):SPACE+RJ_RIGHT", "br(seikantk):BACKSPACE+RJ_RIGHT"),
344342
"kb:escape": ("br(seikantk):SPACE+RJ_CENTER",),
345343
"kb:windows": ("br(seikantk):BACKSPACE+RJ_CENTER",),
346-
"kb:space": ("br(seikantk):BACKSPACE", "br(seikantk):SPACE"),
347344
"kb:backspace": ("br(seikantk):d7",),
348345
"kb:pageup": ("br(seikantk):SPACE+LJ_RIGHT",),
349346
"kb:pagedown": ("br(seikantk):SPACE+LJ_LEFT",),
@@ -385,19 +382,20 @@ def _getRoutingIndexes(routingKeyBytes: bytes) -> Set[int]:
385382
class InputGesture(braille.BrailleDisplayGesture, brailleInput.BrailleInputGesture):
386383
source = BrailleDisplayDriver.name
387384

388-
def __init__(self, keys=None, dots=None, space=False, routing=None):
385+
def __init__(self, keys=0, dots=0, routing=None):
389386
super(braille.BrailleDisplayGesture, self).__init__()
390387
# see what thumb keys are pressed:
391388
names = set()
392-
if keys is not None:
389+
if routing is None:
390+
if dots and keys in (0, 3): # bk:dots or bk:space+dots
391+
self.dots = dots
392+
self.space = (keys != 0)
393+
elif keys in (1, 2): # bk:space or bk:space+dots
394+
self.dots = dots
395+
self.space = True
393396
names.update(_getKeyNames(keys, _keyNames))
394-
elif dots is not None:
395-
self.dots = dots
396-
if space:
397-
self.space = space
398-
names.add(_keyNames[1])
399397
names.update(_getKeyNames(dots, _dotNames))
400-
elif routing is not None:
401-
self.routingIndex = routing
398+
else:
399+
self.routingIndex = routing - 1
402400
names.add("routing")
403401
self.id = "+".join(names)

0 commit comments

Comments
 (0)