kwin/autotests/wayland/client/test_xdg_shell.cpp

592 lines
24 KiB
C++
Raw Normal View History

/*
SPDX-FileCopyrightText: 2016 Martin Gräßlin <mgraesslin@kde.org>
SPDX-FileCopyrightText: 2017 David Edmundson <davidedmundson@kde.org>
SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
*/
Support XDG v6 Summary: The main clever part that's not just boring boiler plate is how we handle the structure change A surface now has an XDGSurface which then has a an Xdg TopLevel or a Xdg Popup We need to fit this into the public API which assumes a surface has a Surface or a Popup. The old Surface is similar to the new TopLevel. The shoehorning works by relying on the fact that a surface without a role is pretty useless. Clients create the surface implicitly with the toplevel or implicitly with the popup. The server only announced it has a new "XdgSurface" when it gets a new zxdg_surface_get_toplevel. ---- Popup decisions: - On popup creation the server should copy the current info from the positioner and then it gets deleted. Given kwaylands job is to keep state, we expose all these parameter via popup. - Due to this positioner is not exposed as a resource anywhere. - Server API is 100% backwards compatiable. i.e new code will work identically with v5 clients. - Client API is not. Grabs are called separately from the constructor, and the parent surface changed to an xdgsurface, not a raw surface. V5 code still works as-is, just not with the new constructors. It seemed better to match the v6 (and what will be the stable v7) than to try and do hacks and lose functionality. Given the client needs to change the code to opt into V6 anyway. I don't think this is a huge problem. Test Plan: Current test still passes. Reviewers: #plasma, graesslin Reviewed By: #plasma, graesslin Subscribers: graesslin, mart, plasma-devel, #frameworks Tags: #frameworks, #plasma_on_wayland Differential Revision: https://phabricator.kde.org/D6047
2017-09-04 15:38:35 +00:00
// Qt
#include <QSignalSpy>
#include <QTest>
// client
#include "KWayland/Client/compositor.h"
#include "KWayland/Client/connection_thread.h"
#include "KWayland/Client/event_queue.h"
#include "KWayland/Client/output.h"
#include "KWayland/Client/registry.h"
#include "KWayland/Client/seat.h"
#include "KWayland/Client/shm_pool.h"
#include "KWayland/Client/surface.h"
#include "KWayland/Client/xdgshell.h"
// server
#include "wayland/compositor.h"
#include "wayland/display.h"
#include "wayland/output.h"
#include "wayland/seat.h"
#include "wayland/surface.h"
#include "wayland/xdgshell.h"
#include "../../../tests/fakeoutput.h"
using namespace KWin;
Q_DECLARE_METATYPE(Qt::MouseButton)
static const QString s_socketName = QStringLiteral("kwayland-test-xdg_shell-0");
class XdgShellTest : public QObject
{
Q_OBJECT
private Q_SLOTS:
void init();
void cleanup();
void testCreateSurface();
void testTitle();
void testWindowClass();
void testMaximize();
void testMinimize();
void testFullscreen();
void testShowWindowMenu();
void testMove();
void testResize_data();
void testResize();
void testTransient();
void testPing();
void testClose();
void testConfigureStates_data();
void testConfigureStates();
void testConfigureMultipleAcks();
private:
XdgShellInterface *m_xdgShellInterface = nullptr;
KWayland::Client::Compositor *m_compositor = nullptr;
KWayland::Client::XdgShell *m_xdgShell = nullptr;
KWin::Display *m_display = nullptr;
CompositorInterface *m_compositorInterface = nullptr;
std::unique_ptr<FakeOutput> m_output1Handle;
OutputInterface *m_output1Interface = nullptr;
std::unique_ptr<FakeOutput> m_output2Handle;
OutputInterface *m_output2Interface = nullptr;
SeatInterface *m_seatInterface = nullptr;
KWayland::Client::ConnectionThread *m_connection = nullptr;
QThread *m_thread = nullptr;
KWayland::Client::EventQueue *m_queue = nullptr;
KWayland::Client::ShmPool *m_shmPool = nullptr;
KWayland::Client::Output *m_output1 = nullptr;
KWayland::Client::Output *m_output2 = nullptr;
KWayland::Client::Seat *m_seat = nullptr;
};
#define SURFACE \
QSignalSpy xdgSurfaceCreatedSpy(m_xdgShellInterface, &XdgShellInterface::toplevelCreated); \
std::unique_ptr<KWayland::Client::Surface> surface(m_compositor->createSurface()); \
std::unique_ptr<KWayland::Client::XdgShellSurface> xdgSurface(m_xdgShell->createSurface(surface.get())); \
QCOMPARE(xdgSurface->size(), QSize()); \
QVERIFY(xdgSurfaceCreatedSpy.wait()); \
auto serverXdgToplevel = xdgSurfaceCreatedSpy.first().first().value<XdgToplevelInterface *>(); \
QVERIFY(serverXdgToplevel);
void XdgShellTest::init()
{
delete m_display;
m_display = new KWin::Display(this);
m_display->addSocketName(s_socketName);
m_display->start();
QVERIFY(m_display->isRunning());
m_display->createShm();
m_output1Handle = std::make_unique<FakeOutput>();
m_output1Handle->setMode(QSize(1024, 768), 60000);
m_output1Interface = new OutputInterface(m_display, m_output1Handle.get(), m_display);
m_output2Handle = std::make_unique<FakeOutput>();
m_output2Handle->setMode(QSize(1024, 768), 60000);
m_output2Interface = new OutputInterface(m_display, m_output2Handle.get(), m_display);
m_seatInterface = new SeatInterface(m_display, m_display);
m_seatInterface->setHasKeyboard(true);
m_seatInterface->setHasPointer(true);
m_seatInterface->setHasTouch(true);
m_compositorInterface = new CompositorInterface(m_display, m_display);
m_xdgShellInterface = new XdgShellInterface(m_display, m_display);
// setup connection
m_connection = new KWayland::Client::ConnectionThread;
QSignalSpy connectedSpy(m_connection, &KWayland::Client::ConnectionThread::connected);
m_connection->setSocketName(s_socketName);
m_thread = new QThread(this);
m_connection->moveToThread(m_thread);
m_thread->start();
m_connection->initConnection();
QVERIFY(connectedSpy.wait());
m_queue = new KWayland::Client::EventQueue(this);
m_queue->setup(m_connection);
KWayland::Client::Registry registry;
QSignalSpy interfacesAnnouncedSpy(&registry, &KWayland::Client::Registry::interfacesAnnounced);
QSignalSpy interfaceAnnouncedSpy(&registry, &KWayland::Client::Registry::interfaceAnnounced);
QSignalSpy outputAnnouncedSpy(&registry, &KWayland::Client::Registry::outputAnnounced);
Support XDG v6 Summary: The main clever part that's not just boring boiler plate is how we handle the structure change A surface now has an XDGSurface which then has a an Xdg TopLevel or a Xdg Popup We need to fit this into the public API which assumes a surface has a Surface or a Popup. The old Surface is similar to the new TopLevel. The shoehorning works by relying on the fact that a surface without a role is pretty useless. Clients create the surface implicitly with the toplevel or implicitly with the popup. The server only announced it has a new "XdgSurface" when it gets a new zxdg_surface_get_toplevel. ---- Popup decisions: - On popup creation the server should copy the current info from the positioner and then it gets deleted. Given kwaylands job is to keep state, we expose all these parameter via popup. - Due to this positioner is not exposed as a resource anywhere. - Server API is 100% backwards compatiable. i.e new code will work identically with v5 clients. - Client API is not. Grabs are called separately from the constructor, and the parent surface changed to an xdgsurface, not a raw surface. V5 code still works as-is, just not with the new constructors. It seemed better to match the v6 (and what will be the stable v7) than to try and do hacks and lose functionality. Given the client needs to change the code to opt into V6 anyway. I don't think this is a huge problem. Test Plan: Current test still passes. Reviewers: #plasma, graesslin Reviewed By: #plasma, graesslin Subscribers: graesslin, mart, plasma-devel, #frameworks Tags: #frameworks, #plasma_on_wayland Differential Revision: https://phabricator.kde.org/D6047
2017-09-04 15:38:35 +00:00
QSignalSpy xdgShellAnnouncedSpy(&registry, &KWayland::Client::Registry::xdgShellStableAnnounced);
registry.setEventQueue(m_queue);
registry.create(m_connection);
QVERIFY(registry.isValid());
registry.setup();
QVERIFY(interfacesAnnouncedSpy.wait());
QCOMPARE(outputAnnouncedSpy.count(), 2);
m_output1 = registry.createOutput(outputAnnouncedSpy.first().at(0).value<quint32>(), outputAnnouncedSpy.first().at(1).value<quint32>(), this);
m_output2 = registry.createOutput(outputAnnouncedSpy.last().at(0).value<quint32>(), outputAnnouncedSpy.last().at(1).value<quint32>(), this);
m_shmPool = registry.createShmPool(registry.interface(KWayland::Client::Registry::Interface::Shm).name, registry.interface(KWayland::Client::Registry::Interface::Shm).version, this);
QVERIFY(m_shmPool);
QVERIFY(m_shmPool->isValid());
m_compositor =
registry.createCompositor(registry.interface(KWayland::Client::Registry::Interface::Compositor).name, registry.interface(KWayland::Client::Registry::Interface::Compositor).version, this);
QVERIFY(m_compositor);
QVERIFY(m_compositor->isValid());
m_seat = registry.createSeat(registry.interface(KWayland::Client::Registry::Interface::Seat).name, registry.interface(KWayland::Client::Registry::Interface::Seat).version, this);
QVERIFY(m_seat);
QVERIFY(m_seat->isValid());
QCOMPARE(xdgShellAnnouncedSpy.count(), 1);
m_xdgShell = registry.createXdgShell(registry.interface(KWayland::Client::Registry::Interface::XdgShellStable).name,
registry.interface(KWayland::Client::Registry::Interface::XdgShellStable).version,
this);
QVERIFY(m_xdgShell);
QVERIFY(m_xdgShell->isValid());
}
void XdgShellTest::cleanup()
{
2022-04-19 10:14:26 +00:00
#define CLEANUP(variable) \
if (variable) { \
delete variable; \
variable = nullptr; \
}
CLEANUP(m_xdgShell)
CLEANUP(m_compositor)
CLEANUP(m_shmPool)
CLEANUP(m_output1)
CLEANUP(m_output2)
CLEANUP(m_seat)
CLEANUP(m_queue)
if (m_connection) {
m_connection->deleteLater();
m_connection = nullptr;
}
if (m_thread) {
m_thread->quit();
m_thread->wait();
delete m_thread;
m_thread = nullptr;
}
CLEANUP(m_display)
#undef CLEANUP
// these are the children of the display
m_compositorInterface = nullptr;
m_xdgShellInterface = nullptr;
m_output1Handle.reset();
m_output1Interface = nullptr;
m_output2Handle.reset();
m_output2Interface = nullptr;
m_seatInterface = nullptr;
}
void XdgShellTest::testCreateSurface()
{
// this test verifies that we can create a surface
// first created the signal spies for the server
QSignalSpy surfaceCreatedSpy(m_compositorInterface, &CompositorInterface::surfaceCreated);
QSignalSpy xdgSurfaceCreatedSpy(m_xdgShellInterface, &XdgShellInterface::toplevelCreated);
// create surface
std::unique_ptr<KWayland::Client::Surface> surface(m_compositor->createSurface());
QVERIFY(surface != nullptr);
QVERIFY(surfaceCreatedSpy.wait());
auto serverSurface = surfaceCreatedSpy.first().first().value<SurfaceInterface *>();
QVERIFY(serverSurface);
// create shell surface
std::unique_ptr<KWayland::Client::XdgShellSurface> xdgSurface(m_xdgShell->createSurface(surface.get()));
QVERIFY(xdgSurface != nullptr);
QVERIFY(xdgSurfaceCreatedSpy.wait());
// verify base things
auto serverToplevel = xdgSurfaceCreatedSpy.first().first().value<XdgToplevelInterface *>();
QVERIFY(serverToplevel);
QCOMPARE(serverToplevel->windowTitle(), QString());
QCOMPARE(serverToplevel->windowClass(), QByteArray());
QCOMPARE(serverToplevel->parentXdgToplevel(), nullptr);
QCOMPARE(serverToplevel->surface(), serverSurface);
// now let's destroy it
QSignalSpy destroyedSpy(serverToplevel, &QObject::destroyed);
xdgSurface.reset();
QVERIFY(destroyedSpy.wait());
}
void XdgShellTest::testTitle()
{
// this test verifies that we can change the title of a shell surface
// first create surface
SURFACE
// should not have a title yet
QCOMPARE(serverXdgToplevel->windowTitle(), QString());
// lets' change the title
QSignalSpy titleChangedSpy(serverXdgToplevel, &XdgToplevelInterface::windowTitleChanged);
xdgSurface->setTitle(QStringLiteral("foo"));
QVERIFY(titleChangedSpy.wait());
QCOMPARE(titleChangedSpy.count(), 1);
QCOMPARE(titleChangedSpy.first().first().toString(), QStringLiteral("foo"));
QCOMPARE(serverXdgToplevel->windowTitle(), QStringLiteral("foo"));
}
void XdgShellTest::testWindowClass()
{
// this test verifies that we can change the window class/app id of a shell surface
// first create surface
SURFACE
// should not have a window class yet
QCOMPARE(serverXdgToplevel->windowClass(), QByteArray());
// let's change the window class
QSignalSpy windowClassChanged(serverXdgToplevel, &XdgToplevelInterface::windowClassChanged);
xdgSurface->setAppId(QByteArrayLiteral("org.kde.xdgsurfacetest"));
QVERIFY(windowClassChanged.wait());
QCOMPARE(windowClassChanged.count(), 1);
QCOMPARE(windowClassChanged.first().first().toByteArray(), QByteArrayLiteral("org.kde.xdgsurfacetest"));
QCOMPARE(serverXdgToplevel->windowClass(), QByteArrayLiteral("org.kde.xdgsurfacetest"));
}
void XdgShellTest::testMaximize()
{
// this test verifies that the maximize/unmaximize calls work
SURFACE
QSignalSpy maximizeRequestedSpy(serverXdgToplevel, &XdgToplevelInterface::maximizeRequested);
QSignalSpy unmaximizeRequestedSpy(serverXdgToplevel, &XdgToplevelInterface::unmaximizeRequested);
xdgSurface->setMaximized(true);
QVERIFY(maximizeRequestedSpy.wait());
QCOMPARE(maximizeRequestedSpy.count(), 1);
xdgSurface->setMaximized(false);
QVERIFY(unmaximizeRequestedSpy.wait());
QCOMPARE(unmaximizeRequestedSpy.count(), 1);
}
void XdgShellTest::testMinimize()
{
// this test verifies that the minimize request is delivered
SURFACE
QSignalSpy minimizeRequestedSpy(serverXdgToplevel, &XdgToplevelInterface::minimizeRequested);
xdgSurface->requestMinimize();
QVERIFY(minimizeRequestedSpy.wait());
QCOMPARE(minimizeRequestedSpy.count(), 1);
}
void XdgShellTest::testFullscreen()
{
qRegisterMetaType<OutputInterface *>();
// this test verifies going to/from fullscreen
SURFACE
QSignalSpy fullscreenRequestedSpy(serverXdgToplevel, &XdgToplevelInterface::fullscreenRequested);
QSignalSpy unfullscreenRequestedSpy(serverXdgToplevel, &XdgToplevelInterface::unfullscreenRequested);
// without an output
xdgSurface->setFullscreen(true, nullptr);
QVERIFY(fullscreenRequestedSpy.wait());
QCOMPARE(fullscreenRequestedSpy.count(), 1);
QVERIFY(!fullscreenRequestedSpy.last().at(0).value<OutputInterface *>());
// unset
xdgSurface->setFullscreen(false);
QVERIFY(unfullscreenRequestedSpy.wait());
QCOMPARE(unfullscreenRequestedSpy.count(), 1);
// with outputs
xdgSurface->setFullscreen(true, m_output1);
QVERIFY(fullscreenRequestedSpy.wait());
QCOMPARE(fullscreenRequestedSpy.count(), 2);
QCOMPARE(fullscreenRequestedSpy.last().at(0).value<OutputInterface *>(), m_output1Interface);
// now other output
xdgSurface->setFullscreen(true, m_output2);
QVERIFY(fullscreenRequestedSpy.wait());
QCOMPARE(fullscreenRequestedSpy.count(), 3);
QCOMPARE(fullscreenRequestedSpy.last().at(0).value<OutputInterface *>(), m_output2Interface);
}
void XdgShellTest::testShowWindowMenu()
{
qRegisterMetaType<SeatInterface *>();
// this test verifies that the show window menu request works
SURFACE
// hack: pretend that the xdg-surface had been configured
serverXdgToplevel->sendConfigure(QSize(0, 0), XdgToplevelInterface::States());
QSignalSpy windowMenuSpy(serverXdgToplevel, &XdgToplevelInterface::windowMenuRequested);
// TODO: the serial needs to be a proper one
xdgSurface->requestShowWindowMenu(m_seat, 20, QPoint(30, 40));
QVERIFY(windowMenuSpy.wait());
QCOMPARE(windowMenuSpy.count(), 1);
QCOMPARE(windowMenuSpy.first().at(0).value<SeatInterface *>(), m_seatInterface);
QCOMPARE(windowMenuSpy.first().at(1).toPoint(), QPoint(30, 40));
QCOMPARE(windowMenuSpy.first().at(2).value<quint32>(), 20u);
}
void XdgShellTest::testMove()
{
qRegisterMetaType<SeatInterface *>();
// this test verifies that the move request works
SURFACE
// hack: pretend that the xdg-surface had been configured
serverXdgToplevel->sendConfigure(QSize(0, 0), XdgToplevelInterface::States());
QSignalSpy moveSpy(serverXdgToplevel, &XdgToplevelInterface::moveRequested);
// TODO: the serial needs to be a proper one
xdgSurface->requestMove(m_seat, 50);
QVERIFY(moveSpy.wait());
QCOMPARE(moveSpy.count(), 1);
QCOMPARE(moveSpy.first().at(0).value<SeatInterface *>(), m_seatInterface);
QCOMPARE(moveSpy.first().at(1).value<quint32>(), 50u);
}
void XdgShellTest::testResize_data()
{
QTest::addColumn<Qt::Edges>("edges");
QTest::addColumn<XdgToplevelInterface::ResizeAnchor>("anchor");
QTest::newRow("none") << Qt::Edges() << XdgToplevelInterface::ResizeAnchor::None;
QTest::newRow("top") << Qt::Edges(Qt::TopEdge) << XdgToplevelInterface::ResizeAnchor::Top;
QTest::newRow("bottom") << Qt::Edges(Qt::BottomEdge) << XdgToplevelInterface::ResizeAnchor::Bottom;
QTest::newRow("left") << Qt::Edges(Qt::LeftEdge) << XdgToplevelInterface::ResizeAnchor::Left;
QTest::newRow("top left") << Qt::Edges(Qt::TopEdge | Qt::LeftEdge) << XdgToplevelInterface::ResizeAnchor::TopLeft;
QTest::newRow("bottom left") << Qt::Edges(Qt::BottomEdge | Qt::LeftEdge) << XdgToplevelInterface::ResizeAnchor::BottomLeft;
QTest::newRow("right") << Qt::Edges(Qt::RightEdge) << XdgToplevelInterface::ResizeAnchor::Right;
QTest::newRow("top right") << Qt::Edges(Qt::TopEdge | Qt::RightEdge) << XdgToplevelInterface::ResizeAnchor::TopRight;
QTest::newRow("bottom right") << Qt::Edges(Qt::BottomEdge | Qt::RightEdge) << XdgToplevelInterface::ResizeAnchor::BottomRight;
}
void XdgShellTest::testResize()
{
qRegisterMetaType<SeatInterface *>();
// this test verifies that the resize request works
SURFACE
// hack: pretend that the xdg-surface had been configured
serverXdgToplevel->sendConfigure(QSize(0, 0), XdgToplevelInterface::States());
QSignalSpy resizeSpy(serverXdgToplevel, &XdgToplevelInterface::resizeRequested);
// TODO: the serial needs to be a proper one
QFETCH(Qt::Edges, edges);
xdgSurface->requestResize(m_seat, 60, edges);
QVERIFY(resizeSpy.wait());
QCOMPARE(resizeSpy.count(), 1);
QCOMPARE(resizeSpy.first().at(0).value<SeatInterface *>(), m_seatInterface);
QTEST(resizeSpy.first().at(1).value<XdgToplevelInterface::ResizeAnchor>(), "anchor");
QCOMPARE(resizeSpy.first().at(2).value<quint32>(), 60u);
}
void XdgShellTest::testTransient()
{
// this test verifies that setting the transient for works
SURFACE
std::unique_ptr<KWayland::Client::Surface> surface2(m_compositor->createSurface());
std::unique_ptr<KWayland::Client::XdgShellSurface> xdgSurface2(m_xdgShell->createSurface(surface2.get()));
QVERIFY(xdgSurfaceCreatedSpy.wait());
auto serverXdgToplevel2 = xdgSurfaceCreatedSpy.last().first().value<XdgToplevelInterface *>();
QVERIFY(serverXdgToplevel2);
QVERIFY(!serverXdgToplevel->parentXdgToplevel());
QVERIFY(!serverXdgToplevel2->parentXdgToplevel());
// now make xdsgSurface2 a transient for xdgSurface
QSignalSpy transientForSpy(serverXdgToplevel2, &XdgToplevelInterface::parentXdgToplevelChanged);
xdgSurface2->setTransientFor(xdgSurface.get());
QVERIFY(transientForSpy.wait());
QCOMPARE(transientForSpy.count(), 1);
QCOMPARE(serverXdgToplevel2->parentXdgToplevel(), serverXdgToplevel);
QVERIFY(!serverXdgToplevel->parentXdgToplevel());
// unset the transient for
xdgSurface2->setTransientFor(nullptr);
QVERIFY(transientForSpy.wait());
QCOMPARE(transientForSpy.count(), 2);
QVERIFY(!serverXdgToplevel2->parentXdgToplevel());
QVERIFY(!serverXdgToplevel->parentXdgToplevel());
}
Support XDG v6 Summary: The main clever part that's not just boring boiler plate is how we handle the structure change A surface now has an XDGSurface which then has a an Xdg TopLevel or a Xdg Popup We need to fit this into the public API which assumes a surface has a Surface or a Popup. The old Surface is similar to the new TopLevel. The shoehorning works by relying on the fact that a surface without a role is pretty useless. Clients create the surface implicitly with the toplevel or implicitly with the popup. The server only announced it has a new "XdgSurface" when it gets a new zxdg_surface_get_toplevel. ---- Popup decisions: - On popup creation the server should copy the current info from the positioner and then it gets deleted. Given kwaylands job is to keep state, we expose all these parameter via popup. - Due to this positioner is not exposed as a resource anywhere. - Server API is 100% backwards compatiable. i.e new code will work identically with v5 clients. - Client API is not. Grabs are called separately from the constructor, and the parent surface changed to an xdgsurface, not a raw surface. V5 code still works as-is, just not with the new constructors. It seemed better to match the v6 (and what will be the stable v7) than to try and do hacks and lose functionality. Given the client needs to change the code to opt into V6 anyway. I don't think this is a huge problem. Test Plan: Current test still passes. Reviewers: #plasma, graesslin Reviewed By: #plasma, graesslin Subscribers: graesslin, mart, plasma-devel, #frameworks Tags: #frameworks, #plasma_on_wayland Differential Revision: https://phabricator.kde.org/D6047
2017-09-04 15:38:35 +00:00
void XdgShellTest::testPing()
{
// this test verifies that a ping request is sent to the client
SURFACE
QSignalSpy pingSpy(m_xdgShellInterface, &XdgShellInterface::pongReceived);
quint32 serial = m_xdgShellInterface->ping(serverXdgToplevel->xdgSurface());
Support XDG v6 Summary: The main clever part that's not just boring boiler plate is how we handle the structure change A surface now has an XDGSurface which then has a an Xdg TopLevel or a Xdg Popup We need to fit this into the public API which assumes a surface has a Surface or a Popup. The old Surface is similar to the new TopLevel. The shoehorning works by relying on the fact that a surface without a role is pretty useless. Clients create the surface implicitly with the toplevel or implicitly with the popup. The server only announced it has a new "XdgSurface" when it gets a new zxdg_surface_get_toplevel. ---- Popup decisions: - On popup creation the server should copy the current info from the positioner and then it gets deleted. Given kwaylands job is to keep state, we expose all these parameter via popup. - Due to this positioner is not exposed as a resource anywhere. - Server API is 100% backwards compatiable. i.e new code will work identically with v5 clients. - Client API is not. Grabs are called separately from the constructor, and the parent surface changed to an xdgsurface, not a raw surface. V5 code still works as-is, just not with the new constructors. It seemed better to match the v6 (and what will be the stable v7) than to try and do hacks and lose functionality. Given the client needs to change the code to opt into V6 anyway. I don't think this is a huge problem. Test Plan: Current test still passes. Reviewers: #plasma, graesslin Reviewed By: #plasma, graesslin Subscribers: graesslin, mart, plasma-devel, #frameworks Tags: #frameworks, #plasma_on_wayland Differential Revision: https://phabricator.kde.org/D6047
2017-09-04 15:38:35 +00:00
QVERIFY(pingSpy.wait());
QCOMPARE(pingSpy.count(), 1);
QCOMPARE(pingSpy.takeFirst().at(0).value<quint32>(), serial);
// test of a ping failure
// disconnecting the connection thread to the queue will break the connection and pings will do a timeout
disconnect(m_connection, &KWayland::Client::ConnectionThread::eventsRead, m_queue, &KWayland::Client::EventQueue::dispatch);
m_xdgShellInterface->ping(serverXdgToplevel->xdgSurface());
Support XDG v6 Summary: The main clever part that's not just boring boiler plate is how we handle the structure change A surface now has an XDGSurface which then has a an Xdg TopLevel or a Xdg Popup We need to fit this into the public API which assumes a surface has a Surface or a Popup. The old Surface is similar to the new TopLevel. The shoehorning works by relying on the fact that a surface without a role is pretty useless. Clients create the surface implicitly with the toplevel or implicitly with the popup. The server only announced it has a new "XdgSurface" when it gets a new zxdg_surface_get_toplevel. ---- Popup decisions: - On popup creation the server should copy the current info from the positioner and then it gets deleted. Given kwaylands job is to keep state, we expose all these parameter via popup. - Due to this positioner is not exposed as a resource anywhere. - Server API is 100% backwards compatiable. i.e new code will work identically with v5 clients. - Client API is not. Grabs are called separately from the constructor, and the parent surface changed to an xdgsurface, not a raw surface. V5 code still works as-is, just not with the new constructors. It seemed better to match the v6 (and what will be the stable v7) than to try and do hacks and lose functionality. Given the client needs to change the code to opt into V6 anyway. I don't think this is a huge problem. Test Plan: Current test still passes. Reviewers: #plasma, graesslin Reviewed By: #plasma, graesslin Subscribers: graesslin, mart, plasma-devel, #frameworks Tags: #frameworks, #plasma_on_wayland Differential Revision: https://phabricator.kde.org/D6047
2017-09-04 15:38:35 +00:00
QSignalSpy pingDelayedSpy(m_xdgShellInterface, &XdgShellInterface::pingDelayed);
QVERIFY(pingDelayedSpy.wait());
QSignalSpy pingTimeoutSpy(m_xdgShellInterface, &XdgShellInterface::pingTimeout);
QVERIFY(pingTimeoutSpy.wait());
}
void XdgShellTest::testClose()
{
// this test verifies that a close request is sent to the client
SURFACE
QSignalSpy closeSpy(xdgSurface.get(), &KWayland::Client::XdgShellSurface::closeRequested);
serverXdgToplevel->sendClose();
QVERIFY(closeSpy.wait());
QCOMPARE(closeSpy.count(), 1);
QSignalSpy destroyedSpy(serverXdgToplevel, &XdgToplevelInterface::destroyed);
xdgSurface.reset();
QVERIFY(destroyedSpy.wait());
}
void XdgShellTest::testConfigureStates_data()
{
QTest::addColumn<XdgToplevelInterface::States>("serverStates");
QTest::addColumn<KWayland::Client::XdgShellSurface::States>("clientStates");
const auto sa = XdgToplevelInterface::States(XdgToplevelInterface::State::Activated);
const auto sm = XdgToplevelInterface::States(XdgToplevelInterface::State::Maximized);
const auto sf = XdgToplevelInterface::States(XdgToplevelInterface::State::FullScreen);
const auto sr = XdgToplevelInterface::States(XdgToplevelInterface::State::Resizing);
const auto ca = KWayland::Client::XdgShellSurface::States(KWayland::Client::XdgShellSurface::State::Activated);
const auto cm = KWayland::Client::XdgShellSurface::States(KWayland::Client::XdgShellSurface::State::Maximized);
const auto cf = KWayland::Client::XdgShellSurface::States(KWayland::Client::XdgShellSurface::State::Fullscreen);
const auto cr = KWayland::Client::XdgShellSurface::States(KWayland::Client::XdgShellSurface::State::Resizing);
QTest::newRow("none") << XdgToplevelInterface::States() << KWayland::Client::XdgShellSurface::States();
QTest::newRow("Active") << sa << ca;
QTest::newRow("Maximize") << sm << cm;
QTest::newRow("Fullscreen") << sf << cf;
QTest::newRow("Resizing") << sr << cr;
QTest::newRow("Active/Maximize") << (sa | sm) << (ca | cm);
QTest::newRow("Active/Fullscreen") << (sa | sf) << (ca | cf);
QTest::newRow("Active/Resizing") << (sa | sr) << (ca | cr);
QTest::newRow("Maximize/Fullscreen") << (sm | sf) << (cm | cf);
QTest::newRow("Maximize/Resizing") << (sm | sr) << (cm | cr);
QTest::newRow("Fullscreen/Resizing") << (sf | sr) << (cf | cr);
QTest::newRow("Active/Maximize/Fullscreen") << (sa | sm | sf) << (ca | cm | cf);
QTest::newRow("Active/Maximize/Resizing") << (sa | sm | sr) << (ca | cm | cr);
QTest::newRow("Maximize/Fullscreen|Resizing") << (sm | sf | sr) << (cm | cf | cr);
QTest::newRow("Active/Maximize/Fullscreen/Resizing") << (sa | sm | sf | sr) << (ca | cm | cf | cr);
}
void XdgShellTest::testConfigureStates()
{
qRegisterMetaType<KWayland::Client::XdgShellSurface::States>();
// this test verifies that configure states works
SURFACE
QSignalSpy configureSpy(xdgSurface.get(), &KWayland::Client::XdgShellSurface::configureRequested);
QFETCH(XdgToplevelInterface::States, serverStates);
serverXdgToplevel->sendConfigure(QSize(0, 0), serverStates);
QVERIFY(configureSpy.wait());
QCOMPARE(configureSpy.count(), 1);
QCOMPARE(configureSpy.first().at(0).toSize(), QSize(0, 0));
QTEST(configureSpy.first().at(1).value<KWayland::Client::XdgShellSurface::States>(), "clientStates");
QCOMPARE(configureSpy.first().at(2).value<quint32>(), m_display->serial());
QSignalSpy ackSpy(serverXdgToplevel->xdgSurface(), &XdgSurfaceInterface::configureAcknowledged);
xdgSurface->ackConfigure(configureSpy.first().at(2).value<quint32>());
surface->commit(KWayland::Client::Surface::CommitFlag::None);
QVERIFY(ackSpy.wait());
QCOMPARE(ackSpy.count(), 1);
QCOMPARE(ackSpy.first().first().value<quint32>(), configureSpy.first().at(2).value<quint32>());
}
void XdgShellTest::testConfigureMultipleAcks()
{
qRegisterMetaType<KWayland::Client::XdgShellSurface::States>();
// this test verifies that with multiple configure requests the last acknowledged one acknowledges all
SURFACE
QSignalSpy configureSpy(xdgSurface.get(), &KWayland::Client::XdgShellSurface::configureRequested);
QSignalSpy sizeChangedSpy(xdgSurface.get(), &KWayland::Client::XdgShellSurface::sizeChanged);
QSignalSpy ackSpy(serverXdgToplevel->xdgSurface(), &XdgSurfaceInterface::configureAcknowledged);
serverXdgToplevel->sendConfigure(QSize(10, 20), XdgToplevelInterface::States());
const quint32 serial1 = m_display->serial();
serverXdgToplevel->sendConfigure(QSize(20, 30), XdgToplevelInterface::States());
const quint32 serial2 = m_display->serial();
QVERIFY(serial1 != serial2);
serverXdgToplevel->sendConfigure(QSize(30, 40), XdgToplevelInterface::States());
const quint32 serial3 = m_display->serial();
QVERIFY(serial1 != serial3);
QVERIFY(serial2 != serial3);
QVERIFY(configureSpy.wait());
QCOMPARE(configureSpy.count(), 3);
QCOMPARE(configureSpy.at(0).at(0).toSize(), QSize(10, 20));
QCOMPARE(configureSpy.at(0).at(1).value<KWayland::Client::XdgShellSurface::States>(), KWayland::Client::XdgShellSurface::States());
QCOMPARE(configureSpy.at(0).at(2).value<quint32>(), serial1);
QCOMPARE(configureSpy.at(1).at(0).toSize(), QSize(20, 30));
QCOMPARE(configureSpy.at(1).at(1).value<KWayland::Client::XdgShellSurface::States>(), KWayland::Client::XdgShellSurface::States());
QCOMPARE(configureSpy.at(1).at(2).value<quint32>(), serial2);
QCOMPARE(configureSpy.at(2).at(0).toSize(), QSize(30, 40));
QCOMPARE(configureSpy.at(2).at(1).value<KWayland::Client::XdgShellSurface::States>(), KWayland::Client::XdgShellSurface::States());
QCOMPARE(configureSpy.at(2).at(2).value<quint32>(), serial3);
QCOMPARE(sizeChangedSpy.count(), 3);
QCOMPARE(sizeChangedSpy.at(0).at(0).toSize(), QSize(10, 20));
QCOMPARE(sizeChangedSpy.at(1).at(0).toSize(), QSize(20, 30));
QCOMPARE(sizeChangedSpy.at(2).at(0).toSize(), QSize(30, 40));
QCOMPARE(xdgSurface->size(), QSize(30, 40));
xdgSurface->ackConfigure(serial3);
surface->commit(KWayland::Client::Surface::CommitFlag::None);
QVERIFY(ackSpy.wait());
QCOMPARE(ackSpy.count(), 1);
QCOMPARE(ackSpy.last().first().value<quint32>(), serial3);
// configure once more with a null size
serverXdgToplevel->sendConfigure(QSize(0, 0), XdgToplevelInterface::States());
// should not change size
QVERIFY(configureSpy.wait());
QCOMPARE(configureSpy.count(), 4);
QCOMPARE(sizeChangedSpy.count(), 3);
QCOMPARE(xdgSurface->size(), QSize(30, 40));
}
QTEST_GUILESS_MAIN(XdgShellTest)
#include "test_xdg_shell.moc"