2015-10-26 08:17:46 +00:00
|
|
|
|
2020-08-02 22:22:19 +00:00
|
|
|
/*
|
|
|
|
KWin - the KDE window manager
|
|
|
|
This file is part of the KDE project.
|
2015-10-26 08:17:46 +00:00
|
|
|
|
2020-08-02 22:22:19 +00:00
|
|
|
SPDX-FileCopyrightText: 2015 Martin Gräßlin <mgraesslin@kde.org>
|
2015-10-26 08:17:46 +00:00
|
|
|
|
2020-08-02 22:22:19 +00:00
|
|
|
SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
*/
|
2015-10-26 08:17:46 +00:00
|
|
|
#include "kwin_wayland_test.h"
|
2022-03-23 10:13:38 +00:00
|
|
|
|
2016-11-02 10:28:54 +00:00
|
|
|
#include "atoms.h"
|
2022-08-29 07:55:49 +00:00
|
|
|
#include "core/output.h"
|
2015-10-26 08:17:46 +00:00
|
|
|
#include "cursor.h"
|
2022-08-31 20:29:15 +00:00
|
|
|
#include "placement.h"
|
2023-02-09 13:07:56 +00:00
|
|
|
#include "pointer_input.h"
|
2015-10-26 08:17:46 +00:00
|
|
|
#include "wayland_server.h"
|
2022-04-22 17:39:12 +00:00
|
|
|
#include "window.h"
|
2015-10-26 08:17:46 +00:00
|
|
|
#include "workspace.h"
|
2022-04-22 17:54:31 +00:00
|
|
|
#include "x11window.h"
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
#include <KWayland/Client/compositor.h>
|
2022-03-23 10:13:38 +00:00
|
|
|
#include <KWayland/Client/connection_thread.h>
|
|
|
|
#include <KWayland/Client/pointer.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/surface.h>
|
|
|
|
|
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();
|
2023-05-19 11:58:32 +00:00
|
|
|
void testAdjustClientGeometryOfHiddenX11Panel_data();
|
|
|
|
void testAdjustClientGeometryOfHiddenX11Panel();
|
|
|
|
void testAdjustClientGeometryOfHiddenWaylandPanel_data();
|
|
|
|
void testAdjustClientGeometryOfHiddenWaylandPanel();
|
2022-05-27 13:14:48 +00:00
|
|
|
void testResizeForVirtualKeyboard_data();
|
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();
|
2023-01-23 15:35:30 +00:00
|
|
|
void testCancelInteractiveMoveResize_data();
|
|
|
|
void testCancelInteractiveMoveResize();
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
KWayland::Client::ConnectionThread *m_connection = nullptr;
|
|
|
|
KWayland::Client::Compositor *m_compositor = nullptr;
|
|
|
|
};
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::initTestCase()
|
|
|
|
{
|
2022-04-22 17:39:12 +00:00
|
|
|
qRegisterMetaType<KWin::Window *>();
|
2015-10-26 08:17:46 +00:00
|
|
|
qRegisterMetaType<KWin::MaximizeMode>("MaximizeMode");
|
2020-07-07 09:32:29 +00:00
|
|
|
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
|
2020-12-09 13:06:15 +00:00
|
|
|
QVERIFY(waylandServer()->init(s_socketName));
|
2023-05-08 10:16:00 +00:00
|
|
|
Test::setOutputConfig({QRect(0, 0, 1280, 1024)});
|
2015-10-26 08:17:46 +00:00
|
|
|
kwinApp()->start();
|
2020-07-07 09:32:29 +00:00
|
|
|
QVERIFY(applicationStartedSpy.wait());
|
2022-07-11 10:41:15 +00:00
|
|
|
const auto outputs = workspace()->outputs();
|
2021-09-07 17:51:48 +00:00
|
|
|
QCOMPARE(outputs.count(), 1);
|
2021-08-31 07:03:05 +00:00
|
|
|
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
|
2015-10-26 08:17:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::init()
|
|
|
|
{
|
2023-05-23 11:38:03 +00:00
|
|
|
QVERIFY(Test::setupWaylandConnection(Test::AdditionalWaylandInterface::LayerShellV1 | 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();
|
2015-10-26 08:17:46 +00:00
|
|
|
|
2021-08-28 18:58:29 +00:00
|
|
|
workspace()->setActiveOutput(QPoint(640, 512));
|
2015-10-26 08:17:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::cleanup()
|
|
|
|
{
|
2016-06-30 11:32:54 +00:00
|
|
|
Test::destroyWaylandConnection();
|
2015-10-26 08:17:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testMove()
|
|
|
|
{
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
2015-10-26 08:17:46 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
2015-10-26 08:17:46 +00:00
|
|
|
// let's render
|
2022-08-01 21:29:02 +00:00
|
|
|
auto window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2015-10-26 08:17:46 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
|
|
|
QCOMPARE(workspace()->activeWindow(), window);
|
|
|
|
QCOMPARE(window->frameGeometry(), QRect(0, 0, 100, 50));
|
2023-02-18 11:38:08 +00:00
|
|
|
QSignalSpy interactiveMoveResizeStartedSpy(window, &Window::interactiveMoveResizeStarted);
|
2022-04-23 19:51:16 +00:00
|
|
|
QSignalSpy moveResizedChangedSpy(window, &Window::moveResizedChanged);
|
2023-02-18 11:38:08 +00:00
|
|
|
QSignalSpy interactiveMoveResizeSteppedSpy(window, &Window::interactiveMoveResizeStepped);
|
|
|
|
QSignalSpy interactiveMoveResizeFinishedSpy(window, &Window::interactiveMoveResizeFinished);
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
// begin move
|
2022-04-23 08:33:23 +00:00
|
|
|
QVERIFY(workspace()->moveResizeWindow() == nullptr);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->isInteractiveMove(), false);
|
2015-10-26 08:17:46 +00:00
|
|
|
workspace()->slotWindowMove();
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), window);
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeStartedSpy.count(), 1);
|
2015-10-26 08:17:46 +00:00
|
|
|
QCOMPARE(moveResizedChangedSpy.count(), 1);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->isInteractiveMove(), true);
|
|
|
|
QCOMPARE(window->geometryRestore(), QRect());
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
// send some key events, not going through input redirection
|
2023-02-19 23:35:44 +00:00
|
|
|
const QPointF cursorPos = Cursors::self()->mouse()->pos();
|
2022-04-23 19:51:16 +00:00
|
|
|
window->keyPressEvent(Qt::Key_Right);
|
|
|
|
window->updateInteractiveMoveResize(Cursors::self()->mouse()->pos());
|
2020-04-02 16:18:01 +00:00
|
|
|
QCOMPARE(Cursors::self()->mouse()->pos(), cursorPos + QPoint(8, 0));
|
2015-10-26 08:17:46 +00:00
|
|
|
QEXPECT_FAIL("", "First event is ignored", Continue);
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeSteppedSpy.count(), 1);
|
|
|
|
interactiveMoveResizeSteppedSpy.clear();
|
2015-10-26 08:17:46 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
window->keyPressEvent(Qt::Key_Right);
|
|
|
|
window->updateInteractiveMoveResize(Cursors::self()->mouse()->pos());
|
2020-04-02 16:18:01 +00:00
|
|
|
QCOMPARE(Cursors::self()->mouse()->pos(), cursorPos + QPoint(16, 0));
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeSteppedSpy.count(), 1);
|
2015-10-26 08:17:46 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
window->keyPressEvent(Qt::Key_Down | Qt::ALT);
|
|
|
|
window->updateInteractiveMoveResize(Cursors::self()->mouse()->pos());
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeSteppedSpy.count(), 2);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(16, 32, 100, 50));
|
2020-04-02 16:18:01 +00:00
|
|
|
QCOMPARE(Cursors::self()->mouse()->pos(), cursorPos + QPoint(16, 32));
|
2015-10-26 08:17:46 +00:00
|
|
|
|
|
|
|
// let's end
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeFinishedSpy.count(), 0);
|
2022-04-23 19:51:16 +00:00
|
|
|
window->keyPressEvent(Qt::Key_Enter);
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeFinishedSpy.count(), 1);
|
2015-10-26 09:14:54 +00:00
|
|
|
QCOMPARE(moveResizedChangedSpy.count(), 2);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(16, 32, 100, 50));
|
|
|
|
QCOMPARE(window->isInteractiveMove(), false);
|
2022-04-23 08:33:23 +00:00
|
|
|
QVERIFY(workspace()->moveResizeWindow() == nullptr);
|
2016-07-01 10:37:09 +00:00
|
|
|
surface.reset();
|
2023-04-21 20:28:48 +00:00
|
|
|
QVERIFY(Test::waitForWindowClosed(window));
|
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
|
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
2017-01-29 13:01:15 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get(), Test::CreationSetup::CreateOnly));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// Wait for the initial configure event.
|
2021-05-11 05:26:51 +00:00
|
|
|
Test::XdgToplevel::States states;
|
2022-08-01 21:29:02 +00:00
|
|
|
QSignalSpy toplevelConfigureRequestedSpy(shellSurface.get(), &Test::XdgToplevel::configureRequested);
|
2021-05-11 05:26:51 +00:00
|
|
|
QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
|
2021-09-03 17:54:03 +00:00
|
|
|
surface->commit(KWayland::Client::Surface::CommitFlag::None);
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
QCOMPARE(surfaceConfigureRequestedSpy.count(), 1);
|
|
|
|
QCOMPARE(toplevelConfigureRequestedSpy.count(), 1);
|
|
|
|
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
|
|
|
|
QVERIFY(!states.testFlag(Test::XdgToplevel::State::Activated));
|
|
|
|
QVERIFY(!states.testFlag(Test::XdgToplevel::State::Resizing));
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// Let's render.
|
2021-05-11 05:26:51 +00:00
|
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value<quint32>());
|
2022-08-01 21:29:02 +00:00
|
|
|
auto window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2017-01-29 13:01:15 +00:00
|
|
|
|
2019-07-30 19:05:50 +00:00
|
|
|
// We have to receive a configure event when the client becomes active.
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
QCOMPARE(surfaceConfigureRequestedSpy.count(), 2);
|
|
|
|
QCOMPARE(toplevelConfigureRequestedSpy.count(), 2);
|
|
|
|
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
|
|
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated));
|
|
|
|
QVERIFY(!states.testFlag(Test::XdgToplevel::State::Resizing));
|
2019-07-30 19:05:50 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
|
|
|
QCOMPARE(workspace()->activeWindow(), window);
|
|
|
|
QCOMPARE(window->frameGeometry(), QRect(0, 0, 100, 50));
|
|
|
|
QSignalSpy frameGeometryChangedSpy(window, &Window::frameGeometryChanged);
|
2023-02-18 11:38:08 +00:00
|
|
|
QSignalSpy interactiveMoveResizeStartedSpy(window, &Window::interactiveMoveResizeStarted);
|
2022-04-23 19:51:16 +00:00
|
|
|
QSignalSpy moveResizedChangedSpy(window, &Window::moveResizedChanged);
|
2023-02-18 11:38:08 +00:00
|
|
|
QSignalSpy interactiveMoveResizeSteppedSpy(window, &Window::interactiveMoveResizeStepped);
|
|
|
|
QSignalSpy interactiveMoveResizeFinishedSpy(window, &Window::interactiveMoveResizeFinished);
|
2017-01-29 13:01:15 +00:00
|
|
|
|
|
|
|
// begin resize
|
2022-04-23 08:33:23 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), nullptr);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->isInteractiveMove(), false);
|
|
|
|
QCOMPARE(window->isInteractiveResize(), false);
|
2017-01-29 13:01:15 +00:00
|
|
|
workspace()->slotWindowResize();
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), window);
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeStartedSpy.count(), 1);
|
2017-01-29 13:01:15 +00:00
|
|
|
QCOMPARE(moveResizedChangedSpy.count(), 1);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->isInteractiveResize(), true);
|
|
|
|
QCOMPARE(window->geometryRestore(), QRect());
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
QCOMPARE(surfaceConfigureRequestedSpy.count(), 3);
|
|
|
|
QCOMPARE(toplevelConfigureRequestedSpy.count(), 3);
|
|
|
|
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
|
|
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated));
|
|
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Resizing));
|
2017-01-29 13:01:15 +00:00
|
|
|
|
2019-07-30 19:05:50 +00:00
|
|
|
// Trigger a change.
|
2023-02-19 23:35:44 +00:00
|
|
|
const QPointF cursorPos = Cursors::self()->mouse()->pos();
|
2022-04-23 19:51:16 +00:00
|
|
|
window->keyPressEvent(Qt::Key_Right);
|
|
|
|
window->updateInteractiveMoveResize(Cursors::self()->mouse()->pos());
|
2020-04-02 16:18:01 +00:00
|
|
|
QCOMPARE(Cursors::self()->mouse()->pos(), cursorPos + QPoint(8, 0));
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// The client should receive a configure event with the new size.
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
QCOMPARE(surfaceConfigureRequestedSpy.count(), 4);
|
|
|
|
QCOMPARE(toplevelConfigureRequestedSpy.count(), 4);
|
|
|
|
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
|
|
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated));
|
|
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Resizing));
|
|
|
|
QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).toSize(), QSize(108, 50));
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeSteppedSpy.count(), 1);
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// Now render new size.
|
2021-05-11 05:26:51 +00:00
|
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value<quint32>());
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), QSize(108, 50), Qt::blue);
|
2020-02-05 09:28:50 +00:00
|
|
|
QVERIFY(frameGeometryChangedSpy.wait());
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(0, 0, 108, 50));
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeSteppedSpy.count(), 1);
|
2017-01-29 13:01:15 +00:00
|
|
|
|
2019-07-30 19:05:50 +00:00
|
|
|
// Go down.
|
2022-04-23 19:51:16 +00:00
|
|
|
window->keyPressEvent(Qt::Key_Down);
|
|
|
|
window->updateInteractiveMoveResize(Cursors::self()->mouse()->pos());
|
2020-04-02 16:18:01 +00:00
|
|
|
QCOMPARE(Cursors::self()->mouse()->pos(), cursorPos + QPoint(8, 8));
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// The client should receive another configure event.
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
QCOMPARE(surfaceConfigureRequestedSpy.count(), 5);
|
|
|
|
QCOMPARE(toplevelConfigureRequestedSpy.count(), 5);
|
|
|
|
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
|
|
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated));
|
|
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Resizing));
|
|
|
|
QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).toSize(), QSize(108, 58));
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// Now render new size.
|
2021-05-11 05:26:51 +00:00
|
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value<quint32>());
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), QSize(108, 58), Qt::blue);
|
2020-02-05 09:28:50 +00:00
|
|
|
QVERIFY(frameGeometryChangedSpy.wait());
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(0, 0, 108, 58));
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeSteppedSpy.count(), 2);
|
2017-01-29 13:01:15 +00:00
|
|
|
|
2019-07-30 19:05:50 +00:00
|
|
|
// Let's finalize the resize operation.
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeFinishedSpy.count(), 0);
|
2022-04-23 19:51:16 +00:00
|
|
|
window->keyPressEvent(Qt::Key_Enter);
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeFinishedSpy.count(), 1);
|
2017-01-29 13:01:15 +00:00
|
|
|
QCOMPARE(moveResizedChangedSpy.count(), 2);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->isInteractiveResize(), false);
|
2022-04-23 08:33:23 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), nullptr);
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
QCOMPARE(surfaceConfigureRequestedSpy.count(), 6);
|
|
|
|
QCOMPARE(toplevelConfigureRequestedSpy.count(), 6);
|
|
|
|
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
|
|
|
|
QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated));
|
|
|
|
QVERIFY(!states.testFlag(Test::XdgToplevel::State::Resizing));
|
2019-07-30 19:05:50 +00:00
|
|
|
|
|
|
|
// Destroy the client.
|
2020-02-17 18:39:17 +00:00
|
|
|
shellSurface.reset();
|
2023-04-21 20:28:48 +00:00
|
|
|
QVERIFY(Test::waitForWindowClosed(window));
|
2017-01-29 13:01:15 +00:00
|
|
|
}
|
|
|
|
|
2015-10-26 10:30:34 +00:00
|
|
|
void MoveResizeWindowTest::testPackTo_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QString>("methodCall");
|
2022-05-16 20:13:39 +00:00
|
|
|
QTest::addColumn<QRectF>("expectedGeometry");
|
2015-10-26 10:30:34 +00:00
|
|
|
|
2022-05-16 20:13:39 +00:00
|
|
|
QTest::newRow("left") << QStringLiteral("slotWindowMoveLeft") << QRectF(0, 487, 100, 50);
|
|
|
|
QTest::newRow("up") << QStringLiteral("slotWindowMoveUp") << QRectF(590, 0, 100, 50);
|
|
|
|
QTest::newRow("right") << QStringLiteral("slotWindowMoveRight") << QRectF(1180, 487, 100, 50);
|
|
|
|
QTest::newRow("down") << QStringLiteral("slotWindowMoveDown") << QRectF(590, 974, 100, 50);
|
2015-10-26 10:30:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testPackTo()
|
|
|
|
{
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
2015-10-26 10:30:34 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
2015-10-26 10:30:34 +00:00
|
|
|
// let's render
|
2022-08-01 21:29:02 +00:00
|
|
|
auto window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2015-10-26 10:30:34 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
|
|
|
QCOMPARE(workspace()->activeWindow(), window);
|
|
|
|
QCOMPARE(window->frameGeometry(), QRect(0, 0, 100, 50));
|
2015-10-26 10:30:34 +00:00
|
|
|
|
|
|
|
// let's place it centered
|
2022-07-30 22:22:38 +00:00
|
|
|
workspace()->placement()->placeCentered(window, QRect(0, 0, 1280, 1024));
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(590, 487, 100, 50));
|
2015-10-26 10:30:34 +00:00
|
|
|
|
|
|
|
QFETCH(QString, methodCall);
|
|
|
|
QMetaObject::invokeMethod(workspace(), methodCall.toLocal8Bit().constData());
|
2022-04-23 19:51:16 +00:00
|
|
|
QTEST(window->frameGeometry(), "expectedGeometry");
|
2016-07-01 10:37:09 +00:00
|
|
|
surface.reset();
|
2023-04-21 20:28:48 +00:00
|
|
|
QVERIFY(Test::waitForWindowClosed(window));
|
2015-10-26 10:30:34 +00:00
|
|
|
}
|
|
|
|
|
2015-10-26 12:25:47 +00:00
|
|
|
void MoveResizeWindowTest::testPackAgainstClient_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QString>("methodCall");
|
2022-05-16 20:13:39 +00:00
|
|
|
QTest::addColumn<QRectF>("expectedGeometry");
|
2015-10-26 12:25:47 +00:00
|
|
|
|
2022-05-16 20:13:39 +00:00
|
|
|
QTest::newRow("left") << QStringLiteral("slotWindowMoveLeft") << QRectF(10, 487, 100, 50);
|
|
|
|
QTest::newRow("up") << QStringLiteral("slotWindowMoveUp") << QRectF(590, 10, 100, 50);
|
|
|
|
QTest::newRow("right") << QStringLiteral("slotWindowMoveRight") << QRectF(1170, 487, 100, 50);
|
|
|
|
QTest::newRow("down") << QStringLiteral("slotWindowMoveDown") << QRectF(590, 964, 100, 50);
|
2015-10-26 12:25:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testPackAgainstClient()
|
|
|
|
{
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface1(Test::createSurface());
|
|
|
|
QVERIFY(surface1 != nullptr);
|
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface2(Test::createSurface());
|
|
|
|
QVERIFY(surface2 != nullptr);
|
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface3(Test::createSurface());
|
|
|
|
QVERIFY(surface3 != nullptr);
|
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface4(Test::createSurface());
|
|
|
|
QVERIFY(surface4 != nullptr);
|
|
|
|
|
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface1(Test::createXdgToplevelSurface(surface1.get()));
|
|
|
|
QVERIFY(shellSurface1 != nullptr);
|
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface2(Test::createXdgToplevelSurface(surface2.get()));
|
|
|
|
QVERIFY(shellSurface2 != nullptr);
|
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface3(Test::createXdgToplevelSurface(surface3.get()));
|
|
|
|
QVERIFY(shellSurface3 != nullptr);
|
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface4(Test::createXdgToplevelSurface(surface4.get()));
|
|
|
|
QVERIFY(shellSurface4 != nullptr);
|
2022-03-23 10:13:38 +00:00
|
|
|
auto renderWindow = [](KWayland::Client::Surface *surface, const QString &methodCall, const QRect &expectedGeometry) {
|
2015-10-26 12:25:47 +00:00
|
|
|
// let's render
|
2022-04-23 19:51:16 +00:00
|
|
|
auto window = Test::renderAndWaitForShown(surface, QSize(10, 10), Qt::blue);
|
2015-10-26 12:25:47 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
|
|
|
QCOMPARE(workspace()->activeWindow(), window);
|
|
|
|
QCOMPARE(window->frameGeometry().size(), QSize(10, 10));
|
2015-10-26 12:25:47 +00:00
|
|
|
// let's place it centered
|
2022-07-30 22:22:38 +00:00
|
|
|
workspace()->placement()->placeCentered(window, QRect(0, 0, 1280, 1024));
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(635, 507, 10, 10));
|
2015-10-26 12:25:47 +00:00
|
|
|
QMetaObject::invokeMethod(workspace(), methodCall.toLocal8Bit().constData());
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), expectedGeometry);
|
2015-10-26 12:25:47 +00:00
|
|
|
};
|
2022-08-01 21:29:02 +00:00
|
|
|
renderWindow(surface1.get(), QStringLiteral("slotWindowMoveLeft"), QRect(0, 507, 10, 10));
|
|
|
|
renderWindow(surface2.get(), QStringLiteral("slotWindowMoveUp"), QRect(635, 0, 10, 10));
|
|
|
|
renderWindow(surface3.get(), QStringLiteral("slotWindowMoveRight"), QRect(1270, 507, 10, 10));
|
|
|
|
renderWindow(surface4.get(), QStringLiteral("slotWindowMoveDown"), QRect(635, 1014, 10, 10));
|
2015-10-26 12:25:47 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
|
|
|
auto window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2015-10-26 12:25:47 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
|
|
|
QCOMPARE(workspace()->activeWindow(), window);
|
2015-10-26 12:25:47 +00:00
|
|
|
// let's place it centered
|
2022-07-30 22:22:38 +00:00
|
|
|
workspace()->placement()->placeCentered(window, QRect(0, 0, 1280, 1024));
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(590, 487, 100, 50));
|
2015-10-26 12:25:47 +00:00
|
|
|
|
|
|
|
QFETCH(QString, methodCall);
|
|
|
|
QMetaObject::invokeMethod(workspace(), methodCall.toLocal8Bit().constData());
|
2022-04-23 19:51:16 +00:00
|
|
|
QTEST(window->frameGeometry(), "expectedGeometry");
|
2015-10-26 12:25:47 +00:00
|
|
|
}
|
|
|
|
|
2015-10-26 14:49:03 +00:00
|
|
|
void MoveResizeWindowTest::testGrowShrink_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QString>("methodCall");
|
2022-05-16 20:13:39 +00:00
|
|
|
QTest::addColumn<QRectF>("expectedGeometry");
|
2015-10-26 14:49:03 +00:00
|
|
|
|
2022-05-16 20:13:39 +00:00
|
|
|
QTest::newRow("grow vertical") << QStringLiteral("slotWindowExpandVertical") << QRectF(590, 487, 100, 537);
|
|
|
|
QTest::newRow("grow horizontal") << QStringLiteral("slotWindowExpandHorizontal") << QRectF(590, 487, 690, 50);
|
|
|
|
QTest::newRow("shrink vertical") << QStringLiteral("slotWindowShrinkVertical") << QRectF(590, 487, 100, 23);
|
|
|
|
QTest::newRow("shrink horizontal") << QStringLiteral("slotWindowShrinkHorizontal") << QRectF(590, 487, 40, 50);
|
2015-10-26 14:49:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testGrowShrink()
|
|
|
|
{
|
|
|
|
// block geometry helper
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface1(Test::createSurface());
|
|
|
|
QVERIFY(surface1 != nullptr);
|
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface1(Test::createXdgToplevelSurface(surface1.get()));
|
|
|
|
QVERIFY(shellSurface1 != nullptr);
|
|
|
|
Test::render(surface1.get(), QSize(650, 514), Qt::blue);
|
2016-07-01 07:54:44 +00:00
|
|
|
QVERIFY(Test::waitForWaylandWindowShown());
|
2021-10-04 16:20:10 +00:00
|
|
|
workspace()->slotWindowMoveRight();
|
|
|
|
workspace()->slotWindowMoveDown();
|
2015-10-26 14:49:03 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
2015-10-26 14:49:03 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
|
|
|
QSignalSpy toplevelConfigureRequestedSpy(shellSurface.get(), &Test::XdgToplevel::configureRequested);
|
2021-05-11 05:26:51 +00:00
|
|
|
QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
|
2015-10-26 14:49:03 +00:00
|
|
|
// let's render
|
2022-08-01 21:29:02 +00:00
|
|
|
auto window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2021-05-11 17:32:24 +00:00
|
|
|
QVERIFY(toplevelConfigureRequestedSpy.wait());
|
2015-10-26 14:49:03 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
|
|
|
QCOMPARE(workspace()->activeWindow(), window);
|
2015-10-26 14:49:03 +00:00
|
|
|
|
|
|
|
// let's place it centered
|
2022-07-30 22:22:38 +00:00
|
|
|
workspace()->placement()->placeCentered(window, QRect(0, 0, 1280, 1024));
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(590, 487, 100, 50));
|
2015-10-26 14:49:03 +00:00
|
|
|
|
|
|
|
QFETCH(QString, methodCall);
|
|
|
|
QMetaObject::invokeMethod(workspace(), methodCall.toLocal8Bit().constData());
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::red);
|
2015-10-26 14:49:03 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
QSignalSpy frameGeometryChangedSpy(window, &Window::frameGeometryChanged);
|
2015-10-26 14:49:03 +00:00
|
|
|
m_connection->flush();
|
2020-02-05 09:28:50 +00:00
|
|
|
QVERIFY(frameGeometryChangedSpy.wait());
|
2022-04-23 19:51:16 +00:00
|
|
|
QTEST(window->frameGeometry(), "expectedGeometry");
|
2015-10-26 14:49:03 +00:00
|
|
|
}
|
|
|
|
|
2016-02-17 10:00:58 +00:00
|
|
|
void MoveResizeWindowTest::testPointerMoveEnd_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<int>("additionalButton");
|
|
|
|
|
2022-03-23 10:13:38 +00:00
|
|
|
QTest::newRow("BTN_RIGHT") << BTN_RIGHT;
|
|
|
|
QTest::newRow("BTN_MIDDLE") << BTN_MIDDLE;
|
|
|
|
QTest::newRow("BTN_SIDE") << BTN_SIDE;
|
|
|
|
QTest::newRow("BTN_EXTRA") << BTN_EXTRA;
|
2016-02-17 10:00:58 +00:00
|
|
|
QTest::newRow("BTN_FORWARD") << BTN_FORWARD;
|
2022-03-23 10:13:38 +00:00
|
|
|
QTest::newRow("BTN_BACK") << BTN_BACK;
|
|
|
|
QTest::newRow("BTN_TASK") << BTN_TASK;
|
|
|
|
for (int i = BTN_TASK + 1; i < BTN_JOYSTICK; i++) {
|
2016-02-17 10:00:58 +00:00
|
|
|
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
|
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
2016-02-17 10:00:58 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
2016-02-17 10:00:58 +00:00
|
|
|
// let's render
|
2022-08-01 21:29:02 +00:00
|
|
|
auto window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2016-02-17 10:00:58 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
|
|
|
QCOMPARE(window, workspace()->activeWindow());
|
|
|
|
QVERIFY(!window->isInteractiveMove());
|
2016-02-17 10:00:58 +00:00
|
|
|
|
|
|
|
// let's trigger the left button
|
|
|
|
quint32 timestamp = 1;
|
2022-03-10 10:27:35 +00:00
|
|
|
Test::pointerButtonPressed(BTN_LEFT, timestamp++);
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(!window->isInteractiveMove());
|
2016-02-17 10:00:58 +00:00
|
|
|
workspace()->slotWindowMove();
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window->isInteractiveMove());
|
2016-02-17 10:00:58 +00:00
|
|
|
|
|
|
|
// let's press another button
|
|
|
|
QFETCH(int, additionalButton);
|
2022-03-10 10:27:35 +00:00
|
|
|
Test::pointerButtonPressed(additionalButton, timestamp++);
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window->isInteractiveMove());
|
2016-02-17 10:00:58 +00:00
|
|
|
|
|
|
|
// release the left button, should still have the window moving
|
2022-03-10 10:27:35 +00:00
|
|
|
Test::pointerButtonReleased(BTN_LEFT, timestamp++);
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window->isInteractiveMove());
|
2016-02-17 10:00:58 +00:00
|
|
|
|
|
|
|
// but releasing the other button should now end moving
|
2022-03-10 10:27:35 +00:00
|
|
|
Test::pointerButtonReleased(additionalButton, timestamp++);
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(!window->isInteractiveMove());
|
2016-07-01 13:21:37 +00:00
|
|
|
surface.reset();
|
2023-04-21 20:28:48 +00:00
|
|
|
QVERIFY(Test::waitForWindowClosed(window));
|
2016-02-17 10:00:58 +00:00
|
|
|
}
|
2016-10-24 15:09:40 +00:00
|
|
|
void MoveResizeWindowTest::testClientSideMove()
|
|
|
|
{
|
2023-02-09 13:07:56 +00:00
|
|
|
input()->pointer()->warp(QPointF(640, 512));
|
2022-11-07 21:33:00 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Pointer> pointer(Test::waylandSeat()->createPointer());
|
|
|
|
QSignalSpy pointerEnteredSpy(pointer.get(), &KWayland::Client::Pointer::entered);
|
|
|
|
QSignalSpy pointerLeftSpy(pointer.get(), &KWayland::Client::Pointer::left);
|
|
|
|
QSignalSpy buttonSpy(pointer.get(), &KWayland::Client::Pointer::buttonStateChanged);
|
2016-10-24 15:09:40 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
auto window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
2016-10-24 15:09:40 +00:00
|
|
|
|
|
|
|
// move pointer into center of geometry
|
2022-05-16 20:13:39 +00:00
|
|
|
const QRectF startGeometry = window->frameGeometry();
|
2023-02-09 13:07:56 +00:00
|
|
|
input()->pointer()->warp(startGeometry.center());
|
2016-10-24 15:09:40 +00:00
|
|
|
QVERIFY(pointerEnteredSpy.wait());
|
2022-05-16 20:13:39 +00:00
|
|
|
QCOMPARE(pointerEnteredSpy.first().last().toPoint(), QPoint(50, 25));
|
2016-10-24 15:09:40 +00:00
|
|
|
// simulate press
|
|
|
|
quint32 timestamp = 1;
|
2022-03-10 10:27:35 +00:00
|
|
|
Test::pointerButtonPressed(BTN_LEFT, timestamp++);
|
2016-10-24 15:09:40 +00:00
|
|
|
QVERIFY(buttonSpy.wait());
|
2023-02-18 11:38:08 +00:00
|
|
|
QSignalSpy interactiveMoveResizeStartedSpy(window, &Window::interactiveMoveResizeStarted);
|
2021-05-11 05:26:51 +00:00
|
|
|
shellSurface->move(*Test::waylandSeat(), buttonSpy.first().first().value<quint32>());
|
2023-02-18 11:38:08 +00:00
|
|
|
QVERIFY(interactiveMoveResizeStartedSpy.wait());
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->isInteractiveMove(), true);
|
2016-10-24 15:09:40 +00:00
|
|
|
QVERIFY(pointerLeftSpy.wait());
|
|
|
|
|
|
|
|
// move a bit
|
2023-02-18 11:38:08 +00:00
|
|
|
QSignalSpy clientMoveStepSpy(window, &Window::interactiveMoveResizeStepped);
|
2022-05-16 20:13:39 +00:00
|
|
|
const QPointF startPoint = startGeometry.center();
|
2016-10-24 15:09:40 +00:00
|
|
|
const int dragDistance = QApplication::startDragDistance();
|
|
|
|
// Why?
|
2022-03-10 10:27:35 +00:00
|
|
|
Test::pointerMotion(startPoint + QPoint(dragDistance, dragDistance) + QPoint(6, 6), timestamp++);
|
2016-10-24 15:09:40 +00:00
|
|
|
QCOMPARE(clientMoveStepSpy.count(), 1);
|
|
|
|
|
|
|
|
// and release again
|
2022-03-10 10:27:35 +00:00
|
|
|
Test::pointerButtonReleased(BTN_LEFT, timestamp++);
|
2016-10-24 15:09:40 +00:00
|
|
|
QVERIFY(pointerEnteredSpy.wait());
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->isInteractiveMove(), false);
|
|
|
|
QCOMPARE(window->frameGeometry(), startGeometry.translated(QPoint(dragDistance, dragDistance) + QPoint(6, 6)));
|
2022-05-16 20:13:39 +00:00
|
|
|
QCOMPARE(pointerEnteredSpy.last().last().toPoint(), QPoint(50, 25));
|
2016-10-24 15:09:40 +00:00
|
|
|
}
|
2016-02-17 10:00:58 +00:00
|
|
|
|
2023-05-19 11:58:32 +00:00
|
|
|
void MoveResizeWindowTest::testAdjustClientGeometryOfHiddenX11Panel_data()
|
2016-11-02 10:28:54 +00:00
|
|
|
{
|
|
|
|
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;
|
2022-03-23 10:13:38 +00:00
|
|
|
QTest::newRow("bottom") << QRect(0, 1024 - 20, 100, 20) << QPoint(50, 1024 - 25 - 50) << QPoint(50, 1024 - 20 - 50) << 2u;
|
2016-11-02 10:28:54 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2023-05-19 11:58:32 +00:00
|
|
|
void MoveResizeWindowTest::testAdjustClientGeometryOfHiddenX11Panel()
|
2016-11-02 10:28:54 +00:00
|
|
|
{
|
|
|
|
// this test verifies that auto hiding panels are ignored when adjusting client geometry
|
|
|
|
// see BUG 365892
|
|
|
|
|
|
|
|
// first create our panel
|
2023-02-03 13:29:21 +00:00
|
|
|
Test::XcbConnectionPtr c = Test::createX11Connection();
|
2022-08-01 21:29:02 +00:00
|
|
|
QVERIFY(!xcb_connection_has_error(c.get()));
|
2016-11-02 10:28:54 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
xcb_window_t windowId = xcb_generate_id(c.get());
|
2016-11-02 10:28:54 +00:00
|
|
|
QFETCH(QRect, panelGeometry);
|
2022-08-01 21:29:02 +00:00
|
|
|
xcb_create_window(c.get(), XCB_COPY_FROM_PARENT, windowId, rootWindow(),
|
2016-11-02 10:28:54 +00:00
|
|
|
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());
|
2022-08-01 21:29:02 +00:00
|
|
|
xcb_icccm_set_wm_normal_hints(c.get(), windowId, &hints);
|
|
|
|
NETWinInfo winInfo(c.get(), windowId, rootWindow(), NET::WMWindowType, NET::Properties2());
|
2016-11-02 10:28:54 +00:00
|
|
|
winInfo.setWindowType(NET::Dock);
|
2022-08-01 21:29:02 +00:00
|
|
|
xcb_map_window(c.get(), windowId);
|
|
|
|
xcb_flush(c.get());
|
2016-11-02 10:28:54 +00:00
|
|
|
|
2022-04-23 08:33:23 +00:00
|
|
|
QSignalSpy windowCreatedSpy(workspace(), &Workspace::windowAdded);
|
2016-11-02 10:28:54 +00:00
|
|
|
QVERIFY(windowCreatedSpy.wait());
|
2022-04-22 17:54:31 +00:00
|
|
|
X11Window *panel = windowCreatedSpy.first().first().value<X11Window *>();
|
2016-11-02 10:28:54 +00:00
|
|
|
QVERIFY(panel);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(panel->window(), windowId);
|
2019-09-27 10:01:10 +00:00
|
|
|
QCOMPARE(panel->frameGeometry(), panelGeometry);
|
2016-11-02 10:28:54 +00:00
|
|
|
QVERIFY(panel->isDock());
|
|
|
|
|
|
|
|
// let's create a window
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
2016-11-02 10:28:54 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
|
|
|
auto testWindow = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2016-11-02 10:28:54 +00:00
|
|
|
|
|
|
|
QVERIFY(testWindow);
|
|
|
|
QVERIFY(testWindow->isMovable());
|
|
|
|
// panel is not yet hidden, we should snap against it
|
|
|
|
QFETCH(QPoint, targetPoint);
|
2022-05-16 20:13:39 +00:00
|
|
|
QTEST(Workspace::self()->adjustWindowPosition(testWindow, targetPoint, false).toPoint(), "expectedAdjustedPoint");
|
2016-11-02 10:28:54 +00:00
|
|
|
|
|
|
|
// now let's hide the panel
|
2024-01-29 22:04:57 +00:00
|
|
|
QSignalSpy panelHiddenSpy(panel, &Window::hiddenChanged);
|
2016-11-02 10:28:54 +00:00
|
|
|
QFETCH(quint32, hideLocation);
|
2022-08-01 21:29:02 +00:00
|
|
|
xcb_change_property(c.get(), XCB_PROP_MODE_REPLACE, windowId, atoms->kde_screen_edge_show, XCB_ATOM_CARDINAL, 32, 1, &hideLocation);
|
|
|
|
xcb_flush(c.get());
|
2016-11-02 10:28:54 +00:00
|
|
|
QVERIFY(panelHiddenSpy.wait());
|
|
|
|
|
|
|
|
// now try to snap again
|
2022-04-23 08:33:23 +00:00
|
|
|
QCOMPARE(Workspace::self()->adjustWindowPosition(testWindow, targetPoint, false), targetPoint);
|
2016-11-02 10:28:54 +00:00
|
|
|
|
|
|
|
// and destroy the panel again
|
2022-08-01 21:29:02 +00:00
|
|
|
xcb_unmap_window(c.get(), windowId);
|
|
|
|
xcb_destroy_window(c.get(), windowId);
|
|
|
|
xcb_flush(c.get());
|
2016-11-02 10:28:54 +00:00
|
|
|
c.reset();
|
|
|
|
|
2023-03-13 19:21:11 +00:00
|
|
|
QSignalSpy panelClosedSpy(panel, &X11Window::closed);
|
2016-11-02 10:28:54 +00:00
|
|
|
QVERIFY(panelClosedSpy.wait());
|
|
|
|
|
|
|
|
// snap once more
|
2022-04-23 08:33:23 +00:00
|
|
|
QCOMPARE(Workspace::self()->adjustWindowPosition(testWindow, targetPoint, false), targetPoint);
|
2016-11-02 10:28:54 +00:00
|
|
|
|
|
|
|
// and close
|
2023-03-13 19:21:11 +00:00
|
|
|
QSignalSpy windowClosedSpy(testWindow, &Window::closed);
|
2016-11-02 10:28:54 +00:00
|
|
|
shellSurface.reset();
|
|
|
|
surface.reset();
|
|
|
|
QVERIFY(windowClosedSpy.wait());
|
|
|
|
}
|
|
|
|
|
2023-05-19 11:58:32 +00:00
|
|
|
void MoveResizeWindowTest::testAdjustClientGeometryOfHiddenWaylandPanel_data()
|
2016-11-02 10:51:01 +00:00
|
|
|
{
|
2023-05-19 11:58:32 +00:00
|
|
|
QTest::addColumn<uint32_t>("anchor");
|
2016-11-02 10:51:01 +00:00
|
|
|
QTest::addColumn<QRect>("panelGeometry");
|
|
|
|
QTest::addColumn<QPoint>("targetPoint");
|
|
|
|
QTest::addColumn<QPoint>("expectedAdjustedPoint");
|
|
|
|
|
2023-05-19 11:58:32 +00:00
|
|
|
QTest::newRow("top") << uint32_t(Test::LayerSurfaceV1::anchor_top) << QRect(0, 0, 1280, 20) << QPoint(50, 25) << QPoint(50, 20);
|
|
|
|
QTest::newRow("bottom") << uint32_t(Test::LayerSurfaceV1::anchor_bottom) << QRect(0, 1024 - 20, 1280, 20) << QPoint(50, 1024 - 25 - 50) << QPoint(50, 1024 - 20 - 50);
|
|
|
|
QTest::newRow("left") << uint32_t(Test::LayerSurfaceV1::anchor_left) << QRect(0, 0, 20, 1024) << QPoint(25, 50) << QPoint(20, 50);
|
|
|
|
QTest::newRow("right") << uint32_t(Test::LayerSurfaceV1::anchor_right) << QRect(1280 - 20, 0, 20, 1024) << QPoint(1280 - 25 - 100, 50) << QPoint(1280 - 20 - 100, 50);
|
2016-11-02 10:51:01 +00:00
|
|
|
}
|
|
|
|
|
2023-05-19 11:58:32 +00:00
|
|
|
void MoveResizeWindowTest::testAdjustClientGeometryOfHiddenWaylandPanel()
|
2016-11-02 10:51:01 +00:00
|
|
|
{
|
2023-05-19 11:58:32 +00:00
|
|
|
// this test verifies that hidden panels are ignored when adjusting client geometry
|
2016-11-02 10:51:01 +00:00
|
|
|
// see BUG 365892
|
|
|
|
|
|
|
|
// first create our panel
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> panelSurface(Test::createSurface());
|
2023-05-19 11:58:32 +00:00
|
|
|
std::unique_ptr<Test::LayerSurfaceV1> panelShellSurface(Test::createLayerSurfaceV1(panelSurface.get(), QStringLiteral("dock")));
|
2016-11-02 10:51:01 +00:00
|
|
|
QFETCH(QRect, panelGeometry);
|
2023-05-19 11:58:32 +00:00
|
|
|
QFETCH(uint32_t, anchor);
|
|
|
|
panelShellSurface->set_anchor(anchor);
|
|
|
|
panelShellSurface->set_size(panelGeometry.width(), panelGeometry.height());
|
|
|
|
panelSurface->commit(KWayland::Client::Surface::CommitFlag::None);
|
|
|
|
|
2016-11-02 10:51:01 +00:00
|
|
|
// let's render
|
2023-05-19 11:58:32 +00:00
|
|
|
QSignalSpy panelConfigureRequestedSpy(panelShellSurface.get(), &Test::LayerSurfaceV1::configureRequested);
|
|
|
|
QVERIFY(panelConfigureRequestedSpy.wait());
|
|
|
|
auto panel = Test::renderAndWaitForShown(panelSurface.get(), panelConfigureRequestedSpy.last().at(1).toSize(), Qt::blue);
|
2016-11-02 10:51:01 +00:00
|
|
|
QVERIFY(panel);
|
2019-09-27 10:01:10 +00:00
|
|
|
QCOMPARE(panel->frameGeometry(), panelGeometry);
|
2016-11-02 10:51:01 +00:00
|
|
|
QVERIFY(panel->isDock());
|
|
|
|
|
|
|
|
// let's create a window
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
2016-11-02 10:51:01 +00:00
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
|
|
|
auto testWindow = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2016-11-02 10:51:01 +00:00
|
|
|
|
|
|
|
QVERIFY(testWindow);
|
|
|
|
QVERIFY(testWindow->isMovable());
|
|
|
|
// panel is not yet hidden, we should snap against it
|
|
|
|
QFETCH(QPoint, targetPoint);
|
2022-05-16 20:13:39 +00:00
|
|
|
QTEST(Workspace::self()->adjustWindowPosition(testWindow, targetPoint, false).toPoint(), "expectedAdjustedPoint");
|
2016-11-02 10:51:01 +00:00
|
|
|
|
|
|
|
// now let's hide the panel
|
2023-06-01 10:31:04 +00:00
|
|
|
panel->setHidden(true);
|
2016-11-02 10:51:01 +00:00
|
|
|
|
|
|
|
// now try to snap again
|
2022-04-23 08:33:23 +00:00
|
|
|
QCOMPARE(Workspace::self()->adjustWindowPosition(testWindow, targetPoint, false), targetPoint);
|
2016-11-02 10:51:01 +00:00
|
|
|
|
|
|
|
// and destroy the panel again
|
2023-03-13 19:21:11 +00:00
|
|
|
QSignalSpy panelClosedSpy(panel, &Window::closed);
|
2016-11-02 10:51:01 +00:00
|
|
|
panelShellSurface.reset();
|
|
|
|
panelSurface.reset();
|
|
|
|
QVERIFY(panelClosedSpy.wait());
|
|
|
|
|
|
|
|
// snap once more
|
2022-04-23 08:33:23 +00:00
|
|
|
QCOMPARE(Workspace::self()->adjustWindowPosition(testWindow, targetPoint, false), targetPoint);
|
2016-11-02 10:51:01 +00:00
|
|
|
|
|
|
|
// and close
|
2023-03-13 19:21:11 +00:00
|
|
|
QSignalSpy windowClosedSpy(testWindow, &Window::closed);
|
2016-11-02 10:51:01 +00:00
|
|
|
shellSurface.reset();
|
|
|
|
surface.reset();
|
|
|
|
QVERIFY(windowClosedSpy.wait());
|
|
|
|
}
|
|
|
|
|
2022-05-27 13:14:48 +00:00
|
|
|
void MoveResizeWindowTest::testResizeForVirtualKeyboard_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QRect>("windowRect");
|
|
|
|
QTest::addColumn<QRect>("keyboardRect");
|
|
|
|
QTest::addColumn<QRect>("resizedWindowRect");
|
|
|
|
|
|
|
|
QTest::newRow("standard") << QRect(100, 300, 500, 800) << QRect(0, 100, 1280, 500) << QRect(100, 0, 500, 100);
|
|
|
|
QTest::newRow("same size") << QRect(100, 300, 500, 500) << QRect(0, 600, 1280, 400) << QRect(100, 100, 500, 500);
|
|
|
|
QTest::newRow("smaller width") << QRect(100, 300, 500, 800) << QRect(300, 100, 100, 500) << QRect(100, 0, 500, 100);
|
|
|
|
QTest::newRow("no height change") << QRect(100, 300, 500, 500) << QRect(0, 900, 1280, 124) << QRect(100, 300, 500, 500);
|
|
|
|
QTest::newRow("no width change") << QRect(100, 300, 500, 500) << QRect(0, 400, 100, 500) << QRect(100, 300, 500, 500);
|
|
|
|
}
|
|
|
|
|
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()
|
|
|
|
{
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
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
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
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
|
|
|
|
2022-05-27 13:14:48 +00:00
|
|
|
QFETCH(QRect, windowRect);
|
|
|
|
QFETCH(QRect, keyboardRect);
|
|
|
|
QFETCH(QRect, resizedWindowRect);
|
|
|
|
|
|
|
|
// There are three things that may happen when the virtual keyboard geometry
|
|
|
|
// is set: We move the window to the top and resize it, we move the window
|
|
|
|
// but don't change its size (if the window is already small enough) or we
|
|
|
|
// do not change anything because the virtual keyboard does not overlap the
|
|
|
|
// window. We should verify that, for the first, we get both a position and
|
|
|
|
// a size change, for the second we only get a position change and for the
|
|
|
|
// last we get no changes.
|
|
|
|
bool sizeChange = windowRect.size() != resizedWindowRect.size();
|
|
|
|
bool positionChange = windowRect.topLeft() != resizedWindowRect.topLeft();
|
|
|
|
|
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
|
|
|
// let's render
|
2022-08-01 21:29:02 +00:00
|
|
|
auto window = Test::renderAndWaitForShown(surface.get(), windowRect.size(), Qt::blue);
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
2019-09-12 17:18:14 +00:00
|
|
|
|
|
|
|
// The client should receive a configure event upon becoming active.
|
2022-08-01 21:29:02 +00:00
|
|
|
QSignalSpy toplevelConfigureRequestedSpy(shellSurface.get(), &Test::XdgToplevel::configureRequested);
|
2021-05-11 05:26:51 +00:00
|
|
|
QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
|
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
2022-05-27 13:14:48 +00:00
|
|
|
surfaceConfigureRequestedSpy.clear();
|
2019-09-12 17:18:14 +00:00
|
|
|
|
2022-05-27 13:14:48 +00:00
|
|
|
window->move(windowRect.topLeft());
|
2022-04-23 19:51:16 +00:00
|
|
|
QSignalSpy frameGeometryChangedSpy(window, &Window::frameGeometryChanged);
|
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
|
|
|
|
2022-05-27 13:14:48 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), windowRect);
|
|
|
|
window->setVirtualKeyboardGeometry(keyboardRect);
|
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
|
|
|
|
2022-05-27 13:14:48 +00:00
|
|
|
if (sizeChange) {
|
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last()[0].toInt());
|
|
|
|
} else {
|
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.count() == 0);
|
|
|
|
}
|
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
|
|
|
// render at the new size
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::blue);
|
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
|
|
|
|
2022-05-27 13:14:48 +00:00
|
|
|
if (positionChange || sizeChange) {
|
|
|
|
QVERIFY(frameGeometryChangedSpy.count() > 0 || frameGeometryChangedSpy.wait());
|
|
|
|
frameGeometryChangedSpy.clear();
|
|
|
|
} else {
|
|
|
|
QVERIFY(frameGeometryChangedSpy.count() == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
QCOMPARE(window->frameGeometry(), resizedWindowRect);
|
2022-04-23 19:51:16 +00:00
|
|
|
window->setVirtualKeyboardGeometry(QRect());
|
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
|
|
|
|
2022-05-27 13:14:48 +00:00
|
|
|
if (sizeChange) {
|
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last()[0].toInt());
|
|
|
|
}
|
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
|
|
|
// render at the new size
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::blue);
|
2022-05-27 13:14:48 +00:00
|
|
|
|
|
|
|
if (positionChange || sizeChange) {
|
|
|
|
QVERIFY(frameGeometryChangedSpy.count() > 0 || frameGeometryChangedSpy.wait());
|
|
|
|
} else {
|
|
|
|
QVERIFY(frameGeometryChangedSpy.count() == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
QCOMPARE(window->frameGeometry(), windowRect);
|
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::testResizeForVirtualKeyboardWithMaximize()
|
|
|
|
{
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
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
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
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
|
|
|
|
|
|
|
// let's render
|
2022-08-01 21:29:02 +00:00
|
|
|
auto window = Test::renderAndWaitForShown(surface.get(), QSize(500, 800), Qt::blue);
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
2019-09-12 17:18:14 +00:00
|
|
|
|
|
|
|
// The client should receive a configure event upon becoming active.
|
2022-08-01 21:29:02 +00:00
|
|
|
QSignalSpy toplevelConfigureRequestedSpy(shellSurface.get(), &Test::XdgToplevel::configureRequested);
|
2021-05-11 05:26:51 +00:00
|
|
|
QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
|
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
2019-09-12 17:18:14 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
window->move(QPoint(100, 300));
|
|
|
|
QSignalSpy frameGeometryChangedSpy(window, &Window::frameGeometryChanged);
|
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
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(100, 300, 500, 800));
|
|
|
|
window->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500));
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.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
|
|
|
|
2021-05-11 05:26:51 +00:00
|
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last()[0].toInt());
|
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
|
|
|
// render at the new size
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::blue);
|
2020-02-05 09:28:50 +00:00
|
|
|
QVERIFY(frameGeometryChangedSpy.wait());
|
2022-05-27 10:34:14 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(100, 0, 500, 100));
|
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
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
window->setMaximize(true, true);
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last()[0].toInt());
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::blue);
|
2020-02-05 09:28:50 +00:00
|
|
|
QVERIFY(frameGeometryChangedSpy.wait());
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(0, 0, 1280, 1024));
|
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
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
window->setVirtualKeyboardGeometry(QRect());
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(!surfaceConfigureRequestedSpy.wait(10));
|
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
|
|
|
|
|
|
|
// render at the size of the configureRequested.. it won't have changed
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::blue);
|
2020-02-05 09:28:50 +00:00
|
|
|
QVERIFY(!frameGeometryChangedSpy.wait(10));
|
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
|
|
|
|
|
|
|
// Size will NOT be restored
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(0, 0, 1280, 1024));
|
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::testResizeForVirtualKeyboardWithFullScreen()
|
|
|
|
{
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
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
|
|
|
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
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
|
|
|
|
|
|
|
// let's render
|
2022-08-01 21:29:02 +00:00
|
|
|
auto window = Test::renderAndWaitForShown(surface.get(), QSize(500, 800), Qt::blue);
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
2019-09-12 17:18:14 +00:00
|
|
|
|
|
|
|
// The client should receive a configure event upon becoming active.
|
2022-08-01 21:29:02 +00:00
|
|
|
QSignalSpy toplevelConfigureRequestedSpy(shellSurface.get(), &Test::XdgToplevel::configureRequested);
|
2021-05-11 05:26:51 +00:00
|
|
|
QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
|
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
Rework async geometry updates
Window management features were written with synchronous geometry
updates in mind. Currently, this poses a big problem on Wayland because
geometry updates are done in asynchronous fashion there.
At the moment, geometry is updated in a so called pseudo-asynchronous
fashion, meaning that the frame geometry will be reset to the old value
once geometry updates are unblocked. The main drawback of this approach
is that it is too error prone, the data flow is hard to comprehend, etc.
It is worth noting that there is already a machinery to perform async
geometry which is used during interactive move/resize operations.
This change extends the move/resize geometry usage beyond interactive
move/resize to make asynchronous geometry updates less error prone and
easier to comprehend.
With the proposed solution, all geometry updates must be done on the
move/resize geometry first. After that, the new geometry is passed on to
the Client-specific implementation of moveResizeInternal().
To be more specific, the frameGeometry() returns the current frame
geometry, it is primarily useful only to the scene. If you want to move
or resize a window, you need to use moveResizeGeometry() because it
corresponds to the last requested frame geometry.
It is worth noting that the moveResizeGeometry() returns the desired
bounding geometry. The client may commit the xdg_toplevel surface with a
slightly smaller window geometry, for example to enforce a specific
aspect ratio. The client is not allowed to resize beyond the size as
indicated in moveResizeGeometry().
The data flow is very simple: moveResize() updates the move/resize
geometry and calls the client-specific implementation of the
moveResizeInternal() method. Based on whether a configure event is
needed, moveResizeInternal() will update the frameGeometry() either
immediately or after the client commits a new buffer.
Unfortunately, both the compositor and xdg-shell clients try to update
the window geometry. It means that it's possible to have conflicts
between the two. With this change, the compositor's move resize geometry
will be synced only if there are no pending configure events, meaning
that the user doesn't try to resize the window.
2021-04-30 18:26:09 +00:00
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
window->move(QPoint(100, 300));
|
|
|
|
QSignalSpy frameGeometryChangedSpy(window, &Window::frameGeometryChanged);
|
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
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(100, 300, 500, 800));
|
|
|
|
window->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500));
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.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
|
|
|
|
2021-05-11 05:26:51 +00:00
|
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last()[0].toInt());
|
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
|
|
|
// render at the new size
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::blue);
|
2020-02-05 09:28:50 +00:00
|
|
|
QVERIFY(frameGeometryChangedSpy.wait());
|
2022-05-27 10:34:14 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(100, 0, 500, 100));
|
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
|
|
|
|
2023-02-06 14:42:22 +00:00
|
|
|
window->setFullScreen(true);
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last()[0].toInt());
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::blue);
|
2020-02-05 09:28:50 +00:00
|
|
|
QVERIFY(frameGeometryChangedSpy.wait());
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(0, 0, 1280, 1024));
|
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
|
|
|
|
2022-04-23 19:51:16 +00:00
|
|
|
window->setVirtualKeyboardGeometry(QRect());
|
2021-05-11 05:26:51 +00:00
|
|
|
QVERIFY(!surfaceConfigureRequestedSpy.wait(10));
|
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
|
|
|
|
|
|
|
// render at the size of the configureRequested.. it won't have changed
|
2022-08-01 21:29:02 +00:00
|
|
|
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::blue);
|
2020-02-05 09:28:50 +00:00
|
|
|
QVERIFY(!frameGeometryChangedSpy.wait(10));
|
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
|
|
|
// Size will NOT be restored
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->frameGeometry(), QRect(0, 0, 1280, 1024));
|
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
|
|
|
}
|
|
|
|
|
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.
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
|
|
|
Window *window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
2019-03-12 09:35:17 +00:00
|
|
|
|
|
|
|
// Start moving the client.
|
2023-02-18 11:38:08 +00:00
|
|
|
QSignalSpy interactiveMoveResizeStartedSpy(window, &Window::interactiveMoveResizeStarted);
|
|
|
|
QSignalSpy interactiveMoveResizeFinishedSpy(window, &Window::interactiveMoveResizeFinished);
|
2019-03-12 09:35:17 +00:00
|
|
|
|
2022-04-23 08:33:23 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), nullptr);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->isInteractiveMove(), false);
|
|
|
|
QCOMPARE(window->isInteractiveResize(), false);
|
2019-03-12 09:35:17 +00:00
|
|
|
workspace()->slotWindowMove();
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeStartedSpy.count(), 1);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), window);
|
|
|
|
QCOMPARE(window->isInteractiveMove(), true);
|
|
|
|
QCOMPARE(window->isInteractiveResize(), false);
|
2019-03-12 09:35:17 +00:00
|
|
|
|
|
|
|
// Let's pretend that the client crashed.
|
|
|
|
shellSurface.reset();
|
|
|
|
surface.reset();
|
2023-04-21 20:28:48 +00:00
|
|
|
QVERIFY(Test::waitForWindowClosed(window));
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeFinishedSpy.count(), 1);
|
2022-04-23 08:33:23 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), 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.
|
2022-08-01 21:29:02 +00:00
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
|
|
|
Window *window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
2022-04-23 19:51:16 +00:00
|
|
|
QVERIFY(window);
|
2019-03-12 09:35:17 +00:00
|
|
|
|
|
|
|
// Start resizing the client.
|
2023-02-18 11:38:08 +00:00
|
|
|
QSignalSpy interactiveMoveResizeStartedSpy(window, &Window::interactiveMoveResizeStarted);
|
|
|
|
QSignalSpy interactiveMoveResizeFinishedSpy(window, &Window::interactiveMoveResizeFinished);
|
2019-03-12 09:35:17 +00:00
|
|
|
|
2022-04-23 08:33:23 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), nullptr);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(window->isInteractiveMove(), false);
|
|
|
|
QCOMPARE(window->isInteractiveResize(), false);
|
2019-03-12 09:35:17 +00:00
|
|
|
workspace()->slotWindowResize();
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeStartedSpy.count(), 1);
|
2022-04-23 19:51:16 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), window);
|
|
|
|
QCOMPARE(window->isInteractiveMove(), false);
|
|
|
|
QCOMPARE(window->isInteractiveResize(), true);
|
2019-03-12 09:35:17 +00:00
|
|
|
|
|
|
|
// Let's pretend that the client crashed.
|
|
|
|
shellSurface.reset();
|
|
|
|
surface.reset();
|
2023-04-21 20:28:48 +00:00
|
|
|
QVERIFY(Test::waitForWindowClosed(window));
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeFinishedSpy.count(), 1);
|
2022-04-23 08:33:23 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), nullptr);
|
2019-03-12 09:35:17 +00:00
|
|
|
}
|
|
|
|
|
2023-01-23 15:35:30 +00:00
|
|
|
void MoveResizeWindowTest::testCancelInteractiveMoveResize_data()
|
|
|
|
{
|
|
|
|
QTest::addColumn<QuickTileMode>("quickTileMode");
|
|
|
|
QTest::addColumn<MaximizeMode>("maximizeMode");
|
|
|
|
|
|
|
|
QTest::newRow("quicktile_bottom") << QuickTileMode(QuickTileFlag::Bottom) << MaximizeMode::MaximizeRestore;
|
|
|
|
QTest::newRow("quicktile_top") << QuickTileMode(QuickTileFlag::Top) << MaximizeMode::MaximizeRestore;
|
|
|
|
QTest::newRow("quicktile_left") << QuickTileMode(QuickTileFlag::Left) << MaximizeMode::MaximizeRestore;
|
|
|
|
QTest::newRow("quicktile_right") << QuickTileMode(QuickTileFlag::Right) << MaximizeMode::MaximizeRestore;
|
|
|
|
QTest::newRow("maximize_vertical") << QuickTileMode(QuickTileFlag::None) << MaximizeMode::MaximizeVertical;
|
|
|
|
QTest::newRow("maximize_horizontal") << QuickTileMode(QuickTileFlag::None) << MaximizeMode::MaximizeHorizontal;
|
|
|
|
QTest::newRow("maximize_full") << QuickTileMode(QuickTileFlag::Maximize) << MaximizeMode::MaximizeFull;
|
|
|
|
}
|
|
|
|
|
|
|
|
void MoveResizeWindowTest::testCancelInteractiveMoveResize()
|
|
|
|
{
|
|
|
|
// This test verifies that after moveresize is cancelled, all relevant window states are restored
|
|
|
|
// to what they were before moveresize began
|
|
|
|
|
|
|
|
// Create the test client.
|
|
|
|
std::unique_ptr<KWayland::Client::Surface> surface(Test::createSurface());
|
|
|
|
QVERIFY(surface != nullptr);
|
|
|
|
std::unique_ptr<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.get()));
|
|
|
|
QVERIFY(shellSurface != nullptr);
|
|
|
|
Window *window = Test::renderAndWaitForShown(surface.get(), QSize(100, 50), Qt::blue);
|
|
|
|
QVERIFY(window);
|
|
|
|
|
|
|
|
// tile / maximize window
|
|
|
|
QFETCH(QuickTileMode, quickTileMode);
|
|
|
|
QFETCH(MaximizeMode, maximizeMode);
|
|
|
|
if (maximizeMode) {
|
|
|
|
window->setMaximize(maximizeMode & MaximizeMode::MaximizeVertical, maximizeMode & MaximizeMode::MaximizeHorizontal);
|
|
|
|
} else {
|
|
|
|
window->setQuickTileMode(quickTileMode, true);
|
|
|
|
}
|
|
|
|
QCOMPARE(window->quickTileMode(), quickTileMode);
|
|
|
|
QCOMPARE(window->requestedMaximizeMode(), maximizeMode);
|
|
|
|
|
|
|
|
QSignalSpy toplevelConfigureRequestedSpy(shellSurface.get(), &Test::XdgToplevel::configureRequested);
|
|
|
|
QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
|
|
|
|
QVERIFY(surfaceConfigureRequestedSpy.wait());
|
|
|
|
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::blue);
|
|
|
|
|
|
|
|
const QRectF geometry = window->moveResizeGeometry();
|
|
|
|
const QRectF geometryRestore = window->geometryRestore();
|
|
|
|
|
|
|
|
// Start resizing the client.
|
2023-02-18 11:38:08 +00:00
|
|
|
QSignalSpy interactiveMoveResizeStartedSpy(window, &Window::interactiveMoveResizeStarted);
|
|
|
|
QSignalSpy interactiveMoveResizeFinishedSpy(window, &Window::interactiveMoveResizeFinished);
|
2023-01-23 15:35:30 +00:00
|
|
|
|
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), nullptr);
|
|
|
|
QCOMPARE(window->isInteractiveMove(), false);
|
|
|
|
QCOMPARE(window->isInteractiveResize(), false);
|
|
|
|
workspace()->slotWindowResize();
|
2023-02-18 11:38:08 +00:00
|
|
|
QCOMPARE(interactiveMoveResizeStartedSpy.count(), 1);
|
2023-01-23 15:35:30 +00:00
|
|
|
QCOMPARE(workspace()->moveResizeWindow(), window);
|
|
|
|
QCOMPARE(window->isInteractiveMove(), false);
|
|
|
|
QCOMPARE(window->isInteractiveResize(), true);
|
|
|
|
|
|
|
|
Test::pointerMotionRelative(QPoint(1, 1), 1);
|
|
|
|
QCOMPARE(window->quickTileMode(), QuickTileMode());
|
|
|
|
QCOMPARE(window->requestedMaximizeMode(), MaximizeMode::MaximizeRestore);
|
|
|
|
|
|
|
|
// cancel moveresize, all state from before should be restored
|
|
|
|
window->keyPressEvent(Qt::Key::Key_Escape);
|
|
|
|
QCOMPARE(window->moveResizeGeometry(), geometry);
|
|
|
|
QCOMPARE(window->quickTileMode(), quickTileMode);
|
|
|
|
QCOMPARE(window->requestedMaximizeMode(), maximizeMode);
|
|
|
|
QCOMPARE(window->geometryRestore(), geometryRestore);
|
|
|
|
}
|
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"
|