mirror of
https://github.com/wez/wezterm.git
synced 2024-12-24 22:01:47 +03:00
keyboard: improve support for numpad buttons
We were missing encoding of these for the base xterm encoding (I haven't daily driven a keyboard with a numpad in over 10 years!). Improve mapping for the kitty protocol. refs: https://github.com/wez/wezterm/issues/3478
This commit is contained in:
Wez Furlong
parent
b646c36e34
commit
f4995511e2
@ -221,6 +221,11 @@ pub enum KeyCode {
|
||||
ApplicationRightArrow,
|
||||
ApplicationUpArrow,
|
||||
ApplicationDownArrow,
|
||||
KeyPadHome,
|
||||
KeyPadEnd,
|
||||
KeyPadPageUp,
|
||||
KeyPadPageDown,
|
||||
KeyPadBegin,
|
||||
|
||||
#[doc(hidden)]
|
||||
InternalPasteStart,
|
||||
@ -304,10 +309,11 @@ impl KeyCode {
|
||||
ApplicationRightArrow => 57418,
|
||||
ApplicationUpArrow => 57419,
|
||||
ApplicationDownArrow => 57420,
|
||||
PageUp => 57421,
|
||||
PageDown => 57422,
|
||||
Home => 57423,
|
||||
End => 57424,
|
||||
KeyPadHome => 57423,
|
||||
KeyPadEnd => 57424,
|
||||
KeyPadBegin => 57427,
|
||||
KeyPadPageUp => 57421,
|
||||
KeyPadPageDown => 57422,
|
||||
Insert => 57425,
|
||||
// KeypadDelete => 57426,
|
||||
MediaPlayPause => 57430,
|
||||
@ -615,7 +621,9 @@ impl KeyCode {
|
||||
}
|
||||
|
||||
Home
|
||||
| KeyPadHome
|
||||
| End
|
||||
| KeyPadEnd
|
||||
| UpArrow
|
||||
| DownArrow
|
||||
| RightArrow
|
||||
@ -663,7 +671,7 @@ impl KeyCode {
|
||||
}
|
||||
}
|
||||
|
||||
PageUp | PageDown | Insert | Delete => {
|
||||
PageUp | PageDown | KeyPadPageUp | KeyPadPageDown | Insert | Delete => {
|
||||
let c = match key {
|
||||
Insert => 2,
|
||||
Delete => 3,
|
||||
@ -734,9 +742,47 @@ impl KeyCode {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: emit numpad sequences
|
||||
Numpad0 | Numpad1 | Numpad2 | Numpad3 | Numpad4 | Numpad5 | Numpad6 | Numpad7
|
||||
| Numpad8 | Numpad9 | Multiply | Add | Separator | Subtract | Decimal | Divide => {}
|
||||
Numpad0 | Numpad3 | Numpad9 | Decimal => {
|
||||
let intro = match key {
|
||||
Numpad0 => "\x1b[2",
|
||||
Numpad3 => "\x1b[6",
|
||||
Numpad9 => "\x1b[6",
|
||||
Decimal => "\x1b[3",
|
||||
_ => unreachable!(),
|
||||
};
|
||||
|
||||
let encoded_mods = encode_modifiers(mods);
|
||||
if encoded_mods == 0 {
|
||||
// If no modifiers are held, don't send the modifier
|
||||
// sequence, as the modifier encoding is a CSI-u extension.
|
||||
write!(buf, "{}~", intro)?;
|
||||
} else {
|
||||
write!(buf, "{};{}~", intro, 1 + encoded_mods)?;
|
||||
}
|
||||
}
|
||||
|
||||
Numpad1 | Numpad2 | Numpad4 | Numpad5 | KeyPadBegin | Numpad6 | Numpad7 | Numpad8 => {
|
||||
let c = match key {
|
||||
Numpad1 => "F",
|
||||
Numpad2 => "B",
|
||||
Numpad4 => "D",
|
||||
Numpad5 => "E",
|
||||
Numpad6 => "C",
|
||||
Numpad7 => "H",
|
||||
Numpad8 => "A",
|
||||
_ => unreachable!(),
|
||||
};
|
||||
|
||||
let encoded_mods = encode_modifiers(mods);
|
||||
if encoded_mods == 0 {
|
||||
// If no modifiers are held, don't send the modifier
|
||||
write!(buf, "{}{}", CSI, c)?;
|
||||
} else {
|
||||
write!(buf, "{}1;{}{}", CSI, 1 + encode_modifiers(mods), c)?;
|
||||
}
|
||||
}
|
||||
|
||||
Multiply | Add | Separator | Subtract | Divide => {}
|
||||
|
||||
// Modifier keys pressed on their own don't expand to anything
|
||||
Control | LeftControl | RightControl | Alt | LeftAlt | RightAlt | Menu | LeftMenu
|
||||
@ -2246,4 +2292,81 @@ mod test {
|
||||
"\u{1b}[57442;1:3u".to_string()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn encode_issue_3478_xterm() {
|
||||
let mode = KeyCodeEncodeModes {
|
||||
encoding: KeyboardEncoding::Xterm,
|
||||
newline_mode: false,
|
||||
application_cursor_keys: false,
|
||||
modify_other_keys: None,
|
||||
};
|
||||
|
||||
assert_eq!(
|
||||
KeyCode::Numpad0
|
||||
.encode(Modifiers::NONE, mode, true)
|
||||
.unwrap(),
|
||||
"\u{1b}[2~".to_string()
|
||||
);
|
||||
assert_eq!(
|
||||
KeyCode::Numpad0
|
||||
.encode(Modifiers::SHIFT, mode, true)
|
||||
.unwrap(),
|
||||
"\u{1b}[2;2~".to_string()
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
KeyCode::Numpad1
|
||||
.encode(Modifiers::NONE, mode, true)
|
||||
.unwrap(),
|
||||
"\u{1b}[F".to_string()
|
||||
);
|
||||
assert_eq!(
|
||||
KeyCode::Numpad1
|
||||
.encode(Modifiers::NONE | Modifiers::SHIFT, mode, true)
|
||||
.unwrap(),
|
||||
"\u{1b}[1;2F".to_string()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn encode_issue_3478_kitty() {
|
||||
let mode = KeyCodeEncodeModes {
|
||||
encoding: KeyboardEncoding::Kitty(
|
||||
KittyKeyboardFlags::DISAMBIGUATE_ESCAPE_CODES
|
||||
| KittyKeyboardFlags::REPORT_EVENT_TYPES
|
||||
| KittyKeyboardFlags::REPORT_ALTERNATE_KEYS
|
||||
| KittyKeyboardFlags::REPORT_ALL_KEYS_AS_ESCAPE_CODES,
|
||||
),
|
||||
newline_mode: false,
|
||||
application_cursor_keys: false,
|
||||
modify_other_keys: None,
|
||||
};
|
||||
|
||||
assert_eq!(
|
||||
KeyCode::Numpad0
|
||||
.encode(Modifiers::NONE, mode, true)
|
||||
.unwrap(),
|
||||
"\u{1b}[57399;1u".to_string()
|
||||
);
|
||||
assert_eq!(
|
||||
KeyCode::Numpad0
|
||||
.encode(Modifiers::SHIFT, mode, true)
|
||||
.unwrap(),
|
||||
"\u{1b}[57399;2u".to_string()
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
KeyCode::Numpad1
|
||||
.encode(Modifiers::NONE, mode, true)
|
||||
.unwrap(),
|
||||
"\u{1b}[57400;1u".to_string()
|
||||
);
|
||||
assert_eq!(
|
||||
KeyCode::Numpad1
|
||||
.encode(Modifiers::NONE | Modifiers::SHIFT, mode, true)
|
||||
.unwrap(),
|
||||
"\u{1b}[57400;2u".to_string()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -851,6 +851,11 @@ impl super::TermWindow {
|
||||
WK::ApplicationRightArrow => KC::ApplicationRightArrow,
|
||||
WK::ApplicationUpArrow => KC::ApplicationUpArrow,
|
||||
WK::ApplicationDownArrow => KC::ApplicationDownArrow,
|
||||
WK::KeyPadHome => KC::KeyPadHome,
|
||||
WK::KeyPadEnd => KC::KeyPadEnd,
|
||||
WK::KeyPadBegin => KC::KeyPadBegin,
|
||||
WK::KeyPadPageUp => KC::KeyPadPageUp,
|
||||
WK::KeyPadPageDown => KC::KeyPadPageDown,
|
||||
};
|
||||
Key::Code(code)
|
||||
}
|
||||
|
||||
@ -111,6 +111,11 @@ pub enum KeyCode {
|
||||
ApplicationRightArrow,
|
||||
ApplicationUpArrow,
|
||||
ApplicationDownArrow,
|
||||
KeyPadHome,
|
||||
KeyPadEnd,
|
||||
KeyPadPageUp,
|
||||
KeyPadPageDown,
|
||||
KeyPadBegin,
|
||||
}
|
||||
|
||||
impl KeyCode {
|
||||
@ -276,6 +281,11 @@ impl KeyCode {
|
||||
| Self::ApplicationRightArrow
|
||||
| Self::ApplicationUpArrow
|
||||
| Self::ApplicationDownArrow
|
||||
| Self::KeyPadHome
|
||||
| Self::KeyPadEnd
|
||||
| Self::KeyPadPageUp
|
||||
| Self::KeyPadPageDown
|
||||
| Self::KeyPadBegin
|
||||
| Self::MediaNextTrack
|
||||
| Self::MediaPrevTrack
|
||||
| Self::MediaStop
|
||||
|
||||
@ -86,10 +86,11 @@ pub fn keysym_to_keycode(keysym: u32) -> Option<KeyCode> {
|
||||
// numeric and function keypad keys
|
||||
KEY_KP_Enter => KeyCode::Char(0xdu8 as char),
|
||||
KEY_KP_Delete => KeyCode::Char('\u{7f}'),
|
||||
KEY_KP_Home => KeyCode::Home,
|
||||
KEY_KP_End => KeyCode::End,
|
||||
KEY_KP_Page_Up => KeyCode::PageUp,
|
||||
KEY_KP_Page_Down => KeyCode::PageDown,
|
||||
KEY_KP_Home => KeyCode::KeyPadHome,
|
||||
KEY_KP_End => KeyCode::KeyPadEnd,
|
||||
KEY_KP_Page_Up => KeyCode::KeyPadPageUp,
|
||||
KEY_KP_Page_Down => KeyCode::KeyPadPageDown,
|
||||
KEY_KP_Begin => KeyCode::KeyPadBegin,
|
||||
KEY_KP_Multiply => KeyCode::Multiply,
|
||||
KEY_KP_Add => KeyCode::Add,
|
||||
KEY_KP_Divide => KeyCode::Divide,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user