diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-03-18 13:52:39 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-03-18 13:52:39 +0000 |
| commit | a69b818a6232a3704e3125e17f7e392382faee84 (patch) | |
| tree | ff3677a91266ac40e442b2c10f00878df3bfd642 | |
| parent | conf: bindings: case insensitive matching against 'none' (diff) | |
input: bindings: don't match raw key code alone - mods must also match
| -rw-r--r-- | input.c | 5 | ||||
| -rw-r--r-- | search.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -558,8 +558,11 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, * User configurable bindings */ tll_foreach(wayl->kbd.bindings.key, it) { + if (it->item.mods != effective_mods) + continue; + /* Match symbol */ - if (it->item.mods == effective_mods && it->item.sym == sym) { + if (it->item.sym == sym) { input_execute_binding(term, it->item.action, serial); goto maybe_repeat; } @@ -430,8 +430,11 @@ search_input(struct terminal *term, uint32_t key, xkb_keysym_t sym, * User configurable bindings */ tll_foreach(term->wl->kbd.bindings.search, it) { + if (it->item.mods != mods) + continue; + /* Match symbol */ - if (it->item.mods == mods && it->item.sym == sym) { + if (it->item.sym == sym) { input_execute_binding(term, it->item.action, serial); return; } |
