9a7ab8a62e
Window management features were written with synchronous geometry updates in mind. Currently, this poses a big problem on Wayland because geometry updates are done in asynchronous fashion there. At the moment, geometry is updated in a so called pseudo-asynchronous fashion, meaning that the frame geometry will be reset to the old value once geometry updates are unblocked. The main drawback of this approach is that it is too error prone, the data flow is hard to comprehend, etc. It is worth noting that there is already a machinery to perform async geometry which is used during interactive move/resize operations. This change extends the move/resize geometry usage beyond interactive move/resize to make asynchronous geometry updates less error prone and easier to comprehend. With the proposed solution, all geometry updates must be done on the move/resize geometry first. After that, the new geometry is passed on to the Client-specific implementation of moveResizeInternal(). To be more specific, the frameGeometry() returns the current frame geometry, it is primarily useful only to the scene. If you want to move or resize a window, you need to use moveResizeGeometry() because it corresponds to the last requested frame geometry. It is worth noting that the moveResizeGeometry() returns the desired bounding geometry. The client may commit the xdg_toplevel surface with a slightly smaller window geometry, for example to enforce a specific aspect ratio. The client is not allowed to resize beyond the size as indicated in moveResizeGeometry(). The data flow is very simple: moveResize() updates the move/resize geometry and calls the client-specific implementation of the moveResizeInternal() method. Based on whether a configure event is needed, moveResizeInternal() will update the frameGeometry() either immediately or after the client commits a new buffer. Unfortunately, both the compositor and xdg-shell clients try to update the window geometry. It means that it's possible to have conflicts between the two. With this change, the compositor's move resize geometry will be synced only if there are no pending configure events, meaning that the user doesn't try to resize the window.
285 lines
9.6 KiB
C++
285 lines
9.6 KiB
C++
/*
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
SPDX-FileCopyrightText: 2016 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
SPDX-License-Identifier: GPL-2.0-or-later
|
|
*/
|
|
#include "kwin_wayland_test.h"
|
|
#include "abstract_client.h"
|
|
#include "platform.h"
|
|
#include "cursor.h"
|
|
#include "screens.h"
|
|
#include "wayland_server.h"
|
|
#include "workspace.h"
|
|
|
|
#include <KWayland/Client/compositor.h>
|
|
#include <KWayland/Client/connection_thread.h>
|
|
#include <KWayland/Client/seat.h>
|
|
#include <KWayland/Client/server_decoration.h>
|
|
#include <KWayland/Client/surface.h>
|
|
#include <KWayland/Client/touch.h>
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
static const QString s_socketName = QStringLiteral("wayland_test_kwin_touch_input-0");
|
|
|
|
class TouchInputTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
void testTouchHidesCursor();
|
|
void testMultipleTouchPoints_data();
|
|
void testMultipleTouchPoints();
|
|
void testCancel();
|
|
void testTouchMouseAction();
|
|
void testTouchPointCount();
|
|
|
|
private:
|
|
AbstractClient *showWindow(bool decorated = false);
|
|
KWayland::Client::Touch *m_touch = nullptr;
|
|
};
|
|
|
|
void TouchInputTest::initTestCase()
|
|
{
|
|
qRegisterMetaType<KWin::AbstractClient*>();
|
|
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
|
|
QVERIFY(applicationStartedSpy.isValid());
|
|
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
|
|
QVERIFY(waylandServer()->init(s_socketName));
|
|
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
|
|
|
|
kwinApp()->start();
|
|
QVERIFY(applicationStartedSpy.wait());
|
|
QCOMPARE(screens()->count(), 2);
|
|
QCOMPARE(screens()->geometry(0), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(screens()->geometry(1), QRect(1280, 0, 1280, 1024));
|
|
Test::initWaylandWorkspace();
|
|
}
|
|
|
|
void TouchInputTest::init()
|
|
{
|
|
using namespace KWayland::Client;
|
|
QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::Seat | Test::AdditionalWaylandInterface::Decoration));
|
|
QVERIFY(Test::waitForWaylandTouch());
|
|
m_touch = Test::waylandSeat()->createTouch(Test::waylandSeat());
|
|
QVERIFY(m_touch);
|
|
QVERIFY(m_touch->isValid());
|
|
|
|
screens()->setCurrent(0);
|
|
Cursors::self()->mouse()->setPos(QPoint(512, 512));
|
|
}
|
|
|
|
void TouchInputTest::cleanup()
|
|
{
|
|
delete m_touch;
|
|
m_touch = nullptr;
|
|
Test::destroyWaylandConnection();
|
|
}
|
|
|
|
AbstractClient *TouchInputTest::showWindow(bool decorated)
|
|
{
|
|
using namespace KWayland::Client;
|
|
#define VERIFY(statement) \
|
|
if (!QTest::qVerify((statement), #statement, "", __FILE__, __LINE__))\
|
|
return nullptr;
|
|
#define COMPARE(actual, expected) \
|
|
if (!QTest::qCompare(actual, expected, #actual, #expected, __FILE__, __LINE__))\
|
|
return nullptr;
|
|
|
|
Surface *surface = Test::createSurface(Test::waylandCompositor());
|
|
VERIFY(surface);
|
|
Test::XdgToplevel *shellSurface = Test::createXdgToplevelSurface(surface, surface);
|
|
VERIFY(shellSurface);
|
|
if (decorated) {
|
|
auto deco = Test::waylandServerSideDecoration()->create(surface, surface);
|
|
QSignalSpy decoSpy(deco, &ServerSideDecoration::modeChanged);
|
|
VERIFY(decoSpy.isValid());
|
|
VERIFY(decoSpy.wait());
|
|
deco->requestMode(ServerSideDecoration::Mode::Server);
|
|
VERIFY(decoSpy.wait());
|
|
COMPARE(deco->mode(), ServerSideDecoration::Mode::Server);
|
|
}
|
|
// let's render
|
|
auto c = Test::renderAndWaitForShown(surface, QSize(100, 50), Qt::blue);
|
|
|
|
VERIFY(c);
|
|
COMPARE(workspace()->activeClient(), c);
|
|
|
|
#undef VERIFY
|
|
#undef COMPARE
|
|
|
|
return c;
|
|
}
|
|
|
|
void TouchInputTest::testTouchHidesCursor()
|
|
{
|
|
QCOMPARE(kwinApp()->platform()->isCursorHidden(), false);
|
|
quint32 timestamp = 1;
|
|
kwinApp()->platform()->touchDown(1, QPointF(125, 125), timestamp++);
|
|
QCOMPARE(kwinApp()->platform()->isCursorHidden(), true);
|
|
kwinApp()->platform()->touchDown(2, QPointF(130, 125), timestamp++);
|
|
kwinApp()->platform()->touchUp(2, timestamp++);
|
|
kwinApp()->platform()->touchUp(1, timestamp++);
|
|
|
|
// now a mouse event should show the cursor again
|
|
kwinApp()->platform()->pointerMotion(QPointF(0, 0), timestamp++);
|
|
QCOMPARE(kwinApp()->platform()->isCursorHidden(), false);
|
|
|
|
// touch should hide again
|
|
kwinApp()->platform()->touchDown(1, QPointF(125, 125), timestamp++);
|
|
kwinApp()->platform()->touchUp(1, timestamp++);
|
|
QCOMPARE(kwinApp()->platform()->isCursorHidden(), true);
|
|
|
|
// wheel should also show
|
|
kwinApp()->platform()->pointerAxisVertical(1.0, timestamp++);
|
|
QCOMPARE(kwinApp()->platform()->isCursorHidden(), false);
|
|
}
|
|
|
|
void TouchInputTest::testMultipleTouchPoints_data()
|
|
{
|
|
QTest::addColumn<bool>("decorated");
|
|
|
|
QTest::newRow("undecorated") << false;
|
|
QTest::newRow("decorated") << true;
|
|
}
|
|
|
|
void TouchInputTest::testMultipleTouchPoints()
|
|
{
|
|
using namespace KWayland::Client;
|
|
QFETCH(bool, decorated);
|
|
AbstractClient *c = showWindow(decorated);
|
|
QCOMPARE(c->isDecorated(), decorated);
|
|
c->move(QPoint(100, 100));
|
|
QVERIFY(c);
|
|
QSignalSpy sequenceStartedSpy(m_touch, &Touch::sequenceStarted);
|
|
QVERIFY(sequenceStartedSpy.isValid());
|
|
QSignalSpy pointAddedSpy(m_touch, &Touch::pointAdded);
|
|
QVERIFY(pointAddedSpy.isValid());
|
|
QSignalSpy pointMovedSpy(m_touch, &Touch::pointMoved);
|
|
QVERIFY(pointMovedSpy.isValid());
|
|
QSignalSpy pointRemovedSpy(m_touch, &Touch::pointRemoved);
|
|
QVERIFY(pointRemovedSpy.isValid());
|
|
QSignalSpy endedSpy(m_touch, &Touch::sequenceEnded);
|
|
QVERIFY(endedSpy.isValid());
|
|
|
|
quint32 timestamp = 1;
|
|
kwinApp()->platform()->touchDown(1, QPointF(125, 125) + c->clientPos(), timestamp++);
|
|
QVERIFY(sequenceStartedSpy.wait());
|
|
QCOMPARE(sequenceStartedSpy.count(), 1);
|
|
QCOMPARE(m_touch->sequence().count(), 1);
|
|
QCOMPARE(m_touch->sequence().first()->isDown(), true);
|
|
QCOMPARE(m_touch->sequence().first()->position(), QPointF(25, 25));
|
|
QCOMPARE(pointAddedSpy.count(), 0);
|
|
QCOMPARE(pointMovedSpy.count(), 0);
|
|
|
|
// a point outside the window
|
|
kwinApp()->platform()->touchDown(2, QPointF(0, 0) + c->clientPos(), timestamp++);
|
|
QVERIFY(pointAddedSpy.wait());
|
|
QCOMPARE(pointAddedSpy.count(), 1);
|
|
QCOMPARE(m_touch->sequence().count(), 2);
|
|
QCOMPARE(m_touch->sequence().at(1)->isDown(), true);
|
|
QCOMPARE(m_touch->sequence().at(1)->position(), QPointF(-100, -100));
|
|
QCOMPARE(pointMovedSpy.count(), 0);
|
|
|
|
// let's move that one
|
|
kwinApp()->platform()->touchMotion(2, QPointF(100, 100) + c->clientPos(), timestamp++);
|
|
QVERIFY(pointMovedSpy.wait());
|
|
QCOMPARE(pointMovedSpy.count(), 1);
|
|
QCOMPARE(m_touch->sequence().count(), 2);
|
|
QCOMPARE(m_touch->sequence().at(1)->isDown(), true);
|
|
QCOMPARE(m_touch->sequence().at(1)->position(), QPointF(0, 0));
|
|
|
|
kwinApp()->platform()->touchUp(1, timestamp++);
|
|
QVERIFY(pointRemovedSpy.wait());
|
|
QCOMPARE(pointRemovedSpy.count(), 1);
|
|
QCOMPARE(m_touch->sequence().count(), 2);
|
|
QCOMPARE(m_touch->sequence().first()->isDown(), false);
|
|
QCOMPARE(endedSpy.count(), 0);
|
|
|
|
kwinApp()->platform()->touchUp(2, timestamp++);
|
|
QVERIFY(pointRemovedSpy.wait());
|
|
QCOMPARE(pointRemovedSpy.count(), 2);
|
|
QCOMPARE(m_touch->sequence().count(), 2);
|
|
QCOMPARE(m_touch->sequence().first()->isDown(), false);
|
|
QCOMPARE(m_touch->sequence().at(1)->isDown(), false);
|
|
QCOMPARE(endedSpy.count(), 1);
|
|
}
|
|
|
|
void TouchInputTest::testCancel()
|
|
{
|
|
using namespace KWayland::Client;
|
|
AbstractClient *c = showWindow();
|
|
c->move(QPoint(100, 100));
|
|
QVERIFY(c);
|
|
QSignalSpy sequenceStartedSpy(m_touch, &Touch::sequenceStarted);
|
|
QVERIFY(sequenceStartedSpy.isValid());
|
|
QSignalSpy cancelSpy(m_touch, &Touch::sequenceCanceled);
|
|
QVERIFY(cancelSpy.isValid());
|
|
QSignalSpy pointRemovedSpy(m_touch, &Touch::pointRemoved);
|
|
QVERIFY(pointRemovedSpy.isValid());
|
|
|
|
quint32 timestamp = 1;
|
|
kwinApp()->platform()->touchDown(1, QPointF(125, 125), timestamp++);
|
|
QVERIFY(sequenceStartedSpy.wait());
|
|
QCOMPARE(sequenceStartedSpy.count(), 1);
|
|
|
|
// cancel
|
|
kwinApp()->platform()->touchCancel();
|
|
QVERIFY(cancelSpy.wait());
|
|
QCOMPARE(cancelSpy.count(), 1);
|
|
}
|
|
|
|
void TouchInputTest::testTouchMouseAction()
|
|
{
|
|
// this test verifies that a touch down on an inactive client will activate it
|
|
using namespace KWayland::Client;
|
|
// create two windows
|
|
AbstractClient *c1 = showWindow();
|
|
QVERIFY(c1);
|
|
AbstractClient *c2 = showWindow();
|
|
QVERIFY(c2);
|
|
|
|
QVERIFY(!c1->isActive());
|
|
QVERIFY(c2->isActive());
|
|
|
|
// also create a sequence started spy as the touch event should be passed through
|
|
QSignalSpy sequenceStartedSpy(m_touch, &Touch::sequenceStarted);
|
|
QVERIFY(sequenceStartedSpy.isValid());
|
|
|
|
quint32 timestamp = 1;
|
|
kwinApp()->platform()->touchDown(1, c1->frameGeometry().center(), timestamp++);
|
|
QVERIFY(c1->isActive());
|
|
|
|
QVERIFY(sequenceStartedSpy.wait());
|
|
QCOMPARE(sequenceStartedSpy.count(), 1);
|
|
|
|
// cleanup
|
|
kwinApp()->platform()->cancelTouchSequence();
|
|
}
|
|
|
|
void TouchInputTest::testTouchPointCount()
|
|
{
|
|
QCOMPARE(kwinApp()->platform()->touchPointCount(), 0);
|
|
quint32 timestamp = 1;
|
|
kwinApp()->platform()->touchDown(0, QPointF(125, 125), timestamp++);
|
|
kwinApp()->platform()->touchDown(1, QPointF(125, 125), timestamp++);
|
|
kwinApp()->platform()->touchDown(2, QPointF(125, 125), timestamp++);
|
|
QCOMPARE(kwinApp()->platform()->touchPointCount(), 3);
|
|
|
|
kwinApp()->platform()->touchUp(1, timestamp++);
|
|
QCOMPARE(kwinApp()->platform()->touchPointCount(), 2);
|
|
|
|
kwinApp()->platform()->cancelTouchSequence();
|
|
QCOMPARE(kwinApp()->platform()->touchPointCount(), 0);
|
|
}
|
|
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(KWin::TouchInputTest)
|
|
#include "touch_input_test.moc"
|