pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(input): remove support for extra modifiers (#3725)

Browse source
This commit is contained in:
Aram Drevekenin 2024-11-05 11:07:42 +01:00 • committed by GitHub
parent f958ae9205
commit 80fcd0fb75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
zellij-utils/src/data.rs
View file

@ -135,10 +135,6 @@ impl Into<Modifiers> for &KeyModifier {
KeyModifier::Alt => Modifiers::ALT, KeyModifier::Alt => Modifiers::ALT,
KeyModifier::Ctrl => Modifiers::CTRL, KeyModifier::Ctrl => Modifiers::CTRL,
KeyModifier::Super => Modifiers::SUPER, KeyModifier::Super => Modifiers::SUPER,
KeyModifier::Hyper => Modifiers::NONE,
KeyModifier::Meta => Modifiers::NONE,
KeyModifier::CapsLock => Modifiers::NONE,
KeyModifier::NumLock => Modifiers::NONE,
} }
} }
} }
@ -256,10 +252,6 @@ pub enum KeyModifier {
Alt, Alt,
Shift, Shift,
Super, Super,
Hyper,
Meta,
CapsLock,
NumLock,
} }
impl FromStr for KeyModifier { impl FromStr for KeyModifier {
@ -367,6 +359,8 @@ bitflags::bitflags! {
const ALT = 0b0000_0010; const ALT = 0b0000_0010;
const CONTROL = 0b0000_0100; const CONTROL = 0b0000_0100;
const SUPER = 0b0000_1000; const SUPER = 0b0000_1000;
// we don't actually use the below, left here for completeness in case we want to add them
// later
const HYPER = 0b0001_0000; const HYPER = 0b0001_0000;
const META = 0b0010_0000; const META = 0b0010_0000;
const CAPS_LOCK = 0b0100_0000; const CAPS_LOCK = 0b0100_0000;
@ -389,10 +383,6 @@ impl KeyModifier {
ModifierFlags::ALT => key_modifiers.insert(KeyModifier::Alt), ModifierFlags::ALT => key_modifiers.insert(KeyModifier::Alt),
ModifierFlags::CONTROL => key_modifiers.insert(KeyModifier::Ctrl), ModifierFlags::CONTROL => key_modifiers.insert(KeyModifier::Ctrl),
ModifierFlags::SUPER => key_modifiers.insert(KeyModifier::Super), ModifierFlags::SUPER => key_modifiers.insert(KeyModifier::Super),
ModifierFlags::HYPER => key_modifiers.insert(KeyModifier::Hyper),
ModifierFlags::META => key_modifiers.insert(KeyModifier::Meta),
ModifierFlags::CAPS_LOCK => key_modifiers.insert(KeyModifier::CapsLock),
ModifierFlags::NUM_LOCK => key_modifiers.insert(KeyModifier::NumLock),
_ => false, _ => false,
}; };
} }