diff options
| author | Inho Lee <inho.lee@qt.io> | 2021-10-21 00:15:13 +0200 |
|---|---|---|
| committer | Inho Lee <inho.lee@qt.io> | 2021-11-08 12:15:09 +0200 |
| commit | d6d67aa9e9946c0ee3a68bd21b1501cd831d0a13 (patch) | |
| tree | 42f4227fac1a77f8fda5b39dc14014157b095ea8 /src/client/qwaylanddisplay_p.h | |
| parent | af8f8c33ea885f472682f98e0699721f50b1f020 (diff) | |
Refactor QT_WAYLAND_TEXT_INPUT_PROTOCOL
Redundant logics are moved from registry_global.
QT_WAYLAND_TEXT_INPUT_PROTOCOL works with priority.
If QT_WAYLAND_TEXT_INPUT_PROTOCOL is empty or invalid,
the order of priority is qt_text_input_method_v1;zwp_text_input_v2
Task-number: QTBUG-96414
Change-Id: I1601091782ee63a57cbc678604b604d0ea287ccd
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/client/qwaylanddisplay_p.h')
| -rw-r--r-- | src/client/qwaylanddisplay_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h index 2104fa9b7..b58099ee8 100644 --- a/src/client/qwaylanddisplay_p.h +++ b/src/client/qwaylanddisplay_p.h @@ -224,8 +224,6 @@ private: void requestWaylandSync(); void checkTextInputProtocol(); - bool registerTextInputManager(const QStringList &protocols, int index); - void unregisterTextInputManager(const QStringList &protocols, int index); struct Listener { Listener() = default; @@ -297,7 +295,8 @@ private: static const wl_callback_listener syncCallbackListener; bool mClientSideInputContextRequested = !QPlatformInputContextFactory::requested().isNull(); - bool textInputProtocolChecked; + QStringList mTextInputManagerList; + int mTextInputManagerIndex = INT_MAX; void registry_global(uint32_t id, const QString &interface, uint32_t version) override; void registry_global_remove(uint32_t id) override; |