diff options
| author | akbash <akbash@herdr.dev> | 2026-09-12 00:38:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-12 01:38:57 +0400 |
| commit | 9ad65d9031e8cb16a7b553c0e6f74809e9811e92 (patch) | |
| tree | 84fb346571442899f6fe1b1a6b60783d2be764b2 /src/input/encode.rs | |
| parent | fb5525fc2234a246dfdfc9e0d7ed73c824cbd8a6 (diff) | |
fix: suppress Windows dead-key fallback characters in remote panes (#3972)
refs #3948
Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
Diffstat (limited to 'src/input/encode.rs')
| -rw-r--r-- | src/input/encode.rs | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/src/input/encode.rs b/src/input/encode.rs index 1dd56351..27e59dce 100644 --- a/src/input/encode.rs +++ b/src/input/encode.rs @@ -16,10 +16,10 @@ pub fn encode_key(key: KeyEvent, protocol: KeyboardProtocol) -> Vec<u8> { } pub fn encode_terminal_key(key: TerminalKey, protocol: KeyboardProtocol) -> Vec<u8> { - // A zero Unicode value on this Windows character event means the host layout is - // still composing a dead key. Kitty panes must not receive its physical fallback. + // The host layout has not committed text for this Windows dead key. Neither + // legacy nor Kitty panes should receive its physical character fallback. // Legacy Windows panes take the native ConPTY fallback before reaching this encoder. - if matches!(protocol, KeyboardProtocol::Kitty { .. }) && key.is_windows_shift_dead_key() { + if key.is_windows_dead_key() { return Vec::new(); } @@ -572,6 +572,36 @@ mod tests { } #[test] + fn kitty_all_keys_does_not_encode_windows_altgr_dead_key_phases() { + use crossterm::event::KeyEventKind; + + let key = TerminalKey::new(KeyCode::Char('4'), KeyModifiers::empty()).with_windows_record( + crate::input::WindowsKeyRecord { + key_down: true, + repeat_count: 1, + virtual_key_code: 52, + virtual_scan_code: 5, + unicode: 0, + control_key_state: 9, + }, + ); + for kind in [ + KeyEventKind::Press, + KeyEventKind::Repeat, + KeyEventKind::Release, + ] { + assert!( + encode_terminal_key( + key.clone().with_kind(kind), + KeyboardProtocol::Kitty { flags: 31 }, + ) + .is_empty(), + "{kind:?}" + ); + } + } + + #[test] fn legacy_enter() { let key = KeyEvent::new(KeyCode::Enter, KeyModifiers::empty()); assert_eq!(encode_key(key, KeyboardProtocol::Legacy), vec![b'\r']); |
