brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keybindings: Check modifier masks one by one

Browse Source 
Commit 48d070dae changed the logic to compare the modifiers mask as a
whole.

Unfortunately, that does not work with all combinations of modifiers, as
some may not be reported when the ISO_Next_Group key is notified.

Revert to the original logic which is to compare against each modifier
mask individually.

Fixes: commit 48d070dae - keybindings: Check for ISO_Next_Group keysym
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4237>
This commit is contained in:
Olivier Fourdan 2025-01-31 11:58:09 +01:00
parent 48d070dae7
commit fc6d79eda9
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/keybindings.c
View File

@ -1704,28 +1704,29 @@ process_iso_next_group (MetaDisplay *display,
uint32_t keyval = clutter_event_get_key_symbol (event);
ClutterModifierType modifiers;
xkb_mod_mask_t mask;
xkb_mod_mask_t iso_next_group_combo_mask;
int i;
if (clutter_event_type (event) == CLUTTER_KEY_RELEASE)
return FALSE;
if (keyval != XKB_KEY_ISO_Next_Group)
return FALSE;
modifiers = get_modifiers (event);
mask = mask_from_event_params (keys, modifiers);
iso_next_group_combo_mask = 0;
for (i = 0; i < keys->n_iso_next_group_combos; ++i)
iso_next_group_combo_mask |= keys->iso_next_group_combo[i].mask;
if (keyval == XKB_KEY_ISO_Next_Group &&
(mask & iso_next_group_combo_mask) == iso_next_group_combo_mask)
for (i = 0; i < keys->n_iso_next_group_combos; ++i)
{
/* If the signal handler returns TRUE the keyboard will
remain frozen. It's the signal handler's responsibility
to unfreeze it. */
if (!meta_display_modifiers_accelerator_activate (display))
meta_backend_unfreeze_keyboard (backend,
clutter_event_get_time (event));
return TRUE;
if (mask == keys->iso_next_group_combo[i].mask)
{
/* If the signal handler returns TRUE the keyboard will
remain frozen. It's the signal handler's responsibility
to unfreeze it. */
if (!meta_display_modifiers_accelerator_activate (display))
meta_backend_unfreeze_keyboard (backend,
clutter_event_get_time (event));
return TRUE;
}
}
return FALSE;