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
This commit is contained in:
parent
2e29711323
commit
a23368d638
2 changed files with 79 additions and 0 deletions
76
input.cpp
76
input.cpp
|
@ -1464,6 +1464,9 @@ public:
|
||||||
if (!seat->isDragPointer()) {
|
if (!seat->isDragPointer()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (seat->isDragTouch()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
seat->setTimestamp(event->timestamp());
|
seat->setTimestamp(event->timestamp());
|
||||||
switch (event->type()) {
|
switch (event->type()) {
|
||||||
case QEvent::MouseMove: {
|
case QEvent::MouseMove: {
|
||||||
|
@ -1495,6 +1498,79 @@ public:
|
||||||
// TODO: should we pass through effects?
|
// TODO: should we pass through effects?
|
||||||
return true;
|
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)
|
KWIN_SINGLETON_FACTORY(InputRedirection)
|
||||||
|
|
|
@ -75,6 +75,9 @@ bool TouchInputRedirection::focusUpdatesBlocked()
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
m_windowUpdatedInCycle = true;
|
m_windowUpdatedInCycle = true;
|
||||||
|
if (waylandServer()->seat()->isDragTouch()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
if (m_touches > 0) {
|
if (m_touches > 0) {
|
||||||
// first touch defines focus
|
// first touch defines focus
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in a new issue