kc3-lang/libxkbcommon

2012-06-22T16:03:17

Don't ignore inactive type entries An entry for a type will only get marked as active if a virtual modifier can be directly mapped to it, and not if an action indirectly leads to it (e.g. LevelThree). We don't really need this test since entries which can never be triggered ... won't be triggered. The entire map->active thing should probably just go away. Signed-off-by: Daniel Stone <daniel@fooishbar.org>

diff --git a/src/map.c b/src/map.c
index d9afc1a..90048cc 100644
--- a/src/map.c
+++ b/src/map.c
@@ -253,9 +253,6 @@ xkb_key_get_level(struct xkb_state *state, xkb_keycode_t key,
     active_mods &= type->mods.mask;
 
     darray_foreach(entry, type->map) {
-        if (!entry->active)
-            continue;
-
         if (entry->mods.mask == active_mods)
             return entry->level;
     }