1 files changed, 56 insertions, 2 deletions

diff --git a/tests/auto/client/shared/coreprotocol.cpp b/tests/auto/client/shared/coreprotocol.cpp
index fdd5f627c..16494d789 100644
--- a/tests/auto/client/shared/coreprotocol.cpp
+++ b/tests/auto/client/shared/coreprotocol.cpp
@@ -193,8 +193,8 @@ Seat::~Seat()
 }
 
 void Seat::setCapabilities(uint capabilities) {
-    // TODO: Add support for touch and keyboard
-    Q_ASSERT(capabilities == 0 || capabilities == capability_pointer);
+    // TODO: Add support for touch
+    Q_ASSERT(~capabilities & capability_touch);
 
     m_capabilities = capabilities;
 
@@ -206,6 +206,14 @@ void Seat::setCapabilities(uint capabilities) {
         m_pointer = nullptr;
     }
 
+    if (m_capabilities & capability_keyboard) {
+        if (!m_keyboard)
+            m_keyboard = (new Keyboard(this));
+    } else if (m_keyboard) {
+        m_oldKeyboards << m_keyboard;
+        m_keyboard = nullptr;
+    }
+
     for (auto *resource : resourceMap())
         wl_seat::send_capabilities(resource->handle, capabilities);
 }
@@ -225,6 +233,21 @@ void Seat::seat_get_pointer(Resource *resource, uint32_t id)
     m_pointer->add(resource->client(), id, resource->version());
 }
 
+void Seat::seat_get_keyboard(QtWaylandServer::wl_seat::Resource *resource, uint32_t id)
+{
+    if (~m_capabilities & capability_pointer) {
+        qWarning() << "Client requested a wl_keyboard without the capability being available."
+                   << "This Could be a race condition when hotunplugging,"
+                   << "but is most likely a client error";
+        Keyboard *keyboard = new Keyboard(this);
+        keyboard->add(resource->client(), id, resource->version());
+        // TODO: mark as destroyed
+        m_oldKeyboards << keyboard;
+        return;
+    }
+    m_keyboard->add(resource->client(), id, resource->version());
+}
+
 Surface *Pointer::cursorSurface()
 {
     return m_cursorRole ? m_cursorRole->m_surface : nullptr;
@@ -296,6 +319,37 @@ void Pointer::pointer_set_cursor(Resource *resource, uint32_t serial, wl_resourc
     emit setCursor(serial);
 }
 
+uint Keyboard::sendEnter(Surface *surface)
+{
+    auto serial = m_seat->m_compositor->nextSerial();
+    wl_client *client = surface->resource()->client();
+    const auto pointerResources = resourceMap().values(client);
+    for (auto *r : pointerResources)
+        send_enter(r->handle, serial, surface->resource()->handle, QByteArray());
+    return serial;
+}
+
+uint Keyboard::sendLeave(Surface *surface)
+{
+    auto serial = m_seat->m_compositor->nextSerial();
+    wl_client *client = surface->resource()->client();
+    const auto pointerResources = resourceMap().values(client);
+    for (auto *r : pointerResources)
+        send_leave(r->handle, serial, surface->resource()->handle);
+    return serial;
+}
+
+uint Keyboard::sendKey(wl_client *client, uint key, uint state)
+{
+    Q_ASSERT(state == key_state_pressed || state == key_state_released);
+    auto time = m_seat->m_compositor->currentTimeMilliseconds();
+    uint serial = m_seat->m_compositor->nextSerial();
+    const auto pointerResources = resourceMap().values(client);
+    for (auto *r : pointerResources)
+        send_key(r->handle, serial, time, key, state);
+    return serial;
+}
+
 // Shm implementation
 Shm::Shm(CoreCompositor *compositor, QVector<format> formats, int version)
     : QtWaylandServer::wl_shm(compositor->m_display, version)