fix keyboard protocol

Author: raphamorim

docs/src/pages/changelog.md

@@ -15,6 +15,7 @@ language: 'en'
 
 ## 0.2.33 (unreleased)
 
+- Fix kitty keyboard protocol.
 - Support reporting terminal version via XTVERSION.
 
 ## 0.2.32

rio-backend/src/crosswords/mod.rs

@@ -1353,6 +1353,10 @@ impl<U: EventListener> Crosswords<U> {
         };
         info!("Setting keyboard mode to {new_mode:?}");
         self.keyboard_mode_stack[self.keyboard_mode_idx] = new_mode;
+
+        // Sync self.mode with keyboard_mode_stack
+        self.mode &= !Mode::KITTY_KEYBOARD_PROTOCOL;
+        self.mode |= Mode::from(KeyboardModes::from_bits_truncate(new_mode));
     }
 
     /// Find the beginning of the current line across linewraps.
@@ -2243,6 +2247,10 @@ impl<U: EventListener> Handler for Crosswords<U> {
             self.keyboard_mode_idx %= KEYBOARD_MODE_STACK_MAX_DEPTH;
         }
         self.keyboard_mode_stack[self.keyboard_mode_idx] = mode.bits();
+
+        // Sync self.mode with keyboard_mode_stack
+        self.mode &= !Mode::KITTY_KEYBOARD_PROTOCOL;
+        self.mode |= Mode::from(mode);
     }
 
     #[inline]
@@ -2251,6 +2259,7 @@ impl<U: EventListener> Handler for Crosswords<U> {
         if usize::from(to_pop) >= KEYBOARD_MODE_STACK_MAX_DEPTH {
             self.keyboard_mode_stack.fill(KeyboardModes::NO_MODE.bits());
             self.keyboard_mode_idx = 0;
+            self.mode &= !Mode::KITTY_KEYBOARD_PROTOCOL;
             return;
         }
         for _ in 0..to_pop {
@@ -2261,6 +2270,11 @@ impl<U: EventListener> Handler for Crosswords<U> {
         if self.keyboard_mode_idx >= KEYBOARD_MODE_STACK_MAX_DEPTH {
             self.keyboard_mode_idx %= KEYBOARD_MODE_STACK_MAX_DEPTH;
         }
+
+        // Sync self.mode with keyboard_mode_stack
+        let current_mode = self.keyboard_mode_stack[self.keyboard_mode_idx];
+        self.mode &= !Mode::KITTY_KEYBOARD_PROTOCOL;
+        self.mode |= Mode::from(KeyboardModes::from_bits_truncate(current_mode));
     }
 
     #[inline]
@@ -3988,4 +4002,79 @@ mod tests {
             other => panic!("Expected PtyWrite event, got {:?}", other),
         }
     }
+
+    #[test]
+    fn test_keyboard_mode_syncs_with_mode() {
+        let size = CrosswordsSize::new(10, 10);
+        let window_id = WindowId::from(0);
+        let mut term =
+            Crosswords::new(size, CursorShape::Block, VoidListener {}, window_id, 0);
+
+        // Initially, no keyboard mode should be set
+        assert!(!term.mode().contains(Mode::DISAMBIGUATE_ESC_CODES));
+        assert!(!term.mode().contains(Mode::REPORT_ALL_KEYS_AS_ESC));
+
+        // Push DISAMBIGUATE_ESC_CODES
+        Handler::push_keyboard_mode(&mut term, KeyboardModes::DISAMBIGUATE_ESC_CODES);
+        assert!(
+            term.mode().contains(Mode::DISAMBIGUATE_ESC_CODES),
+            "mode() should contain DISAMBIGUATE_ESC_CODES after push"
+        );
+        assert!(!term.mode().contains(Mode::REPORT_ALL_KEYS_AS_ESC));
+
+        // Push REPORT_ALL_KEYS_AS_ESC (replaces previous mode at this stack level)
+        Handler::push_keyboard_mode(&mut term, KeyboardModes::REPORT_ALL_KEYS_AS_ESC);
+        assert!(
+            term.mode().contains(Mode::REPORT_ALL_KEYS_AS_ESC),
+            "mode() should contain REPORT_ALL_KEYS_AS_ESC after push"
+        );
+        assert!(!term.mode().contains(Mode::DISAMBIGUATE_ESC_CODES),
+            "mode() should not contain DISAMBIGUATE_ESC_CODES after pushing different mode"
+        );
+
+        // Pop back to previous level
+        Handler::pop_keyboard_modes(&mut term, 1);
+        assert!(
+            term.mode().contains(Mode::DISAMBIGUATE_ESC_CODES),
+            "mode() should contain DISAMBIGUATE_ESC_CODES after pop"
+        );
+        assert!(
+            !term.mode().contains(Mode::REPORT_ALL_KEYS_AS_ESC),
+            "mode() should not contain REPORT_ALL_KEYS_AS_ESC after pop"
+        );
+
+        // Test set_keyboard_mode with Union
+        Handler::set_keyboard_mode(
+            &mut term,
+            KeyboardModes::REPORT_EVENT_TYPES,
+            KeyboardModesApplyBehavior::Union,
+        );
+        assert!(
+            term.mode().contains(Mode::DISAMBIGUATE_ESC_CODES),
+            "mode() should still contain DISAMBIGUATE_ESC_CODES after union"
+        );
+        assert!(
+            term.mode().contains(Mode::REPORT_EVENT_TYPES),
+            "mode() should contain REPORT_EVENT_TYPES after union"
+        );
+
+        // Test set_keyboard_mode with Replace
+        Handler::set_keyboard_mode(
+            &mut term,
+            KeyboardModes::REPORT_ALTERNATE_KEYS,
+            KeyboardModesApplyBehavior::Replace,
+        );
+        assert!(
+            term.mode().contains(Mode::REPORT_ALTERNATE_KEYS),
+            "mode() should contain REPORT_ALTERNATE_KEYS after replace"
+        );
+        assert!(
+            !term.mode().contains(Mode::DISAMBIGUATE_ESC_CODES),
+            "mode() should not contain DISAMBIGUATE_ESC_CODES after replace"
+        );
+        assert!(
+            !term.mode().contains(Mode::REPORT_EVENT_TYPES),
+            "mode() should not contain REPORT_EVENT_TYPES after replace"
+        );
+    }
 }