aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-09-27 12:31:39 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-10-11 17:22:47 +0000
commit59ca98f989129efc1f4a77929921571a8e06949f (patch)
treeaa86e7fd5ebd05b977566299f2ddd8e372da2df0 /input.c
parentinstall: say _why_ ncurses and scdoc is needed (diff)
input: mouse: match binding if binding’s click count is *less*
Allow a mouse binding to match even if its click count is less than the actual click count. If there are multiple bindings that match, use the one with the highest click count (that less than, or equal to the actual click count). Closes #146
Diffstat (limited to 'input.c')
-rw-r--r--input.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/input.c b/input.c
index cfa99574..cc14d41b 100644
--- a/input.c
+++ b/input.c
@@ -1526,6 +1526,8 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
* applications */
mods &= ~(1 << seat->kbd.mod_shift);
+ const struct mouse_binding *match = NULL;
+
tll_foreach(seat->mouse.bindings, it) {
const struct mouse_binding *binding = &it->item;
@@ -1539,19 +1541,25 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
continue;
}
- if (binding->count != seat->mouse.count) {
+ if (binding->count > seat->mouse.count) {
/* Not correct click count */
continue;
}
+ if (match == NULL || binding->count > match->count)
+ match = binding;
+ }
+
+ if (match != NULL) {
seat->mouse.consumed = execute_binding(
- seat, term, binding->action, NULL, serial);
- break;
+ seat, term, match->action, NULL, serial);
}
}
else {
/* Seat does NOT have a keyboard - use mouse bindings *without* modifiers */
+ const struct config_mouse_binding *match = NULL;
+
tll_foreach(seat->wayl->conf->bindings.mouse, it) {
const struct config_mouse_binding *binding = &it->item;
@@ -1560,7 +1568,7 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
continue;
}
- if (binding->count != seat->mouse.count) {
+ if (binding->count > seat->mouse.count) {
/* Incorrect click count */
continue;
}
@@ -1571,9 +1579,13 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
continue;
}
+ if (match == NULL || binding->count > match->count)
+ match = binding;
+ }
+
+ if (match != NULL) {
seat->mouse.consumed = execute_binding(
- seat, term, binding->action, NULL, serial);
- break;
+ seat, term, match->action, NULL, serial);
}
}