do not probe_xtgettcap()

Author: jquast

gambaterm/keyboard_input.py

@@ -152,9 +152,6 @@ def is_kitty_keyboard_protocol_supported(
         return False
     with term.enable_kitty_keyboard(report_events=True, timeout=timeout):
         active = term.get_kitty_keyboard_state(timeout=timeout)
-    if active is not None:
-        if active.report_events:
-            return True
     return active is not None and active.report_events
 
 

gambaterm/remote_terminal.py

@@ -45,14 +45,23 @@ def __init__(
         self._keyboard_decoder = codecs.getincrementaldecoder("UTF-8")()
 
     def probe_xtgettcap(self, timeout: float = 1.0) -> None:
-        """Probe terminal capabilities via XTGETTCAP and apply results.
+        """
+        Probe terminal capabilities via XTGETTCAP and apply results.
+
+        This allows to improved 'number_of_colors' detection, and, to "overlay" capabilities not
+        found in jinxed terminfo database but detected by XTGETTCAP: 'blink', 'sitm', 'ritm',
+        'cvvis', 'Smulx', 'Setulc', 'Ms', the same way that blessed.Terminal() would have but we
+        is_a_tty was detected False when we initialized it.
 
-        Must be called after the remote connection is established and after kitty keyboard detection
-        to prevent interference.  Uses ``force=True`` because blessed thought we were not a terminal
-        when first initialized.
+        This method is not called or used by gambaterm-ssh or gambaterm-telnet, because the above
+        capabilities are not used and kitty keyboard support pretty reliably suggests 24-bit color
+        support. It is just here as a suggestion, and can be safely deleted.
         """
         self._xtgettcap_cache = self._Terminal__init__xtgettcap()  # type: ignore[assignment]
         self.number_of_colors = self._Terminal__init__color_capabilities()  # type: ignore[assignment]
+        if self._xtgettcap_cache.supported and self.does_styling:
+            self._jinxed_term.overlay_capabilities(
+                **self._xtgettcap_cache.make_jinxed_capabilities())
 
     @contextlib.contextmanager
     def raw(self) -> Generator[None, None, None]:

gambaterm/ssh.py

@@ -208,12 +208,13 @@ def ssh_terminal_handler(
     else:
         assert False
 
-    # Probe XTGETTCAP which helps correct terminal.number_of_colors using 'RGB' and 'colors'
-    terminal.probe_xtgettcap(timeout=1.0)
+    # It is possible, here, to probe XTGETTCAP which helps correct terminal.number_of_colors using
+    # 'RGB' and 'colors', and some special attributes like blink, underline et al., but since they
+    # are not used by gambaterm, it is not called unless we find better reason otherwise.
+    #terminal.probe_xtgettcap(timeout=1.0)
 
-    color_mode = app_config.color_mode or detect_local_color_mode(terminal)
-    if color_mode == ColorMode.COULD_NOT_DETECT:
-        color_mode = ColorMode.HAS_8_BIT_COLOR
+    # In practice kitty keyboard protocol pretty well implies 24-bit color support already,
+    color_mode = app_config.color_mode or ColorMode.HAS_24_BIT_COLOR
 
     print(
         f"[Terminal Info] {username}: {terminal_type}, {input_source}, {terminal.width}x{terminal.height}"

gambaterm/telnet.py

@@ -75,16 +75,13 @@ def thread_target(
         print(f"< User `{username}` did not support keyboard protocol")
         return 1
 
-    # Probe XTGETTCAP which helps correct terminal.number_of_colors using 'RGB' and 'colors', though
-    # gnu and bsd telnet clients are pretty good about forwarding TERM and COLORTERM, this provides
-    # some small forward compatibility when they decide to withdraw forward of either of them as ssh
-    # does, gnu telnet dangerously forwards **any** environment variable requested by server (!)
-    terminal.probe_xtgettcap(timeout=1.0)
-
-    # Detect terminal color capabilities (augmented by XTGETTCAP probe)
-    color_mode = app_config.color_mode or detect_local_color_mode(terminal)
-    if color_mode == ColorMode.COULD_NOT_DETECT:
-        color_mode = ColorMode.HAS_8_BIT_COLOR
+    # It is possible, here, to probe XTGETTCAP which helps correct terminal.number_of_colors using
+    # 'RGB' and 'colors', and some special attributes like blink, underline et al., but since they
+    # are not used by gambaterm, it is not called unless we find better reason otherwise.
+    #terminal.probe_xtgettcap(timeout=1.0)
+
+    # In practice kitty keyboard protocol pretty well implies 24-bit color support already,
+    color_mode = app_config.color_mode or ColorMode.HAS_24_BIT_COLOR
 
     try:
         terminal.stream.write(