-
-
Notifications
You must be signed in to change notification settings - Fork 31.9k
GH-130328: Speedup pasting in legacy console on Windows #133728
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -419,10 +419,7 @@ def _getscrollbacksize(self) -> int: | |
|
||
return info.srWindow.Bottom # type: ignore[no-any-return] | ||
|
||
def _read_input(self, block: bool = True) -> INPUT_RECORD | None: | ||
if not block and not self.wait(timeout=0): | ||
return None | ||
|
||
def _read_input(self) -> INPUT_RECORD | None: | ||
rec = INPUT_RECORD() | ||
read = DWORD() | ||
if not ReadConsoleInput(InHandle, rec, 1, read): | ||
|
@@ -431,14 +428,10 @@ def _read_input(self, block: bool = True) -> INPUT_RECORD | None: | |
return rec | ||
|
||
def _read_input_bulk( | ||
self, block: bool, n: int | ||
self, n: int | ||
) -> tuple[ctypes.Array[INPUT_RECORD], int]: | ||
rec = (n * INPUT_RECORD)() | ||
read = DWORD() | ||
|
||
if not block and not self.wait(timeout=0): | ||
return rec, 0 | ||
|
||
if not ReadConsoleInput(InHandle, rec, n, read): | ||
raise WinError(GetLastError()) | ||
|
||
|
@@ -449,8 +442,11 @@ def get_event(self, block: bool = True) -> Event | None: | |
and there is no event pending, otherwise waits for the | ||
completion of an event.""" | ||
|
||
if not block and not self.wait(timeout=0): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have moved blocking and waiting logic into |
||
return None | ||
|
||
while self.event_queue.empty(): | ||
rec = self._read_input(block) | ||
rec = self._read_input() | ||
if rec is None: | ||
return None | ||
|
||
|
@@ -551,12 +547,20 @@ def getpending(self) -> Event: | |
if e2: | ||
e.data += e2.data | ||
|
||
recs, rec_count = self._read_input_bulk(False, 1024) | ||
recs, rec_count = self._read_input_bulk(1024) | ||
for i in range(rec_count): | ||
rec = recs[i] | ||
# In case of a legacy console, we do not only receive a keydown | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually, there is a lot of duplicated logic from |
||
# event, but also a keyup event - and for uppercase letters | ||
# an additional SHIFT_PRESSED event. | ||
if rec and rec.EventType == KEY_EVENT: | ||
key_event = rec.Event.KeyEvent | ||
if not key_event.bKeyDown: | ||
continue | ||
ch = key_event.uChar.UnicodeChar | ||
if ch == "\x00": | ||
# ignore SHIFT_PRESSED and special keys | ||
continue | ||
if ch == "\r": | ||
ch += "\n" | ||
e.data += ch | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
Speedup pasting in ``PyREPL`` on Windows in a legacy console. Patch by Chris | ||
Eibl. |
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 think this is needed. Works for me without it. For both, Linux and Windows, this will immediately return in case of pending data, and just needlessly waits 100 ms if there is no more data.