Merge branch 'releases/1.5' into master

This commit is contained in:
Daniel Eklöf 2020-10-13 08:06:56 +02:00
commit 8b06a55cb0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 20 additions and 9 deletions

View file

@ -1,6 +1,7 @@
# Changelog # Changelog
* [Unreleased](#Unreleased) * [Unreleased](#Unreleased)
* [1.5.2](#1-5-2)
* [1.5.1](#1-5-1) * [1.5.1](#1-5-1)
* [1.5.0](#1-5-0) * [1.5.0](#1-5-0)
* [1.4.4](#1-4-4) * [1.4.4](#1-4-4)
@ -50,6 +51,14 @@
### Contributors ### Contributors
## 1.5.2
### Fixed
* Regression: middle clicking double pastes in e.g. vim
(https://codeberg.org/dnkl/foot/issues/168)
## 1.5.1 ## 1.5.1
### Changed ### Changed

View file

@ -1,5 +1,5 @@
pkgname=('foot-git' 'foot-terminfo-git') pkgname=('foot-git' 'foot-terminfo-git')
pkgver=1.5.1 pkgver=1.5.2
pkgrel=1 pkgrel=1
arch=('x86_64' 'aarch64') arch=('x86_64' 'aarch64')
url=https://codeberg.org/dnkl/foot url=https://codeberg.org/dnkl/foot

16
input.c
View file

@ -1625,13 +1625,15 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
} }
} }
if (!term_mouse_grabbed(term, seat) && }
cursor_is_on_grid)
{ if (!seat->mouse.consumed &&
term_mouse_down( !term_mouse_grabbed(term, seat) &&
term, button, seat->mouse.row, seat->mouse.col, cursor_is_on_grid)
seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl); {
} term_mouse_down(
term, button, seat->mouse.row, seat->mouse.col,
seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl);
} }
break; break;
} }

View file

@ -1,5 +1,5 @@
project('foot', 'c', project('foot', 'c',
version: '1.5.1', version: '1.5.2',
license: 'MIT', license: 'MIT',
meson_version: '>=0.53.0', meson_version: '>=0.53.0',
default_options: [ default_options: [