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, 60 insertions, 17 deletions

diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h
index cdabfcca4..0429dd14e 100644
--- a/src/client/qwaylandinputcontext_p.h
+++ b/src/client/qwaylandinputcontext_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Klarälvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWaylandClient module of the Qt Toolkit.
@@ -54,36 +54,75 @@
 
 #include <qpa/qplatforminputcontext.h>
 
-#include <QtWaylandClient/private/qwayland-text.h>
+#include <QLoggingCategory>
+#include <QPointer>
+#include <QRectF>
+#include <QVector>
+
+#include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h>
+#include <qwaylandinputmethodeventbuilder.h>
 
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_LOGGING_CATEGORY(qLcQpaInputMethods)
+
 namespace QtWaylandClient {
 
 class QWaylandDisplay;
 
-class QWaylandTextInput : public QtWayland::wl_text_input
+class QWaylandTextInput : public QtWayland::zwp_text_input_v2
 {
 public:
-    QWaylandTextInput(struct ::wl_text_input *text_input);
-
-    QString commitString() const;
+    QWaylandTextInput(QWaylandDisplay *display, struct ::zwp_text_input_v2 *text_input);
+    ~QWaylandTextInput();
 
     void reset();
-    void updateState();
+    void commit();
+    void updateState(Qt::InputMethodQueries queries, uint32_t flags);
+
+    bool isInputPanelVisible() const;
+    QRectF keyboardRect() const;
+
+    QLocale locale() const;
+    Qt::LayoutDirection inputDirection() const;
 
 protected:
-    void text_input_preedit_string(uint32_t serial, const QString &text, const QString &commit) Q_DECL_OVERRIDE;
-    void text_input_commit_string(uint32_t serial, const QString &text) Q_DECL_OVERRIDE;
-    void text_input_enter(wl_surface *surface) Q_DECL_OVERRIDE;
-    void text_input_leave() Q_DECL_OVERRIDE;
-    void text_input_keysym(uint32_t serial, uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers);
+    void zwp_text_input_v2_enter(uint32_t serial, struct ::wl_surface *surface) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_leave(uint32_t serial, struct ::wl_surface *surface) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_modifiers_map(wl_array *map) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_input_panel_state(uint32_t state, int32_t x, int32_t y, int32_t width, int32_t height) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_preedit_string(const QString &text, const QString &commit) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_preedit_styling(uint32_t index, uint32_t length, uint32_t style) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_preedit_cursor(int32_t index) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_commit_string(const QString &text) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_cursor_position(int32_t index, int32_t anchor) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_delete_surrounding_text(uint32_t before_length, uint32_t after_length) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_keysym(uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_language(const QString &language) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_text_direction(uint32_t direction) Q_DECL_OVERRIDE;
+    void zwp_text_input_v2_input_method_changed(uint32_t serial, uint32_t flags) Q_DECL_OVERRIDE;
 
 private:
-    QString m_commit;
+    Qt::KeyboardModifiers modifiersToQtModifiers(uint32_t modifiers);
+
+    QWaylandDisplay *m_display;
+    QWaylandInputMethodEventBuilder m_builder;
+
+    QVector<Qt::KeyboardModifier> m_modifiersMap;
 
     uint32_t m_serial;
-    uint32_t m_resetSerial;
+    struct ::wl_surface *m_surface;
+
+    QString m_preeditCommit;
+
+    bool m_inputPanelVisible;
+    QRectF m_keyboardRectangle;
+    QLocale m_locale;
+    Qt::LayoutDirection m_inputDirection;
+
+    struct ::wl_callback *m_resetCallback;
+    static const wl_callback_listener callbackListener;
+    static void resetCallback(void *data, struct wl_callback *wl_callback, uint32_t time);
 };
 
 class QWaylandInputContext : public QPlatformInputContext
@@ -91,25 +130,29 @@ class QWaylandInputContext : public QPlatformInputContext
     Q_OBJECT
 public:
     explicit QWaylandInputContext(QWaylandDisplay *display);
+    ~QWaylandInputContext();
 
     bool isValid() const Q_DECL_OVERRIDE;
 
     void reset() Q_DECL_OVERRIDE;
     void commit() Q_DECL_OVERRIDE;
     void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE;
-    void invokeAction(QInputMethod::Action, int cursorPosition) Q_DECL_OVERRIDE;
 
     void showInputPanel() Q_DECL_OVERRIDE;
     void hideInputPanel() Q_DECL_OVERRIDE;
     bool isInputPanelVisible() const Q_DECL_OVERRIDE;
+    QRectF keyboardRect() const Q_DECL_OVERRIDE;
+
+    QLocale locale() const Q_DECL_OVERRIDE;
+    Qt::LayoutDirection inputDirection() const Q_DECL_OVERRIDE;
 
     void setFocusObject(QObject *object) Q_DECL_OVERRIDE;
 
 private:
-    bool ensureTextInput();
+    QWaylandTextInput *textInput() const;
 
     QWaylandDisplay *mDisplay;
-    QScopedPointer<QWaylandTextInput> mTextInput;
+    QPointer<QWindow> mCurrentWindow;
 };
 
 }