New input method protocol for use with Qt clients

We introduce an alternative input-method protocol, which
is a one-to-one mapping to Qt's input method API. Input
methods such as the virtual keyboard's hunspell
integration is quite sensitive to the inner workings of
the input method handling, both in terms of when state
is updated and which updates are delivered when.

With a one-to-one mapping we are able to match these
expectations and keep a well-synchronized state.

Task-number: QTBUG-85135
Task-number: QTBUG-85134
Change-Id: Id69c22a7b0885ea59f39fdcc8d663749af56c7ce
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

1 files changed, 8 insertions, 3 deletions

diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index 0aa18f098..764acc2d9 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -43,6 +43,7 @@
 #include "qwaylandshmwindow_p.h"
 #include "qwaylandinputdevice_p.h"
 #include "qwaylandinputcontext_p.h"
+#include "qwaylandinputmethodcontext_p.h"
 #include "qwaylandshmbackingstore_p.h"
 #include "qwaylandnativeinterface_p.h"
 #if QT_CONFIG(clipboard)
@@ -465,10 +466,14 @@ void QWaylandIntegration::reconfigureInputContext()
         qCWarning(lcQpaWayland) << "qtvirtualkeyboard currently is not supported at client-side,"
                                    " use QT_IM_MODULE=qtvirtualkeyboard at compositor-side.";
 
-    if (requested.isNull())
-        mInputContext.reset(new QWaylandInputContext(mDisplay.data()));
-    else
+    if (requested.isNull()) {
+        if (mDisplay->textInputMethodManager() != nullptr)
+            mInputContext.reset(new QWaylandInputMethodContext(mDisplay.data()));
+        else
+            mInputContext.reset(new QWaylandInputContext(mDisplay.data()));
+    } else {
         mInputContext.reset(QPlatformInputContextFactory::create(requested));
+    }
 
     const QString defaultInputContext(QStringLiteral("compose"));
     if ((!mInputContext || !mInputContext->isValid()) && requested != defaultInputContext)