Remove the static instance of a compositor.

All classes that needs to access the compositor instance needs to keep
a reference to it

Change-Id: Ia0d4b04b460200ad3c7907b94c032afe90c18771

1 files changed, 13 insertions, 1 deletions

diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
index e02e53fa3..09c0bfc9c 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -53,6 +53,18 @@ QWaylandKeyboard::QWaylandKeyboard(QWaylandInputDevice *seat, QObject *parent)
     connect(&d->m_focusDestroyListener, &QWaylandDestroyListener::fired, this, &QWaylandKeyboard::focusDestroyed);
 }
 
+QWaylandInputDevice *QWaylandKeyboard::inputDevice() const
+{
+    Q_D(const QWaylandKeyboard);
+    return d->m_seat;
+}
+
+QWaylandCompositor *QWaylandKeyboard::compositor() const
+{
+    Q_D(const QWaylandKeyboard);
+    return d->m_seat->compositor();
+}
+
 void QWaylandKeyboard::focusDestroyed(void *data)
 {
     Q_UNUSED(data);
@@ -68,7 +80,7 @@ QWaylandClient *QWaylandKeyboard::focusClient() const
     Q_D(const QWaylandKeyboard);
     if (!d->focusResource())
         return Q_NULLPTR;
-    return QWaylandClient::fromWlClient(d->focusResource()->client());
+    return QWaylandClient::fromWlClient(compositor(), d->focusResource()->client());
 }
 
 void QWaylandKeyboard::sendKeyModifiers(QWaylandClient *client, uint serial)