diff options
Diffstat (limited to 'src/client/qwaylandinputcontext_p.h')
| -rw-r--r-- | src/client/qwaylandinputcontext_p.h | 128 |
1 files changed, 25 insertions, 103 deletions
diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h index 10132dfe1..e6ce21d34 100644 --- a/src/client/qwaylandinputcontext_p.h +++ b/src/client/qwaylandinputcontext_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWaylandClient module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QWAYLANDINPUTCONTEXT_H @@ -54,82 +18,23 @@ #include <qpa/qplatforminputcontext.h> -#include <QLoggingCategory> #include <QPointer> -#include <QRectF> -#include <QVector> -#include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h> -#include <qwaylandinputmethodeventbuilder_p.h> +#include "qwaylandtextinputinterface_p.h" +#include <qtwaylandclientglobal_p.h> +#if QT_CONFIG(xkbcommon) +#include <xkbcommon/xkbcommon-compose.h> +#endif struct wl_callback; struct wl_callback_listener; QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(qLcQpaInputMethods) - namespace QtWaylandClient { class QWaylandDisplay; -class QWaylandTextInput : public QtWayland::zwp_text_input_v2 -{ -public: - QWaylandTextInput(QWaylandDisplay *display, struct ::zwp_text_input_v2 *text_input); - ~QWaylandTextInput() override; - - void reset(); - void commit(); - void updateState(Qt::InputMethodQueries queries, uint32_t flags); - - void setCursorInsidePreedit(int cursor); - - bool isInputPanelVisible() const; - QRectF keyboardRect() const; - - QLocale locale() const; - Qt::LayoutDirection inputDirection() const; - -protected: - void zwp_text_input_v2_enter(uint32_t serial, struct ::wl_surface *surface) override; - void zwp_text_input_v2_leave(uint32_t serial, struct ::wl_surface *surface) override; - void zwp_text_input_v2_modifiers_map(wl_array *map) override; - void zwp_text_input_v2_input_panel_state(uint32_t state, int32_t x, int32_t y, int32_t width, int32_t height) override; - void zwp_text_input_v2_preedit_string(const QString &text, const QString &commit) override; - void zwp_text_input_v2_preedit_styling(uint32_t index, uint32_t length, uint32_t style) override; - void zwp_text_input_v2_preedit_cursor(int32_t index) override; - void zwp_text_input_v2_commit_string(const QString &text) override; - void zwp_text_input_v2_cursor_position(int32_t index, int32_t anchor) override; - void zwp_text_input_v2_delete_surrounding_text(uint32_t before_length, uint32_t after_length) override; - void zwp_text_input_v2_keysym(uint32_t time, uint32_t sym, uint32_t state, uint32_t modifiers) override; - void zwp_text_input_v2_language(const QString &language) override; - void zwp_text_input_v2_text_direction(uint32_t direction) override; - void zwp_text_input_v2_input_method_changed(uint32_t serial, uint32_t flags) override; - -private: - Qt::KeyboardModifiers modifiersToQtModifiers(uint32_t modifiers); - - QWaylandDisplay *m_display = nullptr; - QWaylandInputMethodEventBuilder m_builder; - - QVector<Qt::KeyboardModifier> m_modifiersMap; - - uint32_t m_serial = 0; - struct ::wl_surface *m_surface = nullptr; - - QString m_preeditCommit; - - bool m_inputPanelVisible = false; - QRectF m_keyboardRectangle; - QLocale m_locale; - Qt::LayoutDirection m_inputDirection = Qt::LayoutDirectionAuto; - - struct ::wl_callback *m_resetCallback = nullptr; - static const wl_callback_listener callbackListener; - static void resetCallback(void *data, struct wl_callback *wl_callback, uint32_t time); -}; - class QWaylandInputContext : public QPlatformInputContext { Q_OBJECT @@ -155,11 +60,28 @@ public: void setFocusObject(QObject *object) override; +#if QT_CONFIG(xkbcommon) + bool filterEvent(const QEvent *event) override; + + // This invokable is called from QXkbCommon::setXkbContext(). + Q_INVOKABLE void setXkbContext(struct xkb_context *context) { m_XkbContext = context; } +#endif + private: - QWaylandTextInput *textInput() const; + QWaylandTextInputInterface *textInput() const; QWaylandDisplay *mDisplay = nullptr; QPointer<QWindow> mCurrentWindow; + +#if QT_CONFIG(xkbcommon) + void ensureInitialized(); + + bool m_initialized = false; + QObject *m_focusObject = nullptr; + xkb_compose_table *m_composeTable = nullptr; + xkb_compose_state *m_composeState = nullptr; + struct xkb_context *m_XkbContext = nullptr; +#endif }; } |