untested Ctrl+C & D fixes

Author: jquast

gambaterm/blessed_keyboard_input.py

@@ -20,6 +20,7 @@ class KeyboardState:
 
     pressed: set[DomCode] = field(default_factory=set)
     cpr_received: bool = False
+    keystrokes: list = field(default_factory=list)
 
 
 # Blessed synthesizes key_name as "KEY_{char}" for A-Z and 0-9 on release
@@ -72,25 +73,12 @@ def blessed_key_pressed_context(
 
         def get_pressed() -> KeyboardState:
             state.cpr_received = False
+            state.keystrokes.clear()
             while True:
                 key = term.inkey(timeout=0)
                 if not key:
                     break
-                # Ctrl+C
-                ctrl = key.modifiers_bits & 4
-                if (
-                    str(key) == "\x03"
-                    or key.key_name == "KEY_CTRL_C"
-                    or (ctrl and key.key_value == "c")
-                ):
-                    raise KeyboardInterrupt
-                # Ctrl+D
-                if (
-                    str(key) == "\x04"
-                    or key.key_name == "KEY_CTRL_D"
-                    or (ctrl and key.key_value == "d")
-                ):
-                    raise OSError
+                state.keystrokes.append(key)
                 # Cursor position response
                 if _CPR_RE.match(str(key)):
                     state.cpr_received = True

gambaterm/keyboard_input.py

@@ -95,6 +95,7 @@ def __call__(self) -> set[Console.Input]:
         result = self._get_pressed()
         if isinstance(result, KeyboardState):
             self.cpr_state.cpr_received = result.cpr_received
+            self.cpr_state.keystrokes = result.keystrokes
             new_pressed = set(result.pressed)
         else:
             self.cpr_state.cpr_received = False

gambaterm/pynput_keyboard_input.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import sys
-import threading
 from contextlib import contextmanager
 from typing import Callable, Iterator, TYPE_CHECKING
 
@@ -38,9 +37,6 @@ def get_value_from_pynput_key_code(key: pynput.keyboard.KeyCode) -> DomCode | No
 def pynput_key_pressed_context() -> Iterator[Callable[[], set[DomCode]]]:
     import pynput.keyboard
 
-    ctrl_c_event = threading.Event()
-    ctrl_d_event = threading.Event()
-
     def on_press(key: pynput.keyboard.Key | pynput.keyboard.KeyCode | None) -> None:
         value: DomCode | None
         if isinstance(key, pynput.keyboard.KeyCode):
@@ -51,13 +47,6 @@ def on_press(key: pynput.keyboard.Key | pynput.keyboard.KeyCode | None) -> None:
             return
         if value is not None:
             pressed.add(value)
-        # Check for Ctrl+C / Ctrl+D
-        ctrl_held = DomCode.CONTROL_LEFT in pressed or DomCode.CONTROL_RIGHT in pressed
-        if ctrl_held:
-            if DomCode.US_C in pressed:
-                ctrl_c_event.set()
-            elif DomCode.US_D in pressed:
-                ctrl_d_event.set()
 
     def on_release(key: pynput.keyboard.Key | pynput.keyboard.KeyCode | None) -> None:
         value: DomCode | None
@@ -70,18 +59,11 @@ def on_release(key: pynput.keyboard.Key | pynput.keyboard.KeyCode | None) -> Non
         if value is not None:
             pressed.discard(value)
 
-    def get_pressed() -> set[DomCode]:
-        if ctrl_c_event.is_set():
-            raise KeyboardInterrupt
-        if ctrl_d_event.is_set():
-            raise OSError
-        return pressed
-
     pressed: set[DomCode] = set()
     listener = pynput.keyboard.Listener(on_press=on_press, on_release=on_release)
     try:
         listener.start()
-        yield get_pressed
+        yield lambda: pressed
     finally:
         pressed.clear()
         listener.stop()

gambaterm/run.py

@@ -116,6 +116,31 @@ def run(
             if audio_out:
                 audio_out.send(audio[:samples, :])
 
+        # Read keys for ctrl-c/ctrl-d detection.
+        # We check for raw \x03 and \x04 bytes rather than physical key codes
+        # so that detection is keyboard-layout agnostic: e.g. a Bépo user
+        # presses Ctrl+C (physically Ctrl+H on US layout) and the terminal
+        # translates it to \x03 (ETX) before putting it on stdin.
+        # For blessed backend: keystrokes were collected during get_input()
+        if isinstance(get_input, GameInputGetter) and get_input.cpr_state.keystrokes:
+            for key in get_input.cpr_state.keystrokes:
+                if str(key) == "\x03":
+                    raise KeyboardInterrupt
+                if str(key) == "\x04":
+                    raise OSError
+        # For X11/pynput backends: game input comes from X11 events / OS key
+        # hooks (not stdin), so we read stdin here solely for ctrl-c/ctrl-d.
+        # This replaces prompt-toolkit's read_keys().
+        else:
+            while True:
+                key = term.inkey(timeout=0)
+                if not key:
+                    break
+                if str(key) == "\x03":
+                    raise KeyboardInterrupt
+                if str(key) == "\x04":
+                    raise OSError
+
         # Check for CPR response (set by keyboard handler during get_input)
         if use_cpr_sync and cpr_state is not None and cpr_state.cpr_received:
             screen_ready = True

gambaterm/x11_keyboard_input.py

@@ -93,13 +93,6 @@ def get_pressed() -> set[DomCode]:
                 if is_key_released:
                     pressed.discard(key)
 
-            # Check for Ctrl+C / Ctrl+D
-            if DomCode.CONTROL_LEFT in pressed or DomCode.CONTROL_RIGHT in pressed:
-                if DomCode.US_C in pressed:
-                    raise KeyboardInterrupt
-                if DomCode.US_D in pressed:
-                    raise OSError
-
             # Return the currently pressed keys
             return pressed