aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-09-27 12:43:49 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-09-27 12:43:49 +0000
commitbe9736dea32597bb2c77089cbad3b393f61d2def (patch)
treeaa86e7fd5ebd05b977566299f2ddd8e372da2df0
parentinstall: say _why_ ncurses and scdoc is needed (diff)
parentinput: mouse: match binding if binding’s click count is *less* (diff)
Merge branch 'allow-mouse-binding-click-count-less-than' into master
-rw-r--r--CHANGELOG.md7
-rw-r--r--input.c24
2 files changed, 25 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03e64784..3fbc2cc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,13 @@
### Deprecated
### Removed
### Fixed
+
+* Mouse bindings now match even if the actual click count is larger
+ than specified in the binding. This allows you to, for example,
+ quickly press the middle-button to paste multiple times
+ (https://codeberg.org/dnkl/foot/issues/146).
+
+
### Security
### Contributors
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);
}
}