diff options
| author | Liang Qi <liang.qi@qt.io> | 2021-10-20 08:51:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2021-10-20 13:02:49 +0000 |
| commit | 5ce28f2696031edb2ff7e4ae8f62801fdb63d865 (patch) | |
| tree | 0674cf5a10034f7c4a66fccbb2cc6e887ce63a47 /src/client/qwaylanddisplay_p.h | |
| parent | 0154d0b65b139c4919a020c29846f56697b5b42c (diff) | |
Support different text input protocols - update
This amends 99a6eb7b79471114705d7c68b0d5b388ea16ac03.
Only update text input when needed. And try to unregister the ones
which are not needed.
For client side, when QT_WAYLAND_TEXT_INPUT_PROTOCOL contains
multiple valid ones, the order doesn't matter now.
Fixes: QTBUG-97394
Task-number: QTBUG-96414
Change-Id: Ibe174056a4d4a4f2026e488d2ea99ec875b11ccc
Reviewed-by: Inho Lee <inho.lee@qt.io>
Diffstat (limited to 'src/client/qwaylanddisplay_p.h')
| -rw-r--r-- | src/client/qwaylanddisplay_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index 6d655a66b..2104fa9b7 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -225,6 +225,7 @@ private: void checkTextInputProtocol(); bool registerTextInputManager(const QStringList &protocols, int index); + void unregisterTextInputManager(const QStringList &protocols, int index); struct Listener { Listener() = default; @@ -296,6 +297,7 @@ private: static const wl_callback_listener syncCallbackListener; bool mClientSideInputContextRequested = !QPlatformInputContextFactory::requested().isNull(); + bool textInputProtocolChecked; void registry_global(uint32_t id, const QString &interface, uint32_t version) override; void registry_global_remove(uint32_t id) override; |