From 6cd72bdee6c2b11f7cab15df9afb0ed92a7f8ba0 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Fri, 26 Feb 2021 20:54:42 +0100 Subject: input: do not include consumed modifiers in the set sent to the client When sending a key escape sequence to the client application, do not include consumed modifiers. Fixes part of #376 --- input.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index 98abac9c..110bd378 100644 --- a/input.c +++ b/input.c @@ -1026,10 +1026,10 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial, */ enum modifier keymap_mods = MOD_NONE; - keymap_mods |= seat->kbd.shift ? MOD_SHIFT : MOD_NONE; - keymap_mods |= seat->kbd.alt ? MOD_ALT : MOD_NONE; - keymap_mods |= seat->kbd.ctrl ? MOD_CTRL : MOD_NONE; - keymap_mods |= seat->kbd.meta ? MOD_META : MOD_NONE; + keymap_mods |= mods & ~consumed & shift ? MOD_SHIFT : MOD_NONE; + keymap_mods |= mods & ~consumed & alt ? MOD_ALT : MOD_NONE; + keymap_mods |= mods & ~consumed & ctrl ? MOD_CTRL : MOD_NONE; + keymap_mods |= mods & ~consumed & meta ? MOD_META : MOD_NONE; const struct key_data *keymap; if (sym == XKB_KEY_Escape && keymap_mods == MOD_NONE && term->modify_escape_key) { @@ -1113,7 +1113,7 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial, } else { - if (mods & alt) { + if (mods & ~consumed & alt) { /* * When the alt modifier is pressed, we do one out of three things: * -- cgit v1.3