acb0683e0d
Currently, if a window switches between SSD and CSD, it is possible to encounter a "corrupted" state where the server-side decoration is wrapped around the window while it still has the client-side decoration. The xdg-decoration protocol fixes this problem by saying that decoration updates are bound to xdg_surface configure events. At the moment, kwin sort of applies decoration updates immediately. With this change, decoration updates will be done according to the spec. If the compositor wants to create a decoration, it will send a configure event and apply the decoration when the configure event is acked by the client. In order to send the configure event with a good window geometry size, kwin will create the decoration to query the border size but not assign it to the client yet. As is, KDecoration api doesn't make querying the border size ahead of time easy. The decoration plugin can assign arbitrary border sizes to windows as it pleases it. We could change that, but it effectively means starting KDecoration3 and setting existing window deco ecosystem around kwin on fire the second time, that's off the table. If the compositor wants to remove the decoration, it will send a configure event. When the configure event is acked and the surface is committed, the window decoration will be destroyed. Sync'ing decoration updates to configure events ensures that we cannot end up with having both client-side and server-side decoration. It also helps us to fix a bunch of geometry related issues caused by creating and destroying the decoration without any surface buffer attached yet. BUG: 445259
376 lines
14 KiB
C++
376 lines
14 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 "abstract_output.h"
|
|
#include "platform.h"
|
|
#include "touch_input.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/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();
|
|
void testUpdateFocusOnDecorationDestroy();
|
|
|
|
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());
|
|
const auto outputs = kwinApp()->platform()->enabledOutputs();
|
|
QCOMPARE(outputs.count(), 2);
|
|
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
|
|
Test::initWaylandWorkspace();
|
|
}
|
|
|
|
void TouchInputTest::init()
|
|
{
|
|
using namespace KWayland::Client;
|
|
QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::Seat |
|
|
Test::AdditionalWaylandInterface::XdgDecorationV1));
|
|
QVERIFY(Test::waitForWaylandTouch());
|
|
m_touch = Test::waylandSeat()->createTouch(Test::waylandSeat());
|
|
QVERIFY(m_touch);
|
|
QVERIFY(m_touch->isValid());
|
|
|
|
workspace()->setActiveOutput(QPoint(640, 512));
|
|
Cursors::self()->mouse()->setPos(QPoint(640, 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;
|
|
|
|
KWayland::Client::Surface *surface = Test::createSurface(Test::waylandCompositor());
|
|
VERIFY(surface);
|
|
Test::XdgToplevel *shellSurface = Test::createXdgToplevelSurface(surface, Test::CreationSetup::CreateOnly, surface);
|
|
VERIFY(shellSurface);
|
|
if (decorated) {
|
|
auto decoration = Test::createXdgToplevelDecorationV1(shellSurface, shellSurface);
|
|
decoration->set_mode(Test::XdgToplevelDecorationV1::mode_server_side);
|
|
}
|
|
QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
|
|
surface->commit(KWayland::Client::Surface::CommitFlag::None);
|
|
VERIFY(surfaceConfigureRequestedSpy.wait());
|
|
// let's render
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value<quint32>());
|
|
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(input()->touch()->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(input()->touch()->touchPointCount(), 3);
|
|
|
|
kwinApp()->platform()->touchUp(1, timestamp++);
|
|
QCOMPARE(input()->touch()->touchPointCount(), 2);
|
|
|
|
kwinApp()->platform()->cancelTouchSequence();
|
|
QCOMPARE(input()->touch()->touchPointCount(), 0);
|
|
}
|
|
|
|
void TouchInputTest::testUpdateFocusOnDecorationDestroy()
|
|
{
|
|
// This test verifies that a maximized client gets it's touch focus
|
|
// if decoration was focused and then destroyed on maximize with BorderlessMaximizedWindows option.
|
|
|
|
QSignalSpy sequenceEndedSpy(m_touch, &KWayland::Client::Touch::sequenceEnded);
|
|
QVERIFY(sequenceEndedSpy.isValid());
|
|
|
|
// Enable the borderless maximized windows option.
|
|
auto group = kwinApp()->config()->group("Windows");
|
|
group.writeEntry("BorderlessMaximizedWindows", true);
|
|
group.sync();
|
|
Workspace::self()->slotReconfigure();
|
|
QCOMPARE(options->borderlessMaximizedWindows(), true);
|
|
|
|
// Create the test client.
|
|
QScopedPointer<KWayland::Client::Surface> surface(Test::createSurface());
|
|
QScopedPointer<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.data(), Test::CreationSetup::CreateOnly));
|
|
QScopedPointer<Test::XdgToplevelDecorationV1> decoration(Test::createXdgToplevelDecorationV1(shellSurface.data()));
|
|
|
|
QSignalSpy toplevelConfigureRequestedSpy(shellSurface.data(), &Test::XdgToplevel::configureRequested);
|
|
QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
|
|
QSignalSpy decorationConfigureRequestedSpy(decoration.data(), &Test::XdgToplevelDecorationV1::configureRequested);
|
|
decoration->set_mode(Test::XdgToplevelDecorationV1::mode_server_side);
|
|
surface->commit(KWayland::Client::Surface::CommitFlag::None);
|
|
|
|
// Wait for the initial configure event.
|
|
Test::XdgToplevel::States states;
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
QCOMPARE(surfaceConfigureRequestedSpy.count(), 1);
|
|
QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).toSize(), QSize(0, 0));
|
|
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
|
|
QVERIFY(!states.testFlag(Test::XdgToplevel::State::Activated));
|
|
QVERIFY(!states.testFlag(Test::XdgToplevel::State::Maximized));
|
|
|
|
// Map the client.
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value<quint32>());
|
|
AbstractClient *client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
QVERIFY(client);
|
|
QVERIFY(client->isActive());
|
|
QCOMPARE(client->maximizeMode(), MaximizeMode::MaximizeRestore);
|
|
QCOMPARE(client->requestedMaximizeMode(), MaximizeMode::MaximizeRestore);
|
|
QCOMPARE(client->isDecorated(), true);
|
|
|
|
// We should receive a configure event when the client becomes active.
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
QCOMPARE(surfaceConfigureRequestedSpy.count(), 2);
|
|
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated));
|
|
QVERIFY(!states.testFlag(Test::XdgToplevel::State::Maximized));
|
|
|
|
// Simulate decoration hover
|
|
quint32 timestamp = 0;
|
|
kwinApp()->platform()->touchDown(1, client->frameGeometry().topLeft(), timestamp++);
|
|
QVERIFY(input()->touch()->decoration());
|
|
|
|
// Maximize when on decoration
|
|
workspace()->slotWindowMaximize();
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
QCOMPARE(surfaceConfigureRequestedSpy.count(), 3);
|
|
QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).toSize(), QSize(1280, 1024));
|
|
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated));
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Maximized));
|
|
|
|
QSignalSpy frameGeometryChangedSpy(client, &AbstractClient::frameGeometryChanged);
|
|
QVERIFY(frameGeometryChangedSpy.isValid());
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value<quint32>());
|
|
Test::render(surface.data(), QSize(1280, 1024), Qt::blue);
|
|
QVERIFY(frameGeometryChangedSpy.wait());
|
|
QCOMPARE(client->frameGeometry(), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(client->maximizeMode(), MaximizeFull);
|
|
QCOMPARE(client->requestedMaximizeMode(), MaximizeFull);
|
|
QCOMPARE(client->isDecorated(), false);
|
|
|
|
// Window should have focus
|
|
QVERIFY(!input()->touch()->decoration());
|
|
kwinApp()->platform()->touchUp(1, timestamp++);
|
|
QVERIFY(!sequenceEndedSpy.wait(100));
|
|
kwinApp()->platform()->touchDown(2, client->frameGeometry().center(), timestamp++);
|
|
kwinApp()->platform()->touchUp(2, timestamp++);
|
|
QVERIFY(sequenceEndedSpy.wait());
|
|
|
|
// Destroy the client.
|
|
shellSurface.reset();
|
|
QVERIFY(Test::waitForWindowDestroyed(client));
|
|
}
|
|
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(KWin::TouchInputTest)
|
|
#include "touch_input_test.moc"
|