yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix TouchEvent::id() returning -1, fixes a crash

Browse source 
Summary:
Libinput returns -1 when calling libinput_event_touch_get_slot on an event
from a single-touch touchscreen. The returned value is used in
DecorationEventFilter to determine the touch which is acting on it. The value -1
is used to signify that the decoration is not being acted on. Thus when
releasing the touch, it checks whether it was being dragged, and as it thinks
it isn't, it doesn't handle it and the decoration is still being dragged.
Clicking on the decoration then crashes kwin.

Test Plan: Move a window by dragging the decoration with a single-touch touchscreen.

Reviewers: #kwin, graesslin

Reviewed By: #kwin, graesslin

Subscribers: graesslin, kwin, #kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D7854
This commit is contained in:
Jesse Pullinen 2017-09-17 14:44:10 +03:00
parent a5e523caf0
commit 0eba3f3c18
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
autotests/libinput/touch_event_test.cpp
View file

@ -40,6 +40,7 @@ private Q_SLOTS:
void testType(); void testType();
void testAbsoluteMotion_data(); void testAbsoluteMotion_data();
void testAbsoluteMotion(); void testAbsoluteMotion();
void testNoAssignedSlot();
private: private:
libinput_device *m_nativeDevice = nullptr; libinput_device *m_nativeDevice = nullptr;
@ -126,5 +127,19 @@ void TestLibinputTouchEvent::testAbsoluteMotion()
QCOMPARE(te->absolutePos(QSize(1280, 1024)), QPointF(640, 512)); QCOMPARE(te->absolutePos(QSize(1280, 1024)), QPointF(640, 512));
} }
void TestLibinputTouchEvent::testNoAssignedSlot()
{
// this test verifies that touch events without an assigned slot get id == 0
libinput_event_touch *touchEvent = new libinput_event_touch;
touchEvent->type = LIBINPUT_EVENT_TOUCH_UP;
touchEvent->device = m_nativeDevice;
// touch events without an assigned slot have slot == -1
touchEvent->slot = -1;
QScopedPointer<Event> event(Event::create(touchEvent));
QVERIFY(dynamic_cast<TouchEvent*>(event.data()));
QCOMPARE(dynamic_cast<TouchEvent*>(event.data())->id(), 0);
}
QTEST_GUILESS_MAIN(TestLibinputTouchEvent) QTEST_GUILESS_MAIN(TestLibinputTouchEvent)
#include "touch_event_test.moc" #include "touch_event_test.moc"

5
libinput/events.cpp
View file

@ -225,7 +225,10 @@ QPointF TouchEvent::absolutePos(const QSize &size) const
qint32 TouchEvent::id() const qint32 TouchEvent::id() const
{ {
Q_ASSERT(type() != LIBINPUT_EVENT_TOUCH_CANCEL && type() != LIBINPUT_EVENT_TOUCH_FRAME); Q_ASSERT(type() != LIBINPUT_EVENT_TOUCH_CANCEL && type() != LIBINPUT_EVENT_TOUCH_FRAME);
return libinput_event_touch_get_slot(m_touchEvent);
const qint32 slot = libinput_event_touch_get_slot(m_touchEvent);
return slot == -1 ? 0 : slot;
} }
GestureEvent::GestureEvent(libinput_event *event, libinput_event_type type) GestureEvent::GestureEvent(libinput_event *event, libinput_event_type type)