Differential D19705 Diff 55168 autotests/integration/maximize_test.cpp

Changeset View

Standalone View

View Options

autotests/integration/maximize_test.cpp

Show All 24 Lines
25#include "wayland_server.h" 25​#include "wayland_server.h"
26#include "workspace.h" 26​#include "workspace.h"
27 27​
28#include <KWayland/Client/compositor.h> 28​#include <KWayland/Client/compositor.h>
29#include <KWayland/Client/shell.h> 29​#include <KWayland/Client/shell.h>
30#include <KWayland/Client/shm_pool.h> 30​#include <KWayland/Client/shm_pool.h>
31#include <KWayland/Client/surface.h> 31​#include <KWayland/Client/surface.h>
32#include <KWayland/Client/server_decoration.h> 32​#include <KWayland/Client/server_decoration.h>
33​#include <KWayland/Client/xdgdecoration.h>
33 34​
34#include <KWayland/Server/shell_interface.h> 35​#include <KWayland/Server/shell_interface.h>
36​#include <KWayland/Server/xdgdecoration_interface.h>
35 37​
36#include <KDecoration2/Decoration> 38​#include <KDecoration2/Decoration>
37#include <KDecoration2/DecoratedClient> 39​#include <KDecoration2/DecoratedClient>
38 40​
39using namespace KWin; 41​using namespace KWin;
40using namespace KWayland::Client; 42​using namespace KWayland::Client;
41 43​
42static const QString s_socketName = QStringLiteral("wayland_test_kwin_maximized-0"); 44​static const QString s_socketName = QStringLiteral("wayland_test_kwin_maximized-0");
43 45​
44class TestMaximized : public QObject 46​class TestMaximized : public QObject
45{ 47​{
46 Q_OBJECT 48​ Q_OBJECT
47private Q_SLOTS: 49​private Q_SLOTS:
48 void initTestCase(); 50​ void initTestCase();
49 void init(); 51​ void init();
50 void cleanup(); 52​ void cleanup();
51 53​
52 void testMaximizedPassedToDeco(); 54​ void testMaximizedPassedToDeco();
53 void testInitiallyMaximized(); 55​ void testInitiallyMaximized();
54 void testBorderlessMaximizedWindow(); 56​ void testBorderlessMaximizedWindow();
57​ void testBorderlessMaximizedWindowNoClientSideDecoration();
55}; 58​};
56 59​
57void TestMaximized::initTestCase() 60​void TestMaximized::initTestCase()
58{ 61​{
59 qRegisterMetaType<KWin::ShellClient*>(); 62​ qRegisterMetaType<KWin::ShellClient*>();
60 qRegisterMetaType<KWin::AbstractClient*>(); 63​ qRegisterMetaType<KWin::AbstractClient*>();
61 QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated); 64​ QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
62 QVERIFY(workspaceCreatedSpy.isValid()); 65​ QVERIFY(workspaceCreatedSpy.isValid());
63 kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); 66​ kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
64 QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); 67​ QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
65 QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); 68​ QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit()));
66 69​
67 kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); 70​ kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig));
68 71​
69 kwinApp()->start(); 72​ kwinApp()->start();
70 QVERIFY(workspaceCreatedSpy.wait()); 73​ QVERIFY(workspaceCreatedSpy.wait());
71 QCOMPARE(screens()->count(), 2); 74​ QCOMPARE(screens()->count(), 2);
72 QCOMPARE(screens()->geometry(0), QRect(0, 0, 1280, 1024)); 75​ QCOMPARE(screens()->geometry(0), QRect(0, 0, 1280, 1024));
73 QCOMPARE(screens()->geometry(1), QRect(1280, 0, 1280, 1024)); 76​ QCOMPARE(screens()->geometry(1), QRect(1280, 0, 1280, 1024));
74 waylandServer()->initWorkspace(); 77​ waylandServer()->initWorkspace();
75} 78​}
76 79​
77void TestMaximized::init() 80​void TestMaximized::init()
78{ 81​{
79 QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::Decoration)); 82​ QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::Decoration |
83​ Test::AdditionalWaylandInterface::XdgDecoration));
80 84​
81 screens()->setCurrent(0); 85​ screens()->setCurrent(0);
82 KWin::Cursor::setPos(QPoint(1280, 512)); 86​ KWin::Cursor::setPos(QPoint(1280, 512));
83} 87​}
84 88​
85void TestMaximized::cleanup() 89​void TestMaximized::cleanup()
86{ 90​{
87 Test::destroyWaylandConnection(); 91​ Test::destroyWaylandConnection();
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Line(s)185{
219 Test::render(surface.data(), QSize(100, 50), Qt::red); 223​ Test::render(surface.data(), QSize(100, 50), Qt::red);
220 QVERIFY(geometryChangedSpy.wait()); 224​ QVERIFY(geometryChangedSpy.wait());
221 QCOMPARE(client->maximizeMode(), MaximizeMode::MaximizeRestore); 225​ QCOMPARE(client->maximizeMode(), MaximizeMode::MaximizeRestore);
222 QCOMPARE(client->geometry(), origGeo); 226​ QCOMPARE(client->geometry(), origGeo);
223 QCOMPARE(client->geometryRestore(), origGeo); 227​ QCOMPARE(client->geometryRestore(), origGeo);
224 QCOMPARE(client->isDecorated(), true); 228​ QCOMPARE(client->isDecorated(), true);
225} 229​}
226 230​
231​void TestMaximized::testBorderlessMaximizedWindowNoClientSideDecoration()
232​{
233​ // test case verifies that borderless maximized windows doesn't cause
234​ // clients to render client-side decorations instead (BUG 405385)
235​
236​ // adjust config
237​ auto group = kwinApp()->config()->group("Windows");
238​ group.writeEntry("BorderlessMaximizedWindows", true);
239​ group.sync();
240​ Workspace::self()->slotReconfigure();
241​ QCOMPARE(options->borderlessMaximizedWindows(), true);
242​
243​ QScopedPointer<Surface> surface(Test::createSurface());
244​ QScopedPointer<XdgShellSurface> xdgShellSurface(Test::createXdgShellStableSurface(surface.data()));
245​ QScopedPointer<XdgDecoration> deco(Test::xdgDecorationManager()->getToplevelDecoration(xdgShellSurface.data()));
246​
247​ QSignalSpy decorationConfiguredSpy(deco.data(), &XdgDecoration::modeChanged);
248​ QVERIFY(decorationConfiguredSpy.isValid());
249​
250​ auto client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
251​
252​ QSignalSpy geometryChangedSpy(client, &ShellClient::geometryChanged);
253​ QVERIFY(geometryChangedSpy.isValid());
254​ QSignalSpy sizeChangeRequestedSpy(xdgShellSurface.data(), &XdgShellSurface::sizeChanged);
255​ QVERIFY(sizeChangeRequestedSpy.isValid());
256​ QSignalSpy configureRequestedSpy(xdgShellSurface.data(), &XdgShellSurface::configureRequested);
257​ QVERIFY(configureRequestedSpy.isValid());
258​
259​ QVERIFY(client->isDecorated());
260​ QVERIFY(!client->noBorder());
261​ configureRequestedSpy.wait();
262​ QCOMPARE(decorationConfiguredSpy.count(), 1);
263​ QCOMPARE(deco->mode(), XdgDecoration::Mode::ServerSide);
264​
265​ // go to maximized
266​ xdgShellSurface->setMaximized(true);
267​ QVERIFY(sizeChangeRequestedSpy.wait());
268​ QCOMPARE(sizeChangeRequestedSpy.count(), 1);
zzagUnsubmitted
Not Done

maybe you could check decorationConfiguredSpy.count() here as well. though in general it's a bit messy because kwin sends several configure events in this case.....

zzag: maybe you could check decorationConfiguredSpy.count() here as well. though in general it's a…
davidedmundsonUnsubmitted
Not Done

We should only send one, but whether we or not is somewhat unrelated to this patch.

Try checking it's one, but if it fails leave it.

davidedmundson: We should only send one, but whether we or not is somewhat unrelated to this patch. Try…
269​
270​ for (const auto &it: configureRequestedSpy) {
271​ xdgShellSurface->ackConfigure(it[2].toInt());
272​ }
zzagUnsubmitted
Not Done

just ack the last one

zzag: just ack the last one
273​ Test::render(surface.data(), sizeChangeRequestedSpy.last().first().toSize(), Qt::red);
274​ QVERIFY(geometryChangedSpy.wait());
275​
276​ // no deco
277​ QVERIFY(!client->isDecorated());
278​ QVERIFY(client->noBorder());
279​ // but still server-side
280​ QCOMPARE(deco->mode(), XdgDecoration::Mode::ServerSide);
281​
282​ // go back to normal
283​ xdgShellSurface->setMaximized(false);
284​ QVERIFY(sizeChangeRequestedSpy.wait());
285​ QCOMPARE(sizeChangeRequestedSpy.count(), 2);
286​
287​ for (const auto &it: configureRequestedSpy) {
288​ xdgShellSurface->ackConfigure(it[2].toInt());
289​ }
290​ Test::render(surface.data(), sizeChangeRequestedSpy.last().first().toSize(), Qt::red);
291​ QVERIFY(geometryChangedSpy.wait());
292​
293​ QVERIFY(client->isDecorated());
294​ QVERIFY(!client->noBorder());
295​ QCOMPARE(deco->mode(), XdgDecoration::Mode::ServerSide);
296​}
297​
227WAYLANDTEST_MAIN(TestMaximized) 298​WAYLANDTEST_MAIN(TestMaximized)
228#include "maximize_test.moc" 299​#include "maximize_test.moc"