rpms/libinput
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix occasional crashes on gestures when libinput loses track of hovering

Browse Source 
fake fingers
This commit is contained in:
Peter Hutterer 2018-03-12 12:03:09 +10:00
parent 1778ef6300
commit d99aa73a3c
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch Normal file
View File

@ -0,0 +1,60 @@
From 42e8813a632699e55f8287430f458ae6f5312146 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 12 Mar 2018 10:33:21 +1000
Subject: [PATCH libinput] touchpad: end hovering touches in maybe_end_touch
Otherwise a hovering touch stays around forever even after the finger has
discontinued. This doesn't matter on slots, but for fake fingers the finger
may suddenly end up being forced down/up as a result of the pressure changes
on the real fingers.
So when in maybe_end_touch, switch them back to NONE immediately - hovering
touches do not need to trigger a TOUCH_END event.
https://bugs.freedesktop.org/show_bug.cgi?id=105258
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit d8db6b5927f61460b2991479a85056256c819485)
---
src/evdev-mt-touchpad.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 3080e8a8..4ebadc25 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -345,22 +345,26 @@ tp_maybe_end_touch(struct tp_dispatch *tp,
switch (t->state) {
case TOUCH_NONE:
case TOUCH_MAYBE_END:
- case TOUCH_HOVERING:
return;
case TOUCH_END:
evdev_log_bug_libinput(tp->device,
"touch already in TOUCH_END\n");
return;
+ case TOUCH_HOVERING:
case TOUCH_BEGIN:
case TOUCH_UPDATE:
break;
}
- t->dirty = true;
- t->state = TOUCH_MAYBE_END;
+ if (t->state != TOUCH_HOVERING) {
+ assert(tp->nfingers_down >= 1);
+ tp->nfingers_down--;
+ t->state = TOUCH_MAYBE_END;
+ } else {
+ t->state = TOUCH_NONE;
+ }
- assert(tp->nfingers_down >= 1);
- tp->nfingers_down--;
+ t->dirty = true;
}
/**
--
2.14.3

8
libinput.spec
View File

@ -5,7 +5,7 @@
Name: libinput Name: libinput
Version: 1.10.2 Version: 1.10.2
Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Summary: Input device library Summary: Input device library
License: MIT License: MIT
@ -18,6 +18,8 @@ Source2: commitid
Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz
%endif %endif
Patch01: 0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch
BuildRequires: git-core BuildRequires: git-core
BuildRequires: gcc gcc-c++ BuildRequires: gcc gcc-c++
BuildRequires: meson BuildRequires: meson
@ -109,6 +111,10 @@ The %{name}-utils package contains tools to debug hardware and analyze
%{_mandir}/man1/libinput-measure-trackpoint-range.1* %{_mandir}/man1/libinput-measure-trackpoint-range.1*
%changelog %changelog
* Mon Mar 12 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.10.2-4
- Fix occasional crashes on gestures when libinput loses track of hovering
fake fingers
* Thu Mar 08 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.10.2-3 * Thu Mar 08 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.10.2-3
- Add BuildRequires gcc-c++, needed for a test build - Add BuildRequires gcc-c++, needed for a test build