aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2024-11-05 11:07:42 +0100
committerGitHub <noreply@github.com>2024-11-05 11:07:42 +0100
commit80fcd0fb75b78e42ce72a6c519d2f10c0bd96bd7 (patch)
tree02510a4dfbd322ad96aaf67b9fb6f39f2c65dcb6
parentchore(repo): bump development version (diff)
downloadsl0ppij-80fcd0fb75b78e42ce72a6c519d2f10c0bd96bd7.tar.gz
sl0ppij-80fcd0fb75b78e42ce72a6c519d2f10c0bd96bd7.tar.xz
sl0ppij-80fcd0fb75b78e42ce72a6c519d2f10c0bd96bd7.zip
fix(input): remove support for extra modifiers (#3725)
-rw-r--r--zellij-utils/src/data.rs14
1 files changed, 2 insertions, 12 deletions
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index e35c9238..40bdb200 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -135,10 +135,6 @@ impl Into<Modifiers> for &KeyModifier {
KeyModifier::Alt => Modifiers::ALT,
KeyModifier::Ctrl => Modifiers::CTRL,
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,
Shift,
Super,
- Hyper,
- Meta,
- CapsLock,
- NumLock,
}
impl FromStr for KeyModifier {
@@ -367,6 +359,8 @@ bitflags::bitflags! {
const ALT = 0b0000_0010;
const CONTROL = 0b0000_0100;
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 META = 0b0010_0000;
const CAPS_LOCK = 0b0100_0000;
@@ -389,10 +383,6 @@ impl KeyModifier {
ModifierFlags::ALT => key_modifiers.insert(KeyModifier::Alt),
ModifierFlags::CONTROL => key_modifiers.insert(KeyModifier::Ctrl),
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,
};
}