1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix touch with Weston

Browse Source 
Work around the missing touch_frame after the last touch_up.

Task-number: QTBUG-36602
Change-Id: Iccb03bdc8b430c7cefc097c3c84e50be676c7fe7
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Laszlo Agocs 2014-08-29 20:43:20 +02:00
parent 2f329b4696
commit 6a0d904dda
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -220,6 +220,8 @@ public:
void touch_frame() Q_DECL_OVERRIDE; void touch_frame() Q_DECL_OVERRIDE;
void touch_cancel() Q_DECL_OVERRIDE; void touch_cancel() Q_DECL_OVERRIDE;
bool allTouchPointsReleased();
QWaylandInputDevice *mParent; QWaylandInputDevice *mParent;
QWaylandWindow *mFocus; QWaylandWindow *mFocus;
QList<QWindowSystemInterface::TouchPoint> mTouchPoints; QList<QWindowSystemInterface::TouchPoint> mTouchPoints;
@ -863,6 +865,13 @@ void QWaylandInputDevice::Touch::touch_up(uint32_t serial, uint32_t time, int32_
Q_UNUSED(time); Q_UNUSED(time);
mFocus = 0; mFocus = 0;
mParent->handleTouchPoint(id, 0, 0, Qt::TouchPointReleased); mParent->handleTouchPoint(id, 0, 0, Qt::TouchPointReleased);
// As of Weston 1.5.90 there is no touch_frame after the last touch_up
// (i.e. when the last finger is released). To accommodate for this, issue a
// touch_frame. This cannot hurt since it is safe to call the touch_frame
// handler multiple times when there are no points left.
if (allTouchPointsReleased())
touch_frame();
} }
void QWaylandInputDevice::Touch::touch_motion(uint32_t time, int32_t id, wl_fixed_t x, wl_fixed_t y) void QWaylandInputDevice::Touch::touch_motion(uint32_t time, int32_t id, wl_fixed_t x, wl_fixed_t y)
@ -921,6 +930,15 @@ void QWaylandInputDevice::handleTouchPoint(int id, double x, double y, Qt::Touch
mTouch->mTouchPoints.append(tp); mTouch->mTouchPoints.append(tp);
} }
bool QWaylandInputDevice::Touch::allTouchPointsReleased()
{
for (int i = 0; i < mTouchPoints.count(); ++i)
if (mTouchPoints.at(i).state != Qt::TouchPointReleased)
return false;
return true;
}
void QWaylandInputDevice::Touch::touch_frame() void QWaylandInputDevice::Touch::touch_frame()
{ {
// Copy all points, that are in the previous but not in the current list, as stationary. // Copy all points, that are in the previous but not in the current list, as stationary.
@ -950,13 +968,7 @@ void QWaylandInputDevice::Touch::touch_frame()
QWindowSystemInterface::handleTouchEvent(window, mParent->mTouchDevice, mTouchPoints); QWindowSystemInterface::handleTouchEvent(window, mParent->mTouchDevice, mTouchPoints);
bool allReleased = true; const bool allReleased = allTouchPointsReleased();
for (int i = 0; i < mTouchPoints.count(); ++i)
if (mTouchPoints.at(i).state != Qt::TouchPointReleased) {
allReleased = false;
break;
}
mPrevTouchPoints = mTouchPoints; mPrevTouchPoints = mTouchPoints;
mTouchPoints.clear(); mTouchPoints.clear();