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

keybindings: Only add multiple keycodes from the same level

Browse Source 
The reason why multiple keycodes could be mapped to a single keysym was
to support having both KEY_FAVORITES and KEY_BOOKMARK map to
XF86Favorites. However, iterating through all layout levels adding all
key codes has severe consequences on layouts with levels that map
things like numbers and arrow. The result is that keybindings that
should only have been added for keycodes from the first level, are
replaced by some unexpected keycode where the same keysym was found on
another level.

An example of this is the up-arrow key and l symbol. Normally you'd find
both the up-arrow symbol and the l symbol on the first level and be done
with it. However, on the German Neo-2 layout, layout level 4 maps the
KEY_E to the l symbol, while layout level 4 maps KEY_E to up-arrow.
Which ever gets to take priority is arbitrary, but for this particular
case KEY_E incorrectly mapped to up-arrow instead of the l symbol,
causing the keyboard shortcut Super+l, which would normally lock the
screen, to trigger the workspace-up (Super+up-arrow) key binding.

https://bugzilla.gnome.org/show_bug.cgi?id=789300
This commit is contained in:
Jonas Ådahl 2017-11-01 10:53:59 +08:00
parent 70dfe8c97d
commit 44269e6a1d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/keybindings.c
View File

@ -350,7 +350,9 @@ add_keysym_keycodes_from_layout (int keysym,
{ {
xkb_level_index_t layout_level; xkb_level_index_t layout_level;
for (layout_level = 0; layout_level < layout->n_levels; layout_level++) for (layout_level = 0;
layout_level < layout->n_levels && keycodes->len == 0;
layout_level++)
{ {
FindKeysymData search_data = (FindKeysymData) { FindKeysymData search_data = (FindKeysymData) {
.keycodes = keycodes, .keycodes = keycodes,