1 files changed, 40 insertions, 13 deletions

diff --git a/tests/auto/client/shared/coreprotocol.cpp b/tests/auto/client/shared/coreprotocol.cpp
index 5a59938de..833ad4b09 100644
--- a/tests/auto/client/shared/coreprotocol.cpp
+++ b/tests/auto/client/shared/coreprotocol.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2018 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "coreprotocol.h"
 #include "datadevice.h"
@@ -109,7 +109,7 @@ void Surface::surface_commit(Resource *resource)
             }
         }
 
-        for (wl_resource *frameCallback : qExchange(m_frameCallbackList, {})) {
+        for (wl_resource *frameCallback : std::exchange(m_frameCallbackList, {})) {
             auto time = m_wlCompositor->m_compositor->currentTimeMilliseconds();
             wl_callback_send_done(frameCallback, time);
             wl_resource_destroy(frameCallback);
@@ -144,7 +144,7 @@ void Surface::surface_frame(Resource *resource, uint32_t callback)
 }
 
 bool WlCompositor::isClean() {
-    for (auto *surface : qAsConst(m_surfaces)) {
+    for (auto *surface : std::as_const(m_surfaces)) {
         if (!CursorRole::fromSurface(surface)) {
             if (m_compositor->m_type != CoreCompositor::CompositorType::Legacy)
                 return false;
@@ -160,7 +160,7 @@ QString WlCompositor::dirtyMessage()
     if (isClean())
         return "clean";
     QStringList messages;
-    for (auto *s : qAsConst(m_surfaces)) {
+    for (auto *s : std::as_const(m_surfaces)) {
         QString role = s->m_role ? s->m_role->staticMetaObject.className(): "none/unknown";
         messages << "Surface with role: " + role;
     }
@@ -226,6 +226,8 @@ void Output::output_bind_resource(QtWaylandServer::wl_output::Resource *resource
 
     if (m_version >= WL_OUTPUT_DONE_SINCE_VERSION)
         wl_output::send_done(resource->handle);
+
+    Q_EMIT outputBound(resource);
 }
 
 // Seat stuff
@@ -336,7 +338,7 @@ uint Pointer::sendEnter(Surface *surface, const QPointF &position)
 
     uint serial = m_seat->m_compositor->nextSerial();
     m_enterSerials << serial;
-    m_cursorRole = nullptr; // According to the protocol, the pointer image is undefined after enter
+    m_cursorRole.clear(); // According to the protocol, the pointer image is undefined after enter
 
     wl_client *client = surface->resource()->client();
     const auto pointerResources = resourceMap().values(client);
@@ -423,18 +425,36 @@ void Pointer::sendFrame(wl_client *client)
         send_frame(r->handle);
 }
 
+void Pointer::sendAxisValue120(wl_client *client, QtWaylandServer::wl_pointer::axis axis, int value120)
+{
+    const auto pointerResources = resourceMap().values(client);
+    for (auto *r : pointerResources)
+        send_axis_value120(r->handle, axis, value120);
+}
+
+void Pointer::sendAxisRelativeDirection(wl_client *client, QtWaylandServer::wl_pointer::axis axis, QtWaylandServer::wl_pointer::axis_relative_direction direction)
+{
+    const auto pointerResources = resourceMap().values(client);
+    for (auto *r : pointerResources)
+        send_axis_relative_direction(r->handle, axis, direction);
+}
+
 void Pointer::pointer_set_cursor(Resource *resource, uint32_t serial, wl_resource *surface, int32_t hotspot_x, int32_t hotspot_y)
 {
     Q_UNUSED(resource);
-    auto *s = fromResource<Surface>(surface);
-    QVERIFY(s);
 
-    if (s->m_role) {
-        m_cursorRole = CursorRole::fromSurface(s);
-        QVERIFY(m_cursorRole);
+    if (!surface) {
+        m_cursorRole = nullptr;
     } else {
-        m_cursorRole = new CursorRole(s); //TODO: make sure we don't leak CursorRole
-        s->m_role = m_cursorRole;
+        auto *s = fromResource<Surface>(surface);
+        QVERIFY(s);
+        if (s->m_role) {
+            m_cursorRole = CursorRole::fromSurface(s);
+            QVERIFY(m_cursorRole);
+        } else {
+            m_cursorRole = new CursorRole(s); //TODO: make sure we don't leak CursorRole
+            s->m_role = m_cursorRole;
+        }
     }
 
     // Directly checking the last serial would be racy, we may just have sent leaves/enters which
@@ -493,6 +513,13 @@ void Touch::sendFrame(wl_client *client)
         send_frame(r->handle);
 }
 
+void Touch::sendCancel(wl_client *client)
+{
+    const auto touchResources = resourceMap().values(client);
+    for (auto *r : touchResources)
+        send_cancel(r->handle);
+}
+
 uint Keyboard::sendEnter(Surface *surface)
 {
     auto serial = m_seat->m_compositor->nextSerial();
@@ -540,7 +567,7 @@ Shm::Shm(CoreCompositor *compositor, QList<format> formats, int version)
 
 bool Shm::isClean()
 {
-//    for (ShmPool *pool : qAsConst(m_pools)) {
+//    for (ShmPool *pool : std::as_const(m_pools)) {
 //        //TODO: return false if not cursor buffer
 //        if (pool->m_buffers.isEmpty()) {
 //            return false;