aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Gilg <[email protected]>2018-09-18 16:46:27 +0200
committerRoman Gilg <[email protected]>2018-12-02 21:54:20 +0100
commita23368d63809f0927ac3566060008d0ab755d6bb (patch)
treebaba49c3c5bfbb4172f2de3ec9b35dc6f4ebb7ae
parent2e29711323789319bffb3c39e20079fa667f7f6e (diff)
Add Wayland touch drag and drop support
Summary: Use the new functionality in KWayland to support drag and drop via touch screens. Either a drag and drop session with pointer or touch is possible, but not both at the same time. Pointer/touch gets deactivated if a touch/pointer drag and drop session is active. Test Plan: Manually. Reviewers: #kwin, davidedmundson Subscribers: davidedmundson, alexde, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D15466
-rw-r--r--input.cpp76
-rw-r--r--touch_input.cpp3
2 files changed, 79 insertions, 0 deletions
diff --git a/input.cpp b/input.cpp
index d1baacf..6451d06 100644
--- a/input.cpp
+++ b/input.cpp
@@ -1464,6 +1464,9 @@ public:
if (!seat->isDragPointer()) {
return false;
}
+ if (seat->isDragTouch()) {
+ return true;
+ }
seat->setTimestamp(event->timestamp());
switch (event->type()) {
case QEvent::MouseMove: {
@@ -1495,6 +1498,79 @@ public:
// TODO: should we pass through effects?
return true;
}
+
+ bool touchDown(quint32 id, const QPointF &pos, quint32 time) override {
+ auto seat = waylandServer()->seat();
+ if (seat->isDragPointer()) {
+ return true;
+ }
+ if (!seat->isDragTouch()) {
+ return false;
+ }
+ if (m_touchId != id) {
+ return true;
+ }
+ seat->setTimestamp(time);
+ input()->touch()->insertId(id, seat->touchDown(pos));
+ return true;
+ }
+ bool touchMotion(quint32 id, const QPointF &pos, quint32 time) override {
+ auto seat = waylandServer()->seat();
+ if (seat->isDragPointer()) {
+ return true;
+ }
+ if (!seat->isDragTouch()) {
+ return false;
+ }
+ if (m_touchId < 0) {
+ // We take for now the first id appearing as a move after a drag
+ // started. We can optimize by specifying the id the drag is
+ // associated with by implementing a key-value getter in KWayland.
+ m_touchId = id;
+ }
+ if (m_touchId != id) {
+ return true;
+ }
+ seat->setTimestamp(time);
+ const qint32 kwaylandId = input()->touch()->mappedId(id);
+ if (kwaylandId == -1) {
+ return true;
+ }
+
+ seat->touchMove(kwaylandId, pos);
+
+ if (Toplevel *t = input()->findToplevel(pos.toPoint())) {
+ // TODO: consider decorations
+ if (t->surface() != seat->dragSurface()) {
+ if (AbstractClient *c = qobject_cast<AbstractClient*>(t)) {
+ workspace()->activateClient(c);
+ }
+ seat->setDragTarget(t->surface(), pos, t->inputTransformation());
+ }
+ } else {
+ // no window at that place, if we have a surface we need to reset
+ seat->setDragTarget(nullptr);
+ }
+ return true;
+ }
+ bool touchUp(quint32 id, quint32 time) override {
+ auto seat = waylandServer()->seat();
+ if (!seat->isDragTouch()) {
+ return false;
+ }
+ seat->setTimestamp(time);
+ const qint32 kwaylandId = input()->touch()->mappedId(id);
+ if (kwaylandId != -1) {
+ seat->touchUp(kwaylandId);
+ input()->touch()->removeId(id);
+ }
+ if (m_touchId == id) {
+ m_touchId = -1;
+ }
+ return true;
+ }
+private:
+ qint32 m_touchId = -1;
};
KWIN_SINGLETON_FACTORY(InputRedirection)
diff --git a/touch_input.cpp b/touch_input.cpp
index 4cf685c..f971103 100644
--- a/touch_input.cpp
+++ b/touch_input.cpp
@@ -75,6 +75,9 @@ bool TouchInputRedirection::focusUpdatesBlocked()
return true;
}
m_windowUpdatedInCycle = true;
+ if (waylandServer()->seat()->isDragTouch()) {
+ return true;
+ }
if (m_touches > 0) {
// first touch defines focus
return true;