2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
/********************************************************************
|
|
|
|
KWin - the KDE window manager
|
|
|
|
This file is part of the KDE project.
|
|
|
|
|
|
|
|
Copyright (C) 2015 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"
|
2016-11-02 10:28:54 +00:00
|
|
|
#include "atoms.h"
|
2016-04-07 07:24:17 +00:00
|
|
|
#include "platform.h"
|
2015-10-26 08:17:46 +00:00
|
|
|
#include "abstract_client.h"
|
2018-08-31 18:28:22 +00:00
|
|
|
#include "client.h"
|
2015-10-26 08:17:46 +00:00
|
|
|
#include "cursor.h"
|
2015-10-26 09:43:36 +00:00
|
|
|
#include "effects.h"
|
2015-10-26 08:17:46 +00:00
|
|
|
#include "screens.h"
|
|
|
|
#include "wayland_server.h"
|
|
|
|
#include "workspace.h"
|
|
|
|
#include "shell_client.h"
|
2019-07-30 19:08:28 +00:00
|
|
|
#include "deleted.h"
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
#include <KWayland/Client/connection_thread.h>
|
|
|
|
#include <KWayland/Client/compositor.h>
|
2016-10-24 15:09:40 +00:00
|
|
|
#include <KWayland/Client/pointer.h>
|
2016-03-16 14:35:24 +00:00
|
|
|
#include <KWayland/Client/plasmashell.h>
|
2016-10-24 15:09:40 +00:00
|
|
|
#include <KWayland/Client/seat.h>
|
2015-10-26 08:17:46 +00:00
|
|
|
#include <KWayland/Client/shell.h>
|
virtualkeyboard: resize the focused window to make room for the keyboard
Summary:
alternative approach: try to resize the winidow to make room for the keyboard.
the new input wayland protocol doesn't have anymore the overlap rectangle (and it would not be going to work with qwidget apps anyways)
in the future will probably be needed anextension to the input protocol v3 which partially gets back this, tough window resizing is needed regardless
what's missing: the resize should be "temporary" and the window should be restored to its previous geometry when the keyboard closes
Test Plan: tested with test QML code
Reviewers: #plasma, #kwin, bshah, graesslin, romangg, davidedmundson
Reviewed By: #plasma, #kwin, romangg, davidedmundson
Subscribers: nicolasfella, mart, kwin, davidedmundson, graesslin
Tags: #kwin
Maniphest Tasks: T9815
Differential Revision: https://phabricator.kde.org/D18818
2019-03-20 10:04:51 +00:00
|
|
|
#include <KWayland/Client/xdgshell.h>
|
2015-10-26 08:17:46 +00:00
|
|
|
#include <KWayland/Client/surface.h>
|
2016-10-24 15:09:40 +00:00
|
|
|
#include <KWayland/Client/xdgshell.h>
|
2015-10-26 08:17:46 +00:00
|
|
|
|
2016-02-17 10:00:58 +00:00
|
|
|
#include <linux/input.h>
|
2016-04-15 14:07:39 +00:00
|
|
|
#include <xcb/xcb_icccm.h>
|
2016-02-17 10:00:58 +00:00
|
|
|
|
2017-07-18 19:12:37 +00:00
|
|
|
Q_DECLARE_METATYPE(KWin::QuickTileMode)
|
2015-10-26 08:17:46 +00:00
|
|
|
Q_DECLARE_METATYPE(KWin::MaximizeMode)
|
|
|
|
|
|
|
|
namespace KWin
|
|
|
|
{
|
|
|
|
|
|
|
|
static const QString s_socketName = QStringLiteral("wayland_test_kwin_quick_tiling-0");
|
|
|
|
|
|
|
|
class MoveResizeWindowTest : public QObject
|
|
|
|
{
|
|
|
|
Q_OBJECT
|
|
|
|
private Q_SLOTS:
|
|
|
|
void initTestCase();
|
|
|
|
void init();
|
|
|
|
void cleanup();
|
|
|
|
void testMove();
|
2017-01-29 13:01:15 +00:00
|
|
|
void testResize();
|
2015-10-26 10:30:34 +00:00
|
|
|
void testPackTo_data();
|
|
|
|
void testPackTo();
|
2015-10-26 12:25:47 +00:00
|
|
|
void testPackAgainstClient_data();
|
|
|
|
void testPackAgainstClient();
|
2015-10-26 14:49:03 +00:00
|
|
|
void testGrowShrink_data();
|
|
|
|
void testGrowShrink();
|
2016-02-17 10:00:58 +00:00
|
|
|
void testPointerMoveEnd_data();
|
|
|
|
void testPointerMoveEnd();
|
2016-10-24 15:09:40 +00:00
|
|
|
void testClientSideMove_data();
|
|
|
|
void testClientSideMove();
|
2016-03-16 14:35:24 +00:00
|
|
|
void testPlasmaShellSurfaceMovable_data();
|
|
|
|
void testPlasmaShellSurfaceMovable();
|
2016-04-15 14:07:39 +00:00
|
|
|
void testNetMove();
|
2016-11-02 10:28:54 +00:00
|
|
|
void testAdjustClientGeometryOfAutohidingX11Panel_data();
|
|
|
|
void testAdjustClientGeometryOfAutohidingX11Panel();
|
2016-11-02 10:51:01 +00:00
|
|
|
void testAdjustClientGeometryOfAutohidingWaylandPanel_data();
|
|
|
|
void testAdjustClientGeometryOfAutohidingWaylandPanel();
|
virtualkeyboard: resize the focused window to make room for the keyboard
Summary:
alternative approach: try to resize the winidow to make room for the keyboard.
the new input wayland protocol doesn't have anymore the overlap rectangle (and it would not be going to work with qwidget apps anyways)
in the future will probably be needed anextension to the input protocol v3 which partially gets back this, tough window resizing is needed regardless
what's missing: the resize should be "temporary" and the window should be restored to its previous geometry when the keyboard closes
Test Plan: tested with test QML code
Reviewers: #plasma, #kwin, bshah, graesslin, romangg, davidedmundson
Reviewed By: #plasma, #kwin, romangg, davidedmundson
Subscribers: nicolasfella, mart, kwin, davidedmundson, graesslin
Tags: #kwin
Maniphest Tasks: T9815
Differential Revision: https://phabricator.kde.org/D18818
2019-03-20 10:04:51 +00:00
|
|
|
void testResizeForVirtualKeyboard();
|
|
|
|
void testResizeForVirtualKeyboardWithMaximize();
|
|
|
|
void testResizeForVirtualKeyboardWithFullScreen();
|
2019-03-12 09:35:17 +00:00
|
|
|
void testDestroyMoveClient();
|
|
|
|
void testDestroyResizeClient();
|
|
|
|
void testUnmapMoveClient();
|
|
|
|
void testUnmapResizeClient();
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
KWayland::Client::ConnectionThread *m_connection = nullptr;
|
|
|
|
KWayland::Client::Compositor *m_compositor = nullptr;
|
|
|
|
KWayland::Client::Shell *m_shell = nullptr;
|
|
|
|
};
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::initTestCase()
|
|
|
|
{
|
2019-07-30 19:08:28 +00:00
|
|
|
qRegisterMetaType<KWin::AbstractClient *>();
|
|
|
|
qRegisterMetaType<KWin::Deleted *>();
|
|
|
|
qRegisterMetaType<KWin::ShellClient *>();
|
2015-10-26 08:17:46 +00:00
|
|
|
qRegisterMetaType<KWin::MaximizeMode>("MaximizeMode");
|
|
|
|
QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
|
|
|
|
QVERIFY(workspaceCreatedSpy.isValid());
|
2016-04-07 06:28:35 +00:00
|
|
|
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
|
2016-07-04 07:09:03 +00:00
|
|
|
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit()));
|
2015-10-26 08:17:46 +00:00
|
|
|
kwinApp()->start();
|
|
|
|
QVERIFY(workspaceCreatedSpy.wait());
|
|
|
|
QCOMPARE(screens()->count(), 1);
|
|
|
|
QCOMPARE(screens()->geometry(0), QRect(0, 0, 1280, 1024));
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::init()
|
|
|
|
{
|
2016-12-03 13:31:14 +00:00
|
|
|
QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::PlasmaShell | Test::AdditionalWaylandInterface::Seat));
|
2016-10-24 15:09:40 +00:00
|
|
|
QVERIFY(Test::waitForWaylandPointer());
|
2016-06-30 11:32:54 +00:00
|
|
|
m_connection = Test::waylandConnection();
|
|
|
|
m_compositor = Test::waylandCompositor();
|
|
|
|
m_shell = Test::waylandShell();
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
screens()->setCurrent(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::cleanup()
|
|
|
|
{
|
2016-06-30 11:32:54 +00:00
|
|
|
Test::destroyWaylandConnection();
|
2015-10-26 08:17:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testMove()
|
|
|
|
{
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
2015-10-26 08:17:46 +00:00
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
2015-10-26 08:17:46 +00:00
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
QSignalSpy sizeChangeSpy(shellSurface.data(), &ShellSurface::sizeChanged);
|
|
|
|
QVERIFY(sizeChangeSpy.isValid());
|
|
|
|
// let's render
|
2016-07-01 07:54:44 +00:00
|
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
QVERIFY(c);
|
2016-07-01 07:54:44 +00:00
|
|
|
QCOMPARE(workspace()->activeClient(), c);
|
2015-10-26 08:17:46 +00:00
|
|
|
QCOMPARE(c->geometry(), QRect(0, 0, 100, 50));
|
|
|
|
QSignalSpy geometryChangedSpy(c, &AbstractClient::geometryChanged);
|
|
|
|
QVERIFY(geometryChangedSpy.isValid());
|
|
|
|
QSignalSpy startMoveResizedSpy(c, &AbstractClient::clientStartUserMovedResized);
|
|
|
|
QVERIFY(startMoveResizedSpy.isValid());
|
|
|
|
QSignalSpy moveResizedChangedSpy(c, &AbstractClient::moveResizedChanged);
|
|
|
|
QVERIFY(moveResizedChangedSpy.isValid());
|
|
|
|
QSignalSpy clientStepUserMovedResizedSpy(c, &AbstractClient::clientStepUserMovedResized);
|
|
|
|
QVERIFY(clientStepUserMovedResizedSpy.isValid());
|
|
|
|
QSignalSpy clientFinishUserMovedResizedSpy(c, &AbstractClient::clientFinishUserMovedResized);
|
|
|
|
QVERIFY(clientFinishUserMovedResizedSpy.isValid());
|
|
|
|
|
2015-10-26 09:43:36 +00:00
|
|
|
// effects signal handlers
|
|
|
|
QSignalSpy windowStartUserMovedResizedSpy(effects, &EffectsHandler::windowStartUserMovedResized);
|
|
|
|
QVERIFY(windowStartUserMovedResizedSpy.isValid());
|
|
|
|
QSignalSpy windowStepUserMovedResizedSpy(effects, &EffectsHandler::windowStepUserMovedResized);
|
|
|
|
QVERIFY(windowStepUserMovedResizedSpy.isValid());
|
|
|
|
QSignalSpy windowFinishUserMovedResizedSpy(effects, &EffectsHandler::windowFinishUserMovedResized);
|
|
|
|
QVERIFY(windowFinishUserMovedResizedSpy.isValid());
|
|
|
|
|
2015-10-26 08:17:46 +00:00
|
|
|
// begin move
|
2019-04-18 12:28:11 +00:00
|
|
|
QVERIFY(workspace()->moveResizeClient() == nullptr);
|
2015-10-26 08:17:46 +00:00
|
|
|
QCOMPARE(c->isMove(), false);
|
|
|
|
workspace()->slotWindowMove();
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), c);
|
2015-10-26 08:17:46 +00:00
|
|
|
QCOMPARE(startMoveResizedSpy.count(), 1);
|
|
|
|
QCOMPARE(moveResizedChangedSpy.count(), 1);
|
2015-10-26 09:43:36 +00:00
|
|
|
QCOMPARE(windowStartUserMovedResizedSpy.count(), 1);
|
2015-10-26 08:17:46 +00:00
|
|
|
QCOMPARE(c->isMove(), true);
|
|
|
|
QCOMPARE(c->geometryRestore(), QRect(0, 0, 100, 50));
|
|
|
|
|
|
|
|
// send some key events, not going through input redirection
|
|
|
|
const QPoint cursorPos = Cursor::pos();
|
|
|
|
c->keyPressEvent(Qt::Key_Right);
|
|
|
|
c->updateMoveResize(Cursor::pos());
|
|
|
|
QCOMPARE(Cursor::pos(), cursorPos + QPoint(8, 0));
|
|
|
|
QEXPECT_FAIL("", "First event is ignored", Continue);
|
|
|
|
QCOMPARE(clientStepUserMovedResizedSpy.count(), 1);
|
2017-01-26 19:41:58 +00:00
|
|
|
clientStepUserMovedResizedSpy.clear();
|
|
|
|
windowStepUserMovedResizedSpy.clear();
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
c->keyPressEvent(Qt::Key_Right);
|
|
|
|
c->updateMoveResize(Cursor::pos());
|
|
|
|
QCOMPARE(Cursor::pos(), cursorPos + QPoint(16, 0));
|
2017-01-26 19:41:58 +00:00
|
|
|
QCOMPARE(clientStepUserMovedResizedSpy.count(), 1);
|
|
|
|
QCOMPARE(windowStepUserMovedResizedSpy.count(), 1);
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
c->keyPressEvent(Qt::Key_Down | Qt::ALT);
|
|
|
|
c->updateMoveResize(Cursor::pos());
|
2017-01-26 19:41:58 +00:00
|
|
|
QCOMPARE(clientStepUserMovedResizedSpy.count(), 2);
|
|
|
|
QCOMPARE(windowStepUserMovedResizedSpy.count(), 2);
|
2015-10-26 08:17:46 +00:00
|
|
|
QCOMPARE(c->geometry(), QRect(16, 32, 100, 50));
|
|
|
|
QCOMPARE(Cursor::pos(), cursorPos + QPoint(16, 32));
|
|
|
|
|
|
|
|
// let's end
|
|
|
|
QCOMPARE(clientFinishUserMovedResizedSpy.count(), 0);
|
|
|
|
c->keyPressEvent(Qt::Key_Enter);
|
|
|
|
QCOMPARE(clientFinishUserMovedResizedSpy.count(), 1);
|
2015-10-26 09:14:54 +00:00
|
|
|
QCOMPARE(moveResizedChangedSpy.count(), 2);
|
2015-10-26 09:43:36 +00:00
|
|
|
QCOMPARE(windowFinishUserMovedResizedSpy.count(), 1);
|
2015-10-26 08:17:46 +00:00
|
|
|
QCOMPARE(c->geometry(), QRect(16, 32, 100, 50));
|
|
|
|
QCOMPARE(c->isMove(), false);
|
2019-04-18 12:28:11 +00:00
|
|
|
QVERIFY(workspace()->moveResizeClient() == nullptr);
|
2016-07-01 10:37:09 +00:00
|
|
|
surface.reset();
|
|
|
|
QVERIFY(Test::waitForWindowDestroyed(c));
|
2015-10-26 08:17:46 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 13:01:15 +00:00
|
|
|
void MoveResizeWindowTest::testResize()
|
|
|
|
{
|
|
|
|
// a test case which manually resizes a window
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
2019-07-30 19:05:50 +00:00
|
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(
|
|
|
|
surface.data(), surface.data(), Test::CreationSetup::CreateOnly));
|
2017-01-29 13:01:15 +00:00
|
|
|
QVERIFY(!shellSurface.isNull());
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// Wait for the initial configure event.
|
|
|
|
XdgShellSurface::States states;
|
|
|
|
QSignalSpy configureRequestedSpy(shellSurface.data(), &XdgShellSurface::configureRequested);
|
|
|
|
QVERIFY(configureRequestedSpy.isValid());
|
|
|
|
surface->commit(Surface::CommitFlag::None);
|
|
|
|
QVERIFY(configureRequestedSpy.wait());
|
|
|
|
QCOMPARE(configureRequestedSpy.count(), 1);
|
|
|
|
states = configureRequestedSpy.last().at(1).value<XdgShellSurface::States>();
|
|
|
|
QVERIFY(!states.testFlag(XdgShellSurface::State::Activated));
|
|
|
|
QVERIFY(!states.testFlag(XdgShellSurface::State::Resizing));
|
|
|
|
|
|
|
|
// Let's render.
|
|
|
|
shellSurface->ackConfigure(configureRequestedSpy.last().at(2).value<quint32>());
|
2017-01-29 13:01:15 +00:00
|
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
2019-07-30 19:05:50 +00:00
|
|
|
QSignalSpy surfaceSizeChangedSpy(shellSurface.data(), &XdgShellSurface::sizeChanged);
|
2017-01-29 13:01:15 +00:00
|
|
|
QVERIFY(surfaceSizeChangedSpy.isValid());
|
|
|
|
|
2019-07-30 19:05:50 +00:00
|
|
|
// We have to receive a configure event when the client becomes active.
|
|
|
|
QVERIFY(configureRequestedSpy.wait());
|
|
|
|
QCOMPARE(configureRequestedSpy.count(), 2);
|
|
|
|
states = configureRequestedSpy.last().at(1).value<XdgShellSurface::States>();
|
|
|
|
QVERIFY(states.testFlag(XdgShellSurface::State::Activated));
|
|
|
|
QVERIFY(!states.testFlag(XdgShellSurface::State::Resizing));
|
|
|
|
|
2017-01-29 13:01:15 +00:00
|
|
|
QVERIFY(c);
|
|
|
|
QCOMPARE(workspace()->activeClient(), c);
|
|
|
|
QCOMPARE(c->geometry(), QRect(0, 0, 100, 50));
|
|
|
|
QSignalSpy geometryChangedSpy(c, &AbstractClient::geometryChanged);
|
|
|
|
QVERIFY(geometryChangedSpy.isValid());
|
|
|
|
QSignalSpy startMoveResizedSpy(c, &AbstractClient::clientStartUserMovedResized);
|
|
|
|
QVERIFY(startMoveResizedSpy.isValid());
|
|
|
|
QSignalSpy moveResizedChangedSpy(c, &AbstractClient::moveResizedChanged);
|
|
|
|
QVERIFY(moveResizedChangedSpy.isValid());
|
|
|
|
QSignalSpy clientStepUserMovedResizedSpy(c, &AbstractClient::clientStepUserMovedResized);
|
|
|
|
QVERIFY(clientStepUserMovedResizedSpy.isValid());
|
|
|
|
QSignalSpy clientFinishUserMovedResizedSpy(c, &AbstractClient::clientFinishUserMovedResized);
|
|
|
|
QVERIFY(clientFinishUserMovedResizedSpy.isValid());
|
|
|
|
|
|
|
|
// begin resize
|
2019-07-30 19:05:50 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), nullptr);
|
2017-01-29 13:01:15 +00:00
|
|
|
QCOMPARE(c->isMove(), false);
|
|
|
|
QCOMPARE(c->isResize(), false);
|
|
|
|
workspace()->slotWindowResize();
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), c);
|
2017-01-29 13:01:15 +00:00
|
|
|
QCOMPARE(startMoveResizedSpy.count(), 1);
|
|
|
|
QCOMPARE(moveResizedChangedSpy.count(), 1);
|
|
|
|
QCOMPARE(c->isResize(), true);
|
|
|
|
QCOMPARE(c->geometryRestore(), QRect(0, 0, 100, 50));
|
2019-07-30 19:05:50 +00:00
|
|
|
QVERIFY(configureRequestedSpy.wait());
|
|
|
|
QCOMPARE(configureRequestedSpy.count(), 3);
|
|
|
|
states = configureRequestedSpy.last().at(1).value<XdgShellSurface::States>();
|
|
|
|
QVERIFY(states.testFlag(XdgShellSurface::State::Activated));
|
|
|
|
QVERIFY(states.testFlag(XdgShellSurface::State::Resizing));
|
2017-01-29 13:01:15 +00:00
|
|
|
|
2019-07-30 19:05:50 +00:00
|
|
|
// Trigger a change.
|
2017-01-29 13:01:15 +00:00
|
|
|
const QPoint cursorPos = Cursor::pos();
|
|
|
|
c->keyPressEvent(Qt::Key_Right);
|
|
|
|
c->updateMoveResize(Cursor::pos());
|
|
|
|
QCOMPARE(Cursor::pos(), cursorPos + QPoint(8, 0));
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// The client should receive a configure event with the new size.
|
|
|
|
QVERIFY(configureRequestedSpy.wait());
|
|
|
|
QCOMPARE(configureRequestedSpy.count(), 4);
|
|
|
|
states = configureRequestedSpy.last().at(1).value<XdgShellSurface::States>();
|
|
|
|
QVERIFY(states.testFlag(XdgShellSurface::State::Activated));
|
|
|
|
QVERIFY(states.testFlag(XdgShellSurface::State::Resizing));
|
2017-01-29 13:01:15 +00:00
|
|
|
QCOMPARE(surfaceSizeChangedSpy.count(), 1);
|
|
|
|
QCOMPARE(surfaceSizeChangedSpy.last().first().toSize(), QSize(108, 50));
|
|
|
|
QCOMPARE(clientStepUserMovedResizedSpy.count(), 0);
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// Now render new size.
|
|
|
|
shellSurface->ackConfigure(configureRequestedSpy.last().at(2).value<quint32>());
|
2017-01-29 13:01:15 +00:00
|
|
|
Test::render(surface.data(), QSize(108, 50), Qt::blue);
|
|
|
|
QVERIFY(geometryChangedSpy.wait());
|
|
|
|
QCOMPARE(c->geometry(), QRect(0, 0, 108, 50));
|
|
|
|
QCOMPARE(clientStepUserMovedResizedSpy.count(), 1);
|
|
|
|
|
2019-07-30 19:05:50 +00:00
|
|
|
// Go down.
|
2017-01-29 13:01:15 +00:00
|
|
|
c->keyPressEvent(Qt::Key_Down);
|
|
|
|
c->updateMoveResize(Cursor::pos());
|
|
|
|
QCOMPARE(Cursor::pos(), cursorPos + QPoint(8, 8));
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// The client should receive another configure event.
|
|
|
|
QVERIFY(configureRequestedSpy.wait());
|
|
|
|
QCOMPARE(configureRequestedSpy.count(), 5);
|
|
|
|
states = configureRequestedSpy.last().at(1).value<XdgShellSurface::States>();
|
|
|
|
QVERIFY(states.testFlag(XdgShellSurface::State::Activated));
|
|
|
|
QVERIFY(states.testFlag(XdgShellSurface::State::Resizing));
|
2017-01-29 13:01:15 +00:00
|
|
|
QCOMPARE(surfaceSizeChangedSpy.count(), 2);
|
|
|
|
QCOMPARE(surfaceSizeChangedSpy.last().first().toSize(), QSize(108, 58));
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// Now render new size.
|
|
|
|
shellSurface->ackConfigure(configureRequestedSpy.last().at(2).value<quint32>());
|
2017-01-29 13:01:15 +00:00
|
|
|
Test::render(surface.data(), QSize(108, 58), Qt::blue);
|
|
|
|
QVERIFY(geometryChangedSpy.wait());
|
|
|
|
QCOMPARE(c->geometry(), QRect(0, 0, 108, 58));
|
|
|
|
QCOMPARE(clientStepUserMovedResizedSpy.count(), 2);
|
|
|
|
|
2019-07-30 19:05:50 +00:00
|
|
|
// Let's finalize the resize operation.
|
2017-01-29 13:01:15 +00:00
|
|
|
QCOMPARE(clientFinishUserMovedResizedSpy.count(), 0);
|
|
|
|
c->keyPressEvent(Qt::Key_Enter);
|
|
|
|
QCOMPARE(clientFinishUserMovedResizedSpy.count(), 1);
|
|
|
|
QCOMPARE(moveResizedChangedSpy.count(), 2);
|
|
|
|
QCOMPARE(c->isResize(), false);
|
2019-07-30 19:05:50 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), nullptr);
|
|
|
|
QEXPECT_FAIL("", "ShellClient currently doesn't send final configure event", Abort);
|
|
|
|
QVERIFY(configureRequestedSpy.wait());
|
|
|
|
QCOMPARE(configureRequestedSpy.count(), 6);
|
|
|
|
states = configureRequestedSpy.last().at(1).value<XdgShellSurface::States>();
|
|
|
|
QVERIFY(states.testFlag(XdgShellSurface::State::Activated));
|
|
|
|
QVERIFY(!states.testFlag(XdgShellSurface::State::Resizing));
|
|
|
|
|
|
|
|
// Destroy the client.
|
2017-01-29 13:01:15 +00:00
|
|
|
surface.reset();
|
|
|
|
QVERIFY(Test::waitForWindowDestroyed(c));
|
|
|
|
}
|
|
|
|
|
2015-10-26 10:30:34 +00:00
|
|
|
void MoveResizeWindowTest::testPackTo_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QString>("methodCall");
|
|
|
|
QTest::addColumn<QRect>("expectedGeometry");
|
|
|
|
|
|
|
|
QTest::newRow("left") << QStringLiteral("slotWindowPackLeft") << QRect(0, 487, 100, 50);
|
|
|
|
QTest::newRow("up") << QStringLiteral("slotWindowPackUp") << QRect(590, 0, 100, 50);
|
|
|
|
QTest::newRow("right") << QStringLiteral("slotWindowPackRight") << QRect(1180, 487, 100, 50);
|
|
|
|
QTest::newRow("down") << QStringLiteral("slotWindowPackDown") << QRect(590, 974, 100, 50);
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testPackTo()
|
|
|
|
{
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
2015-10-26 10:30:34 +00:00
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
2015-10-26 10:30:34 +00:00
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
QSignalSpy sizeChangeSpy(shellSurface.data(), &ShellSurface::sizeChanged);
|
|
|
|
QVERIFY(sizeChangeSpy.isValid());
|
|
|
|
// let's render
|
2016-07-01 07:54:44 +00:00
|
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
2015-10-26 10:30:34 +00:00
|
|
|
|
|
|
|
QVERIFY(c);
|
2016-07-01 07:54:44 +00:00
|
|
|
QCOMPARE(workspace()->activeClient(), c);
|
2015-10-26 10:30:34 +00:00
|
|
|
QCOMPARE(c->geometry(), QRect(0, 0, 100, 50));
|
|
|
|
|
|
|
|
// let's place it centered
|
|
|
|
Placement::self()->placeCentered(c, QRect(0, 0, 1280, 1024));
|
|
|
|
QCOMPARE(c->geometry(), QRect(590, 487, 100, 50));
|
|
|
|
|
|
|
|
QFETCH(QString, methodCall);
|
|
|
|
QMetaObject::invokeMethod(workspace(), methodCall.toLocal8Bit().constData());
|
|
|
|
QTEST(c->geometry(), "expectedGeometry");
|
2016-07-01 10:37:09 +00:00
|
|
|
surface.reset();
|
|
|
|
QVERIFY(Test::waitForWindowDestroyed(c));
|
2015-10-26 10:30:34 +00:00
|
|
|
}
|
|
|
|
|
2015-10-26 12:25:47 +00:00
|
|
|
void MoveResizeWindowTest::testPackAgainstClient_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QString>("methodCall");
|
|
|
|
QTest::addColumn<QRect>("expectedGeometry");
|
|
|
|
|
|
|
|
QTest::newRow("left") << QStringLiteral("slotWindowPackLeft") << QRect(10, 487, 100, 50);
|
|
|
|
QTest::newRow("up") << QStringLiteral("slotWindowPackUp") << QRect(590, 10, 100, 50);
|
|
|
|
QTest::newRow("right") << QStringLiteral("slotWindowPackRight") << QRect(1170, 487, 100, 50);
|
|
|
|
QTest::newRow("down") << QStringLiteral("slotWindowPackDown") << QRect(590, 964, 100, 50);
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testPackAgainstClient()
|
|
|
|
{
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface1(Test::createSurface());
|
2015-10-26 12:25:47 +00:00
|
|
|
QVERIFY(!surface1.isNull());
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface2(Test::createSurface());
|
2015-10-26 12:25:47 +00:00
|
|
|
QVERIFY(!surface2.isNull());
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface3(Test::createSurface());
|
2015-10-26 12:25:47 +00:00
|
|
|
QVERIFY(!surface3.isNull());
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface4(Test::createSurface());
|
2015-10-26 12:25:47 +00:00
|
|
|
QVERIFY(!surface4.isNull());
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface1(Test::createShellSurface(surface1.data()));
|
2015-10-26 12:25:47 +00:00
|
|
|
QVERIFY(!shellSurface1.isNull());
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface2(Test::createShellSurface(surface2.data()));
|
2015-10-26 12:25:47 +00:00
|
|
|
QVERIFY(!shellSurface2.isNull());
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface3(Test::createShellSurface(surface3.data()));
|
2015-10-26 12:25:47 +00:00
|
|
|
QVERIFY(!shellSurface3.isNull());
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface4(Test::createShellSurface(surface4.data()));
|
2015-10-26 12:25:47 +00:00
|
|
|
QVERIFY(!shellSurface4.isNull());
|
2016-07-01 07:54:44 +00:00
|
|
|
auto renderWindow = [this] (Surface *surface, const QString &methodCall, const QRect &expectedGeometry) {
|
2015-10-26 12:25:47 +00:00
|
|
|
// let's render
|
2016-07-01 07:54:44 +00:00
|
|
|
auto c = Test::renderAndWaitForShown(surface, QSize(10, 10), Qt::blue);
|
2015-10-26 12:25:47 +00:00
|
|
|
|
|
|
|
QVERIFY(c);
|
2016-07-01 07:54:44 +00:00
|
|
|
QCOMPARE(workspace()->activeClient(), c);
|
2015-10-26 12:25:47 +00:00
|
|
|
QCOMPARE(c->geometry().size(), QSize(10, 10));
|
|
|
|
// let's place it centered
|
|
|
|
Placement::self()->placeCentered(c, QRect(0, 0, 1280, 1024));
|
|
|
|
QCOMPARE(c->geometry(), QRect(635, 507, 10, 10));
|
|
|
|
QMetaObject::invokeMethod(workspace(), methodCall.toLocal8Bit().constData());
|
|
|
|
QCOMPARE(c->geometry(), expectedGeometry);
|
|
|
|
};
|
|
|
|
renderWindow(surface1.data(), QStringLiteral("slotWindowPackLeft"), QRect(0, 507, 10, 10));
|
|
|
|
renderWindow(surface2.data(), QStringLiteral("slotWindowPackUp"), QRect(635, 0, 10, 10));
|
|
|
|
renderWindow(surface3.data(), QStringLiteral("slotWindowPackRight"), QRect(1270, 507, 10, 10));
|
|
|
|
renderWindow(surface4.data(), QStringLiteral("slotWindowPackDown"), QRect(635, 1014, 10, 10));
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
2015-10-26 12:25:47 +00:00
|
|
|
QVERIFY(!surface.isNull());
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
2015-10-26 12:25:47 +00:00
|
|
|
QVERIFY(!shellSurface.isNull());
|
2016-07-01 07:54:44 +00:00
|
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
2015-10-26 12:25:47 +00:00
|
|
|
|
|
|
|
QVERIFY(c);
|
2016-07-01 07:54:44 +00:00
|
|
|
QCOMPARE(workspace()->activeClient(), c);
|
2015-10-26 12:25:47 +00:00
|
|
|
// let's place it centered
|
|
|
|
Placement::self()->placeCentered(c, QRect(0, 0, 1280, 1024));
|
|
|
|
QCOMPARE(c->geometry(), QRect(590, 487, 100, 50));
|
|
|
|
|
|
|
|
QFETCH(QString, methodCall);
|
|
|
|
QMetaObject::invokeMethod(workspace(), methodCall.toLocal8Bit().constData());
|
|
|
|
QTEST(c->geometry(), "expectedGeometry");
|
|
|
|
}
|
|
|
|
|
2015-10-26 14:49:03 +00:00
|
|
|
void MoveResizeWindowTest::testGrowShrink_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QString>("methodCall");
|
|
|
|
QTest::addColumn<QRect>("expectedGeometry");
|
|
|
|
|
|
|
|
QTest::newRow("grow vertical") << QStringLiteral("slotWindowGrowVertical") << QRect(590, 487, 100, 537);
|
|
|
|
QTest::newRow("grow horizontal") << QStringLiteral("slotWindowGrowHorizontal") << QRect(590, 487, 690, 50);
|
|
|
|
QTest::newRow("shrink vertical") << QStringLiteral("slotWindowShrinkVertical") << QRect(590, 487, 100, 23);
|
|
|
|
QTest::newRow("shrink horizontal") << QStringLiteral("slotWindowShrinkHorizontal") << QRect(590, 487, 40, 50);
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testGrowShrink()
|
|
|
|
{
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
|
|
|
|
// block geometry helper
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface1(Test::createSurface());
|
2015-10-26 14:49:03 +00:00
|
|
|
QVERIFY(!surface1.isNull());
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface1(Test::createShellSurface(surface1.data()));
|
2015-10-26 14:49:03 +00:00
|
|
|
QVERIFY(!shellSurface1.isNull());
|
2016-06-30 11:32:54 +00:00
|
|
|
Test::render(surface1.data(), QSize(650, 514), Qt::blue);
|
2016-07-01 07:54:44 +00:00
|
|
|
QVERIFY(Test::waitForWaylandWindowShown());
|
2015-10-26 14:49:03 +00:00
|
|
|
workspace()->slotWindowPackRight();
|
|
|
|
workspace()->slotWindowPackDown();
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
2015-10-26 14:49:03 +00:00
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
2015-10-26 14:49:03 +00:00
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
QSignalSpy sizeChangeSpy(shellSurface.data(), &ShellSurface::sizeChanged);
|
|
|
|
QVERIFY(sizeChangeSpy.isValid());
|
|
|
|
// let's render
|
2016-07-01 07:54:44 +00:00
|
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
2015-10-26 14:49:03 +00:00
|
|
|
|
|
|
|
QVERIFY(c);
|
2016-07-01 07:54:44 +00:00
|
|
|
QCOMPARE(workspace()->activeClient(), c);
|
2015-10-26 14:49:03 +00:00
|
|
|
|
|
|
|
// let's place it centered
|
|
|
|
Placement::self()->placeCentered(c, QRect(0, 0, 1280, 1024));
|
|
|
|
QCOMPARE(c->geometry(), QRect(590, 487, 100, 50));
|
|
|
|
|
|
|
|
QFETCH(QString, methodCall);
|
|
|
|
QMetaObject::invokeMethod(workspace(), methodCall.toLocal8Bit().constData());
|
|
|
|
QVERIFY(sizeChangeSpy.wait());
|
2016-06-30 11:32:54 +00:00
|
|
|
Test::render(surface.data(), shellSurface->size(), Qt::red);
|
2015-10-26 14:49:03 +00:00
|
|
|
|
|
|
|
QSignalSpy geometryChangedSpy(c, &AbstractClient::geometryChanged);
|
|
|
|
QVERIFY(geometryChangedSpy.isValid());
|
|
|
|
m_connection->flush();
|
|
|
|
QVERIFY(geometryChangedSpy.wait());
|
|
|
|
QTEST(c->geometry(), "expectedGeometry");
|
|
|
|
}
|
|
|
|
|
2016-02-17 10:00:58 +00:00
|
|
|
void MoveResizeWindowTest::testPointerMoveEnd_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<int>("additionalButton");
|
|
|
|
|
|
|
|
QTest::newRow("BTN_RIGHT") << BTN_RIGHT;
|
|
|
|
QTest::newRow("BTN_MIDDLE") << BTN_MIDDLE;
|
|
|
|
QTest::newRow("BTN_SIDE") << BTN_SIDE;
|
|
|
|
QTest::newRow("BTN_EXTRA") << BTN_EXTRA;
|
|
|
|
QTest::newRow("BTN_FORWARD") << BTN_FORWARD;
|
|
|
|
QTest::newRow("BTN_BACK") << BTN_BACK;
|
|
|
|
QTest::newRow("BTN_TASK") << BTN_TASK;
|
|
|
|
for (int i=BTN_TASK + 1; i < BTN_JOYSTICK; i++) {
|
|
|
|
QTest::newRow(QByteArray::number(i, 16).constData()) << i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testPointerMoveEnd()
|
|
|
|
{
|
|
|
|
// this test verifies that moving a window through pointer only ends if all buttons are released
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
2016-02-17 10:00:58 +00:00
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
2016-02-17 10:00:58 +00:00
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
QSignalSpy sizeChangeSpy(shellSurface.data(), &ShellSurface::sizeChanged);
|
|
|
|
QVERIFY(sizeChangeSpy.isValid());
|
|
|
|
// let's render
|
2016-07-01 07:54:44 +00:00
|
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
2016-02-17 10:00:58 +00:00
|
|
|
|
|
|
|
QVERIFY(c);
|
2016-07-01 07:54:44 +00:00
|
|
|
QCOMPARE(c, workspace()->activeClient());
|
2016-02-17 10:00:58 +00:00
|
|
|
QVERIFY(!c->isMove());
|
|
|
|
|
|
|
|
// let's trigger the left button
|
|
|
|
quint32 timestamp = 1;
|
2016-04-07 06:28:35 +00:00
|
|
|
kwinApp()->platform()->pointerButtonPressed(BTN_LEFT, timestamp++);
|
2016-02-17 10:00:58 +00:00
|
|
|
QVERIFY(!c->isMove());
|
|
|
|
workspace()->slotWindowMove();
|
|
|
|
QVERIFY(c->isMove());
|
|
|
|
|
|
|
|
// let's press another button
|
|
|
|
QFETCH(int, additionalButton);
|
2016-04-07 06:28:35 +00:00
|
|
|
kwinApp()->platform()->pointerButtonPressed(additionalButton, timestamp++);
|
2016-02-17 10:00:58 +00:00
|
|
|
QVERIFY(c->isMove());
|
|
|
|
|
|
|
|
// release the left button, should still have the window moving
|
2016-04-07 06:28:35 +00:00
|
|
|
kwinApp()->platform()->pointerButtonReleased(BTN_LEFT, timestamp++);
|
2016-02-17 10:00:58 +00:00
|
|
|
QVERIFY(c->isMove());
|
|
|
|
|
|
|
|
// but releasing the other button should now end moving
|
2016-04-07 06:28:35 +00:00
|
|
|
kwinApp()->platform()->pointerButtonReleased(additionalButton, timestamp++);
|
2016-02-17 10:00:58 +00:00
|
|
|
QVERIFY(!c->isMove());
|
2016-07-01 13:21:37 +00:00
|
|
|
surface.reset();
|
|
|
|
QVERIFY(Test::waitForWindowDestroyed(c));
|
2016-02-17 10:00:58 +00:00
|
|
|
}
|
2016-10-24 15:09:40 +00:00
|
|
|
void MoveResizeWindowTest::testClientSideMove_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<Test::ShellSurfaceType>("type");
|
|
|
|
|
|
|
|
QTest::newRow("wlShell") << Test::ShellSurfaceType::WlShell;
|
|
|
|
QTest::newRow("xdgShellV5") << Test::ShellSurfaceType::XdgShellV5;
|
XdgV6 - Kwin side
Summary:
Adds XDGV6 support for the kwin side.
Popup placement support is limited to the stuff v5 had,
a simple offset, rather than the awesome new positioner.
But Qt doesn't make use of it yet either.
Also ideally we should do all the positioning before sending the first
configure, but again Qt doesn't actually do anything with that anyway.
Also integrate pinging clients
Test Plan: gtk3-demo works nicely.
Reviewers: #plasma, graesslin, mart
Reviewed By: #plasma, graesslin
Subscribers: mart, graesslin, kwin, plasma-devel, #kwin
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D6591
2017-09-25 15:37:59 +00:00
|
|
|
QTest::newRow("xdgShellV6") << Test::ShellSurfaceType::XdgShellV6;
|
2019-01-16 10:06:22 +00:00
|
|
|
QTest::newRow("xdgWmBase") << Test::ShellSurfaceType::XdgShellStable;
|
2016-10-24 15:09:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testClientSideMove()
|
|
|
|
{
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
Cursor::setPos(640, 512);
|
|
|
|
QScopedPointer<Pointer> pointer(Test::waylandSeat()->createPointer());
|
|
|
|
QSignalSpy pointerEnteredSpy(pointer.data(), &Pointer::entered);
|
|
|
|
QVERIFY(pointerEnteredSpy.isValid());
|
|
|
|
QSignalSpy pointerLeftSpy(pointer.data(), &Pointer::left);
|
|
|
|
QVERIFY(pointerLeftSpy.isValid());
|
|
|
|
QSignalSpy buttonSpy(pointer.data(), &Pointer::buttonStateChanged);
|
|
|
|
QVERIFY(buttonSpy.isValid());
|
|
|
|
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QFETCH(Test::ShellSurfaceType, type);
|
|
|
|
QScopedPointer<QObject> shellSurface(Test::createShellSurface(type, surface.data()));
|
|
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(c);
|
|
|
|
|
|
|
|
// move pointer into center of geometry
|
|
|
|
const QRect startGeometry = c->geometry();
|
|
|
|
Cursor::setPos(startGeometry.center());
|
|
|
|
QVERIFY(pointerEnteredSpy.wait());
|
|
|
|
QCOMPARE(pointerEnteredSpy.first().last().toPoint(), QPoint(49, 24));
|
|
|
|
// simulate press
|
|
|
|
quint32 timestamp = 1;
|
|
|
|
kwinApp()->platform()->pointerButtonPressed(BTN_LEFT, timestamp++);
|
|
|
|
QVERIFY(buttonSpy.wait());
|
|
|
|
QSignalSpy moveStartSpy(c, &AbstractClient::clientStartUserMovedResized);
|
|
|
|
QVERIFY(moveStartSpy.isValid());
|
|
|
|
if (auto s = qobject_cast<ShellSurface*>(shellSurface.data())) {
|
|
|
|
s->requestMove(Test::waylandSeat(), buttonSpy.first().first().value<quint32>());
|
|
|
|
} else if (auto s = qobject_cast<XdgShellSurface*>(shellSurface.data())) {
|
|
|
|
s->requestMove(Test::waylandSeat(), buttonSpy.first().first().value<quint32>());
|
|
|
|
}
|
|
|
|
QVERIFY(moveStartSpy.wait());
|
|
|
|
QCOMPARE(c->isMove(), true);
|
|
|
|
QVERIFY(pointerLeftSpy.wait());
|
|
|
|
|
|
|
|
// move a bit
|
|
|
|
QSignalSpy clientMoveStepSpy(c, &AbstractClient::clientStepUserMovedResized);
|
|
|
|
QVERIFY(clientMoveStepSpy.isValid());
|
|
|
|
const QPoint startPoint = startGeometry.center();
|
|
|
|
const int dragDistance = QApplication::startDragDistance();
|
|
|
|
// Why?
|
|
|
|
kwinApp()->platform()->pointerMotion(startPoint + QPoint(dragDistance, dragDistance) + QPoint(6, 6), timestamp++);
|
|
|
|
QCOMPARE(clientMoveStepSpy.count(), 1);
|
|
|
|
|
|
|
|
// and release again
|
|
|
|
kwinApp()->platform()->pointerButtonReleased(BTN_LEFT, timestamp++);
|
|
|
|
QVERIFY(pointerEnteredSpy.wait());
|
|
|
|
QCOMPARE(c->isMove(), false);
|
|
|
|
QCOMPARE(c->geometry(), startGeometry.translated(QPoint(dragDistance, dragDistance) + QPoint(6, 6)));
|
|
|
|
QCOMPARE(pointerEnteredSpy.last().last().toPoint(), QPoint(49, 24));
|
|
|
|
}
|
2016-02-17 10:00:58 +00:00
|
|
|
|
2016-03-16 14:35:24 +00:00
|
|
|
void MoveResizeWindowTest::testPlasmaShellSurfaceMovable_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<KWayland::Client::PlasmaShellSurface::Role>("role");
|
|
|
|
QTest::addColumn<bool>("movable");
|
|
|
|
QTest::addColumn<bool>("movableAcrossScreens");
|
|
|
|
QTest::addColumn<bool>("resizable");
|
|
|
|
|
|
|
|
QTest::newRow("normal") << KWayland::Client::PlasmaShellSurface::Role::Normal << true << true << true;
|
|
|
|
QTest::newRow("desktop") << KWayland::Client::PlasmaShellSurface::Role::Desktop << false << false << false;
|
|
|
|
QTest::newRow("panel") << KWayland::Client::PlasmaShellSurface::Role::Panel << false << false << false;
|
|
|
|
QTest::newRow("osd") << KWayland::Client::PlasmaShellSurface::Role::OnScreenDisplay << false << false << false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testPlasmaShellSurfaceMovable()
|
|
|
|
{
|
|
|
|
// this test verifies that certain window types from PlasmaShellSurface are not moveable or resizable
|
|
|
|
using namespace KWayland::Client;
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
2016-03-16 14:35:24 +00:00
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
2016-03-16 14:35:24 +00:00
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
// and a PlasmaShellSurface
|
2016-06-30 11:32:54 +00:00
|
|
|
QScopedPointer<PlasmaShellSurface> plasmaSurface(Test::waylandPlasmaShell()->createSurface(surface.data()));
|
2016-03-16 14:35:24 +00:00
|
|
|
QVERIFY(!plasmaSurface.isNull());
|
|
|
|
QFETCH(KWayland::Client::PlasmaShellSurface::Role, role);
|
|
|
|
plasmaSurface->setRole(role);
|
|
|
|
// let's render
|
2016-07-01 07:54:44 +00:00
|
|
|
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
2016-03-16 14:35:24 +00:00
|
|
|
|
|
|
|
QVERIFY(c);
|
|
|
|
QTEST(c->isMovable(), "movable");
|
|
|
|
QTEST(c->isMovableAcrossScreens(), "movableAcrossScreens");
|
|
|
|
QTEST(c->isResizable(), "resizable");
|
2016-07-01 13:21:37 +00:00
|
|
|
surface.reset();
|
|
|
|
QVERIFY(Test::waitForWindowDestroyed(c));
|
2016-03-16 14:35:24 +00:00
|
|
|
}
|
|
|
|
|
2016-11-02 10:28:54 +00:00
|
|
|
struct XcbConnectionDeleter
|
|
|
|
{
|
|
|
|
static inline void cleanup(xcb_connection_t *pointer)
|
|
|
|
{
|
|
|
|
xcb_disconnect(pointer);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2016-04-15 14:07:39 +00:00
|
|
|
void MoveResizeWindowTest::testNetMove()
|
|
|
|
{
|
|
|
|
// this test verifies that a move request for an X11 window through NET API works
|
|
|
|
// 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());
|
|
|
|
xcb_create_window(c.data(), XCB_COPY_FROM_PARENT, w, rootWindow(),
|
|
|
|
0, 0, 100, 100,
|
|
|
|
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, 0, 0);
|
|
|
|
xcb_icccm_size_hints_set_size(&hints, 1, 100, 100);
|
|
|
|
xcb_icccm_set_wm_normal_hints(c.data(), w, &hints);
|
|
|
|
// let's set a no-border
|
|
|
|
NETWinInfo winInfo(c.data(), w, rootWindow(), NET::WMWindowType, NET::Properties2());
|
|
|
|
winInfo.setWindowType(NET::Override);
|
|
|
|
xcb_map_window(c.data(), w);
|
|
|
|
xcb_flush(c.data());
|
|
|
|
|
|
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
|
|
|
|
QVERIFY(windowCreatedSpy.isValid());
|
|
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
|
|
Client *client = windowCreatedSpy.first().first().value<Client*>();
|
|
|
|
QVERIFY(client);
|
|
|
|
QCOMPARE(client->window(), w);
|
|
|
|
const QRect origGeo = client->geometry();
|
|
|
|
|
|
|
|
// let's move the cursor outside the window
|
|
|
|
Cursor::setPos(screens()->geometry(0).center());
|
|
|
|
QVERIFY(!origGeo.contains(Cursor::pos()));
|
|
|
|
|
|
|
|
QSignalSpy moveStartSpy(client, &Client::clientStartUserMovedResized);
|
|
|
|
QVERIFY(moveStartSpy.isValid());
|
|
|
|
QSignalSpy moveEndSpy(client, &Client::clientFinishUserMovedResized);
|
|
|
|
QVERIFY(moveEndSpy.isValid());
|
|
|
|
QSignalSpy moveStepSpy(client, &Client::clientStepUserMovedResized);
|
|
|
|
QVERIFY(moveStepSpy.isValid());
|
2019-04-18 12:28:11 +00:00
|
|
|
QVERIFY(!workspace()->moveResizeClient());
|
2016-04-15 14:07:39 +00:00
|
|
|
|
|
|
|
// use NETRootInfo to trigger a move request
|
|
|
|
NETRootInfo root(c.data(), NET::Properties());
|
|
|
|
root.moveResizeRequest(w, origGeo.center().x(), origGeo.center().y(), NET::Move);
|
|
|
|
xcb_flush(c.data());
|
|
|
|
|
|
|
|
QVERIFY(moveStartSpy.wait());
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), client);
|
2016-04-15 14:07:39 +00:00
|
|
|
QVERIFY(client->isMove());
|
|
|
|
QCOMPARE(client->geometryRestore(), origGeo);
|
|
|
|
QCOMPARE(Cursor::pos(), origGeo.center());
|
|
|
|
|
|
|
|
// let's move a step
|
|
|
|
Cursor::setPos(Cursor::pos() + QPoint(10, 10));
|
|
|
|
QCOMPARE(moveStepSpy.count(), 1);
|
|
|
|
QCOMPARE(moveStepSpy.first().last().toRect(), origGeo.translated(10, 10));
|
|
|
|
|
|
|
|
// let's cancel the move resize again through the net API
|
|
|
|
root.moveResizeRequest(w, client->geometry().center().x(), client->geometry().center().y(), NET::MoveResizeCancel);
|
|
|
|
xcb_flush(c.data());
|
|
|
|
QVERIFY(moveEndSpy.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, &Client::windowClosed);
|
|
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
|
|
QVERIFY(windowClosedSpy.wait());
|
|
|
|
}
|
|
|
|
|
2016-11-02 10:28:54 +00:00
|
|
|
void MoveResizeWindowTest::testAdjustClientGeometryOfAutohidingX11Panel_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QRect>("panelGeometry");
|
|
|
|
QTest::addColumn<QPoint>("targetPoint");
|
|
|
|
QTest::addColumn<QPoint>("expectedAdjustedPoint");
|
|
|
|
QTest::addColumn<quint32>("hideLocation");
|
|
|
|
|
|
|
|
QTest::newRow("top") << QRect(0, 0, 100, 20) << QPoint(50, 25) << QPoint(50, 20) << 0u;
|
|
|
|
QTest::newRow("bottom") << QRect(0, 1024-20, 100, 20) << QPoint(50, 1024 - 25 - 50) << QPoint(50, 1024 - 20 - 50) << 2u;
|
|
|
|
QTest::newRow("left") << QRect(0, 0, 20, 100) << QPoint(25, 50) << QPoint(20, 50) << 3u;
|
|
|
|
QTest::newRow("right") << QRect(1280 - 20, 0, 20, 100) << QPoint(1280 - 25 - 100, 50) << QPoint(1280 - 20 - 100, 50) << 1u;
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testAdjustClientGeometryOfAutohidingX11Panel()
|
|
|
|
{
|
|
|
|
// this test verifies that auto hiding panels are ignored when adjusting client geometry
|
|
|
|
// see BUG 365892
|
|
|
|
|
|
|
|
// first create our 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());
|
|
|
|
QFETCH(QRect, panelGeometry);
|
|
|
|
xcb_create_window(c.data(), XCB_COPY_FROM_PARENT, w, rootWindow(),
|
|
|
|
panelGeometry.x(), panelGeometry.y(), panelGeometry.width(), panelGeometry.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, panelGeometry.x(), panelGeometry.y());
|
|
|
|
xcb_icccm_size_hints_set_size(&hints, 1, panelGeometry.width(), panelGeometry.height());
|
|
|
|
xcb_icccm_set_wm_normal_hints(c.data(), w, &hints);
|
|
|
|
NETWinInfo winInfo(c.data(), w, rootWindow(), NET::WMWindowType, NET::Properties2());
|
|
|
|
winInfo.setWindowType(NET::Dock);
|
|
|
|
xcb_map_window(c.data(), w);
|
|
|
|
xcb_flush(c.data());
|
|
|
|
|
|
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::clientAdded);
|
|
|
|
QVERIFY(windowCreatedSpy.isValid());
|
|
|
|
QVERIFY(windowCreatedSpy.wait());
|
|
|
|
Client *panel = windowCreatedSpy.first().first().value<Client*>();
|
|
|
|
QVERIFY(panel);
|
|
|
|
QCOMPARE(panel->window(), w);
|
|
|
|
QCOMPARE(panel->geometry(), panelGeometry);
|
|
|
|
QVERIFY(panel->isDock());
|
|
|
|
|
|
|
|
// let's create a window
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
|
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
auto testWindow = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
|
|
|
|
QVERIFY(testWindow);
|
|
|
|
QVERIFY(testWindow->isMovable());
|
|
|
|
// panel is not yet hidden, we should snap against it
|
|
|
|
QFETCH(QPoint, targetPoint);
|
|
|
|
QTEST(Workspace::self()->adjustClientPosition(testWindow, targetPoint, false), "expectedAdjustedPoint");
|
|
|
|
|
|
|
|
// now let's hide the panel
|
|
|
|
QSignalSpy panelHiddenSpy(panel, &AbstractClient::windowHidden);
|
|
|
|
QVERIFY(panelHiddenSpy.isValid());
|
|
|
|
QFETCH(quint32, hideLocation);
|
|
|
|
xcb_change_property(c.data(), XCB_PROP_MODE_REPLACE, w, atoms->kde_screen_edge_show, XCB_ATOM_CARDINAL, 32, 1, &hideLocation);
|
|
|
|
xcb_flush(c.data());
|
|
|
|
QVERIFY(panelHiddenSpy.wait());
|
|
|
|
|
|
|
|
// now try to snap again
|
|
|
|
QCOMPARE(Workspace::self()->adjustClientPosition(testWindow, targetPoint, false), targetPoint);
|
|
|
|
|
|
|
|
// and destroy the panel again
|
|
|
|
xcb_unmap_window(c.data(), w);
|
|
|
|
xcb_destroy_window(c.data(), w);
|
|
|
|
xcb_flush(c.data());
|
|
|
|
c.reset();
|
|
|
|
|
|
|
|
QSignalSpy panelClosedSpy(panel, &Client::windowClosed);
|
|
|
|
QVERIFY(panelClosedSpy.isValid());
|
|
|
|
QVERIFY(panelClosedSpy.wait());
|
|
|
|
|
|
|
|
// snap once more
|
|
|
|
QCOMPARE(Workspace::self()->adjustClientPosition(testWindow, targetPoint, false), targetPoint);
|
|
|
|
|
|
|
|
// and close
|
|
|
|
QSignalSpy windowClosedSpy(testWindow, &ShellClient::windowClosed);
|
|
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
|
|
shellSurface.reset();
|
|
|
|
surface.reset();
|
|
|
|
QVERIFY(windowClosedSpy.wait());
|
|
|
|
}
|
|
|
|
|
2016-11-02 10:51:01 +00:00
|
|
|
void MoveResizeWindowTest::testAdjustClientGeometryOfAutohidingWaylandPanel_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QRect>("panelGeometry");
|
|
|
|
QTest::addColumn<QPoint>("targetPoint");
|
|
|
|
QTest::addColumn<QPoint>("expectedAdjustedPoint");
|
|
|
|
|
|
|
|
QTest::newRow("top") << QRect(0, 0, 100, 20) << QPoint(50, 25) << QPoint(50, 20);
|
|
|
|
QTest::newRow("bottom") << QRect(0, 1024-20, 100, 20) << QPoint(50, 1024 - 25 - 50) << QPoint(50, 1024 - 20 - 50);
|
|
|
|
QTest::newRow("left") << QRect(0, 0, 20, 100) << QPoint(25, 50) << QPoint(20, 50);
|
|
|
|
QTest::newRow("right") << QRect(1280 - 20, 0, 20, 100) << QPoint(1280 - 25 - 100, 50) << QPoint(1280 - 20 - 100, 50);
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testAdjustClientGeometryOfAutohidingWaylandPanel()
|
|
|
|
{
|
|
|
|
// this test verifies that auto hiding panels are ignored when adjusting client geometry
|
|
|
|
// see BUG 365892
|
|
|
|
|
|
|
|
// first create our panel
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
QScopedPointer<Surface> panelSurface(Test::createSurface());
|
|
|
|
QVERIFY(!panelSurface.isNull());
|
|
|
|
QScopedPointer<ShellSurface> panelShellSurface(Test::createShellSurface(panelSurface.data()));
|
|
|
|
QVERIFY(!panelShellSurface.isNull());
|
|
|
|
QScopedPointer<PlasmaShellSurface> plasmaSurface(Test::waylandPlasmaShell()->createSurface(panelSurface.data()));
|
|
|
|
QVERIFY(!plasmaSurface.isNull());
|
|
|
|
plasmaSurface->setRole(PlasmaShellSurface::Role::Panel);
|
|
|
|
plasmaSurface->setPanelBehavior(PlasmaShellSurface::PanelBehavior::AutoHide);
|
|
|
|
QFETCH(QRect, panelGeometry);
|
|
|
|
plasmaSurface->setPosition(panelGeometry.topLeft());
|
|
|
|
// let's render
|
|
|
|
auto panel = Test::renderAndWaitForShown(panelSurface.data(), panelGeometry.size(), Qt::blue);
|
|
|
|
QVERIFY(panel);
|
|
|
|
QCOMPARE(panel->geometry(), panelGeometry);
|
|
|
|
QVERIFY(panel->isDock());
|
|
|
|
|
|
|
|
// let's create a window
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
|
|
|
QScopedPointer<ShellSurface> shellSurface(Test::createShellSurface(surface.data()));
|
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
auto testWindow = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
|
|
|
|
QVERIFY(testWindow);
|
|
|
|
QVERIFY(testWindow->isMovable());
|
|
|
|
// panel is not yet hidden, we should snap against it
|
|
|
|
QFETCH(QPoint, targetPoint);
|
|
|
|
QTEST(Workspace::self()->adjustClientPosition(testWindow, targetPoint, false), "expectedAdjustedPoint");
|
|
|
|
|
|
|
|
// now let's hide the panel
|
|
|
|
QSignalSpy panelHiddenSpy(panel, &AbstractClient::windowHidden);
|
|
|
|
QVERIFY(panelHiddenSpy.isValid());
|
|
|
|
plasmaSurface->requestHideAutoHidingPanel();
|
|
|
|
QVERIFY(panelHiddenSpy.wait());
|
|
|
|
|
|
|
|
// now try to snap again
|
|
|
|
QCOMPARE(Workspace::self()->adjustClientPosition(testWindow, targetPoint, false), targetPoint);
|
|
|
|
|
|
|
|
// and destroy the panel again
|
|
|
|
QSignalSpy panelClosedSpy(panel, &ShellClient::windowClosed);
|
|
|
|
QVERIFY(panelClosedSpy.isValid());
|
|
|
|
plasmaSurface.reset();
|
|
|
|
panelShellSurface.reset();
|
|
|
|
panelSurface.reset();
|
|
|
|
QVERIFY(panelClosedSpy.wait());
|
|
|
|
|
|
|
|
// snap once more
|
|
|
|
QCOMPARE(Workspace::self()->adjustClientPosition(testWindow, targetPoint, false), targetPoint);
|
|
|
|
|
|
|
|
// and close
|
|
|
|
QSignalSpy windowClosedSpy(testWindow, &ShellClient::windowClosed);
|
|
|
|
QVERIFY(windowClosedSpy.isValid());
|
|
|
|
shellSurface.reset();
|
|
|
|
surface.reset();
|
|
|
|
QVERIFY(windowClosedSpy.wait());
|
|
|
|
}
|
|
|
|
|
virtualkeyboard: resize the focused window to make room for the keyboard
Summary:
alternative approach: try to resize the winidow to make room for the keyboard.
the new input wayland protocol doesn't have anymore the overlap rectangle (and it would not be going to work with qwidget apps anyways)
in the future will probably be needed anextension to the input protocol v3 which partially gets back this, tough window resizing is needed regardless
what's missing: the resize should be "temporary" and the window should be restored to its previous geometry when the keyboard closes
Test Plan: tested with test QML code
Reviewers: #plasma, #kwin, bshah, graesslin, romangg, davidedmundson
Reviewed By: #plasma, #kwin, romangg, davidedmundson
Subscribers: nicolasfella, mart, kwin, davidedmundson, graesslin
Tags: #kwin
Maniphest Tasks: T9815
Differential Revision: https://phabricator.kde.org/D18818
2019-03-20 10:04:51 +00:00
|
|
|
void MoveResizeWindowTest::testResizeForVirtualKeyboard()
|
|
|
|
{
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
|
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellSurface(
|
|
|
|
Test::ShellSurfaceType::XdgShellStable, surface.data()));
|
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
QSignalSpy configureRequestedSpy(shellSurface.data(), &XdgShellSurface::configureRequested);
|
|
|
|
|
|
|
|
// let's render
|
|
|
|
auto client = Test::renderAndWaitForShown(surface.data(), QSize(500, 800), Qt::blue);
|
|
|
|
client->move(100, 300);
|
|
|
|
QSignalSpy geometryChangedSpy(client, &ShellClient::geometryChanged);
|
|
|
|
|
|
|
|
QCOMPARE(client->geometry(), QRect(100, 300, 500, 800));
|
|
|
|
client->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500));
|
|
|
|
configureRequestedSpy.wait();
|
|
|
|
|
|
|
|
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
|
|
|
|
// render at the new size
|
|
|
|
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
|
|
|
|
geometryChangedSpy.wait();
|
|
|
|
|
|
|
|
QCOMPARE(client->geometry(), QRect(100, 0, 500, 101));
|
|
|
|
client->setVirtualKeyboardGeometry(QRect());
|
|
|
|
configureRequestedSpy.wait();
|
|
|
|
|
|
|
|
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
|
|
|
|
// render at the new size
|
|
|
|
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
|
|
|
|
geometryChangedSpy.wait();
|
|
|
|
QCOMPARE(client->geometry(), QRect(100, 300, 500, 800));
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testResizeForVirtualKeyboardWithMaximize()
|
|
|
|
{
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
|
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellSurface(
|
|
|
|
Test::ShellSurfaceType::XdgShellStable, surface.data()));
|
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
QSignalSpy configureRequestedSpy(shellSurface.data(), &XdgShellSurface::configureRequested);
|
|
|
|
|
|
|
|
// let's render
|
|
|
|
auto client = Test::renderAndWaitForShown(surface.data(), QSize(500, 800), Qt::blue);
|
|
|
|
client->move(100, 300);
|
|
|
|
QSignalSpy geometryChangedSpy(client, &ShellClient::geometryChanged);
|
|
|
|
|
|
|
|
QCOMPARE(client->geometry(), QRect(100, 300, 500, 800));
|
|
|
|
client->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500));
|
|
|
|
configureRequestedSpy.wait();
|
|
|
|
|
|
|
|
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
|
|
|
|
// render at the new size
|
|
|
|
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
|
|
|
|
geometryChangedSpy.wait();
|
|
|
|
|
|
|
|
QCOMPARE(client->geometry(), QRect(100, 0, 500, 101));
|
|
|
|
|
|
|
|
client->setMaximize(true, true);
|
|
|
|
configureRequestedSpy.wait();
|
|
|
|
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
|
|
|
|
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
|
|
|
|
geometryChangedSpy.wait();
|
|
|
|
QCOMPARE(client->geometry(), QRect(0, 0, 1280, 1024));
|
|
|
|
|
|
|
|
|
|
|
|
client->setVirtualKeyboardGeometry(QRect());
|
|
|
|
QVERIFY(!configureRequestedSpy.wait(10));
|
|
|
|
|
|
|
|
// render at the size of the configureRequested.. it won't have changed
|
|
|
|
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
|
|
|
|
QVERIFY(!geometryChangedSpy.wait(10));
|
|
|
|
|
|
|
|
// Size will NOT be restored
|
|
|
|
QCOMPARE(client->geometry(), QRect(0, 0, 1280, 1024));
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testResizeForVirtualKeyboardWithFullScreen()
|
|
|
|
{
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
|
|
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellSurface(
|
|
|
|
Test::ShellSurfaceType::XdgShellStable, surface.data()));
|
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
QSignalSpy configureRequestedSpy(shellSurface.data(), &XdgShellSurface::configureRequested);
|
|
|
|
|
|
|
|
// let's render
|
|
|
|
auto client = Test::renderAndWaitForShown(surface.data(), QSize(500, 800), Qt::blue);
|
|
|
|
client->move(100, 300);
|
|
|
|
QSignalSpy geometryChangedSpy(client, &ShellClient::geometryChanged);
|
|
|
|
|
|
|
|
QCOMPARE(client->geometry(), QRect(100, 300, 500, 800));
|
|
|
|
client->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500));
|
|
|
|
configureRequestedSpy.wait();
|
|
|
|
|
|
|
|
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
|
|
|
|
// render at the new size
|
|
|
|
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
|
|
|
|
geometryChangedSpy.wait();
|
|
|
|
|
|
|
|
QCOMPARE(client->geometry(), QRect(100, 0, 500, 101));
|
|
|
|
|
|
|
|
client->setFullScreen(true, true);
|
|
|
|
configureRequestedSpy.wait();
|
|
|
|
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
|
|
|
|
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
|
|
|
|
geometryChangedSpy.wait();
|
|
|
|
QCOMPARE(client->geometry(), QRect(0, 0, 1280, 1024));
|
|
|
|
|
|
|
|
|
|
|
|
client->setVirtualKeyboardGeometry(QRect());
|
|
|
|
QVERIFY(!configureRequestedSpy.wait(10));
|
|
|
|
|
|
|
|
// render at the size of the configureRequested.. it won't have changed
|
|
|
|
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
|
|
|
|
QVERIFY(!geometryChangedSpy.wait(10));
|
|
|
|
// Size will NOT be restored
|
|
|
|
QCOMPARE(client->geometry(), QRect(0, 0, 1280, 1024));
|
|
|
|
}
|
|
|
|
|
2019-03-12 09:35:17 +00:00
|
|
|
void MoveResizeWindowTest::testDestroyMoveClient()
|
|
|
|
{
|
|
|
|
// This test verifies that active move operation gets finished when
|
|
|
|
// the associated client is destroyed.
|
|
|
|
|
|
|
|
// Create the test client.
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data()));
|
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
ShellClient *client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(client);
|
|
|
|
|
|
|
|
// Start moving the client.
|
|
|
|
QSignalSpy clientStartMoveResizedSpy(client, &AbstractClient::clientStartUserMovedResized);
|
|
|
|
QVERIFY(clientStartMoveResizedSpy.isValid());
|
|
|
|
QSignalSpy clientFinishUserMovedResizedSpy(client, &AbstractClient::clientFinishUserMovedResized);
|
|
|
|
QVERIFY(clientFinishUserMovedResizedSpy.isValid());
|
|
|
|
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), nullptr);
|
2019-03-12 09:35:17 +00:00
|
|
|
QCOMPARE(client->isMove(), false);
|
|
|
|
QCOMPARE(client->isResize(), false);
|
|
|
|
workspace()->slotWindowMove();
|
|
|
|
QCOMPARE(clientStartMoveResizedSpy.count(), 1);
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), client);
|
2019-03-12 09:35:17 +00:00
|
|
|
QCOMPARE(client->isMove(), true);
|
|
|
|
QCOMPARE(client->isResize(), false);
|
|
|
|
|
|
|
|
// Let's pretend that the client crashed.
|
|
|
|
shellSurface.reset();
|
|
|
|
surface.reset();
|
|
|
|
QVERIFY(Test::waitForWindowDestroyed(client));
|
|
|
|
QCOMPARE(clientFinishUserMovedResizedSpy.count(), 0);
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), nullptr);
|
2019-03-12 09:35:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testDestroyResizeClient()
|
|
|
|
{
|
|
|
|
// This test verifies that active resize operation gets finished when
|
|
|
|
// the associated client is destroyed.
|
|
|
|
|
|
|
|
// Create the test client.
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data()));
|
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
ShellClient *client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(client);
|
|
|
|
|
|
|
|
// Start resizing the client.
|
|
|
|
QSignalSpy clientStartMoveResizedSpy(client, &AbstractClient::clientStartUserMovedResized);
|
|
|
|
QVERIFY(clientStartMoveResizedSpy.isValid());
|
|
|
|
QSignalSpy clientFinishUserMovedResizedSpy(client, &AbstractClient::clientFinishUserMovedResized);
|
|
|
|
QVERIFY(clientFinishUserMovedResizedSpy.isValid());
|
|
|
|
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), nullptr);
|
2019-03-12 09:35:17 +00:00
|
|
|
QCOMPARE(client->isMove(), false);
|
|
|
|
QCOMPARE(client->isResize(), false);
|
|
|
|
workspace()->slotWindowResize();
|
|
|
|
QCOMPARE(clientStartMoveResizedSpy.count(), 1);
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), client);
|
2019-03-12 09:35:17 +00:00
|
|
|
QCOMPARE(client->isMove(), false);
|
|
|
|
QCOMPARE(client->isResize(), true);
|
|
|
|
|
|
|
|
// Let's pretend that the client crashed.
|
|
|
|
shellSurface.reset();
|
|
|
|
surface.reset();
|
|
|
|
QVERIFY(Test::waitForWindowDestroyed(client));
|
|
|
|
QCOMPARE(clientFinishUserMovedResizedSpy.count(), 0);
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), nullptr);
|
2019-03-12 09:35:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testUnmapMoveClient()
|
|
|
|
{
|
|
|
|
// This test verifies that active move operation gets cancelled when
|
|
|
|
// the associated client is unmapped.
|
|
|
|
|
|
|
|
// Create the test client.
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data()));
|
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
ShellClient *client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(client);
|
|
|
|
|
|
|
|
// Start resizing the client.
|
|
|
|
QSignalSpy clientStartMoveResizedSpy(client, &AbstractClient::clientStartUserMovedResized);
|
|
|
|
QVERIFY(clientStartMoveResizedSpy.isValid());
|
|
|
|
QSignalSpy clientFinishUserMovedResizedSpy(client, &AbstractClient::clientFinishUserMovedResized);
|
|
|
|
QVERIFY(clientFinishUserMovedResizedSpy.isValid());
|
|
|
|
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), nullptr);
|
2019-03-12 09:35:17 +00:00
|
|
|
QCOMPARE(client->isMove(), false);
|
|
|
|
QCOMPARE(client->isResize(), false);
|
|
|
|
workspace()->slotWindowMove();
|
|
|
|
QCOMPARE(clientStartMoveResizedSpy.count(), 1);
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), client);
|
2019-03-12 09:35:17 +00:00
|
|
|
QCOMPARE(client->isMove(), true);
|
|
|
|
QCOMPARE(client->isResize(), false);
|
|
|
|
|
|
|
|
// Unmap the client while we're moving it.
|
|
|
|
QSignalSpy hiddenSpy(client, &ShellClient::windowHidden);
|
|
|
|
QVERIFY(hiddenSpy.isValid());
|
|
|
|
surface->attachBuffer(Buffer::Ptr());
|
|
|
|
surface->commit(Surface::CommitFlag::None);
|
|
|
|
QVERIFY(hiddenSpy.wait());
|
|
|
|
QCOMPARE(clientFinishUserMovedResizedSpy.count(), 0);
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), nullptr);
|
2019-03-12 09:35:17 +00:00
|
|
|
QCOMPARE(client->isMove(), false);
|
|
|
|
QCOMPARE(client->isResize(), false);
|
|
|
|
|
|
|
|
// Destroy the client.
|
|
|
|
shellSurface.reset();
|
|
|
|
QVERIFY(Test::waitForWindowDestroyed(client));
|
|
|
|
QCOMPARE(clientFinishUserMovedResizedSpy.count(), 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testUnmapResizeClient()
|
|
|
|
{
|
|
|
|
// This test verifies that active resize operation gets cancelled when
|
|
|
|
// the associated client is unmapped.
|
|
|
|
|
|
|
|
// Create the test client.
|
|
|
|
using namespace KWayland::Client;
|
|
|
|
QScopedPointer<Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(!surface.isNull());
|
|
|
|
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data()));
|
|
|
|
QVERIFY(!shellSurface.isNull());
|
|
|
|
ShellClient *client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(client);
|
|
|
|
|
|
|
|
// Start resizing the client.
|
|
|
|
QSignalSpy clientStartMoveResizedSpy(client, &AbstractClient::clientStartUserMovedResized);
|
|
|
|
QVERIFY(clientStartMoveResizedSpy.isValid());
|
|
|
|
QSignalSpy clientFinishUserMovedResizedSpy(client, &AbstractClient::clientFinishUserMovedResized);
|
|
|
|
QVERIFY(clientFinishUserMovedResizedSpy.isValid());
|
|
|
|
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), nullptr);
|
2019-03-12 09:35:17 +00:00
|
|
|
QCOMPARE(client->isMove(), false);
|
|
|
|
QCOMPARE(client->isResize(), false);
|
|
|
|
workspace()->slotWindowResize();
|
|
|
|
QCOMPARE(clientStartMoveResizedSpy.count(), 1);
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), client);
|
2019-03-12 09:35:17 +00:00
|
|
|
QCOMPARE(client->isMove(), false);
|
|
|
|
QCOMPARE(client->isResize(), true);
|
|
|
|
|
|
|
|
// Unmap the client while we're resizing it.
|
|
|
|
QSignalSpy hiddenSpy(client, &ShellClient::windowHidden);
|
|
|
|
QVERIFY(hiddenSpy.isValid());
|
|
|
|
surface->attachBuffer(Buffer::Ptr());
|
|
|
|
surface->commit(Surface::CommitFlag::None);
|
|
|
|
QVERIFY(hiddenSpy.wait());
|
|
|
|
QCOMPARE(clientFinishUserMovedResizedSpy.count(), 0);
|
2019-04-18 12:28:11 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeClient(), nullptr);
|
2019-03-12 09:35:17 +00:00
|
|
|
QCOMPARE(client->isMove(), false);
|
|
|
|
QCOMPARE(client->isResize(), false);
|
|
|
|
|
|
|
|
// Destroy the client.
|
|
|
|
shellSurface.reset();
|
|
|
|
QVERIFY(Test::waitForWindowDestroyed(client));
|
|
|
|
QCOMPARE(clientFinishUserMovedResizedSpy.count(), 0);
|
|
|
|
}
|
|
|
|
|
2015-10-26 08:17:46 +00:00
|
|
|
}
|
|
|
|
|
2016-02-11 08:34:19 +00:00
|
|
|
WAYLANDTEST_MAIN(KWin::MoveResizeWindowTest)
|
2015-10-26 08:17:46 +00:00
|
|
|
#include "move_resize_window_test.moc"
|