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

clutter/evdev: Don't ignore CAPS lock as modifier

Browse Source 
Mark CAPS lock as a modifier (as it should) so that when using XKB
options to change the default behaviour of CAPS lock, the new assigned
key can by used as a sticky key as well.

Closes: https://gitlab.gnome.org/GNOME/mutter/issues/112
This commit is contained in:
Olivier Fourdan 2018-04-17 14:03:12 +02:00
parent c01b099dbd
commit 6df2b7af55
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter/evdev/clutter-input-device-evdev.c
View File

@ -433,6 +433,8 @@ key_event_is_modifier (ClutterEvent *event)
case XKB_KEY_Super_R: case XKB_KEY_Super_R:
case XKB_KEY_Hyper_L: case XKB_KEY_Hyper_L:
case XKB_KEY_Hyper_R: case XKB_KEY_Hyper_R:
case XKB_KEY_Caps_Lock:
case XKB_KEY_Shift_Lock:
return TRUE; return TRUE;
default: default:
return FALSE; return FALSE;
@ -584,6 +586,12 @@ handle_stickykeys_press (ClutterEvent *event,
} }
depressed_mods = xkb_state_serialize_mods (seat->xkb, XKB_STATE_MODS_DEPRESSED); depressed_mods = xkb_state_serialize_mods (seat->xkb, XKB_STATE_MODS_DEPRESSED);
/* Ignore the lock modifier mask, that one cannot be sticky, yet the
* CAPS_LOCK key itself counts as a modifier as it might be remapped
* to some other modifier which can be sticky.
*/
depressed_mods &= ~CLUTTER_LOCK_MASK;
new_latched_mask = device->stickykeys_latched_mask; new_latched_mask = device->stickykeys_latched_mask;
new_locked_mask = device->stickykeys_locked_mask; new_locked_mask = device->stickykeys_locked_mask;