7d4471eba6
Summary: In order to properly implement xdg_surface.set_window_geometry we need two kinds of geometry - frame and buffer. The frame geometry specifies visible bounds of the client on the screen, excluding client-side drop shadows. The buffer geometry specifies rectangle on the screen that the attached buffer or x11 pixmap occupies on the screen. This change renames the geometry property to frameGeometry in order to reflect the new meaning assigned to it as well to make it easier to differentiate between frame geometry and buffer geometry in the future. Reviewers: #kwin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D24334
296 lines
12 KiB
C++
296 lines
12 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 <netwm.h>
|
|
#include <xcb/xcb_icccm.h>
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
static const QString s_socketName = QStringLiteral("wayland_test_kwin_screenedge_client_show-0");
|
|
|
|
class ScreenEdgeClientShowTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private Q_SLOTS:
|
|
void initTestCase();
|
|
void init();
|
|
void testScreenEdgeShowHideX11_data();
|
|
void testScreenEdgeShowHideX11();
|
|
void testScreenEdgeShowX11Touch_data();
|
|
void testScreenEdgeShowX11Touch();
|
|
};
|
|
|
|
void ScreenEdgeClientShowTest::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 disable touch edge
|
|
KSharedConfig::Ptr config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
|
|
KConfigGroup group = config->group("TabBox");
|
|
group.writeEntry(QStringLiteral("TouchBorderActivate"), "9");
|
|
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 ScreenEdgeClientShowTest::init()
|
|
{
|
|
screens()->setCurrent(0);
|
|
Cursor::setPos(QPoint(640, 512));
|
|
QVERIFY(waylandServer()->clients().isEmpty());
|
|
}
|
|
|
|
|
|
struct XcbConnectionDeleter
|
|
{
|
|
static inline void cleanup(xcb_connection_t *pointer)
|
|
{
|
|
xcb_disconnect(pointer);
|
|
}
|
|
};
|
|
|
|
void ScreenEdgeClientShowTest::testScreenEdgeShowHideX11_data()
|
|
{
|
|
QTest::addColumn<QRect>("windowGeometry");
|
|
QTest::addColumn<QRect>("resizedWindowGeometry");
|
|
QTest::addColumn<quint32>("location");
|
|
QTest::addColumn<QPoint>("triggerPos");
|
|
|
|
QTest::newRow("bottom/left") << QRect(50, 1004, 1180, 20) << QRect(150, 1004, 1000, 20) << 2u << QPoint(100, 1023);
|
|
QTest::newRow("bottom/right") << QRect(1330, 1004, 1180, 20) << QRect(1410, 1004, 1000, 20) << 2u << QPoint(1400, 1023);
|
|
QTest::newRow("top/left") << QRect(50, 0, 1180, 20) << QRect(150, 0, 1000, 20) << 0u << QPoint(100, 0);
|
|
QTest::newRow("top/right") << QRect(1330, 0, 1180, 20) << QRect(1410, 0, 1000, 20) << 0u << QPoint(1400, 0);
|
|
QTest::newRow("left") << QRect(0, 10, 20, 1000) << QRect(0, 70, 20, 800) << 3u << QPoint(0, 50);
|
|
QTest::newRow("right") << QRect(2540, 10, 20, 1000) << QRect(2540, 70, 20, 800) << 1u << QPoint(2559, 60);
|
|
}
|
|
|
|
void ScreenEdgeClientShowTest::testScreenEdgeShowHideX11()
|
|
{
|
|
// this test creates a window which borders the screen and sets the screenedge show hint
|
|
// that should trigger a show of the window whenever the cursor is pushed against the screen edge
|
|
|
|
// create the test window
|
|
QScopedPointer<xcb_connection_t, XcbConnectionDeleter> c(xcb_connect(nullptr, nullptr));
|
|
QVERIFY(!xcb_connection_has_error(c.data()));
|
|
// atom for the screenedge show hide functionality
|
|
Xcb::Atom atom(QByteArrayLiteral("_KDE_NET_WM_SCREEN_EDGE_SHOW"), false, 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);
|
|
xcb_map_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
|
|
QVERIFY(windowCreatedSpy.isValid());
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
X11Client *client = windowCreatedSpy.last().first().value<X11Client *>();
|
|
QVERIFY(client);
|
|
QVERIFY(!client->isDecorated());
|
|
QCOMPARE(client->frameGeometry(), windowGeometry);
|
|
QVERIFY(!client->hasStrut());
|
|
QVERIFY(!client->isHiddenInternal());
|
|
|
|
QSignalSpy effectsWindowAdded(effects, &EffectsHandler::windowAdded);
|
|
QVERIFY(effectsWindowAdded.isValid());
|
|
QVERIFY(effectsWindowAdded.wait());
|
|
|
|
// now try to hide
|
|
QFETCH(quint32, location);
|
|
xcb_change_property(c.data(), XCB_PROP_MODE_REPLACE, w, atom, XCB_ATOM_CARDINAL, 32, 1, &location);
|
|
xcb_flush(c.data());
|
|
|
|
QSignalSpy effectsWindowHiddenSpy(effects, &EffectsHandler::windowHidden);
|
|
QVERIFY(effectsWindowHiddenSpy.isValid());
|
|
QSignalSpy clientHiddenSpy(client, &X11Client::windowHidden);
|
|
QVERIFY(clientHiddenSpy.isValid());
|
|
QVERIFY(clientHiddenSpy.wait());
|
|
QVERIFY(client->isHiddenInternal());
|
|
QCOMPARE(effectsWindowHiddenSpy.count(), 1);
|
|
|
|
// now trigger the edge
|
|
QSignalSpy effectsWindowShownSpy(effects, &EffectsHandler::windowShown);
|
|
QVERIFY(effectsWindowShownSpy.isValid());
|
|
QFETCH(QPoint, triggerPos);
|
|
Cursor::setPos(triggerPos);
|
|
QVERIFY(!client->isHiddenInternal());
|
|
QCOMPARE(effectsWindowShownSpy.count(), 1);
|
|
|
|
// go into event loop to trigger xcb_flush
|
|
QTest::qWait(1);
|
|
|
|
//hide window again
|
|
Cursor::setPos(QPoint(640, 512));
|
|
xcb_change_property(c.data(), XCB_PROP_MODE_REPLACE, w, atom, XCB_ATOM_CARDINAL, 32, 1, &location);
|
|
xcb_flush(c.data());
|
|
QVERIFY(clientHiddenSpy.wait());
|
|
QVERIFY(client->isHiddenInternal());
|
|
QFETCH(QRect, resizedWindowGeometry);
|
|
//resizewhile hidden
|
|
client->setFrameGeometry(resizedWindowGeometry);
|
|
//triggerPos shouldn't be valid anymore
|
|
Cursor::setPos(triggerPos);
|
|
QVERIFY(client->isHiddenInternal());
|
|
|
|
// destroy window again
|
|
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
xcb_unmap_window(c.data(), w);
|
|
xcb_destroy_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
QVERIFY(windowClosedSpy.wait());
|
|
}
|
|
|
|
void ScreenEdgeClientShowTest::testScreenEdgeShowX11Touch_data()
|
|
{
|
|
QTest::addColumn<QRect>("windowGeometry");
|
|
QTest::addColumn<quint32>("location");
|
|
QTest::addColumn<QPoint>("touchDownPos");
|
|
QTest::addColumn<QPoint>("targetPos");
|
|
|
|
QTest::newRow("bottom/left") << QRect(50, 1004, 1180, 20) << 2u << QPoint(100, 1023) << QPoint(100, 540);
|
|
QTest::newRow("bottom/right") << QRect(1330, 1004, 1180, 20) << 2u << QPoint(1400, 1023) << QPoint(1400, 520);
|
|
QTest::newRow("top/left") << QRect(50, 0, 1180, 20) << 0u << QPoint(100, 0) << QPoint(100, 350);
|
|
QTest::newRow("top/right") << QRect(1330, 0, 1180, 20) << 0u << QPoint(1400, 0) << QPoint(1400, 400);
|
|
QTest::newRow("left") << QRect(0, 10, 20, 1000) << 3u << QPoint(0, 50) << QPoint(400, 50);
|
|
QTest::newRow("right") << QRect(2540, 10, 20, 1000) << 1u << QPoint(2559, 60) << QPoint(2200, 60);
|
|
}
|
|
|
|
void ScreenEdgeClientShowTest::testScreenEdgeShowX11Touch()
|
|
{
|
|
// this test creates a window which borders the screen and sets the screenedge show hint
|
|
// that should trigger a show of the window whenever the touch screen swipe gesture is triggered
|
|
|
|
// create the test window
|
|
QScopedPointer<xcb_connection_t, XcbConnectionDeleter> c(xcb_connect(nullptr, nullptr));
|
|
QVERIFY(!xcb_connection_has_error(c.data()));
|
|
// atom for the screenedge show hide functionality
|
|
Xcb::Atom atom(QByteArrayLiteral("_KDE_NET_WM_SCREEN_EDGE_SHOW"), false, 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);
|
|
xcb_map_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
|
|
QVERIFY(windowCreatedSpy.isValid());
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
X11Client *client = windowCreatedSpy.last().first().value<X11Client *>();
|
|
QVERIFY(client);
|
|
QVERIFY(!client->isDecorated());
|
|
QCOMPARE(client->frameGeometry(), windowGeometry);
|
|
QVERIFY(!client->hasStrut());
|
|
QVERIFY(!client->isHiddenInternal());
|
|
|
|
QSignalSpy effectsWindowAdded(effects, &EffectsHandler::windowAdded);
|
|
QVERIFY(effectsWindowAdded.isValid());
|
|
QVERIFY(effectsWindowAdded.wait());
|
|
|
|
// now try to hide
|
|
QFETCH(quint32, location);
|
|
xcb_change_property(c.data(), XCB_PROP_MODE_REPLACE, w, atom, XCB_ATOM_CARDINAL, 32, 1, &location);
|
|
xcb_flush(c.data());
|
|
|
|
QSignalSpy effectsWindowHiddenSpy(effects, &EffectsHandler::windowHidden);
|
|
QVERIFY(effectsWindowHiddenSpy.isValid());
|
|
QSignalSpy clientHiddenSpy(client, &X11Client::windowHidden);
|
|
QVERIFY(clientHiddenSpy.isValid());
|
|
QVERIFY(clientHiddenSpy.wait());
|
|
QVERIFY(client->isHiddenInternal());
|
|
QCOMPARE(effectsWindowHiddenSpy.count(), 1);
|
|
|
|
// now trigger the edge
|
|
QSignalSpy effectsWindowShownSpy(effects, &EffectsHandler::windowShown);
|
|
QVERIFY(effectsWindowShownSpy.isValid());
|
|
quint32 timestamp = 0;
|
|
QFETCH(QPoint, touchDownPos);
|
|
QFETCH(QPoint, targetPos);
|
|
kwinApp()->platform()->touchDown(0, touchDownPos, timestamp++);
|
|
kwinApp()->platform()->touchMotion(0, targetPos, timestamp++);
|
|
kwinApp()->platform()->touchUp(0, timestamp++);
|
|
QVERIFY(effectsWindowShownSpy.wait());
|
|
QVERIFY(!client->isHiddenInternal());
|
|
QCOMPARE(effectsWindowShownSpy.count(), 1);
|
|
|
|
// destroy window again
|
|
QSignalSpy windowClosedSpy(client, &X11Client::windowClosed);
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
xcb_unmap_window(c.data(), w);
|
|
xcb_destroy_window(c.data(), w);
|
|
xcb_flush(c.data());
|
|
QVERIFY(windowClosedSpy.wait());
|
|
}
|
|
|
|
}
|
|
|
|
WAYLANDTEST_MAIN(KWin::ScreenEdgeClientShowTest)
|
|
#include "screenedge_client_show_test.moc"
|