d3741bd530
Summary: The restore geometry gets initially set to 0/0xsize before the placement is done. When going into updateClientArea and then afterwards into AbstractClient::checkWorkspacePosition the geometry restory is used for calculating the new position. This results in windows getting moved to 0/0 when e.g. plugging in a new screen or a panel changes, etc. This change ensures that the restore geometry is set correctly after the first placement. BUG: 366696 Reviewers: #kwin, #plasma_on_wayland, bshah Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D2627
239 lines
9.3 KiB
C++
239 lines
9.3 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 "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/event_queue.h>
|
|
#include <KWayland/Client/plasmashell.h>
|
|
#include <KWayland/Client/registry.h>
|
|
#include <KWayland/Client/shm_pool.h>
|
|
#include <KWayland/Client/shell.h>
|
|
#include <KWayland/Client/surface.h>
|
|
|
|
using namespace KWin;
|
|
using namespace KWayland::Client;
|
|
|
|
static const QString s_socketName = QStringLiteral("wayland_test_kwin_plasma_surface-0");
|
|
|
|
class PlasmaSurfaceTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
|
|
void testRoleOnAllDesktops_data();
|
|
void testRoleOnAllDesktops();
|
|
void testAcceptsFocus_data();
|
|
void testAcceptsFocus();
|
|
|
|
void testDesktopIsOpaque();
|
|
void testOSDPlacement();
|
|
|
|
private:
|
|
ConnectionThread *m_connection = nullptr;
|
|
KWayland::Client::Compositor *m_compositor = nullptr;
|
|
Shell *m_shell = nullptr;
|
|
PlasmaShell *m_plasmaShell = nullptr;
|
|
};
|
|
|
|
void PlasmaSurfaceTest::initTestCase()
|
|
{
|
|
qRegisterMetaType<KWin::ShellClient*>();
|
|
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
|
|
QVERIFY(workspaceCreatedSpy.isValid());
|
|
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
|
|
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit()));
|
|
kwinApp()->start();
|
|
QVERIFY(workspaceCreatedSpy.wait());
|
|
}
|
|
|
|
void PlasmaSurfaceTest::init()
|
|
{
|
|
QVERIFY(Test::setupWaylandConnection(s_socketName, Test::AdditionalWaylandInterface::PlasmaShell));
|
|
m_compositor = Test::waylandCompositor();
|
|
m_shell = Test::waylandShell();
|
|
m_plasmaShell = Test::waylandPlasmaShell();
|
|
}
|
|
|
|
void PlasmaSurfaceTest::cleanup()
|
|
{
|
|
Test::destroyWaylandConnection();
|
|
}
|
|
|
|
void PlasmaSurfaceTest::testRoleOnAllDesktops_data()
|
|
{
|
|
QTest::addColumn<PlasmaShellSurface::Role>("role");
|
|
QTest::addColumn<bool>("expectedOnAllDesktops");
|
|
|
|
QTest::newRow("Desktop") << PlasmaShellSurface::Role::Desktop << true;
|
|
QTest::newRow("Panel") << PlasmaShellSurface::Role::Panel << true;
|
|
QTest::newRow("OSD") << PlasmaShellSurface::Role::OnScreenDisplay << true;
|
|
QTest::newRow("Normal") << PlasmaShellSurface::Role::Normal << false;
|
|
QTest::newRow("Notification") << PlasmaShellSurface::Role::Notification << true;
|
|
QTest::newRow("ToolTip") << PlasmaShellSurface::Role::ToolTip << true;
|
|
}
|
|
|
|
void PlasmaSurfaceTest::testRoleOnAllDesktops()
|
|
{
|
|
// this test verifies that a ShellClient is set on all desktops when the role changes
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QVERIFY(!surface.isNull());
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
|
QVERIFY(!shellSurface.isNull());
|
|
QScopedPointer<PlasmaShellSurface> plasmaSurface(m_plasmaShell->createSurface(surface.data()));
|
|
QVERIFY(!plasmaSurface.isNull());
|
|
|
|
// now render to map the window
|
|
AbstractClient *c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
QVERIFY(c);
|
|
QCOMPARE(workspace()->activeClient(), c);
|
|
|
|
// currently the role is not yet set, so the window should not be on all desktops
|
|
QCOMPARE(c->isOnAllDesktops(), false);
|
|
|
|
// now let's try to change that
|
|
QSignalSpy onAllDesktopsSpy(c, &AbstractClient::desktopChanged);
|
|
QVERIFY(onAllDesktopsSpy.isValid());
|
|
QFETCH(PlasmaShellSurface::Role, role);
|
|
plasmaSurface->setRole(role);
|
|
QFETCH(bool, expectedOnAllDesktops);
|
|
QCOMPARE(onAllDesktopsSpy.wait(), expectedOnAllDesktops);
|
|
QCOMPARE(c->isOnAllDesktops(), expectedOnAllDesktops);
|
|
|
|
// let's create a second window where we init a little bit different
|
|
// first creating the PlasmaSurface then the Shell Surface
|
|
QScopedPointer<Surface> surface2(Test::createSurface());
|
|
QVERIFY(!surface2.isNull());
|
|
QScopedPointer<PlasmaShellSurface> plasmaSurface2(m_plasmaShell->createSurface(surface2.data()));
|
|
QVERIFY(!plasmaSurface2.isNull());
|
|
plasmaSurface2->setRole(role);
|
|
QScopedPointer<ShellSurface> shellSurface2(Test::createShellSurface(surface2.data()));
|
|
QVERIFY(!shellSurface2.isNull());
|
|
Test::render(surface2.data(), QSize(100, 50), Qt::blue);
|
|
QVERIFY(Test::waitForWaylandWindowShown());
|
|
|
|
QVERIFY(workspace()->activeClient() != c);
|
|
c = workspace()->activeClient();
|
|
QEXPECT_FAIL("Desktop", "PS before WS not supported", Continue);
|
|
QEXPECT_FAIL("Panel", "PS before WS not supported", Continue);
|
|
QEXPECT_FAIL("OSD", "PS before WS not supported", Continue);
|
|
QEXPECT_FAIL("Notification", "PS before WS not supported", Continue);
|
|
QEXPECT_FAIL("ToolTip", "PS before WS not supported", Continue);
|
|
QCOMPARE(c->isOnAllDesktops(), expectedOnAllDesktops);
|
|
}
|
|
|
|
void PlasmaSurfaceTest::testAcceptsFocus_data()
|
|
{
|
|
QTest::addColumn<PlasmaShellSurface::Role>("role");
|
|
QTest::addColumn<bool>("wantsInput");
|
|
QTest::addColumn<bool>("active");
|
|
|
|
QTest::newRow("Desktop") << PlasmaShellSurface::Role::Desktop << true << true;
|
|
QTest::newRow("Panel") << PlasmaShellSurface::Role::Panel << true << false;
|
|
QTest::newRow("OSD") << PlasmaShellSurface::Role::OnScreenDisplay << false << false;
|
|
QTest::newRow("Normal") << PlasmaShellSurface::Role::Normal << true << true;
|
|
QTest::newRow("Notification") << PlasmaShellSurface::Role::Notification << false << false;
|
|
QTest::newRow("ToolTip") << PlasmaShellSurface::Role::ToolTip << false << false;
|
|
}
|
|
|
|
void PlasmaSurfaceTest::testAcceptsFocus()
|
|
{
|
|
// this test verifies that some surface roles don't get focus
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QVERIFY(!surface.isNull());
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
|
QVERIFY(!shellSurface.isNull());
|
|
QScopedPointer<PlasmaShellSurface> plasmaSurface(m_plasmaShell->createSurface(surface.data()));
|
|
QVERIFY(!plasmaSurface.isNull());
|
|
QFETCH(PlasmaShellSurface::Role, role);
|
|
plasmaSurface->setRole(role);
|
|
|
|
// now render to map the window
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(c);
|
|
QTEST(c->wantsInput(), "wantsInput");
|
|
QTEST(c->isActive(), "active");
|
|
}
|
|
|
|
void PlasmaSurfaceTest::testDesktopIsOpaque()
|
|
{
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QVERIFY(!surface.isNull());
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
|
QVERIFY(!shellSurface.isNull());
|
|
QScopedPointer<PlasmaShellSurface> plasmaSurface(m_plasmaShell->createSurface(surface.data()));
|
|
QVERIFY(!plasmaSurface.isNull());
|
|
plasmaSurface->setRole(PlasmaShellSurface::Role::Desktop);
|
|
|
|
// now render to map the window
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(c);
|
|
QCOMPARE(c->windowType(), NET::Desktop);
|
|
QVERIFY(c->isDesktop());
|
|
|
|
QVERIFY(!c->hasAlpha());
|
|
QCOMPARE(c->depth(), 24);
|
|
}
|
|
|
|
void PlasmaSurfaceTest::testOSDPlacement()
|
|
{
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QVERIFY(!surface.isNull());
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
|
QVERIFY(!shellSurface.isNull());
|
|
QScopedPointer<PlasmaShellSurface> plasmaSurface(m_plasmaShell->createSurface(surface.data()));
|
|
QVERIFY(!plasmaSurface.isNull());
|
|
plasmaSurface->setRole(PlasmaShellSurface::Role::OnScreenDisplay);
|
|
|
|
// now render and map the window
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(c);
|
|
QCOMPARE(c->windowType(), NET::OnScreenDisplay);
|
|
QVERIFY(c->isOnScreenDisplay());
|
|
QCOMPARE(c->geometry(), QRect(590, 649, 100, 50));
|
|
|
|
// change the screen size
|
|
QSignalSpy screensChangedSpy(screens(), &Screens::changed);
|
|
QVERIFY(screensChangedSpy.isValid());
|
|
const QVector<QRect> geometries{QRect(0, 0, 1280, 1024), QRect(1280, 0, 1280, 1024)};
|
|
QMetaObject::invokeMethod(kwinApp()->platform(), "outputGeometriesChanged",
|
|
Qt::DirectConnection,
|
|
Q_ARG(QVector<QRect>, geometries));
|
|
QVERIFY(screensChangedSpy.wait());
|
|
QCOMPARE(screensChangedSpy.count(), 1);
|
|
QCOMPARE(screens()->count(), 2);
|
|
QCOMPARE(screens()->geometry(0), geometries.at(0));
|
|
QCOMPARE(screens()->geometry(1), geometries.at(1));
|
|
|
|
QCOMPARE(c->geometry(), QRect(590, 649, 100, 50));
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(PlasmaSurfaceTest)
|
|
#include "plasma_surface_test.moc"
|