diff options
| author | Jan Arne Petersen <jan.petersen@kdab.com> | 2015-12-30 00:08:17 +0100 |
|---|---|---|
| committer | Giulio Camuffo <giulio.camuffo@kdab.com> | 2016-04-18 11:39:14 +0000 |
| commit | 5444ea50bb2b1b894d5b3c33676f9ef207fdcd1a (patch) | |
| tree | 72ca3e6b3f6530ffe16795a96a717b5666cd5284 /src/compositor/compositor_api/qwaylandquickitem.h | |
| parent | 68f40f95972b857433df424cc16809eebfd77b8f (diff) | |
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>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickitem.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h index 81ea5213b..9dab65acf 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.h +++ b/src/compositor/compositor_api/qwaylandquickitem.h @@ -99,6 +99,11 @@ public: bool sizeFollowsSurface() const; void setSizeFollowsSurface(bool sizeFollowsSurface); +#ifndef QT_NO_IM + QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; + Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; +#endif + protected: void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; @@ -114,6 +119,10 @@ protected: void touchEvent(QTouchEvent *event) Q_DECL_OVERRIDE; void mouseUngrabEvent() Q_DECL_OVERRIDE; +#ifndef QT_NO_IM + void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; +#endif + virtual void surfaceChangedEvent(QWaylandSurface *newSurface, QWaylandSurface *oldSurface); public Q_SLOTS: virtual void takeFocus(QWaylandInputDevice *device = 0); @@ -129,6 +138,9 @@ private Q_SLOTS: void updateBuffer(bool hasBuffer); void updateWindow(); void beforeSync(); +#ifndef QT_NO_IM + void updateInputMethod(Qt::InputMethodQueries queries); +#endif Q_SIGNALS: void surfaceChanged(); |