Skip to content

fix: recognize kitty CSI-u codepoints for F1 through F12 #2378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ashokDevs wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −7
Open

fix: recognize kitty CSI-u codepoints for F1 through F12 #2378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions src/input/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ fn kitty_codepoint_to_keycode(codepoint: u32) -> Option<KeyCode> {
57361 => Some(KeyCode::PrintScreen),
57362 => Some(KeyCode::Pause),
57363 => Some(KeyCode::Menu),
57364..=57375 => Some(KeyCode::F((codepoint - 57364 + 1) as u8)),
57376..=57398 => Some(KeyCode::F((codepoint - 57376 + 13) as u8)),
57399 => Some(KeyCode::Char('0')),
57400 => Some(KeyCode::Char('1')),
Expand Down Expand Up @@ -318,15 +319,10 @@ fn kitty_codepoint_to_keycode(codepoint: u32) -> Option<KeyCode> {
57452 => Some(KeyCode::Modifier(ModifierKeyCode::RightMeta)),
57453 => Some(KeyCode::Modifier(ModifierKeyCode::IsoLevel3Shift)),
57454 => Some(KeyCode::Modifier(ModifierKeyCode::IsoLevel5Shift)),
value if is_kitty_functional_codepoint(value) => None,
value => char::from_u32(value).map(KeyCode::Char),
}
}

fn is_kitty_functional_codepoint(codepoint: u32) -> bool {
(57358..=57454).contains(&codepoint)
}

#[allow(dead_code)] // Reserved for the upcoming raw stdin parser.
fn key_modifiers_from_u8(modifier: u8) -> KeyModifiers {
let mut mods = KeyModifiers::empty();
Expand Down Expand Up @@ -851,8 +847,27 @@ mod tests {
}

#[test]
fn unknown_kitty_functional_key_remains_unsupported() {
assert!(parse_terminal_key_sequence("\x1b[57364;1u").is_none());
fn kitty_f1_through_f12_codepoints_are_recognized() {
let cases = [
("\x1b[57364;1u", KeyCode::F(1)),
("\x1b[57365;1u", KeyCode::F(2)),
("\x1b[57366;1u", KeyCode::F(3)),
("\x1b[57367;1u", KeyCode::F(4)),
("\x1b[57368;1u", KeyCode::F(5)),
("\x1b[57375;1u", KeyCode::F(12)),
("\x1b[57376;1u", KeyCode::F(13)),
];

for (sequence, code) in cases {
let parsed = parse_terminal_key_sequence(sequence).unwrap();
assert_terminal_key_eq(
parsed,
code,
KeyModifiers::empty(),
crossterm::event::KeyEventKind::Press,
None,
);
}
}

fn assert_fixture_corpus_parses(corpus: &str) {
Expand Down
Loading