Skip to content

gh-127947: Repeat PyREPL key events on Windows when wRepeatCount > 1 #127948

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

Open
SimonvBez wants to merge 11 commits into
base: main
Choose a base branch
from
Open

gh-127947: Repeat PyREPL key events on Windows when wRepeatCount > 1 #127948

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
975bf7b
Repeat PyREPL key events on Windows when wRepeatCount > 1
SimonvBez Dec 13, 2024
215894d
Fixed typo in type hint
SimonvBez Dec 14, 2024
50f260a
Fixed mypy type error
SimonvBez Dec 14, 2024
655a98e
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 14, 2024
e77c89d
Shortened news
SimonvBez Jan 10, 2025
825ccaf
Simplified if-logic
SimonvBez Jan 10, 2025
72e380d
Added tests for wRepeatCount to PyREPL on Windows
SimonvBez Jan 12, 2025
a68e045
Added self to ACKS
SimonvBez Jan 12, 2025
ebe00f0
Merge branch 'main' into fix-pyrepl-dead-keys
SimonvBez Jan 12, 2025
1f7bf1f
Removed key_repeat_queue, only use the event_queue
SimonvBez Jan 13, 2025
fa12c70
Fixed typo in code comment
SimonvBez Jan 14, 2025
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
Prev Previous commit
Next Next commit
Merge branch 'main' into fix-pyrepl-dead-keys
  • Loading branch information
@SimonvBez
SimonvBez authored Jan 12, 2025
commit ebe00f0362e5eb658f41cebcf3b68cc5df3921fa
39 changes: 22 additions & 17 deletions Lib/_pyrepl/windows_console.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,30 +427,35 @@ def get_event(self, block: bool = True) -> Event | None:

return event

def _event_from_keyevent(self, keyevent: KeyEvent) -> Event | None:
key = keyevent.uChar.UnicodeChar
def _event_from_keyevent(self, key_event: KeyEvent) -> Event | None:
raw_key = key = key_event.uChar.UnicodeChar

if keyevent.uChar.UnicodeChar == "\r":
# Make enter make unix-like
if key == "\r":
# Make enter unix-like
return Event(evt="key", data="\n", raw=b"\n")
elif keyevent.wVirtualKeyCode == 8:
elif key_event.wVirtualKeyCode == 8:
# Turn backspace directly into the command
return Event(
evt="key",
data="backspace",
raw=keyevent.uChar.UnicodeChar,
)
elif keyevent.uChar.UnicodeChar == "\x00":
key = "backspace"
elif key == "\x00":
# Handle special keys like arrow keys and translate them into the appropriate command
code = VK_MAP.get(keyevent.wVirtualKeyCode)
if code:
return Event(
evt="key", data=code, raw=keyevent.uChar.UnicodeChar
)
key = VK_MAP.get(key_event.wVirtualKeyCode)
if key:
if key_event.dwControlKeyState & CTRL_ACTIVE:
key = f"ctrl {key}"
elif key_event.dwControlKeyState & ALT_ACTIVE:
# queue the key, return the meta command
self.event_queue.insert(0, Event(evt="key", data=key, raw=key))
return Event(evt="key", data="\033") # keymap.py uses this for meta
return Event(evt="key", data=key, raw=key)

return None

return Event(evt="key", data=key, raw=keyevent.uChar.UnicodeChar)
if key_event.dwControlKeyState & ALT_ACTIVE:
# queue the key, return the meta command
self.event_queue.insert(0, Event(evt="key", data=key, raw=raw_key))
return Event(evt="key", data="\033") # keymap.py uses this for meta

return Event(evt="key", data=key, raw=raw_key)

def push_char(self, char: int | bytes) -> None:
"""
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.