-
-
Notifications
You must be signed in to change notification settings - Fork 30.8k
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.
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
gh-128388: pyrepl on Windows: add meta and ctrl+arrow keybindings #128389
base: main
Are you sure you want to change the base?
Conversation
Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool. If this change has little impact on Python users, wait for a maintainer to apply the |
6606f63
to
283e7c3
Compare
Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool. If this change has little impact on Python users, wait for a maintainer to apply the |
Yes please, and also sign the CLA. |
@hugovk, UPDATE: it looks like these are the instructions for which file I should create: https://devguide.python.org/core-developers/committing/#how-to-add-a-news-entry. I think I tried signing the CLA, but the
|
Yes, that's right, the Lib dir is the stdlib. |
Misc/NEWS.d/next/Library/2025-01-01-19-24-43.gh-issue-128388.8UdMz_.rst
Outdated
Show resolved
Hide resolved
…8.8UdMz_.rst` Co-authored-by: Hugo van Kemenade <[email protected]>
@hugovk, thank you for that suggested doc change, which I approved. Is there anything else I need to do, or do we now just need to wait for someone else (e.g. @pablogsal, @lysnikolaou, or @ambv) to review the code changes? |
Thanks for the updates. Yes, someone with Windows will need to review, hopefully it shouldn't be too long :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left some comments for improvement of the code, but the PR is good: I tested with Windows 11 and the meta keybindings work now
Lib/_pyrepl/windows_console.py
Outdated
return Event( | ||
evt="key", data=code, raw=rec.Event.KeyEvent.uChar.UnicodeChar | ||
) | ||
if code in ("left", "right") and (ctrlstate := key_event.dwControlKeyState) and ctrlstate & CTRL_OR_ALT_ACTIVE: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes Alt
+←
and Ctrl-Alt
+←
work just as Ctrl
+←
. Is that how it should be?
On Unix for me Alt
+←
gives me capital C (not sure why, does not really make sense to me) and Ctrl-Alt
+←
triggers my window manager.
In the keymap I also don't see Alt-left with a special meaning:
Lines 146 to 161 in f157485
(r"\<up>", "up"), | |
(r"\<down>", "down"), | |
(r"\<left>", "left"), | |
(r"\C-\<left>", "backward-word"), | |
(r"\<right>", "right"), | |
(r"\C-\<right>", "forward-word"), | |
(r"\<delete>", "delete"), | |
(r"\x1b[3~", "delete"), | |
(r"\<backspace>", "backspace"), | |
(r"\M-\<backspace>", "backward-kill-word"), | |
(r"\<end>", "end-of-line"), # was 'end' | |
(r"\<home>", "beginning-of-line"), # was 'home' | |
(r"\<f1>", "help"), | |
(r"\<f2>", "show-history"), | |
(r"\<f3>", "paste-mode"), | |
(r"\EOF", "end"), # the entries in the terminfo database for xterms |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Exactly, I didn't see anything existing that was useful for Alt
+←
, so I figured might as well make it useful. I can remove it if you prefer only Ctrl
+←
being useful. Also, it would definitely violate separation of concerns if this Lib/_pyrepl/windows_console.py
file were to try to read the keymappings in Lib/_pyrepl/reader.py
to check if r"\M-\<left>"
existed, and I don't expect that to be added anytime soon.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer all implementations (unix, windows, etc.) to have the same implementation. Please revert the changes to ALT. There might be good use for the ALT modifier, but that would be for another PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That brings up a good question, why don't we add (r"\M-\<left>", "backward-word")
and (r"\M-\<right>", "forward-word")
to the default_keymap
, so that way all implementations will have something useful for Alt
+←
?
Also, I just tested that, and it made me realize that the Lib\_pyrepl\windows_console.py
code also needs to # queue the key, return the meta command
in the special key == "\x00"
section (see 46b22d1 for the fix and removal of treating Alt
+←
as Ctrl
+←
).
Misc/NEWS.d/next/Library/2025-01-01-19-24-43.gh-issue-128388.8UdMz_.rst
Outdated
Show resolved
Hide resolved
Misc/NEWS.d/next/Library/2025-01-01-19-24-43.gh-issue-128388.8UdMz_.rst
Outdated
Show resolved
Hide resolved
Co-authored-by: Pieter Eendebak <[email protected]>
Co-authored-by: Pieter Eendebak <[email protected]>
) | ||
key = VK_MAP.get(key_event.wVirtualKeyCode) | ||
if key: | ||
if key in ("left", "right") and key_event.dwControlKeyState & CTRL_ACTIVE: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if key in ("left", "right") and key_event.dwControlKeyState & CTRL_ACTIVE: | |
if key_event.dwControlKeyState & CTRL_ACTIVE: |
I tried this locally and it works. For example for arrow up the ctrl up
is passed on as the key. Currently it is ignored, but maybe it is better to just pass whatever we get and let some platform independent part of the code decide what to do with it?
self.event_queue.insert(0, Event(evt="key", data=key, raw=key)) | ||
return Event(evt="key", data="\033") # keymap.py uses this for meta |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know the answer. But why pass the ctrl modifier as a key f'ctrl {key}`, and the alt modifier using a special event?
Fix
Lib/_pyrepl/windows_console.py
to support more keybindings, like theCtrl
+←
andCtrl
+→
word-skipping keybindings and those with meta (i.e. Alt), e.g. tokill-word
orbackward-kill-word
.Specifics: if Ctrl is pressed, emit "ctrl left" and "ctrl right" instead of just "left" or "right," and if Meta/Alt is pressed, emit the special key code for meta before emitting the other key that was pressed.
NOTE: this is my first PR for https://github.com/python/cpython, so please tell me if I need to do something else, e.g. does this need an entry added somewhere under
Misc/NEWS.d
?pyrepl
on Windows: add Ctrl+← and Ctrl+→ word-skipping and other keybindings #128388