From a2a8a9ea0159cc6239737de2d745129f01c94d37 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 29 Apr 2013 20:26:25 +0200 Subject: Make access to xkbcommon_workaround.h more generic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It makes more sense to keep this workaround header together with the other libxkbcommon files for a better access point since it's used by several *.pro files. Change-Id: I63d4eb58f6e7f3852834e41c4b6e058a2c962233 Reviewed-by: Oswald Buddenhagen Reviewed-by: Samuel Rødal --- configure | 2 + .../xkbcommon/xkbcommon/xkbcommon_workaround.h | 105 +++++++++++++++++++++ .../platforminputcontexts/compose/compose.pro | 5 +- .../compose/generator/qtablegenerator.cpp | 7 ++ .../compose/xkbcommon_workaround.h | 105 --------------------- src/plugins/platforms/xcb/qxcbkeyboard.cpp | 22 ++++- src/plugins/platforms/xcb/xcb-plugin.pro | 4 + 7 files changed, 143 insertions(+), 107 deletions(-) create mode 100644 src/3rdparty/xkbcommon/xkbcommon/xkbcommon_workaround.h delete mode 100644 src/plugins/platforminputcontexts/compose/xkbcommon_workaround.h diff --git a/configure b/configure index ab5e7ecbb0..aa840cbd73 100755 --- a/configure +++ b/configure @@ -5290,9 +5290,11 @@ if [ "$CFG_XKBCOMMON" != "qt" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon >= 0.2.0" 2>/dev/null; then QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`" QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`" + QMAKE_VERSION_XKBCOMMON="`$PKG_CONFIG --modversion xkbcommon 2>/dev/null`" QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" + QMakeVar set QMAKE_VERSION_XKBCOMMON "$QMAKE_VERSION_XKBCOMMON" CFG_XKBCOMMON=yes else CFG_XKBCOMMON=no diff --git a/src/3rdparty/xkbcommon/xkbcommon/xkbcommon_workaround.h b/src/3rdparty/xkbcommon/xkbcommon/xkbcommon_workaround.h new file mode 100644 index 0000000000..58ce143978 --- /dev/null +++ b/src/3rdparty/xkbcommon/xkbcommon/xkbcommon_workaround.h @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** 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 XKBCOMMON_WORKAROUND_H +#define XKBCOMMON_WORKAROUND_H + +// Function utf32_to_utf8() is borrowed from the libxkbcommon library, +// file keysym-utf.c. The workaround should be removed once the fix from +// https://bugs.freedesktop.org/show_bug.cgi?id=56780 gets released. +static int utf32_to_utf8(uint32_t unichar, char *buffer) +{ + int count, shift, length; + uint8_t head; + + if (unichar <= 0x007f) { + buffer[0] = unichar; + buffer[1] = '\0'; + return 2; + } + else if (unichar <= 0x07FF) { + length = 2; + head = 0xc0; + } + else if (unichar <= 0xffff) { + length = 3; + head = 0xe0; + } + else if (unichar <= 0x1fffff) { + length = 4; + head = 0xf0; + } + else if (unichar <= 0x3ffffff) { + length = 5; + head = 0xf8; + } + else { + length = 6; + head = 0xfc; + } + + for (count = length - 1, shift = 0; count > 0; count--, shift += 6) + buffer[count] = 0x80 | ((unichar >> shift) & 0x3f); + + buffer[0] = head | ((unichar >> shift) & 0x3f); + buffer[length] = '\0'; + + return length + 1; +} + +static bool needWorkaround(uint32_t sym) +{ + /* patch encoding botch */ + if (sym == XKB_KEY_KP_Space) + return true; + + /* special keysyms */ + if ((sym >= XKB_KEY_BackSpace && sym <= XKB_KEY_Clear) || + (sym >= XKB_KEY_KP_Multiply && sym <= XKB_KEY_KP_9) || + sym == XKB_KEY_Return || sym == XKB_KEY_Escape || + sym == XKB_KEY_Delete || sym == XKB_KEY_KP_Tab || + sym == XKB_KEY_KP_Enter || sym == XKB_KEY_KP_Equal) + return true; + + return false; +} + +#endif // XKBCOMMON_WORKAROUND_H diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro index 1bfd46ebca..2490a4ffbe 100644 --- a/src/plugins/platforminputcontexts/compose/compose.pro +++ b/src/plugins/platforminputcontexts/compose/compose.pro @@ -15,7 +15,6 @@ SOURCES += $$PWD/main.cpp \ HEADERS += $$PWD/qcomposeplatforminputcontext.h \ $$PWD/generator/qtablegenerator.h \ - $$PWD/xkbcommon_workaround.h \ # libxkbcommon contains(QT_CONFIG, xkbcommon-qt): { @@ -23,6 +22,10 @@ contains(QT_CONFIG, xkbcommon-qt): { } else { LIBS += $$QMAKE_LIBS_XKBCOMMON QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON + equals(QMAKE_VERSION_XKBCOMMON, "0.2.0") { + DEFINES += XKBCOMMON_0_2_0 + INCLUDEPATH += ../../../3rdparty/xkbcommon/xkbcommon/ + } } OTHER_FILES += $$PWD/compose.json diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index 400f7aece8..f746207cc0 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -49,7 +49,10 @@ #include #include + +#ifdef XKBCOMMON_0_2_0 #include +#endif //#define DEBUG_GENERATOR @@ -258,6 +261,7 @@ ushort TableGenerator::keysymToUtf8(quint32 sym) int bytes; chars.resize(8); +#ifdef XKBCOMMON_0_2_0 if (needWorkaround(sym)) { quint32 codepoint; if (sym == XKB_KEY_KP_Space) @@ -269,6 +273,9 @@ ushort TableGenerator::keysymToUtf8(quint32 sym) } else { bytes = xkb_keysym_to_utf8(sym, chars.data(), chars.size()); } +#else + bytes = xkb_keysym_to_utf8(sym, chars.data(), chars.size()); +#endif if (bytes == -1) qWarning("TableGenerator::keysymToUtf8 - buffer too small"); diff --git a/src/plugins/platforminputcontexts/compose/xkbcommon_workaround.h b/src/plugins/platforminputcontexts/compose/xkbcommon_workaround.h deleted file mode 100644 index 58ce143978..0000000000 --- a/src/plugins/platforminputcontexts/compose/xkbcommon_workaround.h +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** -** 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 XKBCOMMON_WORKAROUND_H -#define XKBCOMMON_WORKAROUND_H - -// Function utf32_to_utf8() is borrowed from the libxkbcommon library, -// file keysym-utf.c. The workaround should be removed once the fix from -// https://bugs.freedesktop.org/show_bug.cgi?id=56780 gets released. -static int utf32_to_utf8(uint32_t unichar, char *buffer) -{ - int count, shift, length; - uint8_t head; - - if (unichar <= 0x007f) { - buffer[0] = unichar; - buffer[1] = '\0'; - return 2; - } - else if (unichar <= 0x07FF) { - length = 2; - head = 0xc0; - } - else if (unichar <= 0xffff) { - length = 3; - head = 0xe0; - } - else if (unichar <= 0x1fffff) { - length = 4; - head = 0xf0; - } - else if (unichar <= 0x3ffffff) { - length = 5; - head = 0xf8; - } - else { - length = 6; - head = 0xfc; - } - - for (count = length - 1, shift = 0; count > 0; count--, shift += 6) - buffer[count] = 0x80 | ((unichar >> shift) & 0x3f); - - buffer[0] = head | ((unichar >> shift) & 0x3f); - buffer[length] = '\0'; - - return length + 1; -} - -static bool needWorkaround(uint32_t sym) -{ - /* patch encoding botch */ - if (sym == XKB_KEY_KP_Space) - return true; - - /* special keysyms */ - if ((sym >= XKB_KEY_BackSpace && sym <= XKB_KEY_Clear) || - (sym >= XKB_KEY_KP_Multiply && sym <= XKB_KEY_KP_9) || - sym == XKB_KEY_Return || sym == XKB_KEY_Escape || - sym == XKB_KEY_Delete || sym == XKB_KEY_KP_Tab || - sym == XKB_KEY_KP_Enter || sym == XKB_KEY_KP_Equal) - return true; - - return false; -} - -#endif // XKBCOMMON_WORKAROUND_H diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp index f1b26853a1..18270d3cd5 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -53,6 +53,10 @@ #include #include +#ifdef XKBCOMMON_0_2_0 +#include +#endif + #ifndef XK_ISO_Left_Tab #define XK_ISO_Left_Tab 0xFE20 #endif @@ -1311,7 +1315,23 @@ QString QXcbKeyboard::keysymToUnicode(xcb_keysym_t sym) const int bytes; chars.resize(7); - if ((bytes = xkb_keysym_to_utf8(sym, chars.data(), chars.size())) == -1) +#ifdef XKBCOMMON_0_2_0 + if (needWorkaround(sym)) { + quint32 codepoint; + if (sym == XKB_KEY_KP_Space) + codepoint = XKB_KEY_space & 0x7f; + else + codepoint = sym & 0x7f; + + bytes = utf32_to_utf8(codepoint, chars.data()); + } else { + bytes = xkb_keysym_to_utf8(sym, chars.data(), chars.size()); + } +#else + bytes = xkb_keysym_to_utf8(sym, chars.data(), chars.size()); +#endif + + if (bytes == -1) qWarning("QXcbKeyboard::handleKeyEvent - buffer too small"); chars.resize(bytes-1); diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro index e8d52ebf2f..f01fa90e2d 100644 --- a/src/plugins/platforms/xcb/xcb-plugin.pro +++ b/src/plugins/platforms/xcb/xcb-plugin.pro @@ -124,4 +124,8 @@ contains(QT_CONFIG, xkbcommon-qt): { } else { LIBS += $$QMAKE_LIBS_XKBCOMMON QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON + equals(QMAKE_VERSION_XKBCOMMON, "0.2.0") { + DEFINES += XKBCOMMON_0_2_0 + INCLUDEPATH += ../../../3rdparty/xkbcommon/xkbcommon/ + } } -- cgit v1.2.3