andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

add mod3 key binding support (#565)

Browse Source 
* add support for iso_level5_shift modifier

* update Cargo.lock

bumps smithay to de94e8f59e202b605c35dfe1fef1857bad427e8c
This commit is contained in:
Jeff Peeler
2024-07-31 11:00:35 -04:00
committed by GitHub
parent 324029ca3b
commit 9728dbeeac
4 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
niri-config/src/lib.rs
+26 -6
View File
@@ -1004,11 +1004,12 @@ bitflags! {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct Modifiers : u8 {
const CTRL = 1;
const SHIFT = 2;
const ALT = 4;
const SUPER = 8;
const ISO_LEVEL3_SHIFT = 16;
const COMPOSITOR = 32;
const SHIFT = 1 << 1;
const ALT = 1 << 2;
const SUPER = 1 << 3;
const ISO_LEVEL3_SHIFT = 1 << 4;
const ISO_LEVEL5_SHIFT = 1 << 5;
const COMPOSITOR = 1 << 6;
}
}
@@ -2509,6 +2510,10 @@ impl FromStr for Key {
|| part.eq_ignore_ascii_case("mod5")
{
modifiers |= Modifiers::ISO_LEVEL3_SHIFT;
} else if part.eq_ignore_ascii_case("iso_level5_shift")
|| part.eq_ignore_ascii_case("mod3")
{
modifiers |= Modifiers::ISO_LEVEL5_SHIFT;
} else {
return Err(miette!("invalid modifier: {part}"));
}
@@ -3275,7 +3280,7 @@ mod tests {
}
#[test]
fn parse_iso_level3_shift() {
fn parse_iso_level_shifts() {
assert_eq!(
"ISO_Level3_Shift+A".parse::<Key>().unwrap(),
Key {
@@ -3290,6 +3295,21 @@ mod tests {
modifiers: Modifiers::ISO_LEVEL3_SHIFT
},
);
assert_eq!(
"ISO_Level5_Shift+A".parse::<Key>().unwrap(),
Key {
trigger: Trigger::Keysym(Keysym::a),
modifiers: Modifiers::ISO_LEVEL5_SHIFT
},
);
assert_eq!(
"Mod3+A".parse::<Key>().unwrap(),
Key {
trigger: Trigger::Keysym(Keysym::a),
modifiers: Modifiers::ISO_LEVEL5_SHIFT
},
);
}
#[test]