aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-12-04 17:27:03 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-12-04 17:27:03 +0000
commitecfff42300c7fd904254562c3124dc4f61250601 (patch)
tree5a6273077200137f9c008e4996885b81e9b8048b /terminal.c
parentinstall: add UTF-8 locate to runtime deps (diff)
parentimprove documentation for [mouse-bindings].selection-override-modifiers (diff)
Merge branch 'configure-select-override-mods'
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/terminal.c b/terminal.c
index 25310d36..1d27693a 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2826,10 +2826,15 @@ term_mouse_grabbed(const struct terminal *term, struct seat *seat)
/*
* Mouse is grabbed by us, regardless of whether mouse tracking has been enabled or not.
*/
+
+ xkb_mod_mask_t mods;
+ get_current_modifiers(seat, &mods, NULL, 0);
+
+ const xkb_mod_mask_t override_modmask = seat->kbd.selection_override_modmask;
+ bool override_mods_pressed = (mods & override_modmask) == override_modmask;
+
return term->mouse_tracking == MOUSE_NONE ||
- (seat->kbd_focus == term &&
- seat->kbd.shift &&
- !seat->kbd.alt && /*!seat->kbd.ctrl &&*/ !seat->kbd.super);
+ (seat->kbd_focus == term && override_mods_pressed);
}
void