aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-03-08 19:30:33 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-03-08 19:30:33 +0000
commit098bc2771b3a4c1ef330274a7c5168b5cca89ec8 (patch)
treefc97d55f21e97d9e6aaf176e4bcd3ac7813ac466 /input.c
parentMerge branch 'xkbcommon-bump' (diff)
parentkeymap: handle shift+tab combos correctly, after consuming modifiers (diff)
Merge branch 'consume-modifiers-for-client-application'
Closes #376
Diffstat (limited to 'input.c')
-rw-r--r--input.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/input.c b/input.c
index 98abac9c..bc28bbf2 100644
--- a/input.c
+++ b/input.c
@@ -770,8 +770,8 @@ keymap_data_for_sym(xkb_keysym_t sym, size_t *count)
switch (sym) {
case XKB_KEY_Escape: *count = ALEN(key_escape); return key_escape;
case XKB_KEY_Return: *count = ALEN(key_return); return key_return;
- case XKB_KEY_Tab: /* FALLTHROUGH */
- case XKB_KEY_ISO_Left_Tab: *count = ALEN(key_tab); return key_tab;
+ case XKB_KEY_ISO_Left_Tab: *count = ALEN(key_iso_left_tab); return key_iso_left_tab;
+ case XKB_KEY_Tab: *count = ALEN(key_tab); return key_tab;
case XKB_KEY_BackSpace: *count = ALEN(key_backspace); return key_backspace;
case XKB_KEY_Up: *count = ALEN(key_up); return key_up;
case XKB_KEY_Down: *count = ALEN(key_down); return key_down;
@@ -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:
*