From d02aecce6172b6df9482ab966568c5b90d357f6c Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Wed, 18 Sep 2024 12:54:44 -0700 Subject: [PATCH] Use `.modified_sym()` instead of casting keycode to keysym Not sure if this is actually used, and if so the code may need more testing, but this definitely is more correct, at least. --- src/input/mod.rs | 2 +- src/shell/layout/tiling/grabs/swap.rs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/input/mod.rs b/src/input/mod.rs index 0e608117..c05638c1 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -391,7 +391,7 @@ impl State { let action = Action::Private(PrivateAction::Resizing(direction, edge.into(), cosmic_keystate_from_smithay(state))); let key_pattern = shortcuts::Binding { modifiers: cosmic_modifiers_from_smithay(modifiers.clone()), - key: Some(Keysym::new(handle.raw_code().raw())), + key: Some(handle.modified_sym()), description: None, }; diff --git a/src/shell/layout/tiling/grabs/swap.rs b/src/shell/layout/tiling/grabs/swap.rs index a0004eef..60c56cb2 100644 --- a/src/shell/layout/tiling/grabs/swap.rs +++ b/src/shell/layout/tiling/grabs/swap.rs @@ -10,7 +10,6 @@ use smithay::{ }, utils::Serial, }; -use xkbcommon::xkb::Keysym; use crate::{ config::key_bindings::cosmic_modifiers_from_smithay, @@ -81,7 +80,7 @@ impl KeyboardGrab for SwapWindowGrab { modifiers: modifiers .map(cosmic_modifiers_from_smithay) .unwrap_or_default(), - key: Some(Keysym::new(keycode)), + key: Some(handle.keysym_handle(keycode).modified_sym()), description: None, }, None,