From d749871d39dc17858acb621b1501080d63c2a5f4 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Wed, 11 Sep 2024 20:41:45 +0200 Subject: [PATCH] tests: Send seat name on bind Pick-to: 6.8 Change-Id: I4cec8d6c26076f0213dbeb9ab3d39585936d0c25 Reviewed-by: David Edmundson --- tests/auto/wayland/shared/coreprotocol.cpp | 3 ++- tests/auto/wayland/shared/coreprotocol.h | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/auto/wayland/shared/coreprotocol.cpp b/tests/auto/wayland/shared/coreprotocol.cpp index 5d9c4e9a368..a6f391777c2 100644 --- a/tests/auto/wayland/shared/coreprotocol.cpp +++ b/tests/auto/wayland/shared/coreprotocol.cpp @@ -240,8 +240,9 @@ void Output::output_bind_resource(QtWaylandServer::wl_output::Resource *resource } // Seat stuff -Seat::Seat(CoreCompositor *compositor, uint capabilities, int version) //TODO: check version +Seat::Seat(CoreCompositor *compositor, uint capabilities, int version, const QString &seatName) //TODO: check version : QtWaylandServer::wl_seat(compositor->m_display, version) + , m_seatName(seatName) , m_compositor(compositor) { setCapabilities(capabilities); diff --git a/tests/auto/wayland/shared/coreprotocol.h b/tests/auto/wayland/shared/coreprotocol.h index bea39dd134d..bb469cb121e 100644 --- a/tests/auto/wayland/shared/coreprotocol.h +++ b/tests/auto/wayland/shared/coreprotocol.h @@ -302,12 +302,14 @@ class Seat : public Global, public QtWaylandServer::wl_seat { Q_OBJECT public: - explicit Seat(CoreCompositor *compositor, uint capabilities = Seat::capability_pointer | Seat::capability_keyboard | Seat::capability_touch, int version = 9); + explicit Seat(CoreCompositor *compositor, uint capabilities = Seat::capability_pointer | Seat::capability_keyboard | Seat::capability_touch, int version = 9, const QString &seatName = QLatin1String("seat0")); ~Seat() override; void send_capabilities(Resource *resource, uint capabilities) = delete; // Use wrapper instead void send_capabilities(uint capabilities) = delete; // Use wrapper instead void setCapabilities(uint capabilities); + + QString m_seatName; CoreCompositor *m_compositor = nullptr; Pointer* m_pointer = nullptr; @@ -325,6 +327,7 @@ protected: void seat_bind_resource(Resource *resource) override { wl_seat::send_capabilities(resource->handle, m_capabilities); + wl_seat::send_name(resource->handle, m_seatName); // in any normal world this is would be set before capabilities. Weston does it after } void seat_get_pointer(Resource *resource, uint32_t id) override;