leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(keyboard): Fix keyboard shortcuts for non-Latin layouts

Browse source
This commit is contained in:
Ilia Malanin 2026-02-07 17:26:12 +01:00 • committed by Victoria Brekenfeld
parent c569a35fc9
commit 110c11eff9
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/input/mod.rs
View file

@ -1581,6 +1581,13 @@ impl State {
handle: KeysymHandle<'_>, handle: KeysymHandle<'_>,
serial: Serial, serial: Serial,
) -> FilterResult<Option<(Action, shortcuts::Binding)>> { ) -> FilterResult<Option<(Action, shortcuts::Binding)>> {
// Pre-compute for layout-agnostic shortcut matching
let raw_syms = handle.raw_syms();
let latin_sym = handle.raw_latin_sym_or_raw_current_sym();
let key_matches = |binding_key: Keysym| -> bool {
raw_syms.contains(&binding_key) || latin_sym.is_some_and(|sym| sym == binding_key)
};
let mut shell = self.common.shell.write(); let mut shell = self.common.shell.write();
let keyboard = seat.get_keyboard().unwrap(); let keyboard = seat.get_keyboard().unwrap();
@ -1632,7 +1639,7 @@ impl State {
|| (action_pattern.modifiers.logo && !modifiers.logo) || (action_pattern.modifiers.logo && !modifiers.logo)
|| (action_pattern.modifiers.shift && !modifiers.shift) || (action_pattern.modifiers.shift && !modifiers.shift)
|| (action_pattern.key.is_some() || (action_pattern.key.is_some()
&& handle.raw_syms().contains(&action_pattern.key.unwrap()) && key_matches(action_pattern.key.unwrap())
&& event.state() == KeyState::Released) && event.state() == KeyState::Released)
{ {
shell.set_overview_mode(None, self.common.event_loop_handle.clone()); shell.set_overview_mode(None, self.common.event_loop_handle.clone());
@ -1651,7 +1658,7 @@ impl State {
if let Some(action_pattern) = shell.resize_mode().0.active_binding() { if let Some(action_pattern) = shell.resize_mode().0.active_binding() {
if action_pattern.key.is_some() if action_pattern.key.is_some()
&& event.state() == KeyState::Released && event.state() == KeyState::Released
&& handle.raw_syms().contains(&action_pattern.key.unwrap()) && key_matches(action_pattern.key.unwrap())
{ {
shell.set_resize_mode( shell.set_resize_mode(
None, None,
@ -1896,7 +1903,7 @@ impl State {
// is this a normal binding? // is this a normal binding?
if binding.key.is_some() if binding.key.is_some()
&& event.state() == KeyState::Pressed && event.state() == KeyState::Pressed
&& handle.raw_syms().contains(&binding.key.unwrap()) && key_matches(binding.key.unwrap())
&& cosmic_modifiers_eq_smithay(&binding.modifiers, modifiers) && cosmic_modifiers_eq_smithay(&binding.modifiers, modifiers)
{ {
modifiers_queue.clear(); modifiers_queue.clear();