diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-03-19 17:59:15 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-03-20 12:29:29 +0000 |
| commit | 1e63dddb89a27de702fced65d7b6ba3b39812bb9 (patch) | |
| tree | a8d05fbefb5cd35d977df06c4b8a197d516f2011 /url-mode.c | |
| parent | char32: only include stdc-predef.h if it is available (diff) | |
input: don’t allow non-significant modifiers when matching untranslated symbols
When matching “untranslated” bindings (by matching the base symbol of
the key, e.g. ctrl+shift+2 in US layout), require that no
non-significant modifiers are active.
This fixes an issue where AltGr was “ignored”, and would cause certain
combinations to match a key binding.
Example: ctrl+altgr+0, on many European layouts matched against the
default ctrl+0 (reset the font size), instead of emitting ^]
To make this work, we now need to filter out “locked”
modifiers (e.g. NumLock and CapsLock). Otherwise having e.g. NumLock
active would prevent *all* untranslated matching to fail.
Closes #983
Diffstat (limited to 'url-mode.c')
| -rw-r--r-- | url-mode.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -119,22 +119,28 @@ activate_url(struct seat *seat, struct terminal *term, const struct url *url) void urls_input(struct seat *seat, struct terminal *term, uint32_t key, xkb_keysym_t sym, xkb_mod_mask_t mods, xkb_mod_mask_t consumed, + xkb_mod_mask_t locked, const xkb_keysym_t *raw_syms, size_t raw_count, uint32_t serial) { + const xkb_mod_mask_t bind_mods = + mods & seat->kbd.bind_significant & ~locked; + const xkb_mod_mask_t bind_consumed = + consumed & seat->kbd.bind_significant & ~locked; + /* Key bindings */ tll_foreach(seat->kbd.bindings.url, it) { const struct key_binding *bind = &it->item; /* Match translated symbol */ if (bind->k.sym == sym && - bind->mods == (mods & ~consumed)) + bind->mods == (bind_mods & ~bind_consumed)) { execute_binding(seat, term, bind, serial); return; } - if (bind->mods != mods) + if (bind->mods != bind_mods || bind_mods != (mods & ~locked)) continue; for (size_t i = 0; i < raw_count; i++) { |
