isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-27 10:30:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Do not latch modifiers on modifier keys

Browse Source 
If the user maps eg. Alt+F2 to a pad button, the MetaInputSettings will
send the full Alt press, F2 press, F2 release, Alt release sequence.
However the keycode corresponding to Alt is found in level 1, so the
Shift modifier gets unintendedly latched in addition to the Alt key
press/release pair.

We could probably improve keycode lookup heuristics so level=0 (and
no modifier latching) is preferred, but we can do without it altogether
for modifier keys.


(cherry picked from commit 67aab7c138)
This commit is contained in:
Carlos Garnacho 2018-10-03 20:43:21 +00:00 committed by Marco Trevisan
parent 1b78ca8c5e
commit d9cc8530ec
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clutter/clutter/x11/clutter-virtual-input-device-x11.c
View File

@ -147,14 +147,16 @@ clutter_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtu
return; return;
} }
if (key_state == CLUTTER_KEY_STATE_PRESSED) if (!_clutter_keymap_x11_get_is_modifier (keymap, keycode) &&
key_state == CLUTTER_KEY_STATE_PRESSED)
clutter_keymap_x11_latch_modifiers (keymap, level, TRUE); clutter_keymap_x11_latch_modifiers (keymap, level, TRUE);
XTestFakeKeyEvent (clutter_x11_get_default_display (), XTestFakeKeyEvent (clutter_x11_get_default_display (),
(KeyCode) keycode, (KeyCode) keycode,
key_state == CLUTTER_KEY_STATE_PRESSED, 0); key_state == CLUTTER_KEY_STATE_PRESSED, 0);
if (key_state == CLUTTER_KEY_STATE_RELEASED) if (!_clutter_keymap_x11_get_is_modifier (keymap, keycode) &&
key_state == CLUTTER_KEY_STATE_RELEASED)
clutter_keymap_x11_latch_modifiers (keymap, level, FALSE); clutter_keymap_x11_latch_modifiers (keymap, level, FALSE);
} }