7e8facc3fd
Summary: implement virtual desktop support for Wayland. use the new virtual desktop protocol from D12820 The VirtualDesktopManager class needed some big change in order to accomodate it, which is where most changes are. Other than that, it's mostly connections to wire up VirtualDesktopsManager and VirtualDesktopsManagement(the wayland protocol impl) Depends on D12820 Other notable detail, is the client visibility updated to reflect the presence of the client in the plasmavirtualdesktop. (and the unSetDesktop concept) Test Plan: used a bit a plasma session together with D12820, D13748 and D13746 Reviewers: #plasma, #kwin, graesslin, davidedmundson Reviewed By: #plasma, #kwin, davidedmundson Subscribers: hein, zzag, davidedmundson, kwin Tags: #kwin Maniphest Tasks: T4457 Differential Revision: https://phabricator.kde.org/D13887
315 lines
12 KiB
C++
315 lines
12 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 testNetCurrentDesktop();
|
|
void testLastDesktopRemoved_data();
|
|
void testLastDesktopRemoved();
|
|
void testWindowOnMultipleDesktops_data();
|
|
void testWindowOnMultipleDesktops();
|
|
void testRemoveDesktopWithWindow_data();
|
|
void testRemoveDesktopWithWindow();
|
|
};
|
|
|
|
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();
|
|
|
|
if (kwinApp()->x11Connection()) {
|
|
// verify the current desktop x11 property on startup, see BUG: 391034
|
|
Xcb::Atom currentDesktopAtom("_NET_CURRENT_DESKTOP");
|
|
QVERIFY(currentDesktopAtom.isValid());
|
|
Xcb::Property currentDesktop(0, kwinApp()->x11RootWindow(), currentDesktopAtom, XCB_ATOM_CARDINAL, 0, 1);
|
|
bool ok = true;
|
|
QCOMPARE(currentDesktop.value(0, &ok), 0);
|
|
QVERIFY(ok);
|
|
}
|
|
}
|
|
|
|
void VirtualDesktopTest::init()
|
|
{
|
|
QVERIFY(Test::setupWaylandConnection());
|
|
screens()->setCurrent(0);
|
|
VirtualDesktopManager::self()->setCount(1);
|
|
}
|
|
|
|
void VirtualDesktopTest::cleanup()
|
|
{
|
|
Test::destroyWaylandConnection();
|
|
}
|
|
|
|
void VirtualDesktopTest::testNetCurrentDesktop()
|
|
{
|
|
if (!kwinApp()->x11Connection()) {
|
|
QSKIP("Skipped on Wayland only");
|
|
}
|
|
QCOMPARE(VirtualDesktopManager::self()->count(), 1u);
|
|
VirtualDesktopManager::self()->setCount(4);
|
|
QCOMPARE(VirtualDesktopManager::self()->count(), 4u);
|
|
|
|
Xcb::Atom currentDesktopAtom("_NET_CURRENT_DESKTOP");
|
|
QVERIFY(currentDesktopAtom.isValid());
|
|
Xcb::Property currentDesktop(0, kwinApp()->x11RootWindow(), currentDesktopAtom, XCB_ATOM_CARDINAL, 0, 1);
|
|
bool ok = true;
|
|
QCOMPARE(currentDesktop.value(0, &ok), 0);
|
|
QVERIFY(ok);
|
|
|
|
// go to desktop 2
|
|
VirtualDesktopManager::self()->setCurrent(2);
|
|
currentDesktop = Xcb::Property(0, kwinApp()->x11RootWindow(), currentDesktopAtom, XCB_ATOM_CARDINAL, 0, 1);
|
|
QCOMPARE(currentDesktop.value(0, &ok), 1);
|
|
QVERIFY(ok);
|
|
|
|
// go to desktop 3
|
|
VirtualDesktopManager::self()->setCurrent(3);
|
|
currentDesktop = Xcb::Property(0, kwinApp()->x11RootWindow(), currentDesktopAtom, XCB_ATOM_CARDINAL, 0, 1);
|
|
QCOMPARE(currentDesktop.value(0, &ok), 2);
|
|
QVERIFY(ok);
|
|
|
|
// go to desktop 4
|
|
VirtualDesktopManager::self()->setCurrent(4);
|
|
currentDesktop = Xcb::Property(0, kwinApp()->x11RootWindow(), currentDesktopAtom, XCB_ATOM_CARDINAL, 0, 1);
|
|
QCOMPARE(currentDesktop.value(0, &ok), 3);
|
|
QVERIFY(ok);
|
|
|
|
// and back to first
|
|
VirtualDesktopManager::self()->setCurrent(1);
|
|
currentDesktop = Xcb::Property(0, kwinApp()->x11RootWindow(), currentDesktopAtom, XCB_ATOM_CARDINAL, 0, 1);
|
|
QCOMPARE(currentDesktop.value(0, &ok), 0);
|
|
QVERIFY(ok);
|
|
}
|
|
|
|
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());
|
|
|
|
QCOMPARE(client->desktops().count(), 1u);
|
|
QCOMPARE(VirtualDesktopManager::self()->currentDesktop(), client->desktops().first());
|
|
|
|
// 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);
|
|
|
|
QCOMPARE(client->desktops().count(), 1u);
|
|
QCOMPARE(VirtualDesktopManager::self()->currentDesktop(), client->desktops().first());
|
|
}
|
|
|
|
void VirtualDesktopTest::testWindowOnMultipleDesktops_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::testWindowOnMultipleDesktops()
|
|
{
|
|
// first create two new desktops
|
|
QCOMPARE(VirtualDesktopManager::self()->count(), 1u);
|
|
VirtualDesktopManager::self()->setCount(3);
|
|
QCOMPARE(VirtualDesktopManager::self()->count(), 3u);
|
|
|
|
// switch to last desktop
|
|
VirtualDesktopManager::self()->setCurrent(VirtualDesktopManager::self()->desktops().last());
|
|
QCOMPARE(VirtualDesktopManager::self()->current(), 3u);
|
|
|
|
// 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(), 3u);
|
|
QSignalSpy desktopPresenceChangedSpy(client, &ShellClient::desktopPresenceChanged);
|
|
QVERIFY(desktopPresenceChangedSpy.isValid());
|
|
|
|
QCOMPARE(client->desktops().count(), 1u);
|
|
QCOMPARE(VirtualDesktopManager::self()->currentDesktop(), client->desktops().first());
|
|
|
|
//Set the window on desktop 2 as well
|
|
client->setDesktop(2u);
|
|
QCOMPARE(client->desktops().count(), 2u);
|
|
QCOMPARE(VirtualDesktopManager::self()->desktops()[2], client->desktops()[0]);
|
|
QCOMPARE(VirtualDesktopManager::self()->desktops()[1], client->desktops()[1]);
|
|
QVERIFY(client->isOnDesktop(2));
|
|
QVERIFY(client->isOnDesktop(3));
|
|
|
|
//leave desktop 3
|
|
client->unSetDesktop(3);
|
|
QCOMPARE(client->desktops().count(), 1u);
|
|
//leave desktop 2
|
|
client->unSetDesktop(2);
|
|
QCOMPARE(client->desktops().count(), 0u);
|
|
//we should be on all desktops now
|
|
QVERIFY(client->isOnAllDesktops());
|
|
//put on desktop 1
|
|
client->setDesktop(1);
|
|
QVERIFY(client->isOnDesktop(1));
|
|
QVERIFY(!client->isOnDesktop(2));
|
|
QVERIFY(!client->isOnDesktop(3));
|
|
QCOMPARE(client->desktops().count(), 1u);
|
|
//put on desktop 2
|
|
client->setDesktop(2);
|
|
QVERIFY(client->isOnDesktop(1));
|
|
QVERIFY(client->isOnDesktop(2));
|
|
QVERIFY(!client->isOnDesktop(3));
|
|
QCOMPARE(client->desktops().count(), 2u);
|
|
//put on desktop 3
|
|
client->setDesktop(3);
|
|
QVERIFY(client->isOnDesktop(1));
|
|
QVERIFY(client->isOnDesktop(2));
|
|
QVERIFY(client->isOnDesktop(3));
|
|
QVERIFY(client->isOnAllDesktops());
|
|
//when it gets on all desktops, it loses all desktops()
|
|
QCOMPARE(client->desktops().count(), 0u);
|
|
}
|
|
|
|
void VirtualDesktopTest::testRemoveDesktopWithWindow_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::testRemoveDesktopWithWindow()
|
|
{
|
|
// first create two new desktops
|
|
QCOMPARE(VirtualDesktopManager::self()->count(), 1u);
|
|
VirtualDesktopManager::self()->setCount(3);
|
|
QCOMPARE(VirtualDesktopManager::self()->count(), 3u);
|
|
|
|
// switch to last desktop
|
|
VirtualDesktopManager::self()->setCurrent(VirtualDesktopManager::self()->desktops().last());
|
|
QCOMPARE(VirtualDesktopManager::self()->current(), 3u);
|
|
|
|
// 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(), 3u);
|
|
QSignalSpy desktopPresenceChangedSpy(client, &ShellClient::desktopPresenceChanged);
|
|
QVERIFY(desktopPresenceChangedSpy.isValid());
|
|
|
|
QCOMPARE(client->desktops().count(), 1u);
|
|
QCOMPARE(VirtualDesktopManager::self()->currentDesktop(), client->desktops().first());
|
|
|
|
//Set the window on desktop 2 as well
|
|
client->setDesktop(2u);
|
|
QCOMPARE(client->desktops().count(), 2u);
|
|
QCOMPARE(VirtualDesktopManager::self()->desktops()[2], client->desktops()[0]);
|
|
QCOMPARE(VirtualDesktopManager::self()->desktops()[1], client->desktops()[1]);
|
|
QVERIFY(client->isOnDesktop(2));
|
|
QVERIFY(client->isOnDesktop(3));
|
|
|
|
//remove desktop 3
|
|
VirtualDesktopManager::self()->setCount(2);
|
|
QCOMPARE(client->desktops().count(), 1u);
|
|
//window is only on desktop 2
|
|
QCOMPARE(VirtualDesktopManager::self()->desktops()[1], client->desktops()[0]);
|
|
|
|
//Again 3 desktops
|
|
VirtualDesktopManager::self()->setCount(3);
|
|
//move window to be only on desktop 3
|
|
client->setDesktop(3);
|
|
client->unSetDesktop(2);
|
|
QCOMPARE(client->desktops().count(), 1u);
|
|
//window is only on desktop 3
|
|
QCOMPARE(VirtualDesktopManager::self()->desktops()[2], client->desktops()[0]);
|
|
|
|
//remove desktop 3
|
|
VirtualDesktopManager::self()->setCount(2);
|
|
QCOMPARE(client->desktops().count(), 1u);
|
|
//window is only on desktop 2
|
|
QCOMPARE(VirtualDesktopManager::self()->desktops()[1], client->desktops()[0]);
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(VirtualDesktopTest)
|
|
#include "virtual_desktop_test.moc"
|