0d96e60b79
Summary: So far the method only operated on X11 clients. So when the last desktop got removed Wayland clients were still on it. As the auto test showed: this results in a crash. Credits go to code coverage as it showed that area as red, which made me look on it and realize this must be broken. Test Plan: New test case added Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D8082
117 lines
3.9 KiB
C++
117 lines
3.9 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2017 Martin Flöser <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 "main.h"
|
|
#include "platform.h"
|
|
#include "screens.h"
|
|
#include "shell_client.h"
|
|
#include "wayland_server.h"
|
|
#include "virtualdesktops.h"
|
|
|
|
#include <KWayland/Client/surface.h>
|
|
|
|
using namespace KWin;
|
|
using namespace KWayland::Client;
|
|
|
|
static const QString s_socketName = QStringLiteral("wayland_test_kwin_virtualdesktop-0");
|
|
|
|
class VirtualDesktopTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
|
|
void testLastDesktopRemoved_data();
|
|
void testLastDesktopRemoved();
|
|
};
|
|
|
|
void VirtualDesktopTest::initTestCase()
|
|
{
|
|
qRegisterMetaType<KWin::ShellClient*>();
|
|
qRegisterMetaType<KWin::AbstractClient*>();
|
|
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
|
|
QVERIFY(workspaceCreatedSpy.isValid());
|
|
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
|
|
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit()));
|
|
|
|
kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig));
|
|
qputenv("KWIN_XKB_DEFAULT_KEYMAP", "1");
|
|
qputenv("XKB_DEFAULT_RULES", "evdev");
|
|
|
|
kwinApp()->start();
|
|
QVERIFY(workspaceCreatedSpy.wait());
|
|
waylandServer()->initWorkspace();
|
|
}
|
|
|
|
void VirtualDesktopTest::init()
|
|
{
|
|
QVERIFY(Test::setupWaylandConnection());
|
|
screens()->setCurrent(0);
|
|
VirtualDesktopManager::self()->setCount(1);
|
|
}
|
|
|
|
void VirtualDesktopTest::cleanup()
|
|
{
|
|
Test::destroyWaylandConnection();
|
|
}
|
|
|
|
void VirtualDesktopTest::testLastDesktopRemoved_data()
|
|
{
|
|
QTest::addColumn<Test::ShellSurfaceType>("type");
|
|
|
|
QTest::newRow("wlShell") << Test::ShellSurfaceType::WlShell;
|
|
QTest::newRow("xdgShellV5") << Test::ShellSurfaceType::XdgShellV5;
|
|
QTest::newRow("xdgShellV6") << Test::ShellSurfaceType::XdgShellV6;
|
|
}
|
|
|
|
void VirtualDesktopTest::testLastDesktopRemoved()
|
|
{
|
|
// first create a new desktop
|
|
QCOMPARE(VirtualDesktopManager::self()->count(), 1u);
|
|
VirtualDesktopManager::self()->setCount(2);
|
|
QCOMPARE(VirtualDesktopManager::self()->count(), 2u);
|
|
|
|
// switch to last desktop
|
|
VirtualDesktopManager::self()->setCurrent(VirtualDesktopManager::self()->desktops().last());
|
|
QCOMPARE(VirtualDesktopManager::self()->current(), 2u);
|
|
|
|
// now create a window on this desktop
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QFETCH(Test::ShellSurfaceType, type);
|
|
QScopedPointer<QObject> shellSurface(Test::createShellSurface(type, surface.data()));
|
|
auto client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(client);
|
|
QCOMPARE(client->desktop(), 2);
|
|
QSignalSpy desktopPresenceChangedSpy(client, &ShellClient::desktopPresenceChanged);
|
|
QVERIFY(desktopPresenceChangedSpy.isValid());
|
|
|
|
// and remove last desktop
|
|
VirtualDesktopManager::self()->setCount(1);
|
|
QCOMPARE(VirtualDesktopManager::self()->count(), 1u);
|
|
// now the client should be moved as well
|
|
QTRY_COMPARE(desktopPresenceChangedSpy.count(), 1);
|
|
QCOMPARE(client->desktop(), 1);
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(VirtualDesktopTest)
|
|
#include "virtual_desktop_test.moc"
|