From 1e63dddb89a27de702fced65d7b6ba3b39812bb9 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 19 Mar 2022 18:59:15 +0100 Subject: input: don’t allow non-significant modifiers when matching untranslated symbols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- search.h | 1 + 1 file changed, 1 insertion(+) (limited to 'search.h') diff --git a/search.h b/search.h index f4dfa5b9..18af0d62 100644 --- a/search.h +++ b/search.h @@ -8,6 +8,7 @@ void search_cancel(struct terminal *term); void search_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); void search_add_chars(struct terminal *term, const char *text, size_t len); -- cgit v1.3