keymap: don't forget about fallback mappings in xkb_keymap_key_get_mods_for_level()
authorRan Benita <ran@unusedvar.com>
Sat, 4 Apr 2020 21:07:57 +0000 (00:07 +0300)
committerRan Benita <ran@unusedvar.com>
Sat, 18 Apr 2020 19:23:06 +0000 (22:23 +0300)
commit860cfc039fef7e6067170e4dee224a8c1cec56af
tree664a14e49aa09abdfa7f00a949577d6e3a150c4c
parent908e014f0176734e1882da12167c6cc46f94a795
keymap: don't forget about fallback mappings in xkb_keymap_key_get_mods_for_level()

If the active set of modifiers doesn't match any explicit entry of the
key type, the resulting level is 0 (i.e. Level 1). Some key types don't
explicitly map Level 1, taking advantage of this fallback.

Previously, xkb_keymap_key_get_mods_for_level didn't consider this, and
only reported masks for explicit mappings. But this causes some glaring
omissions, like matching "a" in the "us" keymap returning not results.

Since every mask which isn't explicitly mapped falls back to 0, we can't
return the all. Almost always the best choice for this is the empty
mask, so return that, when applicable.

Fixes https://github.com/xkbcommon/libxkbcommon/issues/140.
Reported-by: https://github.com/AliKet
Signed-off-by: Ran Benita <ran@unusedvar.com>
src/keymap.c
test/keymap.c