1 files changed, 24 insertions, 2 deletions

diff --git a/tests/auto/client/shared/coreprotocol.h b/tests/auto/client/shared/coreprotocol.h
index 5cef476c8..fe8202ad1 100644
--- a/tests/auto/client/shared/coreprotocol.h
+++ b/tests/auto/client/shared/coreprotocol.h
@@ -38,6 +38,7 @@ namespace MockCompositor {
 class WlCompositor;
 class Output;
 class Pointer;
+class Touch;
 class Keyboard;
 class CursorRole;
 class ShmPool;
@@ -236,7 +237,7 @@ class Seat : public Global, public QtWaylandServer::wl_seat
 {
     Q_OBJECT
 public:
-    explicit Seat(CoreCompositor *compositor, uint capabilities, int version = 4);
+    explicit Seat(CoreCompositor *compositor, uint capabilities = Seat::capability_pointer | Seat::capability_keyboard | Seat::capability_touch, int version = 5);
     ~Seat() override;
     void send_capabilities(Resource *resource, uint capabilities) = delete; // Use wrapper instead
     void send_capabilities(uint capabilities) = delete; // Use wrapper instead
@@ -247,6 +248,9 @@ public:
     Pointer* m_pointer = nullptr;
     QVector<Pointer *> m_oldPointers;
 
+    Touch* m_touch = nullptr;
+    QVector<Touch *> m_oldTouchs;
+
     Keyboard* m_keyboard = nullptr;
     QVector<Keyboard *> m_oldKeyboards;
 
@@ -259,8 +263,8 @@ protected:
     }
 
     void seat_get_pointer(Resource *resource, uint32_t id) override;
+    void seat_get_touch(Resource *resource, uint32_t id) override;
     void seat_get_keyboard(Resource *resource, uint32_t id) override;
-//    void seat_get_touch(Resource *resource, uint32_t id) override;
 
 //    void seat_release(Resource *resource) override;
 };
@@ -279,6 +283,10 @@ public:
     void sendMotion(wl_client *client, const QPointF &position);
     uint sendButton(wl_client *client, uint button, uint state);
     void sendAxis(wl_client *client, axis axis, qreal value);
+    void sendAxisDiscrete(wl_client *client, axis axis, int discrete);
+    void sendAxisSource(wl_client *client, axis_source source);
+    void sendAxisStop(wl_client *client, axis axis);
+    void sendFrame(wl_client *client);
 
     Seat *m_seat = nullptr;
     QVector<uint> m_enterSerials;
@@ -303,6 +311,19 @@ public:
     Surface *m_surface = nullptr;
 };
 
+class Touch : public QObject, public QtWaylandServer::wl_touch
+{
+    Q_OBJECT
+public:
+    explicit Touch(Seat *seat) : m_seat(seat) {}
+    uint sendDown(Surface *surface, const QPointF &position, int id);
+    uint sendUp(wl_client *client, int id);
+    void sendMotion(wl_client *client, const QPointF &position, int id);
+    void sendFrame(wl_client *client);
+
+    Seat *m_seat = nullptr;
+};
+
 class Keyboard : public QObject, public QtWaylandServer::wl_keyboard
 {
     Q_OBJECT
@@ -313,6 +334,7 @@ public:
     uint sendLeave(Surface *surface);
     uint sendKey(wl_client *client, uint key, uint state);
     Seat *m_seat = nullptr;
+    Surface *m_enteredSurface = nullptr;
 };
 
 class Shm : public Global, public QtWaylandServer::wl_shm