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/qwaylandsurface_p.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/qwaylandsurface_p.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h index 635820931..d8b289c63 100644 --- a/src/compositor/compositor_api/qwaylandsurface_p.h +++ b/src/compositor/compositor_api/qwaylandsurface_p.h @@ -56,7 +56,6 @@ #include <QtWaylandCompositor/qwaylandsurface.h> #include <QtWaylandCompositor/qwaylandbufferref.h> -#include <QtWaylandCompositor/private/qwlinputpanelsurface_p.h> #include <QtWaylandCompositor/private/qwlregion_p.h> #include <QtCore/QVector> @@ -78,6 +77,7 @@ class QWaylandCompositor; class QWaylandSurface; class QWaylandView; class QWaylandSurfaceInterface; +class QWaylandInputMethodControl; namespace QtWayland { class FrameCallback; @@ -105,8 +105,6 @@ public: void notifyViewsAboutDestruction(); - void setInputPanelSurface(QtWayland::InputPanelSurface *ips) { inputPanelSurface = ips; } - #ifndef QT_NO_DEBUG static void addUninitializedSurface(QWaylandSurfacePrivate *surface); static void removeUninitializedSurface(QWaylandSurfacePrivate *surface); @@ -161,8 +159,6 @@ public: //member variables QList<QtWayland::FrameCallback *> pendingFrameCallbacks; QList<QtWayland::FrameCallback *> frameCallbacks; - QtWayland::InputPanelSurface *inputPanelSurface; - QRegion inputRegion; QRegion opaqueRegion; @@ -175,6 +171,7 @@ public: //member variables bool isInitialized; Qt::ScreenOrientation contentOrientation; QWindow::Visibility visibility; + QWaylandInputMethodControl *inputMethodControl; class Subsurface : public QtWaylandServer::wl_subsurface { |