aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorfeeptr@codeberg.org <feeptr>2021-09-27 19:09:07 +0000
committerfeeptr@codeberg.org <feeptr>2021-12-02 23:44:08 +0000
commita4d53bdf88ea112d1d802a6a004a84732297f01b (patch)
tree002b8f8145de122d61ca533acd5c683bae410f48 /input.c
parentchangelog: add new ‘unreleased’ section (diff)
config, input: allow configuring select-override modifiers
Diffstat (limited to 'input.c')
-rw-r--r--input.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/input.c b/input.c
index 055c0fc8..36991567 100644
--- a/input.c
+++ b/input.c
@@ -701,6 +701,11 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
seat->kbd.key_arrow_down = xkb_keymap_key_by_name(seat->kbd.xkb_keymap, "DOWN");
}
+ /* Set selection-override modmask from configured mods and seat's mod indices */
+ const struct config_key_modifiers* override_mods =
+ &wayl->conf->mouse.selection_override_modifiers;
+ seat->kbd.selection_override_modmask = conf_modifiers_to_mask(seat, override_mods);
+
munmap(map_str, size);
close(fd);
@@ -983,7 +988,7 @@ UNITTEST
xassert(strcmp(info->seq, "\033[27;3;13~") == 0);
}
-static void
+void
get_current_modifiers(const struct seat *seat,
xkb_mod_mask_t *effective,
xkb_mod_mask_t *consumed, uint32_t key)
@@ -2372,11 +2377,8 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
get_current_modifiers(seat, &mods, NULL, 0);
mods &= seat->kbd.bind_significant;
- /* Ignore Shift when matching modifiers, since it is
- * used to enable selection in mouse grabbing client
- * applications */
- if (seat->kbd.mod_shift != XKB_MOD_INVALID)
- mods &= ~(1 << seat->kbd.mod_shift);
+ /* Ignore selection override modifiers when matching modifiers */
+ mods &= ~seat->kbd.selection_override_modmask;
const struct mouse_binding *match = NULL;