diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-10-13 06:06:56 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-10-13 06:06:56 +0000 |
| commit | 8b06a55cb01c74a3639eadf9d85aadd213bfd0a5 (patch) | |
| tree | feb31b4cd22f3136fb909397372f803841eae8d7 | |
| parent | Merge branch 'scroll-up-down-while-selecting' into master (diff) | |
| parent | meson/pkgbuild: bump version to 1.5.2 (diff) | |
Merge branch 'releases/1.5' into master
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | input.c | 16 | ||||
| -rw-r--r-- | meson.build | 2 |
4 files changed, 20 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 929c83e5..e06d6a60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog * [Unreleased](#Unreleased) +* [1.5.2](#1-5-2) * [1.5.1](#1-5-1) * [1.5.0](#1-5-0) * [1.4.4](#1-4-4) @@ -50,6 +51,14 @@ ### Contributors +## 1.5.2 + +### Fixed + +* Regression: middle clicking double pastes in e.g. vim + (https://codeberg.org/dnkl/foot/issues/168) + + ## 1.5.1 ### Changed @@ -1,5 +1,5 @@ pkgname=('foot-git' 'foot-terminfo-git') -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 arch=('x86_64' 'aarch64') url=https://codeberg.org/dnkl/foot @@ -1625,13 +1625,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; } diff --git a/meson.build b/meson.build index 613c388b..16a42150 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('foot', 'c', - version: '1.5.1', + version: '1.5.2', license: 'MIT', meson_version: '>=0.53.0', default_options: [ |
