Skip to content

Allow QWERTY input from Papenmeier braille displays to work again #11944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feerrenrut merged 5 commits into from
Dec 22, 2020
Merged

Allow QWERTY input from Papenmeier braille displays to work again #11944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8858a2d
keyboardHandler.injectRawKeyboardInput: simply by just using keybd_ev…
michaelDCurran Dec 10, 2020
bb98372
Papenmeier braille driver: more gesture bindings and fix detection of…
michaelDCurran Dec 10, 2020
8d6cfec
Fix linting issues
michaelDCurran Dec 10, 2020
14d46c6
Merge remote-tracking branch 'origin/beta' into papenmeierKeyboardInput
feerrenrut Dec 22, 2020
92393e7
update changes file for PR #11944
feerrenrut Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 50 additions & 2 deletions source/brailleDisplayDrivers/papenmeier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,60 @@ def _handleKeyPresses(self):
"kb:alt": ("br(papenmeier):lt+d3",),
"kb:control": ("br(papenmeier):lt+d2",),
"kb:escape": ("br(papenmeier):space+d7",),
"kb:control+escape": ("br(papenmeier):lt+d1+d2+d3+d4+d5+d6",),
"kb:tab": ("br(papenmeier):space+d3+d7",),
"kb:upArrow": ("br(papenmeier):space+d2",),
"kb:downArrow": ("br(papenmeier):space+d5",),
"kb:leftArrow": ("br(papenmeier):space+d1",),
"kb:rightArrow": ("br(papenmeier):space+d4",),

"kb:control+escape": ("br(papenmeier):space+d1+d2+d3+d4+d5+d6",),
"kb:control+alt+delete": ("br(papenmeier):space+d1+d2+d3+d4+d5+d6+d7+d8",),
"kb:enter": ("br(papenmeier):space+d8", "br(papenmeier):d8",),
"kb:pageup": ("br(papenmeier):space+d3",),
"kb:pagedown": ("br(papenmeier):space+d6",),
"kb:backspace": ("br(papenmeier):space+d6+d8", "br(papenmeier):d7",),
"kb:home": ("br(papenmeier):space+d1+d2",),
"kb:end": ("br(papenmeier):space+d4+d5",),
"kb:delete": ("br(papenmeier):space+d5+d6",),

"kb:f1": ("br(papenmeier):rt+d1",),
"kb:f2": ("br(papenmeier):rt+d1+d2",),
"kb:f3": ("br(papenmeier):rt+d1+d4",),
"kb:f4": ("br(papenmeier):rt+d1+d4+d5",),
"kb:f5": ("br(papenmeier):rt+d1+d5",),
"kb:f6": ("br(papenmeier):rt+d1+d2+d4",),
"kb:f7": ("br(papenmeier):rt+d1+d2+d4+d5",),
"kb:f8": ("br(papenmeier):rt+d1+d2+d5",),
"kb:f9": ("br(papenmeier):rt+d2+d4",),
"kb:f10": ("br(papenmeier):rt+d2+d4+d5",),
"kb:f11": ("br(papenmeier):rt+d1+d3",),
"kb:f12": ("br(papenmeier):rt+d1+d2+d3",),
"kb:control+a": ("br(papenmeier):d1+d7+d8",),
"kb:control+p": ("br(papenmeier):d1+d2+d3+d4+d7+d8",),
"kb:control+s": ("br(papenmeier):d2+d3+d4+d7+d8",),
"kb:control+b": ("br(papenmeier):d1+d2+d7+d8",),
"kb:control+c": ("br(papenmeier):d1+d4+d7+d8",),
"kb:control+d": ("br(papenmeier):d1+d4+d5+d7+d8",),
"kb:control+e": ("br(papenmeier):d1+d5+d7+d8",),
"kb:control+f": ("br(papenmeier):d1+d2+d4+d7+d8",),
"kb:control+g": ("br(papenmeier):d1+d2+d4+d5+d7+d8",),
"kb:control+h": ("br(papenmeier):d1+d2+d5+d7+d8",),
"kb:control+i": ("br(papenmeier):d2+d4+d7+d8",),
"kb:control+j": ("br(papenmeier):d2+d4+d5+d7+d8",),
"kb:control+k": ("br(papenmeier):d1+d3+d7+d8",),
"kb:control+l": ("br(papenmeier):d1+d2+d3+d7+d8",),
"kb:control+m": ("br(papenmeier):d1+d3+d4+d7+d8",),
"kb:control+n": ("br(papenmeier):d1+d3+d4+d5+d7+d8",),
"kb:control+o": ("br(papenmeier):d1+d3+d5+d7+d8",),
"kb:control+q": ("br(papenmeier):d1+d2+d3+d4+d5+d7+d8",),
"kb:control+r": ("br(papenmeier):d1+d2+d3+d5+d7+d8",),
"kb:control+t": ("br(papenmeier):d2+d3+d4+d5+d7+d8",),
"kb:control+u": ("br(papenmeier):d1+d3+d6+d7+d8",),
"kb:control+v": ("br(papenmeier):d1+d2+d3+d6+d7+d8",),
"kb:control+w": ("br(papenmeier):d2+d4+d5+d6+d7+d8",),
"kb:control+x": ("br(papenmeier):d1+d3+d4+d6+d7+d8",),
"kb:control+y": ("br(papenmeier):d1+d3+d4+d5+d6+d7+d8",),
"kb:control+z": ("br(papenmeier):d1+d3+d5+d6+d7+d8",),
}
})

Expand Down Expand Up @@ -535,7 +583,7 @@ def __init__(self, keys: Optional[Union[bytes, int]], driver: BrailleDisplayDriv
self.id=brl_join_keys(brl_decode_key_names_repeat(driver))
return

if driver._baud != 1 and keys[0] == 'L':
if driver._baud != 1 and keys[0] == ord(b'L'):
assert isinstance(keys, bytes)
if (keys[3] - 48) >> 3:
scancode = keys[5] - 48 << 4 | keys[6] - 48
Expand Down
19 changes: 6 additions & 13 deletions source/keyboardHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,16 +651,9 @@ def injectRawKeyboardInput(isPress, code, isExtended):
# Change what we pass to MapVirtualKeyEx, but don't change what NVDA gets.
mapScan |= 0xE000
vkCode = winUser.user32.MapVirtualKeyExW(mapScan, winUser.MAPVK_VSC_TO_VK_EX, getInputHkl())
if isPress:
shouldSend = internal_keyDownEvent(vkCode, code, isExtended, False)
else:
shouldSend = internal_keyUpEvent(vkCode, code, isExtended, False)
if shouldSend:
flags = 0
if not isPress:
flags |= 2
if isExtended:
flags |= 1
with ignoreInjection():
winUser.keybd_event(vkCode, code, flags, None)
wx.Yield()
flags = 0
if not isPress:
flags |= 2
if isExtended:
flags |= 1
winUser.keybd_event(vkCode, code, flags, None)
1 change: 1 addition & 0 deletions user_docs/en/changes.t2t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Plus many other important bug fixes and improvements.
- In Windows 10 Calculator, NVDA will not announce progress of calculations if speak typed characters is disabled. (#9428)
- NVDA no longer crashes when using English US grade 2 and expand to computer Braille at the cursor is on, when displaying certain content such as a URL in Braille. (#11754)
- It is again possible to report formatting information for the focused Excel cell using NVDA+F. (#11914)
- QWERTY input on Papenmeier braille displays that support it again works and no longer causes NVDA to randomly freeze. (#11944)


== Changes for Developers ==
Expand Down