wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-26 23:04:49 +03:00
Code Issues Projects Releases Wiki Activity

kitty keyboard: improve mode 1 support

Browse Source 
We don't need to encode as many keys in mode 1.

refs: #3315
This commit is contained in:
Wez Furlong 2023-04-09 13:05:23 -07:00
parent f4995511e2
commit b704ec6d70
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
1 changed files with 89 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
termwiz/src/input.rs
View File

@ -399,6 +399,57 @@ impl KeyCode {
match key {
Char(shifted_key) => {
if !flags.contains(KittyKeyboardFlags::REPORT_ALTERNATE_KEYS) {
if shifted_key.is_ascii_alphanumeric()
|| matches!(
shifted_key,
'`' | '-'
| '='
| '['
| ']'
| '\\'
| ';'
| '\''
| ','
| '.'
| '/'
| '~'
| '_'
| '+'
| '{'
| '}'
| '|'
| ':'
| '"'
| '<'
| '>'
| '?'
)
{
// Legacy text key
let mut output = String::new();
if mods.contains(Modifiers::ALT) {
output.push('\x1b');
}
if mods.contains(Modifiers::CTRL) {
csi_u_encode(
&mut output,
shifted_key.to_ascii_uppercase(),
mods,
&KeyCodeEncodeModes {
encoding: KeyboardEncoding::Xterm,
newline_mode: false,
application_cursor_keys: false,
modify_other_keys: None,
},
)?;
} else {
output.push(shifted_key);
}
return Ok(output);
}
}
let c = shifted_key.to_ascii_lowercase();
let key_code = if flags.contains(KittyKeyboardFlags::REPORT_ALTERNATE_KEYS)
@ -468,7 +519,13 @@ impl KeyCode {
}
_ => {
if let Some(code) = key.kitty_function_code() {
if key.is_modifier()
&& !flags.contains(KittyKeyboardFlags::REPORT_ALL_KEYS_AS_ESCAPE_CODES)
{
// Don't report bare modifier only key events unless
// we're reporting all keys with escape codes
Ok(String::new())
} else if let Some(code) = key.kitty_function_code() {
Ok(format!("\x1b[{code};{modifiers}{event_type}u"))
} else {
Ok(String::new())
@ -2369,4 +2426,35 @@ mod test {
"\u{1b}[57400;2u".to_string()
);
}
#[test]
fn encode_issue_3315() {
let mode = KeyCodeEncodeModes {
encoding: KeyboardEncoding::Kitty(KittyKeyboardFlags::DISAMBIGUATE_ESCAPE_CODES),
newline_mode: false,
application_cursor_keys: false,
modify_other_keys: None,
};
assert_eq!(
KeyCode::Char('"')
.encode(Modifiers::NONE, mode, true)
.unwrap(),
"\"".to_string()
);
assert_eq!(
KeyCode::Char('"')
.encode(Modifiers::SHIFT, mode, true)
.unwrap(),
"\"".to_string()
);
assert_eq!(
KeyCode::LeftShift
.encode(Modifiers::NONE, mode, true)
.unwrap(),
"".to_string()
);
}
}