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

kitty keeb: use raw modifiers rather than normalized modifiers

Browse Source 
refs: https://github.com/wez/wezterm/issues/2546
This commit is contained in:
Wez Furlong 2023-04-15 22:57:53 -07:00
parent bdbedad38a
commit 5fc9349c92
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wezterm-input-types/src/lib.rs
View File

@ -1628,17 +1628,23 @@ impl KeyEvent {
}
}
let raw_modifiers = self
.raw
.as_ref()
.map(|raw| raw.modifiers)
.unwrap_or(self.modifiers);
let mut modifiers = 0;
if self.modifiers.contains(Modifiers::SHIFT) {
if raw_modifiers.contains(Modifiers::SHIFT) {
modifiers |= 1;
}
if self.modifiers.contains(Modifiers::ALT) {
if raw_modifiers.contains(Modifiers::ALT) {
modifiers |= 2;
}
if self.modifiers.contains(Modifiers::CTRL) {
if raw_modifiers.contains(Modifiers::CTRL) {
modifiers |= 4;
}
if self.modifiers.contains(Modifiers::SUPER) {
if raw_modifiers.contains(Modifiers::SUPER) {
modifiers |= 8;
}
if self.leds.contains(KeyboardLedStatus::CAPS_LOCK) {
@ -2305,6 +2311,30 @@ mod test {
"\x1b[105;6u".to_string()
);
assert_eq!(
KeyEvent {
key: KeyCode::Char('I'),
modifiers: Modifiers::CTRL,
leds: KeyboardLedStatus::empty(),
repeat_count: 1,
key_is_down: true,
raw: Some(RawKeyEvent {
key: KeyCode::Char('I'),
modifiers: Modifiers::SHIFT | Modifiers::CTRL,
handled: Handled::new(),
key_is_down: true,
raw_code: 0,
leds: KeyboardLedStatus::empty(),
phys_code: Some(PhysKeyCode::I),
#[cfg(windows)]
scan_code: 0,
repeat_count: 1,
}),
}
.encode_kitty(flags),
"\x1b[105;6u".to_string()
);
assert_eq!(
KeyEvent {
key: KeyCode::Char('i'),