diff options
author | Gatis Paeglis <gatis.paeglis@digia.com> | 2013-03-01 12:55:42 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-21 15:26:24 +0100 |
commit | 24c10b0b8d7673f2d5e04766b7e3e0e65f771127 (patch) | |
tree | d430145296d294490ce92ea64326db521af3b61c /src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h | |
parent | fb9cff6e88699b57b5dbc05d79c7958a2deacd71 (diff) |
Introducing QComposeInputContext
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 <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h')
-rw-r--r-- | src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h | 128 |
1 files changed, 128 insertions, 0 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h new file mode 100644 index 0000000000..11e7b2b422 --- /dev/null +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h @@ -0,0 +1,128 @@ +/**************************************************************************** +** +** 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 QTABLEGENERATOR_H +#define QTABLEGENERATOR_H + +#include <QtCore/QList> +#include <QtCore/QFile> +#include <QtCore/QMap> +#include <QtCore/QString> + +#define QT_KEYSEQUENCE_MAX_LEN 6 + +struct QComposeTableElement { + uint keys[QT_KEYSEQUENCE_MAX_LEN]; + uint value; + QString comment; +}; + +class Compare +{ +public: + bool operator () (const QComposeTableElement &lhs, const uint rhs[QT_KEYSEQUENCE_MAX_LEN]) + { + for (size_t i = 0; i < QT_KEYSEQUENCE_MAX_LEN; i++) { + if (lhs.keys[i] != rhs[i]) + return (lhs.keys[i] < rhs[i]); + } + return false; + } + + bool operator () (const QComposeTableElement &lhs, const QComposeTableElement &rhs) + { + for (size_t i = 0; i < QT_KEYSEQUENCE_MAX_LEN; i++) { + if (lhs.keys[i] != rhs.keys[i]) + return (lhs.keys[i] < rhs.keys[i]); + } + return false; + } +}; + +class TableGenerator +{ + +public: + enum TableState + { + UnsupportedLocale, + EmptyTable, + UnknownSystemComposeDir, + MissingComposeFile, + NoErrors + }; + + TableGenerator(); + ~TableGenerator(); + + void parseComposeFile(QFile *composeFile); + void printComposeTable() const; + void orderComposeTable(); + + QList<QComposeTableElement> composeTable() const; + TableState tableState() const { return m_state; } + +protected: + bool processFile(QString composeFileName); + void parseKeySequence(QString line); + void parseIncludeInstruction(QString line); + + void findComposeFile(); + bool findSystemComposeDir(); + QString systemComposeDir(); + + ushort keysymToUtf8(uint32_t sym); + uint32_t stringToKeysym(QString keysymName); + + void readLocaleMappings(); + void initPossibleLocations(); + bool cleanState() const { return ((m_state & NoErrors) == NoErrors); } + QString locale() const; + +private: + QList<QComposeTableElement> m_composeTable; + QMap<QString, QString> m_localeToTable; + TableState m_state; + QString m_systemComposeDir; + QList<QString> m_possibleLocations; +}; + +#endif // QTABLEGENERATOR_H |