aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-10-13 06:02:09 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-10-13 06:02:09 +0000
commitfdb7e403555df5fdcb7daf23f665bdec13b02500 (patch)
tree622c95ee103d7f9636d13af9cb47a448b636450a
parentmeson/pkgbuild: bump version to 1.5.1 (diff)
input: regression: don’t pass on mouse click to application if we consumed it
When we ‘consume’ a mouse button event (i.e. when we have a shortcut mapped to it), the event should *not* be passed on to the client application. In 5f64c5c33590a41afd3f621870c6abd89b859073, button handling was refactored and unfortunately introduced a regression where we once again started passing consumed button presses to the client application. Fixes #168
-rw-r--r--CHANGELOG.md9
-rw-r--r--input.c16
2 files changed, 18 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7497e499..3d43150f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
# Changelog
+* [1.5.2](#1-5-2)
* [1.5.1](#1-5-1)
* [1.5.0](#1-5-0)
* [1.4.4](#1-4-4)
@@ -14,6 +15,14 @@
* [1.2.0](#1-2-0)
+## 1.5.2
+
+### Fixed
+
+* Regression: middle clicking double pastes in e.g. vim
+ (https://codeberg.org/dnkl/foot/issues/168)
+
+
## 1.5.1
### Changed
diff --git a/input.c b/input.c
index 20c1381c..160c78a7 100644
--- a/input.c
+++ b/input.c
@@ -1589,13 +1589,15 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
}
}
- if (!term_mouse_grabbed(term, seat) &&
- cursor_is_on_grid)
- {
- term_mouse_down(
- term, button, seat->mouse.row, seat->mouse.col,
- seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl);
- }
+ }
+
+ if (!seat->mouse.consumed &&
+ !term_mouse_grabbed(term, seat) &&
+ cursor_is_on_grid)
+ {
+ term_mouse_down(
+ term, button, seat->mouse.row, seat->mouse.col,
+ seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl);
}
break;
}