summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/client/client/mockcompositor.cpp10
-rw-r--r--tests/auto/client/client/mockoutput.cpp4
-rw-r--r--tests/auto/client/client/mockshell.cpp9
-rw-r--r--tests/auto/client/client/mocksurface.cpp2
-rw-r--r--tests/auto/compositor/compositor/compositor.pro4
-rw-r--r--tests/auto/compositor/compositor/testcompositor.cpp16
-rw-r--r--tests/auto/compositor/compositor/testcompositor.h6
-rw-r--r--tests/auto/compositor/compositor/testkeyboardgrabber.cpp4
-rw-r--r--tests/auto/compositor/compositor/testkeyboardgrabber.h2
-rw-r--r--tests/auto/compositor/compositor/testseat.cpp (renamed from tests/auto/compositor/compositor/testinputdevice.cpp)12
-rw-r--r--tests/auto/compositor/compositor/testseat.h (renamed from tests/auto/compositor/compositor/testinputdevice.h)8
-rw-r--r--tests/auto/compositor/compositor/tst_compositor.cpp80
12 files changed, 78 insertions, 79 deletions
diff --git a/tests/auto/client/client/mockcompositor.cpp b/tests/auto/client/client/mockcompositor.cpp
index c00d24bc3..45a35ea7d 100644
--- a/tests/auto/client/client/mockcompositor.cpp
+++ b/tests/auto/client/client/mockcompositor.cpp
@@ -274,7 +274,7 @@ Compositor::Compositor()
exit(EXIT_FAILURE);
}
- wl_display_add_global(m_display, &wl_compositor_interface, this, bindCompositor);
+ wl_global_create(m_display, &wl_compositor_interface, 1, this, bindCompositor);
m_data_device_manager.reset(new DataDeviceManager(this, m_display));
@@ -285,8 +285,8 @@ Compositor::Compositor()
m_keyboard = m_seat->keyboard();
m_touch = m_seat->touch();
- wl_display_add_global(m_display, &wl_output_interface, this, bindOutput);
- wl_display_add_global(m_display, &wl_shell_interface, this, bindShell);
+ wl_global_create(m_display, &wl_output_interface, 1, this, bindOutput);
+ wl_global_create(m_display, &wl_shell_interface, 1, this, bindShell);
m_loop = wl_display_get_event_loop(m_display);
m_fd = wl_event_loop_get_fd(m_loop);
@@ -323,8 +323,8 @@ void Compositor::bindCompositor(wl_client *client, void *compositorData, uint32_
compositor_create_region
};
- Q_UNUSED(version);
- wl_client_add_object(client, &wl_compositor_interface, &compositorInterface, id, compositorData);
+ wl_resource *resource = wl_resource_create(client, &wl_compositor_interface, static_cast<int>(version), id);
+ wl_resource_set_implementation(resource, &compositorInterface, compositorData, nullptr);
}
static void unregisterResourceCallback(wl_listener *listener, void *data)
diff --git a/tests/auto/client/client/mockoutput.cpp b/tests/auto/client/client/mockoutput.cpp
index 057387160..86561976f 100644
--- a/tests/auto/client/client/mockoutput.cpp
+++ b/tests/auto/client/client/mockoutput.cpp
@@ -32,9 +32,7 @@ namespace Impl {
void Compositor::bindOutput(wl_client *client, void *compositorData, uint32_t version, uint32_t id)
{
- Q_UNUSED(version);
-
- wl_resource *resource = wl_client_add_object(client, &wl_output_interface, 0, id, compositorData);
+ wl_resource *resource = wl_resource_create(client, &wl_output_interface, static_cast<int>(version), id);
Compositor *compositor = static_cast<Compositor *>(compositorData);
registerResource(&compositor->m_outputResources, resource);
diff --git a/tests/auto/client/client/mockshell.cpp b/tests/auto/client/client/mockshell.cpp
index 2ce5965a3..d5eede22e 100644
--- a/tests/auto/client/client/mockshell.cpp
+++ b/tests/auto/client/client/mockshell.cpp
@@ -159,8 +159,9 @@ static void get_shell_surface(wl_client *client, wl_resource *compositorResource
shell_surface_set_class
};
- Q_UNUSED(compositorResource);
- wl_client_add_object(client, &wl_shell_surface_interface, &shellSurfaceInterface, id, surfaceResource->data);
+ int version = wl_resource_get_version(compositorResource);
+ wl_resource *shellSurface = wl_resource_create(client, &wl_shell_surface_interface, version, id);
+ wl_resource_set_implementation(shellSurface, &shellSurfaceInterface, surfaceResource->data, nullptr);
Surface *surf = Surface::fromResource(surfaceResource);
surf->map();
}
@@ -171,8 +172,8 @@ void Compositor::bindShell(wl_client *client, void *compositorData, uint32_t ver
get_shell_surface
};
- Q_UNUSED(version);
- wl_client_add_object(client, &wl_shell_interface, &shellInterface, id, compositorData);
+ wl_resource *resource = wl_resource_create(client, &wl_shell_interface, static_cast<int>(version), id);
+ wl_resource_set_implementation(resource, &shellInterface, compositorData, nullptr);
}
}
diff --git a/tests/auto/client/client/mocksurface.cpp b/tests/auto/client/client/mocksurface.cpp
index 749a1470d..55712af11 100644
--- a/tests/auto/client/client/mocksurface.cpp
+++ b/tests/auto/client/client/mocksurface.cpp
@@ -96,7 +96,7 @@ void Surface::surface_damage(Resource *resource,
void Surface::surface_frame(Resource *resource,
uint32_t callback)
{
- wl_resource *frameCallback = wl_client_add_object(resource->client(), &wl_callback_interface, 0, callback, this);
+ wl_resource *frameCallback = wl_resource_create(resource->client(), &wl_callback_interface, 1, callback);
m_frameCallbackList << frameCallback;
}
diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro
index d85c30483..a3748697d 100644
--- a/tests/auto/compositor/compositor/compositor.pro
+++ b/tests/auto/compositor/compositor/compositor.pro
@@ -30,11 +30,11 @@ SOURCES += \
testkeyboardgrabber.cpp \
mockclient.cpp \
mockseat.cpp \
- testinputdevice.cpp
+ testseat.cpp
HEADERS += \
testcompositor.h \
testkeyboardgrabber.h \
mockclient.h \
mockseat.h \
- testinputdevice.h
+ testseat.h
diff --git a/tests/auto/compositor/compositor/testcompositor.cpp b/tests/auto/compositor/compositor/testcompositor.cpp
index dfa26a542..733bea5b3 100644
--- a/tests/auto/compositor/compositor/testcompositor.cpp
+++ b/tests/auto/compositor/compositor/testcompositor.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
#include "testcompositor.h"
-#include "testinputdevice.h"
+#include "testseat.h"
#include "testkeyboardgrabber.h"
#include <wayland-server.h>
@@ -35,7 +35,7 @@
TestCompositor::TestCompositor(bool createInputDev)
: QWaylandCompositor()
, shell(new QWaylandWlShell(this))
- , m_createInputDevice(createInputDev)
+ , m_createSeat(createInputDev)
{
setSocketName("wayland-qt-test-0");
}
@@ -64,14 +64,14 @@ void TestCompositor::onSurfaceAboutToBeDestroyed(QWaylandSurface *surface)
surfaces.removeOne(surface);
}
-QWaylandInputDevice *TestCompositor::createInputDevice()
+QWaylandSeat *TestCompositor::createSeat()
{
- if (m_createInputDevice)
- return new TestInputDevice(this, QWaylandInputDevice::Pointer | QWaylandInputDevice::Keyboard);
+ if (m_createSeat)
+ return new TestSeat(this, QWaylandSeat::Pointer | QWaylandSeat::Keyboard);
else
- return QWaylandCompositor::createInputDevice();
+ return QWaylandCompositor::createSeat();
}
-QWaylandKeyboard *TestCompositor::createKeyboardDevice(QWaylandInputDevice *inputDevice) {
- return new TestKeyboardGrabber(inputDevice);
+QWaylandKeyboard *TestCompositor::createKeyboardDevice(QWaylandSeat *seat) {
+ return new TestKeyboardGrabber(seat);
}
diff --git a/tests/auto/compositor/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h
index fb5909d19..8eeb7ade6 100644
--- a/tests/auto/compositor/compositor/testcompositor.h
+++ b/tests/auto/compositor/compositor/testcompositor.h
@@ -43,12 +43,12 @@ public slots:
void onSurfaceAboutToBeDestroyed(QWaylandSurface *surface);
protected:
- QWaylandInputDevice *createInputDevice() Q_DECL_OVERRIDE;
- QWaylandKeyboard *createKeyboardDevice(QWaylandInputDevice *inputDevice) Q_DECL_OVERRIDE;
+ QWaylandSeat *createSeat() Q_DECL_OVERRIDE;
+ QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) Q_DECL_OVERRIDE;
public:
QList<QWaylandSurface *> surfaces;
QWaylandWlShell* shell;
- bool m_createInputDevice;
+ bool m_createSeat;
};
diff --git a/tests/auto/compositor/compositor/testkeyboardgrabber.cpp b/tests/auto/compositor/compositor/testkeyboardgrabber.cpp
index 315b7f4fd..a3aa42ac2 100644
--- a/tests/auto/compositor/compositor/testkeyboardgrabber.cpp
+++ b/tests/auto/compositor/compositor/testkeyboardgrabber.cpp
@@ -28,8 +28,8 @@
#include "testkeyboardgrabber.h"
-TestKeyboardGrabber::TestKeyboardGrabber(QWaylandInputDevice *inputDevice)
- : QWaylandKeyboard(inputDevice)
+TestKeyboardGrabber::TestKeyboardGrabber(QWaylandSeat *seat)
+ : QWaylandKeyboard(seat)
{
}
diff --git a/tests/auto/compositor/compositor/testkeyboardgrabber.h b/tests/auto/compositor/compositor/testkeyboardgrabber.h
index ca5f51628..0ef595987 100644
--- a/tests/auto/compositor/compositor/testkeyboardgrabber.h
+++ b/tests/auto/compositor/compositor/testkeyboardgrabber.h
@@ -32,7 +32,7 @@ class TestKeyboardGrabber : public QWaylandKeyboard
{
Q_OBJECT
public:
- TestKeyboardGrabber(QWaylandInputDevice *inputDevice);
+ TestKeyboardGrabber(QWaylandSeat *seat);
void setFocus(QWaylandSurface *surface) Q_DECL_OVERRIDE;
void sendKeyModifiers(QWaylandClient *client, uint32_t serial) Q_DECL_OVERRIDE;
diff --git a/tests/auto/compositor/compositor/testinputdevice.cpp b/tests/auto/compositor/compositor/testseat.cpp
index 5c02dff85..38227872b 100644
--- a/tests/auto/compositor/compositor/testinputdevice.cpp
+++ b/tests/auto/compositor/compositor/testseat.cpp
@@ -26,27 +26,27 @@
**
****************************************************************************/
-#include "testinputdevice.h"
+#include "testseat.h"
#include <QMouseEvent>
-TestInputDevice::TestInputDevice(QWaylandCompositor *compositor, QWaylandInputDevice::CapabilityFlags caps)
- : QWaylandInputDevice(compositor, caps)
+TestSeat::TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps)
+ : QWaylandSeat(compositor, caps)
{
m_queryCount = 0;
}
-TestInputDevice::~TestInputDevice()
+TestSeat::~TestSeat()
{
}
-bool TestInputDevice::isOwner(QInputEvent *event) const
+bool TestSeat::isOwner(QInputEvent *event) const
{
m_queryCount++;
QMouseEvent *me = dynamic_cast<QMouseEvent *>(event);
return m_events.contains(me);
}
-QList<QMouseEvent *> TestInputDevice::createMouseEvents(int count)
+QList<QMouseEvent *> TestSeat::createMouseEvents(int count)
{
for (int i = 0; i < count; i++) {
m_events.append(new QMouseEvent(QEvent::MouseMove, QPointF(10 + i, 10 + i), Qt::NoButton, Qt::NoButton, Qt::NoModifier));
diff --git a/tests/auto/compositor/compositor/testinputdevice.h b/tests/auto/compositor/compositor/testseat.h
index e6134aa18..54641c07d 100644
--- a/tests/auto/compositor/compositor/testinputdevice.h
+++ b/tests/auto/compositor/compositor/testseat.h
@@ -26,7 +26,7 @@
**
****************************************************************************/
-#include <QWaylandInputDevice>
+#include <QWaylandSeat>
#include <QList>
QT_BEGIN_NAMESPACE
@@ -34,13 +34,13 @@ class QInputEvent;
class QMouseEvent;
QT_END_NAMESPACE
-class TestInputDevice : public QWaylandInputDevice
+class TestSeat : public QWaylandSeat
{
public:
- TestInputDevice(QWaylandCompositor *compositor, QWaylandInputDevice::CapabilityFlags caps);
- ~TestInputDevice();
+ TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps);
+ ~TestSeat();
bool isOwner(QInputEvent *inputEvent) const Q_DECL_OVERRIDE;
diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp
index 8405277b4..05e876dd0 100644
--- a/tests/auto/compositor/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/compositor/tst_compositor.cpp
@@ -29,11 +29,11 @@
#include "mockclient.h"
#include "testcompositor.h"
#include "testkeyboardgrabber.h"
-#include "testinputdevice.h"
+#include "testseat.h"
#include "qwaylandview.h"
#include "qwaylandbufferref.h"
-#include "qwaylandinput.h"
+#include "qwaylandseat.h"
#include <QtWaylandCompositor/QWaylandXdgShell>
#include <QtWaylandCompositor/QWaylandSurface>
@@ -48,10 +48,10 @@ class tst_WaylandCompositor : public QObject
private slots:
void init();
- void inputDeviceCapabilities();
+ void seatCapabilities();
void keyboardGrab();
- void inputDeviceCreation();
- void inputDeviceKeyboardFocus();
+ void seatCreation();
+ void seatKeyboardFocus();
void singleClient();
void multipleClients();
void geometry();
@@ -152,38 +152,38 @@ void tst_WaylandCompositor::keyboardGrab()
// Set the focused surface so that key event will flow through
QWaylandSurface *waylandSurface = compositor.surfaces.at(0);
- QWaylandInputDevice* inputDevice = compositor.defaultInputDevice();
+ QWaylandSeat* seat = compositor.defaultSeat();
- TestKeyboardGrabber* grab = static_cast<TestKeyboardGrabber *>(inputDevice->keyboard());
- QTRY_COMPARE(grab, inputDevice->keyboard());
+ TestKeyboardGrabber* grab = static_cast<TestKeyboardGrabber *>(seat->keyboard());
+ QTRY_COMPARE(grab, seat->keyboard());
QSignalSpy grabFocusSpy(grab, SIGNAL(focusedCalled()));
QSignalSpy grabKeyPressSpy(grab, SIGNAL(keyPressCalled()));
QSignalSpy grabKeyReleaseSpy(grab, SIGNAL(keyReleaseCalled()));
//QSignalSpy grabModifierSpy(grab, SIGNAL(modifiersCalled()));
- inputDevice->setKeyboardFocus(waylandSurface);
+ seat->setKeyboardFocus(waylandSurface);
QTRY_COMPARE(grabFocusSpy.count(), 1);
QKeyEvent ke(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, 30, 0, 0);
QKeyEvent ke1(QEvent::KeyRelease, Qt::Key_A, Qt::NoModifier, 30, 0, 0);
- inputDevice->sendFullKeyEvent(&ke);
- inputDevice->sendFullKeyEvent(&ke1);
+ seat->sendFullKeyEvent(&ke);
+ seat->sendFullKeyEvent(&ke1);
QTRY_COMPARE(grabKeyPressSpy.count(), 1);
QTRY_COMPARE(grabKeyReleaseSpy.count(), 1);
QKeyEvent ke2(QEvent::KeyPress, Qt::Key_Shift, Qt::NoModifier, 50, 0, 0);
QKeyEvent ke3(QEvent::KeyRelease, Qt::Key_Shift, Qt::NoModifier, 50, 0, 0);
- inputDevice->sendFullKeyEvent(&ke2);
- inputDevice->sendFullKeyEvent(&ke3);
+ seat->sendFullKeyEvent(&ke2);
+ seat->sendFullKeyEvent(&ke3);
//QTRY_COMPARE(grabModifierSpy.count(), 2);
// Modifiers are also keys
QTRY_COMPARE(grabKeyPressSpy.count(), 2);
QTRY_COMPARE(grabKeyReleaseSpy.count(), 2);
// Stop grabbing
- inputDevice->setKeyboardFocus(Q_NULLPTR);
- inputDevice->sendFullKeyEvent(&ke);
- inputDevice->sendFullKeyEvent(&ke1);
+ seat->setKeyboardFocus(Q_NULLPTR);
+ seat->sendFullKeyEvent(&ke);
+ seat->sendFullKeyEvent(&ke1);
QTRY_COMPARE(grabKeyPressSpy.count(), 2);
}
@@ -212,10 +212,10 @@ void tst_WaylandCompositor::mapSurface()
QWaylandSurface *waylandSurface = compositor.surfaces.at(0);
- QSignalSpy mappedSpy(waylandSurface, SIGNAL(mappedChanged()));
+ QSignalSpy hasContentSpy(waylandSurface, SIGNAL(hasContentChanged()));
QCOMPARE(waylandSurface->size(), QSize());
- QCOMPARE(waylandSurface->isMapped(), false);
+ QCOMPARE(waylandSurface->hasContent(), false);
QSize size(256, 256);
ShmBuffer buffer(size, client.shm);
@@ -227,8 +227,8 @@ void tst_WaylandCompositor::mapSurface()
wl_surface_commit(surface);
QTRY_COMPARE(waylandSurface->size(), size);
- QTRY_COMPARE(waylandSurface->isMapped(), true);
- QTRY_COMPARE(mappedSpy.count(), 1);
+ QTRY_COMPARE(waylandSurface->hasContent(), true);
+ QTRY_COMPARE(hasContentSpy.count(), 1);
wl_surface_destroy(surface);
}
@@ -261,7 +261,7 @@ void tst_WaylandCompositor::frameCallback()
QImage image() const
{
- if (bufferRef.isNull() || !bufferRef.isShm())
+ if (bufferRef.isNull() || !bufferRef.isSharedMemory())
return QImage();
return bufferRef.image();
}
@@ -296,7 +296,7 @@ void tst_WaylandCompositor::frameCallback()
wl_surface_damage(surface, 0, 0, size.width(), size.height());
wl_surface_commit(surface);
- QTRY_COMPARE(waylandSurface->isMapped(), true);
+ QTRY_COMPARE(waylandSurface->hasContent(), true);
QTRY_COMPARE(damagedSpy.count(), i + 1);
QCOMPARE(static_cast<BufferView*>(waylandSurface->views().first())->image(), buffer.image);
@@ -309,7 +309,7 @@ void tst_WaylandCompositor::frameCallback()
wl_surface_destroy(surface);
}
-void tst_WaylandCompositor::inputDeviceCapabilities()
+void tst_WaylandCompositor::seatCapabilities()
{
TestCompositor compositor;
compositor.create();
@@ -317,19 +317,19 @@ void tst_WaylandCompositor::inputDeviceCapabilities()
MockClient client;
Q_UNUSED(client);
- QWaylandInputDevice dev(&compositor, QWaylandInputDevice::Pointer);
+ QWaylandSeat dev(&compositor, QWaylandSeat::Pointer);
QTRY_VERIFY(dev.pointer());
QTRY_VERIFY(!dev.keyboard());
QTRY_VERIFY(!dev.touch());
- QWaylandInputDevice dev2(&compositor, QWaylandInputDevice::Keyboard | QWaylandInputDevice::Touch);
+ QWaylandSeat dev2(&compositor, QWaylandSeat::Keyboard | QWaylandSeat::Touch);
QTRY_VERIFY(!dev2.pointer());
QTRY_VERIFY(dev2.keyboard());
QTRY_VERIFY(dev2.touch());
}
-void tst_WaylandCompositor::inputDeviceCreation()
+void tst_WaylandCompositor::seatCreation()
{
TestCompositor compositor(true);
compositor.create();
@@ -337,15 +337,15 @@ void tst_WaylandCompositor::inputDeviceCreation()
MockClient client;
Q_UNUSED(client);
- TestInputDevice* dev = static_cast<TestInputDevice*>(compositor.defaultInputDevice());
+ TestSeat* dev = static_cast<TestSeat*>(compositor.defaultSeat());
// The compositor will create the default input device
- QTRY_COMPARE(compositor.defaultInputDevice(), dev);
+ QTRY_COMPARE(compositor.defaultSeat(), dev);
QList<QMouseEvent *> allEvents;
allEvents += dev->createMouseEvents(5);
foreach (QMouseEvent *me, allEvents) {
- compositor.inputDeviceFor(me);
+ compositor.seatFor(me);
}
// The default input device will get called exatly the number of times it has created
@@ -353,7 +353,7 @@ void tst_WaylandCompositor::inputDeviceCreation()
QTRY_COMPARE(dev->queryCount(), 5);
}
-void tst_WaylandCompositor::inputDeviceKeyboardFocus()
+void tst_WaylandCompositor::seatKeyboardFocus()
{
TestCompositor compositor(true);
compositor.create();
@@ -365,14 +365,14 @@ void tst_WaylandCompositor::inputDeviceKeyboardFocus()
QTRY_COMPARE(compositor.surfaces.size(), 1);
QWaylandSurface *waylandSurface = compositor.surfaces.at(0);
- QWaylandInputDevice* dev = compositor.defaultInputDevice();
+ QWaylandSeat* dev = compositor.defaultSeat();
dev->setKeyboardFocus(waylandSurface);
- QTRY_COMPARE(compositor.defaultInputDevice()->keyboardFocus(), waylandSurface);
+ QTRY_COMPARE(compositor.defaultSeat()->keyboardFocus(), waylandSurface);
wl_surface_destroy(surface);
QTRY_VERIFY(compositor.surfaces.size() == 0);
- QTRY_VERIFY(!compositor.defaultInputDevice()->keyboardFocus());
+ QTRY_VERIFY(!compositor.defaultSeat()->keyboardFocus());
}
class XdgTestCompositor: public TestCompositor {
@@ -508,7 +508,7 @@ void tst_WaylandCompositor::sendsXdgConfigure()
QTRY_COMPARE(mockXdgSurface.configureStates, QList<uint>{QWaylandXdgSurface::State::ActivatedState});
QTRY_COMPARE(mockXdgSurface.configureSize, QSize(10, 20));
- xdgSurface->requestMaximized(QSize(800, 600));
+ xdgSurface->sendMaximized(QSize(800, 600));
compositor.flushClients();
QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::MaximizedState));
QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
@@ -523,7 +523,7 @@ void tst_WaylandCompositor::sendsXdgConfigure()
QTRY_VERIFY(xdgSurface->activated());
QTRY_VERIFY(xdgSurface->maximized());
- xdgSurface->requestUnMaximized();
+ xdgSurface->sendUnmaximized();
compositor.flushClients();
QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::MaximizedState));
QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
@@ -533,19 +533,19 @@ void tst_WaylandCompositor::sendsXdgConfigure()
QTRY_VERIFY(xdgSurface->maximized());
QTRY_VERIFY(xdgSurface->activated());
- xdgSurface->requestResizing(QSize(800, 600));
+ xdgSurface->sendResizing(QSize(800, 600));
compositor.flushClients();
QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ResizingState));
QTRY_COMPARE(mockXdgSurface.configureSize, QSize(800, 600));
- xdgSurface->requestFullscreen(QSize(1024, 768));
+ xdgSurface->sendFullscreen(QSize(1024, 768));
compositor.flushClients();
QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::FullscreenState));
QTRY_COMPARE(mockXdgSurface.configureSize, QSize(1024, 768));
uint fullscreenSerial = mockXdgSurface.configureSerial;
- xdgSurface->requestUnMaximized();
+ xdgSurface->sendUnmaximized();
compositor.flushClients();
QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::FullscreenState));
@@ -554,11 +554,11 @@ void tst_WaylandCompositor::sendsXdgConfigure()
compositor.flushClients();
QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
- xdgSurface->requestMaximized(QSize(800, 600));
+ xdgSurface->sendMaximized(QSize(800, 600));
compositor.flushClients();
QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
- xdgSurface->requestFullscreen(QSize(800, 600));
+ xdgSurface->sendFullscreen(QSize(800, 600));
compositor.flushClients();
QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::MaximizedState));
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 21:05:18 +0000