summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/client/qwaylandtextinputv3.cpp17
-rw-r--r--src/client/qwaylandtextinputv3_p.h6
2 files changed, 5 insertions, 18 deletions
diff --git a/src/client/qwaylandtextinputv3.cpp b/src/client/qwaylandtextinputv3.cpp
index 4344667a2..fbd902801 100644
--- a/src/client/qwaylandtextinputv3.cpp
+++ b/src/client/qwaylandtextinputv3.cpp
@@ -43,7 +43,7 @@ const Qt::InputMethodQueries supportedQueries3 = Qt::ImEnabled |
void QWaylandTextInputv3::zwp_text_input_v3_enter(struct ::wl_surface *surface)
{
- qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO;
+ qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO << m_surface << surface;
m_surface = surface;
@@ -185,21 +185,6 @@ void QWaylandTextInputv3::reset()
m_pendingPreeditString.clear();
}
-void QWaylandTextInputv3::enableSurface(::wl_surface *)
-{
- qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO;
-}
-
-void QWaylandTextInputv3::disableSurface(::wl_surface *surface)
-{
- qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO;
-
- if (m_surface != surface) {
- qCWarning(qLcQpaWaylandTextInput()) << Q_FUNC_INFO << "for surface" << surface << "focused surface" << m_surface;
- return;
- }
-}
-
void QWaylandTextInputv3::commit()
{
m_currentSerial = (m_currentSerial < UINT_MAX) ? m_currentSerial + 1U: 0U;
diff --git a/src/client/qwaylandtextinputv3_p.h b/src/client/qwaylandtextinputv3_p.h
index 8c5b93b9b..90b393cc0 100644
--- a/src/client/qwaylandtextinputv3_p.h
+++ b/src/client/qwaylandtextinputv3_p.h
@@ -49,8 +49,10 @@ public:
QLocale locale() const override;
Qt::LayoutDirection inputDirection() const override;
- void enableSurface(::wl_surface *surface) override;
- void disableSurface(::wl_surface *surface) override;
+ // doing nothing in zwp_text_input_v3.
+ // enter() and leave() takes the role to enable/disable the surface
+ void enableSurface(::wl_surface *) override {};
+ void disableSurface(::wl_surface *) override {};
protected:
void zwp_text_input_v3_enter(struct ::wl_surface *surface) override;