ffcbe24e2b
Summary: Currently each managed X11 client is represented with an instance of Client class, however the name of that class is very generic and the only reason why it's called that way is because historically kwin was created as an x11 window manager, so "Client" was a sensible choice. With introduction of wayland support, things had changed and therefore Client needs to be renamed to X11Client in order to better reflect what that class stands for. Renaming of Client to X11Client was agreed upon during the last KWin sprint. Test Plan: Compiles, the test suite is still green. Reviewers: #kwin, romangg Reviewed By: #kwin, romangg Subscribers: romangg, davidedmundson, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D24184
967 lines
48 KiB
C++
967 lines
48 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 "x11client.h"
|
|
#include "cursor.h"
|
|
#include "deleted.h"
|
|
#include "screenedge.h"
|
|
#include "screens.h"
|
|
#include "wayland_server.h"
|
|
#include "workspace.h"
|
|
#include "xdgshellclient.h"
|
|
#include <kwineffects.h>
|
|
|
|
#include <KWayland/Client/compositor.h>
|
|
#include <KWayland/Client/plasmashell.h>
|
|
#include <KWayland/Client/surface.h>
|
|
|
|
#include <KDecoration2/Decoration>
|
|
|
|
#include <netwm.h>
|
|
#include <xcb/xcb_icccm.h>
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
static const QString s_socketName = QStringLiteral("wayland_test_kwin_struts-0");
|
|
|
|
class StrutsTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
void testWaylandStruts_data();
|
|
void testWaylandStruts();
|
|
void testMoveWaylandPanel();
|
|
void testWaylandMobilePanel();
|
|
void testX11Struts_data();
|
|
void testX11Struts();
|
|
void test363804();
|
|
void testLeftScreenSmallerBottomAligned();
|
|
void testWindowMoveWithPanelBetweenScreens();
|
|
|
|
private:
|
|
KWayland::Client::Compositor *m_compositor = nullptr;
|
|
KWayland::Client::PlasmaShell *m_plasmaShell = nullptr;
|
|
};
|
|
|
|
void StrutsTest::initTestCase()
|
|
{
|
|
qRegisterMetaType<KWin::XdgShellClient *>();
|
|
qRegisterMetaType<KWin::AbstractClient*>();
|
|
qRegisterMetaType<KWin::Deleted*>();
|
|
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
|
|
QVERIFY(workspaceCreatedSpy.isValid());
|
|
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
|
|
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit()));
|
|
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
|
|
|
|
// set custom config which disables the Outline
|
|
KSharedConfig::Ptr config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
|
|
KConfigGroup group = config->group("Outline");
|
|
group.writeEntry(QStringLiteral("QmlPath"), QString("/does/not/exist.qml"));
|
|
group.sync();
|
|
|
|
kwinApp()->setConfig(config);
|
|
|
|
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));
|
|
setenv("QT_QPA_PLATFORM", "wayland", true);
|
|
waylandServer()->initWorkspace();
|
|
}
|
|
|
|
void StrutsTest::init()
|
|
{
|
|
QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::PlasmaShell));
|
|
m_compositor = Test::waylandCompositor();
|
|
m_plasmaShell = Test::waylandPlasmaShell();
|
|
|
|
screens()->setCurrent(0);
|
|
Cursor::setPos(QPoint(640, 512));
|
|
QVERIFY(waylandServer()->clients().isEmpty());
|
|
}
|
|
|
|
void StrutsTest::cleanup()
|
|
{
|
|
Test::destroyWaylandConnection();
|
|
}
|
|
|
|
void StrutsTest::testWaylandStruts_data()
|
|
{
|
|
QTest::addColumn<QVector<QRect>>("windowGeometries");
|
|
QTest::addColumn<QRect>("screen0Maximized");
|
|
QTest::addColumn<QRect>("screen1Maximized");
|
|
QTest::addColumn<QRect>("workArea");
|
|
QTest::addColumn<QRegion>("restrictedMoveArea");
|
|
|
|
QTest::newRow("bottom/0") << QVector<QRect>{QRect(0, 992, 1280, 32)} << QRect(0, 0, 1280, 992) << QRect(1280, 0, 1280, 1024) << QRect(0, 0, 2560, 992) << QRegion(0, 992, 1280, 32);
|
|
QTest::newRow("bottom/1") << QVector<QRect>{QRect(1280, 992, 1280, 32)} << QRect(0, 0, 1280, 1024) << QRect(1280, 0, 1280, 992) << QRect(0, 0, 2560, 992) << QRegion(1280, 992, 1280, 32);
|
|
QTest::newRow("top/0") << QVector<QRect>{QRect(0, 0, 1280, 32)} << QRect(0, 32, 1280, 992) << QRect(1280, 0, 1280, 1024) << QRect(0, 32, 2560, 992) << QRegion(0, 0, 1280, 32);
|
|
QTest::newRow("top/1") << QVector<QRect>{QRect(1280, 0, 1280, 32)} << QRect(0, 0, 1280, 1024) << QRect(1280, 32, 1280, 992) << QRect(0, 32, 2560, 992) << QRegion(1280, 0, 1280, 32);
|
|
QTest::newRow("left/0") << QVector<QRect>{QRect(0, 0, 32, 1024)} << QRect(32, 0, 1248, 1024) << QRect(1280, 0, 1280, 1024) << QRect(32, 0, 2528, 1024) << QRegion(0, 0, 32, 1024);
|
|
QTest::newRow("left/1") << QVector<QRect>{QRect(1280, 0, 32, 1024)} << QRect(0, 0, 1280, 1024) << QRect(1312, 0, 1248, 1024) << QRect(0, 0, 2560, 1024) << QRegion(1280, 0, 32, 1024);
|
|
QTest::newRow("right/0") << QVector<QRect>{QRect(1248, 0, 32, 1024)} << QRect(0, 0, 1248, 1024) << QRect(1280, 0, 1280, 1024) << QRect(0, 0, 2560, 1024) << QRegion(1248, 0, 32, 1024);
|
|
QTest::newRow("right/1") << QVector<QRect>{QRect(2528, 0, 32, 1024)} << QRect(0, 0, 1280, 1024) << QRect(1280, 0, 1248, 1024) << QRect(0, 0, 2528, 1024) << QRegion(2528, 0, 32, 1024);
|
|
|
|
// same with partial panels not covering the whole area
|
|
QTest::newRow("part bottom/0") << QVector<QRect>{QRect(100, 992, 1080, 32)} << QRect(0, 0, 1280, 992) << QRect(1280, 0, 1280, 1024) << QRect(0, 0, 2560, 992) << QRegion(100, 992, 1080, 32);
|
|
QTest::newRow("part bottom/1") << QVector<QRect>{QRect(1380, 992, 1080, 32)} << QRect(0, 0, 1280, 1024) << QRect(1280, 0, 1280, 992) << QRect(0, 0, 2560, 992) << QRegion(1380, 992, 1080, 32);
|
|
QTest::newRow("part top/0") << QVector<QRect>{QRect(100, 0, 1080, 32)} << QRect(0, 32, 1280, 992) << QRect(1280, 0, 1280, 1024) << QRect(0, 32, 2560, 992) << QRegion(100, 0, 1080, 32);
|
|
QTest::newRow("part top/1") << QVector<QRect>{QRect(1380, 0, 1080, 32)} << QRect(0, 0, 1280, 1024) << QRect(1280, 32, 1280, 992) << QRect(0, 32, 2560, 992) << QRegion(1380, 0, 1080, 32);
|
|
QTest::newRow("part left/0") << QVector<QRect>{QRect(0, 100, 32, 824)} << QRect(32, 0, 1248, 1024) << QRect(1280, 0, 1280, 1024) << QRect(32, 0, 2528, 1024) << QRegion(0, 100, 32, 824);
|
|
QTest::newRow("part left/1") << QVector<QRect>{QRect(1280, 100, 32, 824)} << QRect(0, 0, 1280, 1024) << QRect(1312, 0, 1248, 1024) << QRect(0, 0, 2560, 1024) << QRegion(1280, 100, 32, 824);
|
|
QTest::newRow("part right/0") << QVector<QRect>{QRect(1248, 100, 32, 824)} << QRect(0, 0, 1248, 1024) << QRect(1280, 0, 1280, 1024) << QRect(0, 0, 2560, 1024) << QRegion(1248, 100, 32, 824);
|
|
QTest::newRow("part right/1") << QVector<QRect>{QRect(2528, 100, 32, 824)} << QRect(0, 0, 1280, 1024) << QRect(1280, 0, 1248, 1024) << QRect(0, 0, 2528, 1024) << QRegion(2528, 100, 32, 824);
|
|
|
|
// multiple panels
|
|
QTest::newRow("two bottom panels") << QVector<QRect>{QRect(100, 992, 1080, 32), QRect(1380, 984, 1080, 40)} << QRect(0, 0, 1280, 992) << QRect(1280, 0, 1280, 984) << QRect(0, 0, 2560, 984) << QRegion(100, 992, 1080, 32).united(QRegion(1380, 984, 1080, 40));
|
|
QTest::newRow("two left panels") << QVector<QRect>{QRect(0, 10, 32, 390), QRect(0, 450, 40, 100)} << QRect(40, 0, 1240, 1024) << QRect(1280, 0, 1280, 1024) << QRect(40, 0, 2520, 1024) << QRegion(0, 10, 32, 390).united(QRegion(0, 450, 40, 100));
|
|
}
|
|
|
|
void StrutsTest::testWaylandStruts()
|
|
{
|
|
// this test verifies that struts on Wayland panels are handled correctly
|
|
using namespace KWayland::Client;
|
|
// no, struts yet
|
|
QVERIFY(waylandServer()->clients().isEmpty());
|
|
// first screen
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MovementArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeFullArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullScreenArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(ScreenArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
// second screen
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MovementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeFullArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullScreenArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(ScreenArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
// combined
|
|
QCOMPARE(workspace()->clientArea(WorkArea, 0, 1), QRect(0, 0, 2560, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullArea, 0, 1), QRect(0, 0, 2560, 1024));
|
|
QCOMPARE(workspace()->restrictedMoveArea(-1), QRegion());
|
|
|
|
QFETCH(QVector<QRect>, windowGeometries);
|
|
// create the panels
|
|
QHash<Surface*, XdgShellClient *> clients;
|
|
for (auto it = windowGeometries.constBegin(), end = windowGeometries.constEnd(); it != end; it++) {
|
|
const QRect windowGeometry = *it;
|
|
Surface *surface = Test::createSurface(m_compositor);
|
|
XdgShellSurface *shellSurface = Test::createXdgShellStableSurface(surface, surface, Test::CreationSetup::CreateOnly);
|
|
PlasmaShellSurface *plasmaSurface = m_plasmaShell->createSurface(surface, surface);
|
|
plasmaSurface->setPosition(windowGeometry.topLeft());
|
|
plasmaSurface->setRole(PlasmaShellSurface::Role::Panel);
|
|
Test::initXdgShellSurface(surface, shellSurface);
|
|
|
|
// map the window
|
|
auto c = Test::renderAndWaitForShown(surface, windowGeometry.size(), Qt::red, QImage::Format_RGB32);
|
|
|
|
QVERIFY(c);
|
|
QVERIFY(!c->isActive());
|
|
QCOMPARE(c->geometry(), windowGeometry);
|
|
QVERIFY(c->isDock());
|
|
QVERIFY(c->hasStrut());
|
|
clients.insert(surface, c);
|
|
}
|
|
|
|
// some props are independent of struts - those first
|
|
// screen 0
|
|
QCOMPARE(workspace()->clientArea(MovementArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeFullArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullScreenArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(ScreenArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
// screen 1
|
|
QCOMPARE(workspace()->clientArea(MovementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeFullArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullScreenArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(ScreenArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
// combined
|
|
QCOMPARE(workspace()->clientArea(FullArea, 0, 1), QRect(0, 0, 2560, 1024));
|
|
|
|
// now verify the actual updated client areas
|
|
QTEST(workspace()->clientArea(PlacementArea, 0, 1), "screen0Maximized");
|
|
QTEST(workspace()->clientArea(MaximizeArea, 0, 1), "screen0Maximized");
|
|
QTEST(workspace()->clientArea(PlacementArea, 1, 1), "screen1Maximized");
|
|
QTEST(workspace()->clientArea(MaximizeArea, 1, 1), "screen1Maximized");
|
|
QTEST(workspace()->clientArea(WorkArea, 0, 1), "workArea");
|
|
QTEST(workspace()->restrictedMoveArea(-1), "restrictedMoveArea");
|
|
|
|
// delete all surfaces
|
|
for (auto it = clients.begin(); it != clients.end(); it++) {
|
|
QSignalSpy destroyedSpy(it.value(), &QObject::destroyed);
|
|
QVERIFY(destroyedSpy.isValid());
|
|
delete it.key();
|
|
QVERIFY(destroyedSpy.wait());
|
|
}
|
|
QCOMPARE(workspace()->restrictedMoveArea(-1), QRegion());
|
|
}
|
|
|
|
void StrutsTest::testMoveWaylandPanel()
|
|
{
|
|
// this test verifies that repositioning a Wayland panel updates the client area
|
|
using namespace KWayland::Client;
|
|
const QRect windowGeometry(0, 1000, 1280, 24);
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data(), surface.data(), Test::CreationSetup::CreateOnly));
|
|
QScopedPointer<PlasmaShellSurface> plasmaSurface(m_plasmaShell->createSurface(surface.data()));
|
|
plasmaSurface->setPosition(windowGeometry.topLeft());
|
|
plasmaSurface->setRole(PlasmaShellSurface::Role::Panel);
|
|
Test::initXdgShellSurface(surface.data(), shellSurface.data());
|
|
|
|
// map the window
|
|
auto c = Test::renderAndWaitForShown(surface.data(), windowGeometry.size(), Qt::red, QImage::Format_RGB32);
|
|
QVERIFY(c);
|
|
QVERIFY(!c->isActive());
|
|
QCOMPARE(c->geometry(), windowGeometry);
|
|
QVERIFY(c->isDock());
|
|
QVERIFY(c->hasStrut());
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 0, 1), QRect(0, 0, 1280, 1000));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 0, 1), QRect(0, 0, 1280, 1000));
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(WorkArea, 0, 1), QRect(0, 0, 2560, 1000));
|
|
|
|
QSignalSpy geometryChangedSpy(c, &XdgShellClient::geometryShapeChanged);
|
|
QVERIFY(geometryChangedSpy.isValid());
|
|
plasmaSurface->setPosition(QPoint(1280, 1000));
|
|
QVERIFY(geometryChangedSpy.wait());
|
|
QCOMPARE(c->geometry(), QRect(1280, 1000, 1280, 24));
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 1, 1), QRect(1280, 0, 1280, 1000));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 1, 1), QRect(1280, 0, 1280, 1000));
|
|
QCOMPARE(workspace()->clientArea(WorkArea, 0, 1), QRect(0, 0, 2560, 1000));
|
|
}
|
|
|
|
void StrutsTest::testWaylandMobilePanel()
|
|
{
|
|
using namespace KWayland::Client;
|
|
|
|
//First enable maxmizing policy
|
|
KConfigGroup group = kwinApp()->config()->group("Windows");
|
|
group.writeEntry("Placement", "Maximizing");
|
|
group.sync();
|
|
workspace()->slotReconfigure();
|
|
|
|
// create first top panel
|
|
const QRect windowGeometry(0, 0, 1280, 60);
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data(), surface.data(), Test::CreationSetup::CreateOnly));
|
|
QScopedPointer<PlasmaShellSurface> plasmaSurface(m_plasmaShell->createSurface(surface.data()));
|
|
plasmaSurface->setPosition(windowGeometry.topLeft());
|
|
plasmaSurface->setRole(PlasmaShellSurface::Role::Panel);
|
|
Test::initXdgShellSurface(surface.data(), shellSurface.data());
|
|
|
|
// map the first panel
|
|
auto c = Test::renderAndWaitForShown(surface.data(), windowGeometry.size(), Qt::red, QImage::Format_RGB32);
|
|
QVERIFY(c);
|
|
QVERIFY(!c->isActive());
|
|
QCOMPARE(c->geometry(), windowGeometry);
|
|
QVERIFY(c->isDock());
|
|
QVERIFY(c->hasStrut());
|
|
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 0, 1), QRect(0, 60, 1280, 964));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 0, 1), QRect(0, 60, 1280, 964));
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(WorkArea, 0, 1), QRect(0, 60, 2560, 964));
|
|
|
|
// create another bottom panel
|
|
const QRect windowGeometry2(0, 874, 1280, 150);
|
|
QScopedPointer<Surface> surface2(Test::createSurface());
|
|
QScopedPointer<XdgShellSurface> shellSurface2(Test::createXdgShellStableSurface(surface2.data(), surface2.data(), Test::CreationSetup::CreateOnly));
|
|
QScopedPointer<PlasmaShellSurface> plasmaSurface2(m_plasmaShell->createSurface(surface2.data()));
|
|
plasmaSurface2->setPosition(windowGeometry2.topLeft());
|
|
plasmaSurface2->setRole(PlasmaShellSurface::Role::Panel);
|
|
Test::initXdgShellSurface(surface2.data(), shellSurface2.data());
|
|
|
|
auto c1 = Test::renderAndWaitForShown(surface2.data(), windowGeometry2.size(), Qt::blue, QImage::Format_RGB32);
|
|
|
|
QVERIFY(c1);
|
|
QVERIFY(!c1->isActive());
|
|
QCOMPARE(c1->geometry(), windowGeometry2);
|
|
QVERIFY(c1->isDock());
|
|
QVERIFY(c1->hasStrut());
|
|
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 0, 1), QRect(0, 60, 1280, 814));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 0, 1), QRect(0, 60, 1280, 814));
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(WorkArea, 0, 1), QRect(0, 60, 2560, 814));
|
|
|
|
// Destroy test clients.
|
|
shellSurface.reset();
|
|
QVERIFY(Test::waitForWindowDestroyed(c));
|
|
shellSurface2.reset();
|
|
QVERIFY(Test::waitForWindowDestroyed(c1));
|
|
}
|
|
|
|
void StrutsTest::testX11Struts_data()
|
|
{
|
|
QTest::addColumn<QRect>("windowGeometry");
|
|
QTest::addColumn<int>("leftStrut");
|
|
QTest::addColumn<int>("rightStrut");
|
|
QTest::addColumn<int>("topStrut");
|
|
QTest::addColumn<int>("bottomStrut");
|
|
QTest::addColumn<int>("leftStrutStart");
|
|
QTest::addColumn<int>("leftStrutEnd");
|
|
QTest::addColumn<int>("rightStrutStart");
|
|
QTest::addColumn<int>("rightStrutEnd");
|
|
QTest::addColumn<int>("topStrutStart");
|
|
QTest::addColumn<int>("topStrutEnd");
|
|
QTest::addColumn<int>("bottomStrutStart");
|
|
QTest::addColumn<int>("bottomStrutEnd");
|
|
QTest::addColumn<QRect>("screen0Maximized");
|
|
QTest::addColumn<QRect>("screen1Maximized");
|
|
QTest::addColumn<QRect>("workArea");
|
|
QTest::addColumn<QRegion>("restrictedMoveArea");
|
|
|
|
QTest::newRow("bottom panel/no strut") << QRect(0, 980, 1280, 44)
|
|
<< 0 << 0 << 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion();
|
|
QTest::newRow("bottom panel/strut") << QRect(0, 980, 1280, 44)
|
|
<< 0 << 0 << 0 << 44
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 1279
|
|
<< QRect(0, 0, 1280, 980)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 980)
|
|
<< QRegion(0, 980, 1279, 44);
|
|
QTest::newRow("top panel/no strut") << QRect(0, 0, 1280, 44)
|
|
<< 0 << 0 << 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion();
|
|
QTest::newRow("top panel/strut") << QRect(0, 0, 1280, 44)
|
|
<< 0 << 0 << 44 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 1279
|
|
<< 0 << 0
|
|
<< QRect(0, 44, 1280, 980)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 44, 2560, 980)
|
|
<< QRegion(0, 0, 1279, 44);
|
|
QTest::newRow("left panel/no strut") << QRect(0, 0, 60, 1024)
|
|
<< 0 << 0 << 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion();
|
|
QTest::newRow("left panel/strut") << QRect(0, 0, 60, 1024)
|
|
<< 60 << 0 << 0 << 0
|
|
<< 0 << 1023
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< QRect(60, 0, 1220, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(60, 0, 2500, 1024)
|
|
<< QRegion(0, 0, 60, 1023);
|
|
QTest::newRow("right panel/no strut") << QRect(1220, 0, 60, 1024)
|
|
<< 0 << 0 << 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion();
|
|
QTest::newRow("right panel/strut") << QRect(1220, 0, 60, 1024)
|
|
<< 0 << 1340 << 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 1023
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1220, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion(1220, 0, 60, 1023);
|
|
// second screen
|
|
QTest::newRow("bottom panel 1/no strut") << QRect(1280, 980, 1280, 44)
|
|
<< 0 << 0 << 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion();
|
|
QTest::newRow("bottom panel 1/strut") << QRect(1280, 980, 1280, 44)
|
|
<< 0 << 0 << 0 << 44
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 1280 << 2559
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 980)
|
|
<< QRect(0, 0, 2560, 980)
|
|
<< QRegion(1280, 980, 1279, 44);
|
|
QTest::newRow("top panel 1/no strut") << QRect(1280, 0, 1280, 44)
|
|
<< 0 << 0 << 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion();
|
|
QTest::newRow("top panel 1 /strut") << QRect(1280, 0, 1280, 44)
|
|
<< 0 << 0 << 44 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 1280 << 2559
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 44, 1280, 980)
|
|
<< QRect(0, 44, 2560, 980)
|
|
<< QRegion(1280, 0, 1279, 44);
|
|
QTest::newRow("left panel 1/no strut") << QRect(1280, 0, 60, 1024)
|
|
<< 0 << 0 << 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion();
|
|
QTest::newRow("left panel 1/strut") << QRect(1280, 0, 60, 1024)
|
|
<< 1340 << 0 << 0 << 0
|
|
<< 0 << 1023
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1340, 0, 1220, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion(1280, 0, 60, 1023);
|
|
// invalid struts
|
|
QTest::newRow("bottom panel/ invalid strut") << QRect(0, 980, 1280, 44)
|
|
<< 1280 << 0 << 0 << 44
|
|
<< 980 << 1024
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 1279
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion(0, 980, 1280, 44);
|
|
QTest::newRow("top panel/ invalid strut") << QRect(0, 0, 1280, 44)
|
|
<< 1280 << 0 << 44 << 0
|
|
<< 0 << 44
|
|
<< 0 << 0
|
|
<< 0 << 1279
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion(0, 0, 1280, 44);
|
|
QTest::newRow("top panel/invalid strut 2") << QRect(0, 0, 1280, 44)
|
|
<< 0 << 0 << 1024 << 0
|
|
<< 0 << 0
|
|
<< 0 << 0
|
|
<< 0 << 1279
|
|
<< 0 << 0
|
|
<< QRect(0, 0, 1280, 1024)
|
|
<< QRect(1280, 0, 1280, 1024)
|
|
<< QRect(0, 0, 2560, 1024)
|
|
<< QRegion(0, 0, 1279, 1024);
|
|
}
|
|
|
|
struct XcbConnectionDeleter
|
|
{
|
|
static inline void cleanup(xcb_connection_t *pointer)
|
|
{
|
|
xcb_disconnect(pointer);
|
|
}
|
|
};
|
|
|
|
void StrutsTest::testX11Struts()
|
|
{
|
|
// this test verifies that struts are applied correctly for X11 windows
|
|
|
|
// no, struts yet
|
|
// first screen
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MovementArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeFullArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullScreenArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(ScreenArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
// second screen
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MovementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeFullArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullScreenArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(ScreenArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
// combined
|
|
QCOMPARE(workspace()->clientArea(WorkArea, 0, 1), QRect(0, 0, 2560, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullArea, 0, 1), QRect(0, 0, 2560, 1024));
|
|
QCOMPARE(workspace()->restrictedMoveArea(-1), QRegion());
|
|
|
|
// create an xcb window
|
|
QScopedPointer<xcb_connection_t, XcbConnectionDeleter> c(xcb_connect(nullptr, nullptr));
|
|
QVERIFY(!xcb_connection_has_error(c.data()));
|
|
|
|
xcb_window_t w = xcb_generate_id(c.data());
|
|
QFETCH(QRect, windowGeometry);
|
|
xcb_create_window(c.data(), XCB_COPY_FROM_PARENT, w, rootWindow(),
|
|
windowGeometry.x(),
|
|
windowGeometry.y(),
|
|
windowGeometry.width(),
|
|
windowGeometry.height(),
|
|
0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr);
|
|
xcb_size_hints_t hints;
|
|
memset(&hints, 0, sizeof(hints));
|
|
xcb_icccm_size_hints_set_position(&hints, 1, windowGeometry.x(), windowGeometry.y());
|
|
xcb_icccm_size_hints_set_size(&hints, 1, windowGeometry.width(), windowGeometry.height());
|
|
xcb_icccm_set_wm_normal_hints(c.data(), w, &hints);
|
|
NETWinInfo info(c.data(), w, rootWindow(), NET::WMAllProperties, NET::WM2AllProperties);
|
|
info.setWindowType(NET::Dock);
|
|
// set the extended strut
|
|
QFETCH(int, leftStrut);
|
|
QFETCH(int, rightStrut);
|
|
QFETCH(int, topStrut);
|
|
QFETCH(int, bottomStrut);
|
|
QFETCH(int, leftStrutStart);
|
|
QFETCH(int, leftStrutEnd);
|
|
QFETCH(int, rightStrutStart);
|
|
QFETCH(int, rightStrutEnd);
|
|
QFETCH(int, topStrutStart);
|
|
QFETCH(int, topStrutEnd);
|
|
QFETCH(int, bottomStrutStart);
|
|
QFETCH(int, bottomStrutEnd);
|
|
NETExtendedStrut strut;
|
|
strut.left_start = leftStrutStart;
|
|
strut.left_end = leftStrutEnd;
|
|
strut.left_width = leftStrut;
|
|
strut.right_start = rightStrutStart;
|
|
strut.right_end = rightStrutEnd;
|
|
strut.right_width = rightStrut;
|
|
strut.top_start = topStrutStart;
|
|
strut.top_end = topStrutEnd;
|
|
strut.top_width = topStrut;
|
|
strut.bottom_start = bottomStrutStart;
|
|
strut.bottom_end = bottomStrutEnd;
|
|
strut.bottom_width = bottomStrut;
|
|
info.setExtendedStrut(strut);
|
|
xcb_map_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
|
|
// we should get a client for it
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
|
|
QVERIFY(windowCreatedSpy.isValid());
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
|
|
QVERIFY(client);
|
|
QCOMPARE(client->window(), w);
|
|
QVERIFY(!client->isDecorated());
|
|
QCOMPARE(client->windowType(), NET::Dock);
|
|
QCOMPARE(client->geometry(), windowGeometry);
|
|
|
|
// this should have affected the client area
|
|
// some props are independent of struts - those first
|
|
// screen 0
|
|
QCOMPARE(workspace()->clientArea(MovementArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeFullArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullScreenArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(ScreenArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
// screen 1
|
|
QCOMPARE(workspace()->clientArea(MovementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeFullArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullScreenArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(ScreenArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
// combined
|
|
QCOMPARE(workspace()->clientArea(FullArea, 0, 1), QRect(0, 0, 2560, 1024));
|
|
|
|
// now verify the actual updated client areas
|
|
QTEST(workspace()->clientArea(PlacementArea, 0, 1), "screen0Maximized");
|
|
QTEST(workspace()->clientArea(MaximizeArea, 0, 1), "screen0Maximized");
|
|
QTEST(workspace()->clientArea(PlacementArea, 1, 1), "screen1Maximized");
|
|
QTEST(workspace()->clientArea(MaximizeArea, 1, 1), "screen1Maximized");
|
|
QTEST(workspace()->clientArea(WorkArea, 0, 1), "workArea");
|
|
QTEST(workspace()->restrictedMoveArea(-1), "restrictedMoveArea");
|
|
|
|
// and destroy the window again
|
|
xcb_unmap_window(c.data(), w);
|
|
xcb_destroy_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
c.reset();
|
|
|
|
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
QVERIFY(windowClosedSpy.wait());
|
|
|
|
// now struts should be removed again
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MovementArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeFullArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullScreenArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(ScreenArea, 0, 1), QRect(0, 0, 1280, 1024));
|
|
// second screen
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MovementArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(MaximizeFullArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullScreenArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
QCOMPARE(workspace()->clientArea(ScreenArea, 1, 1), QRect(1280, 0, 1280, 1024));
|
|
// combined
|
|
QCOMPARE(workspace()->clientArea(WorkArea, 0, 1), QRect(0, 0, 2560, 1024));
|
|
QCOMPARE(workspace()->clientArea(FullArea, 0, 1), QRect(0, 0, 2560, 1024));
|
|
QCOMPARE(workspace()->restrictedMoveArea(-1), QRegion());
|
|
}
|
|
|
|
void StrutsTest::test363804()
|
|
{
|
|
// this test verifies the condition described in BUG 363804
|
|
// two screens in a vertical setup, aligned to right border with panel on the bottom screen
|
|
const QVector<QRect> geometries{QRect(0, 0, 1920, 1080), QRect(554, 1080, 1366, 768)};
|
|
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs",
|
|
Qt::DirectConnection,
|
|
Q_ARG(int, 2),
|
|
Q_ARG(QVector<QRect>, geometries));
|
|
QCOMPARE(screens()->geometry(0), geometries.at(0));
|
|
QCOMPARE(screens()->geometry(1), geometries.at(1));
|
|
QCOMPARE(screens()->geometry(), QRect(0, 0, 1920, 1848));
|
|
|
|
// create an xcb window
|
|
QScopedPointer<xcb_connection_t, XcbConnectionDeleter> c(xcb_connect(nullptr, nullptr));
|
|
QVERIFY(!xcb_connection_has_error(c.data()));
|
|
|
|
xcb_window_t w = xcb_generate_id(c.data());
|
|
const QRect windowGeometry(554, 1812, 1366, 36);
|
|
xcb_create_window(c.data(), XCB_COPY_FROM_PARENT, w, rootWindow(),
|
|
windowGeometry.x(),
|
|
windowGeometry.y(),
|
|
windowGeometry.width(),
|
|
windowGeometry.height(),
|
|
0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr);
|
|
xcb_size_hints_t hints;
|
|
memset(&hints, 0, sizeof(hints));
|
|
xcb_icccm_size_hints_set_position(&hints, 1, windowGeometry.x(), windowGeometry.y());
|
|
xcb_icccm_size_hints_set_size(&hints, 1, windowGeometry.width(), windowGeometry.height());
|
|
xcb_icccm_set_wm_normal_hints(c.data(), w, &hints);
|
|
NETWinInfo info(c.data(), w, rootWindow(), NET::WMAllProperties, NET::WM2AllProperties);
|
|
info.setWindowType(NET::Dock);
|
|
NETExtendedStrut strut;
|
|
strut.left_start = 0;
|
|
strut.left_end = 0;
|
|
strut.left_width = 0;
|
|
strut.right_start = 0;
|
|
strut.right_end = 0;
|
|
strut.right_width = 0;
|
|
strut.top_start = 0;
|
|
strut.top_end = 0;
|
|
strut.top_width = 0;
|
|
strut.bottom_start = 554;
|
|
strut.bottom_end = 1919;
|
|
strut.bottom_width = 36;
|
|
info.setExtendedStrut(strut);
|
|
xcb_map_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
|
|
// we should get a client for it
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
|
|
QVERIFY(windowCreatedSpy.isValid());
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
|
|
QVERIFY(client);
|
|
QCOMPARE(client->window(), w);
|
|
QVERIFY(!client->isDecorated());
|
|
QCOMPARE(client->windowType(), NET::Dock);
|
|
QCOMPARE(client->geometry(), windowGeometry);
|
|
|
|
// now verify the actual updated client areas
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 0, 1), geometries.at(0));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 0, 1), geometries.at(0));
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 1, 1), QRect(554, 1080, 1366, 732));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 1, 1), QRect(554, 1080, 1366, 732));
|
|
QCOMPARE(workspace()->clientArea(WorkArea, 0, 1), QRect(0, 0, 1920, 1812));
|
|
|
|
// and destroy the window again
|
|
xcb_unmap_window(c.data(), w);
|
|
xcb_destroy_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
c.reset();
|
|
|
|
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
QVERIFY(windowClosedSpy.wait());
|
|
}
|
|
|
|
void StrutsTest::testLeftScreenSmallerBottomAligned()
|
|
{
|
|
// this test verifies a two screen setup with the left screen smaller than the right and bottom aligned
|
|
// the panel is on the top of the left screen, thus not at 0/0
|
|
// what this test in addition tests is whether a window larger than the left screen is not placed into
|
|
// the dead area
|
|
const QVector<QRect> geometries{QRect(0, 282, 1366, 768), QRect(1366, 0, 1680, 1050)};
|
|
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs",
|
|
Qt::DirectConnection,
|
|
Q_ARG(int, 2),
|
|
Q_ARG(QVector<QRect>, geometries));
|
|
QCOMPARE(screens()->geometry(0), geometries.at(0));
|
|
QCOMPARE(screens()->geometry(1), geometries.at(1));
|
|
QCOMPARE(screens()->geometry(), QRect(0, 0, 3046, 1050));
|
|
|
|
// create the panel
|
|
QScopedPointer<xcb_connection_t, XcbConnectionDeleter> c(xcb_connect(nullptr, nullptr));
|
|
QVERIFY(!xcb_connection_has_error(c.data()));
|
|
|
|
xcb_window_t w = xcb_generate_id(c.data());
|
|
const QRect windowGeometry(0, 282, 1366, 24);
|
|
xcb_create_window(c.data(), XCB_COPY_FROM_PARENT, w, rootWindow(),
|
|
windowGeometry.x(),
|
|
windowGeometry.y(),
|
|
windowGeometry.width(),
|
|
windowGeometry.height(),
|
|
0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr);
|
|
xcb_size_hints_t hints;
|
|
memset(&hints, 0, sizeof(hints));
|
|
xcb_icccm_size_hints_set_position(&hints, 1, windowGeometry.x(), windowGeometry.y());
|
|
xcb_icccm_size_hints_set_size(&hints, 1, windowGeometry.width(), windowGeometry.height());
|
|
xcb_icccm_set_wm_normal_hints(c.data(), w, &hints);
|
|
NETWinInfo info(c.data(), w, rootWindow(), NET::WMAllProperties, NET::WM2AllProperties);
|
|
info.setWindowType(NET::Dock);
|
|
NETExtendedStrut strut;
|
|
strut.left_start = 0;
|
|
strut.left_end = 0;
|
|
strut.left_width = 0;
|
|
strut.right_start = 0;
|
|
strut.right_end = 0;
|
|
strut.right_width = 0;
|
|
strut.top_start = 0;
|
|
strut.top_end = 1365;
|
|
strut.top_width = 306;
|
|
strut.bottom_start = 0;
|
|
strut.bottom_end = 0;
|
|
strut.bottom_width = 0;
|
|
info.setExtendedStrut(strut);
|
|
xcb_map_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
|
|
// we should get a client for it
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
|
|
QVERIFY(windowCreatedSpy.isValid());
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
|
|
QVERIFY(client);
|
|
QCOMPARE(client->window(), w);
|
|
QVERIFY(!client->isDecorated());
|
|
QCOMPARE(client->windowType(), NET::Dock);
|
|
QCOMPARE(client->geometry(), windowGeometry);
|
|
|
|
// now verify the actual updated client areas
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 0, 1), QRect(0, 306, 1366, 744));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 0, 1), QRect(0, 306, 1366, 744));
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 1, 1), geometries.at(1));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 1, 1), geometries.at(1));
|
|
QCOMPARE(workspace()->clientArea(WorkArea, 0, 1), QRect(0, 0, 3046, 1050));
|
|
|
|
// now create a window which is larger than screen 0
|
|
|
|
xcb_window_t w2 = xcb_generate_id(c.data());
|
|
const QRect windowGeometry2(0, 26, 1280, 774);
|
|
xcb_create_window(c.data(), XCB_COPY_FROM_PARENT, w2, rootWindow(),
|
|
windowGeometry2.x(),
|
|
windowGeometry2.y(),
|
|
windowGeometry2.width(),
|
|
windowGeometry2.height(),
|
|
0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr);
|
|
xcb_size_hints_t hints2;
|
|
memset(&hints2, 0, sizeof(hints2));
|
|
xcb_icccm_size_hints_set_min_size(&hints2, 868, 431);
|
|
xcb_icccm_set_wm_normal_hints(c.data(), w2, &hints2);
|
|
xcb_map_window(c.data(), w2);
|
|
xcb_flush(c.data());
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
X11Client *client2 = windowCreatedSpy.last().first().value<X11Client *>();
|
|
QVERIFY(client2);
|
|
QVERIFY(client2 != client);
|
|
QVERIFY(client2->isDecorated());
|
|
QCOMPARE(client2->geometry(), QRect(0, 306, 1366, 744));
|
|
QCOMPARE(client2->maximizeMode(), KWin::MaximizeFull);
|
|
// destroy window again
|
|
QSignalSpy normalWindowClosedSpy(client2, &X11Client::windowClosed);
|
|
QVERIFY(normalWindowClosedSpy.isValid());
|
|
xcb_unmap_window(c.data(), w2);
|
|
xcb_destroy_window(c.data(), w2);
|
|
xcb_flush(c.data());
|
|
QVERIFY(normalWindowClosedSpy.wait());
|
|
|
|
// and destroy the window again
|
|
xcb_unmap_window(c.data(), w);
|
|
xcb_destroy_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
c.reset();
|
|
|
|
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
QVERIFY(windowClosedSpy.wait());
|
|
}
|
|
|
|
void StrutsTest::testWindowMoveWithPanelBetweenScreens()
|
|
{
|
|
// this test verifies the condition of BUG
|
|
// when moving a window with decorations in a restricted way it should pass from one screen
|
|
// to the other even if there is a panel in between.
|
|
|
|
// left screen must be smaller than right screen
|
|
const QVector<QRect> geometries{QRect(0, 282, 1366, 768), QRect(1366, 0, 1680, 1050)};
|
|
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs",
|
|
Qt::DirectConnection,
|
|
Q_ARG(int, 2),
|
|
Q_ARG(QVector<QRect>, geometries));
|
|
QCOMPARE(screens()->geometry(0), geometries.at(0));
|
|
QCOMPARE(screens()->geometry(1), geometries.at(1));
|
|
QCOMPARE(screens()->geometry(), QRect(0, 0, 3046, 1050));
|
|
|
|
// create the panel on the right screen, left edge
|
|
QScopedPointer<xcb_connection_t, XcbConnectionDeleter> c(xcb_connect(nullptr, nullptr));
|
|
QVERIFY(!xcb_connection_has_error(c.data()));
|
|
|
|
xcb_window_t w = xcb_generate_id(c.data());
|
|
const QRect windowGeometry(1366, 0, 24, 1050);
|
|
xcb_create_window(c.data(), XCB_COPY_FROM_PARENT, w, rootWindow(),
|
|
windowGeometry.x(),
|
|
windowGeometry.y(),
|
|
windowGeometry.width(),
|
|
windowGeometry.height(),
|
|
0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr);
|
|
xcb_size_hints_t hints;
|
|
memset(&hints, 0, sizeof(hints));
|
|
xcb_icccm_size_hints_set_position(&hints, 1, windowGeometry.x(), windowGeometry.y());
|
|
xcb_icccm_size_hints_set_size(&hints, 1, windowGeometry.width(), windowGeometry.height());
|
|
xcb_icccm_set_wm_normal_hints(c.data(), w, &hints);
|
|
NETWinInfo info(c.data(), w, rootWindow(), NET::WMAllProperties, NET::WM2AllProperties);
|
|
info.setWindowType(NET::Dock);
|
|
NETExtendedStrut strut;
|
|
strut.left_start = 0;
|
|
strut.left_end = 1050;
|
|
strut.left_width = 1366+24;
|
|
strut.right_start = 0;
|
|
strut.right_end = 0;
|
|
strut.right_width = 0;
|
|
strut.top_start = 0;
|
|
strut.top_end = 0;
|
|
strut.top_width = 0;
|
|
strut.bottom_start = 0;
|
|
strut.bottom_end = 0;
|
|
strut.bottom_width = 0;
|
|
info.setExtendedStrut(strut);
|
|
xcb_map_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
|
|
// we should get a client for it
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
|
|
QVERIFY(windowCreatedSpy.isValid());
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
X11Client *client = windowCreatedSpy.first().first().value<X11Client *>();
|
|
QVERIFY(client);
|
|
QCOMPARE(client->window(), w);
|
|
QVERIFY(!client->isDecorated());
|
|
QCOMPARE(client->windowType(), NET::Dock);
|
|
QCOMPARE(client->geometry(), windowGeometry);
|
|
|
|
// now verify the actual updated client areas
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 0, 1), QRect(0, 282, 1366, 768));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 0, 1), QRect(0, 282, 1366, 768));
|
|
QCOMPARE(workspace()->clientArea(PlacementArea, 1, 1), QRect(1390, 0, 1656, 1050));
|
|
QCOMPARE(workspace()->clientArea(MaximizeArea, 1, 1), QRect(1390, 0, 1656, 1050));
|
|
QCOMPARE(workspace()->clientArea(WorkArea, 0, 1), QRect(0, 0, 3046, 1050));
|
|
QCOMPARE(workspace()->restrictedMoveArea(-1), QRegion(1366, 0, 24, 1050));
|
|
|
|
// create another window and try to move it
|
|
|
|
xcb_window_t w2 = xcb_generate_id(c.data());
|
|
const QRect windowGeometry2(1500, 400, 200, 300);
|
|
xcb_create_window(c.data(), XCB_COPY_FROM_PARENT, w2, rootWindow(),
|
|
windowGeometry2.x(),
|
|
windowGeometry2.y(),
|
|
windowGeometry2.width(),
|
|
windowGeometry2.height(),
|
|
0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, 0, nullptr);
|
|
xcb_size_hints_t hints2;
|
|
memset(&hints2, 0, sizeof(hints2));
|
|
xcb_icccm_size_hints_set_position(&hints2, 1, windowGeometry2.x(), windowGeometry2.y());
|
|
xcb_icccm_size_hints_set_min_size(&hints2, 200, 300);
|
|
xcb_icccm_set_wm_normal_hints(c.data(), w2, &hints2);
|
|
xcb_map_window(c.data(), w2);
|
|
xcb_flush(c.data());
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
X11Client *client2 = windowCreatedSpy.last().first().value<X11Client *>();
|
|
QVERIFY(client2);
|
|
QVERIFY(client2 != client);
|
|
QVERIFY(client2->isDecorated());
|
|
QCOMPARE(client2->clientSize(), QSize(200, 300));
|
|
QCOMPARE(client2->pos(), QPoint(1500, 400));
|
|
|
|
const QRect origGeo = client2->geometry();
|
|
Cursor::setPos(origGeo.center());
|
|
workspace()->performWindowOperation(client2, Options::MoveOp);
|
|
QTRY_COMPARE(workspace()->moveResizeClient(), client2);
|
|
QVERIFY(client2->isMove());
|
|
// move to next screen - step is 8 pixel, so 800 pixel
|
|
for (int i = 0; i < 100; i++) {
|
|
client2->keyPressEvent(Qt::Key_Left);
|
|
QTest::qWait(50);
|
|
}
|
|
client2->keyPressEvent(Qt::Key_Enter);
|
|
QCOMPARE(client2->isMove(), false);
|
|
QVERIFY(workspace()->moveResizeClient() == nullptr);
|
|
QCOMPARE(client2->geometry(), QRect(origGeo.translated(-800, 0)));
|
|
}
|
|
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(KWin::StrutsTest)
|
|
#include "struts_test.moc"
|