445335ba5f
Summary: Have one dedicated method which performs the connection for both Client and ShellClient. This fixes the desktopPresenceChanged signal not being passed to the effects. Note that not all signals are merged. Most signals setup for Client don't make sense for ShellClient as ShellClient cannot block composite or unredirect. Test Plan: Test case added for ShellClient to ensure that the signal is correctly invoked on the ShellClient, Workspace and EffectsHandler. Reviewers: #kwin, #plasma_on_wayland Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D2059
173 lines
6.4 KiB
C++
173 lines
6.4 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2016 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
#include "kwin_wayland_test.h"
|
|
#include "cursor.h"
|
|
#include "effects.h"
|
|
#include "platform.h"
|
|
#include "shell_client.h"
|
|
#include "screens.h"
|
|
#include "wayland_server.h"
|
|
#include "workspace.h"
|
|
|
|
#include <KWayland/Client/connection_thread.h>
|
|
#include <KWayland/Client/compositor.h>
|
|
#include <KWayland/Client/shell.h>
|
|
#include <KWayland/Client/surface.h>
|
|
|
|
#include <KWayland/Server/shell_interface.h>
|
|
|
|
using namespace KWin;
|
|
using namespace KWayland::Client;
|
|
|
|
static const QString s_socketName = QStringLiteral("wayland_test_kwin_shell_client-0");
|
|
|
|
class TestShellClient : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
|
|
void testMapUnmapMap();
|
|
void testDesktopPresenceChanged();
|
|
};
|
|
|
|
void TestShellClient::initTestCase()
|
|
{
|
|
qRegisterMetaType<KWin::ShellClient*>();
|
|
qRegisterMetaType<KWin::AbstractClient*>();
|
|
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
|
|
QVERIFY(workspaceCreatedSpy.isValid());
|
|
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
|
|
QMetaObject::invokeMethod(kwinApp()->platform(), "setOutputCount", Qt::DirectConnection, Q_ARG(int, 2));
|
|
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit()));
|
|
|
|
kwinApp()->start();
|
|
QVERIFY(workspaceCreatedSpy.wait());
|
|
QCOMPARE(screens()->count(), 2);
|
|
QCOMPARE(screens()->geometry(0), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(screens()->geometry(1), QRect(1280, 0, 1280, 1024));
|
|
waylandServer()->initWorkspace();
|
|
}
|
|
|
|
void TestShellClient::init()
|
|
{
|
|
QVERIFY(Test::setupWaylandConnection(s_socketName));
|
|
|
|
screens()->setCurrent(0);
|
|
KWin::Cursor::setPos(QPoint(1280, 512));
|
|
}
|
|
|
|
void TestShellClient::cleanup()
|
|
{
|
|
Test::destroyWaylandConnection();
|
|
}
|
|
|
|
void TestShellClient::testMapUnmapMap()
|
|
{
|
|
// this test verifies that mapping a previously mapped window works correctly
|
|
QSignalSpy clientAddedSpy(waylandServer(), &WaylandServer::shellClientAdded);
|
|
QVERIFY(clientAddedSpy.isValid());
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
|
|
|
// now let's render
|
|
Test::render(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(clientAddedSpy.isEmpty());
|
|
QVERIFY(clientAddedSpy.wait());
|
|
auto client = clientAddedSpy.first().first().value<ShellClient*>();
|
|
QVERIFY(client);
|
|
QVERIFY(client->isShown(true));
|
|
QCOMPARE(workspace()->activeClient(), client);
|
|
|
|
// now unmap
|
|
QSignalSpy hiddenSpy(client, &ShellClient::windowHidden);
|
|
QVERIFY(hiddenSpy.isValid());
|
|
QSignalSpy windowClosedSpy(client, &ShellClient::windowClosed);
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
surface->attachBuffer(Buffer::Ptr());
|
|
surface->commit(Surface::CommitFlag::None);
|
|
QVERIFY(hiddenSpy.wait());
|
|
QVERIFY(windowClosedSpy.isEmpty());
|
|
QVERIFY(!workspace()->activeClient());
|
|
|
|
QSignalSpy windowShownSpy(client, &ShellClient::windowShown);
|
|
QVERIFY(windowShownSpy.isValid());
|
|
Test::render(surface.data(), QSize(100, 50), Qt::blue);
|
|
QCOMPARE(clientAddedSpy.count(), 1);
|
|
QVERIFY(windowShownSpy.wait());
|
|
QCOMPARE(windowShownSpy.count(), 1);
|
|
QCOMPARE(clientAddedSpy.count(), 1);
|
|
QCOMPARE(workspace()->activeClient(), client);
|
|
|
|
// let's unmap again
|
|
surface->attachBuffer(Buffer::Ptr());
|
|
surface->commit(Surface::CommitFlag::None);
|
|
QVERIFY(hiddenSpy.wait());
|
|
QCOMPARE(hiddenSpy.count(), 2);
|
|
QVERIFY(windowClosedSpy.isEmpty());
|
|
|
|
shellSurface.reset();
|
|
surface.reset();
|
|
QVERIFY(windowClosedSpy.wait());
|
|
QCOMPARE(windowClosedSpy.count(), 1);
|
|
}
|
|
|
|
void TestShellClient::testDesktopPresenceChanged()
|
|
{
|
|
// this test verifies that the desktop presence changed signals are properly emitted
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
QVERIFY(c);
|
|
QCOMPARE(c->desktop(), 1);
|
|
effects->setNumberOfDesktops(4);
|
|
QSignalSpy desktopPresenceChangedClientSpy(c, &ShellClient::desktopPresenceChanged);
|
|
QVERIFY(desktopPresenceChangedClientSpy.isValid());
|
|
QSignalSpy desktopPresenceChangedWorkspaceSpy(workspace(), &Workspace::desktopPresenceChanged);
|
|
QVERIFY(desktopPresenceChangedWorkspaceSpy.isValid());
|
|
QSignalSpy desktopPresenceChangedEffectsSpy(effects, &EffectsHandler::desktopPresenceChanged);
|
|
QVERIFY(desktopPresenceChangedEffectsSpy.isValid());
|
|
|
|
// let's change the desktop
|
|
workspace()->sendClientToDesktop(c, 2, false);
|
|
QCOMPARE(c->desktop(), 2);
|
|
QCOMPARE(desktopPresenceChangedClientSpy.count(), 1);
|
|
QCOMPARE(desktopPresenceChangedWorkspaceSpy.count(), 1);
|
|
// effects is delayed by one cycle
|
|
QCOMPARE(desktopPresenceChangedEffectsSpy.count(), 0);
|
|
QVERIFY(desktopPresenceChangedEffectsSpy.wait());
|
|
QCOMPARE(desktopPresenceChangedEffectsSpy.count(), 1);
|
|
|
|
// verify the arguments
|
|
QCOMPARE(desktopPresenceChangedClientSpy.first().at(0).value<AbstractClient*>(), c);
|
|
QCOMPARE(desktopPresenceChangedClientSpy.first().at(1).toInt(), 1);
|
|
QCOMPARE(desktopPresenceChangedWorkspaceSpy.first().at(0).value<AbstractClient*>(), c);
|
|
QCOMPARE(desktopPresenceChangedWorkspaceSpy.first().at(1).toInt(), 1);
|
|
QCOMPARE(desktopPresenceChangedEffectsSpy.first().at(0).value<EffectWindow*>(), c->effectWindow());
|
|
QCOMPARE(desktopPresenceChangedEffectsSpy.first().at(1).toInt(), 1);
|
|
QCOMPARE(desktopPresenceChangedEffectsSpy.first().at(2).toInt(), 2);
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(TestShellClient)
|
|
#include "shell_client_test.moc"
|