1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Send seat name on bind

Browse Source 
Pick-to: 6.8
Change-Id: I4cec8d6c26076f0213dbeb9ab3d39585936d0c25
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
David Edmundson 2024-09-11 20:41:45 +02:00
parent ceebf0d57a
commit d749871d39
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/wayland/shared/coreprotocol.cpp
View File

@ -240,8 +240,9 @@ void Output::output_bind_resource(QtWaylandServer::wl_output::Resource *resource
} }
// Seat stuff // 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) : QtWaylandServer::wl_seat(compositor->m_display, version)
, m_seatName(seatName)
, m_compositor(compositor) , m_compositor(compositor)
{ {
setCapabilities(capabilities); setCapabilities(capabilities);

5
tests/auto/wayland/shared/coreprotocol.h
View File

@ -302,12 +302,14 @@ class Seat : public Global, public QtWaylandServer::wl_seat
{ {
Q_OBJECT Q_OBJECT
public: 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; ~Seat() override;
void send_capabilities(Resource *resource, uint capabilities) = delete; // Use wrapper instead void send_capabilities(Resource *resource, uint capabilities) = delete; // Use wrapper instead
void send_capabilities(uint capabilities) = delete; // Use wrapper instead void send_capabilities(uint capabilities) = delete; // Use wrapper instead
void setCapabilities(uint capabilities); void setCapabilities(uint capabilities);
QString m_seatName;
CoreCompositor *m_compositor = nullptr; CoreCompositor *m_compositor = nullptr;
Pointer* m_pointer = nullptr; Pointer* m_pointer = nullptr;
@ -325,6 +327,7 @@ protected:
void seat_bind_resource(Resource *resource) override void seat_bind_resource(Resource *resource) override
{ {
wl_seat::send_capabilities(resource->handle, m_capabilities); 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; void seat_get_pointer(Resource *resource, uint32_t id) override;