Merge remote-tracking branch 'upstream/main' into jq/using-blessed-for-kitty

Author: jquast

gambaterm/ansi_escape_code.py

@@ -6,7 +6,7 @@
 from string import ascii_lowercase, ascii_uppercase
 from typing import Callable, Generator, TypeAlias, TypeVar, cast
 
-from asyncssh import SSHServerProcess, TerminalSizeChanged 
+from asyncssh import SSHServerProcess, TerminalSizeChanged
 
 T = TypeVar("T")
 

gambaterm/blessed_keyboard_input.py

@@ -66,16 +66,9 @@ def get_pressed() -> set[DomCode]:
                 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")):
+                if key.key_name == "KEY_CTRL_C":
                     raise KeyboardInterrupt
-                # Ctrl+D
-                if (str(key) == "\x04"
-                        or key.key_name == "KEY_CTRL_D"
-                        or (ctrl and key.key_value == "d")):
+                if key.key_name == "KEY_CTRL_D":
                     raise OSError
                 # Cursor position response
                 if _CPR_RE.match(str(key)):

gambaterm/keyboard_input.py

@@ -43,6 +43,10 @@ def get_input_mapping(console: Console) -> dict[DomCode, Console.Input]:
         DomCode.ARROW_DOWN: console.Input.DOWN,
         DomCode.ARROW_LEFT: console.Input.LEFT,
         DomCode.ARROW_RIGHT: console.Input.RIGHT,
+        DomCode.NUMPAD8: console.Input.UP,
+        DomCode.NUMPAD2: console.Input.DOWN,
+        DomCode.NUMPAD4: console.Input.LEFT,
+        DomCode.NUMPAD6: console.Input.RIGHT,
         DomCode.US_Z: console.Input.A,
         DomCode.US_X: console.Input.B,
         # WASD controls
@@ -154,7 +158,7 @@ def console_input_from_keyboard_context(
         if xdg_session_type is None:
             xdg_session_type = os.environ.get("XDG_SESSION_TYPE", "")
         if xdg_session_type != "x11":
-            raise RuntimeError(MESSAGE_FOR_WAYLAND_USERS)
+            raise RuntimeError(MESSAGE_SUGGESTING_KITTY_SUPPORT)
         with console_input_from_x11_keyboard_context(console, display) as get_input:
             yield get_input
     else:

gambaterm/pynput_keyboard_input.py

@@ -34,8 +34,6 @@ def get_value_from_pynput_key_code(key: pynput.keyboard.KeyCode) -> DomCode | No
         assert False
 
 
-
-
 @contextmanager
 def pynput_key_pressed_context() -> Iterator[Callable[[], set[DomCode]]]:
     import pynput.keyboard

gambaterm/run.py

@@ -133,20 +133,22 @@ def run(
                 # Check terminal size
                 new_height = term.height or 24
                 new_width = term.width or 80
-                maybe_clear_prefix, maybe_clear_suffix = b"", b""
+                maybe_clear_seq = b""
                 if (new_height, new_width) != (height, width):
-                    # Write video frame with clear sequence inside synchronized output mode (DEC
-                    # 2026) to prevent flicker, and, set last_frame as inverse of the current frame
-                    # to ensure a full redraw by the blitter
-                    maybe_clear_prefix = b"\033[?2026h\033[H\033[2J"
-                    maybe_clear_suffix = b"\033[?2026l"
+                    maybe_clear_seq = b"\033[H\033[2J"
                     height, width = new_height, new_width
                     refx, refy = get_ref(width, height, console)
                     last_frame = ~video
-                # Render frame
-                video_data = maybe_clear_prefix + blit(
-                    video, last_frame, refx, refy, width - 1, height, color_mode
-                ) + maybe_clear_suffix
+                # Render frame with synchronized output mode (DEC 2026) to prevent flickering
+                # when the screen is cleared, or an artificial CRT-like "rolling band" side-effects
+                # from fast "sprite blinking" meant to cause "transparency" effect on original HW,
+                # https://zladx.github.io/posts/links-awakening-partial-translucency
+                video_data = (
+                    b"\033[?2026h"
+                    + maybe_clear_seq
+                    + blit(video, last_frame, refx, refy, width - 1, height, color_mode)
+                    + b"\033[?2026l"
+                )
                 last_frame = video.copy()
                 # Update reporting
                 data_length.append(len(video_data))

gambaterm/ssh.py

@@ -111,7 +111,6 @@ async def ssh_process_handler(process: SSHServerProcess[str]) -> int:
     executor: ThreadPoolExecutor = process.get_extra_info("executor")
     display = process.channel.get_x11_display()
     command = process.channel.get_command()
-    environment = dict(process.channel.get_environment())
     terminal_type = process.get_terminal_type()
     connection = process.get_extra_info("connection")
     username = process.get_extra_info("username")
@@ -182,17 +181,6 @@ async def ssh_process_handler(process: SSHServerProcess[str]) -> int:
     else:
         color_mode = ColorMode.HAS_24_BIT_COLOR
 
-    if color_mode == ColorMode.NO_COLOR:
-        print(
-            f"Your terminal `{terminal_type}` doesn't seem to support colors.",
-            f"Try to force a color mode by appending `-t -- --color-mode 3`"
-            f" to the ssh command",
-            sep="\r\n",
-            file=process.stdout,
-        )
-        print(f"< User `{username}` terminal `{terminal_type}` does not support colors")
-        return 1
-
     # Now is a good time to instanciate the console
     # (it might fail if the ROM does not exist for instance)
     console = console_callback()