1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
|
From: Rodney Dawes <dobey.pwns@gmail.com>
Date: Tue, 19 Dec 2023 15:36:16 -0500
Subject: Revert to text-input-unstable-v1 support
---
CMakeLists.txt | 1 +
connection/waylandinputmethodconnection.cpp | 38 ++++++++++++++---------------
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d4d1f2..3e81ded 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,7 @@ if(enable-wayland)
connection/waylandinputmethodconnection.h)
ecm_add_qtwayland_client_protocol(CONNECTION_SOURCES PROTOCOL ${WAYLANDPROTOCOLS_PATH}/unstable/input-method/input-method-unstable-v1.xml BASENAME input-method-unstable-v1)
+ ecm_add_qtwayland_client_protocol(CONNECTION_SOURCES PROTOCOL ${WAYLANDPROTOCOLS_PATH}/unstable/text-input/text-input-unstable-v1.xml BASENAME text-input-unstable-v1)
add_definitions(-DHAVE_WAYLAND)
endif()
diff --git a/connection/waylandinputmethodconnection.cpp b/connection/waylandinputmethodconnection.cpp
index 25e6fbf..8ecf557 100644
--- a/connection/waylandinputmethodconnection.cpp
+++ b/connection/waylandinputmethodconnection.cpp
@@ -18,7 +18,7 @@
#include "wayland-client.h"
#include <qwayland-input-method-unstable-v1.h>
-#include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h>
+#include <qwayland-text-input-unstable-v1.h>
#include <xkbcommon/xkbcommon.h>
@@ -113,37 +113,37 @@ xkb_keysym_t keyFromQt(int qt_key)
}
}
-QtWayland::zwp_text_input_v2::preedit_style preeditStyleFromMaliit(Maliit::PreeditFace face)
+QtWayland::zwp_text_input_v1::preedit_style preeditStyleFromMaliit(Maliit::PreeditFace face)
{
switch (face) {
case Maliit::PreeditDefault:
- return QtWayland::zwp_text_input_v2::preedit_style_default;
+ return QtWayland::zwp_text_input_v1::preedit_style_default;
case Maliit::PreeditNoCandidates:
- return QtWayland::zwp_text_input_v2::preedit_style_incorrect;
+ return QtWayland::zwp_text_input_v1::preedit_style_incorrect;
case Maliit::PreeditKeyPress:
- return QtWayland::zwp_text_input_v2::preedit_style_highlight;
+ return QtWayland::zwp_text_input_v1::preedit_style_highlight;
case Maliit::PreeditUnconvertible:
- return QtWayland::zwp_text_input_v2::preedit_style_inactive;
+ return QtWayland::zwp_text_input_v1::preedit_style_inactive;
case Maliit::PreeditActive:
- return QtWayland::zwp_text_input_v2::preedit_style_active;
+ return QtWayland::zwp_text_input_v1::preedit_style_active;
default:
- return QtWayland::zwp_text_input_v2::preedit_style_none;
+ return QtWayland::zwp_text_input_v1::preedit_style_none;
}
}
Maliit::TextContentType contentTypeFromWayland(uint32_t purpose)
{
switch (purpose) {
- case QtWayland::zwp_text_input_v2::content_purpose_normal:
+ case QtWayland::zwp_text_input_v1::content_purpose_normal:
return Maliit::FreeTextContentType;
- case QtWayland::zwp_text_input_v2::content_purpose_digits:
- case QtWayland::zwp_text_input_v2::content_purpose_number:
+ case QtWayland::zwp_text_input_v1::content_purpose_digits:
+ case QtWayland::zwp_text_input_v1::content_purpose_number:
return Maliit::NumberContentType;
- case QtWayland::zwp_text_input_v2::content_purpose_phone:
+ case QtWayland::zwp_text_input_v1::content_purpose_phone:
return Maliit::PhoneNumberContentType;
- case QtWayland::zwp_text_input_v2::content_purpose_url:
+ case QtWayland::zwp_text_input_v1::content_purpose_url:
return Maliit::UrlContentType;
- case QtWayland::zwp_text_input_v2::content_purpose_email:
+ case QtWayland::zwp_text_input_v1::content_purpose_email:
return Maliit::EmailContentType;
default:
return Maliit::CustomContentType;
@@ -344,7 +344,7 @@ void WaylandInputMethodConnection::sendPreeditString(const QString &string,
}
Q_FOREACH (const Maliit::PreeditTextFormat& format, preedit_formats) {
- QtWayland::zwp_text_input_v2::preedit_style style = preeditStyleFromMaliit(format.preeditFace);
+ QtWayland::zwp_text_input_v1::preedit_style style = preeditStyleFromMaliit(format.preeditFace);
uint32_t index = string.leftRef(format.start).toUtf8().size();
uint32_t length = string.leftRef(format.start + format.length).toUtf8().size() - index;
qCDebug(lcWaylandConnection) << Q_FUNC_INFO << "preedit_styling" << index << length;
@@ -563,10 +563,10 @@ void InputMethodContext::zwp_input_method_context_v1_content_type(uint32_t hint,
qCDebug(lcWaylandConnection) << Q_FUNC_INFO;
m_stateInfo[ContentTypeAttribute] = contentTypeFromWayland(purpose);
- m_stateInfo[AutoCapitalizationAttribute] = matchesFlag(hint, QtWayland::zwp_text_input_v2::content_hint_auto_capitalization);
- m_stateInfo[CorrectionAttribute] = matchesFlag(hint, QtWayland::zwp_text_input_v2::content_hint_auto_correction);
- m_stateInfo[PredictionAttribute] = matchesFlag(hint, QtWayland::zwp_text_input_v2::content_hint_auto_completion);
- m_stateInfo[HiddenTextAttribute] = matchesFlag(hint, QtWayland::zwp_text_input_v2::content_hint_hidden_text);
+ m_stateInfo[AutoCapitalizationAttribute] = matchesFlag(hint, QtWayland::zwp_text_input_v1::content_hint_auto_capitalization);
+ m_stateInfo[CorrectionAttribute] = matchesFlag(hint, QtWayland::zwp_text_input_v1::content_hint_auto_correction);
+ m_stateInfo[PredictionAttribute] = matchesFlag(hint, QtWayland::zwp_text_input_v1::content_hint_auto_completion);
+ m_stateInfo[HiddenTextAttribute] = matchesFlag(hint, QtWayland::zwp_text_input_v1::content_hint_hidden_text);
}
void InputMethodContext::zwp_input_method_context_v1_invoke_action(uint32_t button, uint32_t index)
|
