Fallback to normal input method plugins

wl_text_input is still a weston-specific extension. other compositors
just expect the normal input context plugins to be instantiated when the
wayland client connects.
now try to use the one based upon wl_text_input, if fails fallback to
the QPlatformInputContextFactory::create() route

Change-Id: I034acf9ed19c766250f81fc5648d0318ae45f1bf
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index 9526aec4c..c8d121766 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -128,7 +128,15 @@ QWaylandIntegration::QWaylandIntegration()
     mClipboard = new QWaylandClipboard(mDisplay);
     mDrag = new QWaylandDrag(mDisplay);
 
-    mInputContext.reset(new QWaylandInputContext(mDisplay));
+    //try to use the input context using the wl_text_input interface
+    QPlatformInputContext *ctx = new QWaylandInputContext(mDisplay);
+    mInputContext.reset(ctx);
+
+    //use the traditional way for on screen keyboards for now
+    if (!mInputContext.data()->isValid()) {
+        ctx = QPlatformInputContextFactory::create();
+        mInputContext.reset(ctx);
+    }
 }
 
 QWaylandIntegration::~QWaylandIntegration()