summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-06-22 16:03:17 +0100
committerDaniel Stone <daniel@fooishbar.org>2012-06-22 16:05:45 +0100
commitacdad6058d52dc8a3e724dc95448300850d474f2 (patch)
treeaa843841927c1aa2156961cf66f7899b7d9c9a5b
parent6d606d1068197453db40d78dc44e7bbe816f0623 (diff)
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>
-rw-r--r--src/map.c3
1 files changed, 0 insertions, 3 deletions
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;
}