8bbd53a774
Summary: We need to call Workspace::clientHidden when minimizing. Otherwise Workspace doesn't update the active client and the now minimized window is still active. BUG: 366634 Test Plan: Test case works now and also tested in nested setup that active window changes. Reviewers: #kwin, #plasma_on_wayland Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D2410
269 lines
11 KiB
C++
269 lines
11 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_data();
|
|
void testMapUnmapMap();
|
|
void testDesktopPresenceChanged();
|
|
void testTransientPositionAfterRemap();
|
|
void testMinimizeActiveWindow_data();
|
|
void testMinimizeActiveWindow();
|
|
};
|
|
|
|
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_data()
|
|
{
|
|
QTest::addColumn<Test::ShellSurfaceType>("type");
|
|
|
|
QTest::newRow("wlShell") << Test::ShellSurfaceType::WlShell;
|
|
QTest::newRow("xdgShellV5") << Test::ShellSurfaceType::XdgShellV5;
|
|
}
|
|
|
|
void TestShellClient::testMapUnmapMap()
|
|
{
|
|
// this test verifies that mapping a previously mapped window works correctly
|
|
QSignalSpy clientAddedSpy(waylandServer(), &WaylandServer::shellClientAdded);
|
|
QVERIFY(clientAddedSpy.isValid());
|
|
QSignalSpy effectsWindowShownSpy(effects, &EffectsHandler::windowShown);
|
|
QVERIFY(effectsWindowShownSpy.isValid());
|
|
QSignalSpy effectsWindowHiddenSpy(effects, &EffectsHandler::windowHidden);
|
|
QVERIFY(effectsWindowHiddenSpy.isValid());
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QFETCH(Test::ShellSurfaceType, type);
|
|
QScopedPointer<QObject> shellSurface(Test::createShellSurface(type, 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(client->isHiddenInternal(), false);
|
|
QCOMPARE(client->readyForPainting(), true);
|
|
QCOMPARE(client->depth(), 32);
|
|
QVERIFY(client->hasAlpha());
|
|
QCOMPARE(workspace()->activeClient(), client);
|
|
QVERIFY(effectsWindowShownSpy.isEmpty());
|
|
|
|
// 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());
|
|
QCOMPARE(client->readyForPainting(), true);
|
|
QCOMPARE(client->isHiddenInternal(), true);
|
|
QVERIFY(windowClosedSpy.isEmpty());
|
|
QVERIFY(!workspace()->activeClient());
|
|
QCOMPARE(effectsWindowHiddenSpy.count(), 1);
|
|
QCOMPARE(effectsWindowHiddenSpy.first().first().value<EffectWindow*>(), client->effectWindow());
|
|
|
|
QSignalSpy windowShownSpy(client, &ShellClient::windowShown);
|
|
QVERIFY(windowShownSpy.isValid());
|
|
Test::render(surface.data(), QSize(100, 50), Qt::blue, QImage::Format_RGB32);
|
|
QCOMPARE(clientAddedSpy.count(), 1);
|
|
QVERIFY(windowShownSpy.wait());
|
|
QCOMPARE(windowShownSpy.count(), 1);
|
|
QCOMPARE(clientAddedSpy.count(), 1);
|
|
QCOMPARE(client->readyForPainting(), true);
|
|
QCOMPARE(client->isHiddenInternal(), false);
|
|
QCOMPARE(client->depth(), 24);
|
|
QVERIFY(!client->hasAlpha());
|
|
QCOMPARE(workspace()->activeClient(), client);
|
|
QCOMPARE(effectsWindowShownSpy.count(), 1);
|
|
QCOMPARE(effectsWindowShownSpy.first().first().value<EffectWindow*>(), client->effectWindow());
|
|
|
|
// let's unmap again
|
|
surface->attachBuffer(Buffer::Ptr());
|
|
surface->commit(Surface::CommitFlag::None);
|
|
QVERIFY(hiddenSpy.wait());
|
|
QCOMPARE(hiddenSpy.count(), 2);
|
|
QCOMPARE(client->readyForPainting(), true);
|
|
QCOMPARE(client->isHiddenInternal(), true);
|
|
QVERIFY(windowClosedSpy.isEmpty());
|
|
QCOMPARE(effectsWindowHiddenSpy.count(), 2);
|
|
QCOMPARE(effectsWindowHiddenSpy.last().first().value<EffectWindow*>(), client->effectWindow());
|
|
|
|
shellSurface.reset();
|
|
surface.reset();
|
|
QVERIFY(windowClosedSpy.wait());
|
|
QCOMPARE(windowClosedSpy.count(), 1);
|
|
QCOMPARE(effectsWindowHiddenSpy.count(), 2);
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
void TestShellClient::testTransientPositionAfterRemap()
|
|
{
|
|
// this test simulates the situation that a transient window gets reused and the parent window
|
|
// moved between the two usages
|
|
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);
|
|
|
|
// create the Transient window
|
|
QScopedPointer<Surface> transientSurface(Test::createSurface());
|
|
QScopedPointer<ShellSurface> transientShellSurface(Test::createShellSurface(transientSurface.data()));
|
|
transientShellSurface->setTransient(surface.data(), QPoint(5, 10));
|
|
auto transient = Test::renderAndWaitForShown(transientSurface.data(), QSize(50, 40), Qt::blue);
|
|
QVERIFY(transient);
|
|
QCOMPARE(transient->geometry(), QRect(c->geometry().topLeft() + QPoint(5, 10), QSize(50, 40)));
|
|
|
|
// unmap the transient
|
|
QSignalSpy windowHiddenSpy(transient, &ShellClient::windowHidden);
|
|
QVERIFY(windowHiddenSpy.isValid());
|
|
transientSurface->attachBuffer(Buffer::Ptr());
|
|
transientSurface->commit(Surface::CommitFlag::None);
|
|
QVERIFY(windowHiddenSpy.wait());
|
|
|
|
// now move the parent surface
|
|
c->setGeometry(c->geometry().translated(5, 10));
|
|
|
|
// now map the transient again
|
|
QSignalSpy windowShownSpy(transient, &ShellClient::windowShown);
|
|
QVERIFY(windowShownSpy.isValid());
|
|
Test::render(transientSurface.data(), QSize(50, 40), Qt::blue);
|
|
QVERIFY(windowShownSpy.wait());
|
|
QCOMPARE(transient->geometry(), QRect(c->geometry().topLeft() + QPoint(5, 10), QSize(50, 40)));
|
|
}
|
|
|
|
void TestShellClient::testMinimizeActiveWindow_data()
|
|
{
|
|
QTest::addColumn<Test::ShellSurfaceType>("type");
|
|
|
|
QTest::newRow("wlShell") << Test::ShellSurfaceType::WlShell;
|
|
QTest::newRow("xdgShellV5") << Test::ShellSurfaceType::XdgShellV5;
|
|
}
|
|
|
|
void TestShellClient::testMinimizeActiveWindow()
|
|
{
|
|
// this test verifies that when minimizing the active window it gets deactivated
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QFETCH(Test::ShellSurfaceType, type);
|
|
QScopedPointer<QObject> shellSurface(Test::createShellSurface(type, surface.data()));
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
QVERIFY(c);
|
|
QVERIFY(c->isActive());
|
|
QCOMPARE(workspace()->activeClient(), c);
|
|
|
|
workspace()->slotWindowMinimize();
|
|
QVERIFY(!c->isActive());
|
|
QVERIFY(!workspace()->activeClient());
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(TestShellClient)
|
|
#include "shell_client_test.moc"
|