From 24c10b0b8d7673f2d5e04766b7e3e0e65f771127 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Fri, 1 Mar 2013 12:55:42 +0100 Subject: Introducing QComposeInputContext MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When switching from Xlib to xcb platform plugin it was agreed that XIM is deprecated. Users should be using QT_IM_MODULE to load input context plugin for a more advance input method framework support. The proposed solution is to parse the compose file directly from Qt. This approach removes the overhead of communication protocols used in Xlib and/or IBUS. TableGenerator class follows [1]. The compose file is searched for in the following order: 1) If the environment variable $XCOMPOSEFILE is set, its value is used as the name of the Compose file. 2) If the user’s home directory has a file named .XCompose, it is used as the Compose file. 3) The system provided compose file is used by mapping the locale to a compose file from the list in /usr/share/X11/locale/compose.dir. Regarding step 3 - TableGenerator searches in hard-coded locations for system-provided compose files. Here I have introcuded a new environment variable QTCOMPOSE which can be used to prepend an extra location to be searched. [1] http://www.x.org/archive/X11R7.7/doc/man/man5/Compose.5.xhtml Task-number: QTBUG-28183 Change-Id: I76dcfd454f3acc23db98192a3673c1ab2af4425f Reviewed-by: Samuel Rødal --- .../compose/qcomposeplatforminputcontext.h | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h (limited to 'src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h') diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h new file mode 100644 index 0000000000..1ced2f8ded --- /dev/null +++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QCOMPOSEPLATFORMINPUTCONTEXT_H +#define QCOMPOSEPLATFORMINPUTCONTEXT_H + +#include + +#include + +#include "generator/qtablegenerator.h" + +QT_BEGIN_NAMESPACE + +class QEvent; + +class QComposeInputContext : public QPlatformInputContext +{ + Q_OBJECT + +public: + QComposeInputContext(); + ~QComposeInputContext(); + + bool isValid() const; + void setFocusObject(QObject *object); + void reset(); + void update(Qt::InputMethodQueries); + bool filterEvent(const QEvent *event); + +protected: + void clearComposeBuffer(); + bool ignoreKey(int keyval) const; + bool composeKey(int keyval) const; + bool checkComposeTable(); + void commitText(uint character) const; + +private: + QObject *m_focusObject; + QList m_composeTable; + uint m_composeBuffer[QT_KEYSEQUENCE_MAX_LEN + 1]; + TableGenerator::TableState m_tableState; +}; + +QT_END_NAMESPACE + +#endif // QCOMPOSEPLATFORMINPUTCONTEXT_H -- cgit v1.2.3