Fix text-input support for new API

Update text input support to upstream text-input protocol v2 from
wayland-protocols. Remove support for input-method protocol for now.

Map text-input protocol on compositor side to the Qt input method API,
this allows to use any qt platform input method on compositor side
(especially qtvirtualkeyboard). Add support for qtvirtualkeyboard to
pure-qml example.

Implement all missing functions of the text-input protocol.

Change-Id: I597451ff65454a63dff86026b6a8d1ffbe07ce02
Done-with: Zeno Endemann <zeno.endemann@kdab.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>

1 files changed, 9 insertions, 11 deletions

diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index 97e4b6a80..3a16ed27a 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -43,6 +43,7 @@
 #include "wayland_wrapper/qwlregion_p.h"
 
 #include "extensions/qwlextendedsurface_p.h"
+#include "qwaylandinputmethodcontrol_p.h"
 
 #include <QtWaylandCompositor/QWaylandCompositor>
 #include <QtWaylandCompositor/QWaylandClient>
@@ -124,13 +125,13 @@ QWaylandSurfacePrivate::QWaylandSurfacePrivate()
     , client(Q_NULLPTR)
     , buffer(0)
     , role(0)
-    , inputPanelSurface(0)
     , inputRegion(infiniteRegion())
     , isCursorSurface(false)
     , destroyed(false)
     , mapped(false)
     , isInitialized(false)
     , contentOrientation(Qt::PrimaryOrientation)
+    , inputMethodControl(Q_NULLPTR)
     , subsurface(0)
 {
     pending.buffer = 0;
@@ -426,6 +427,7 @@ void QWaylandSurface::initialize(QWaylandCompositor *compositor, QWaylandClient
     d->client = client;
     d->init(client->client(), id, version);
     d->isInitialized = true;
+    d->inputMethodControl = new QWaylandInputMethodControl(this);
 #ifndef QT_NO_DEBUG
     QWaylandSurfacePrivate::removeUninitializedSurface(d);
 #endif
@@ -588,16 +590,6 @@ void QWaylandSurface::sendFrameCallbacks()
 }
 
 /*!
- * Returns true if the QWaylandSurface has an input panel surface. Otherwise returns false.
- */
-bool QWaylandSurface::hasInputPanelSurface() const
-{
-    Q_D(const QWaylandSurface);
-
-    return d->inputPanelSurface != 0;
-}
-
-/*!
  * Returns true if the QWaylandSurface's input region contains the point \a p.
  * Otherwise returns false.
  */
@@ -660,6 +652,12 @@ bool QWaylandSurface::isCursorSurface() const
     return d->isCursorSurface;
 }
 
+QWaylandInputMethodControl *QWaylandSurface::inputMethodControl() const
+{
+    Q_D(const QWaylandSurface);
+    return d->inputMethodControl;
+}
+
 /*!
  * Updates the surface with the compositor's retained clipboard selection. While this
  * is done automatically when the surface receives keyboard focus, this function is