1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use new feature name xkbcommon_evdev -> xkbcommon

Browse Source 
The xkbcommon configure logic was refactored in
qtbase/c3a963da1f9e7b1d37e63eedded61da4fbdaaf9a.
For more details see the relevant commit.

Change-Id: Ic1aa26846ab8266c589f6e92dc8b81aba36df58a
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
Gatis Paeglis 2018-11-19 16:32:12 +01:00
parent a3e23fe560
commit f1e49d9309
9 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/client.pro
View File

@ -15,8 +15,8 @@ use_gold_linker: CONFIG += no_linker_version_script
CONFIG -= precompile_header CONFIG -= precompile_header
CONFIG += link_pkgconfig wayland-scanner CONFIG += link_pkgconfig wayland-scanner
qtConfig(xkbcommon-evdev): \ qtConfig(xkbcommon): \
QMAKE_USE_PRIVATE += xkbcommon_evdev QMAKE_USE_PRIVATE += xkbcommon
QMAKE_USE += wayland-client QMAKE_USE += wayland-client

4
src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/wl-shell.pro
View File

@ -2,8 +2,8 @@ QT += gui-private waylandclient-private
CONFIG += wayland-scanner CONFIG += wayland-scanner
QMAKE_USE += wayland-client QMAKE_USE += wayland-client
qtConfig(xkbcommon-evdev): \ qtConfig(xkbcommon): \
QMAKE_USE_PRIVATE += xkbcommon_evdev QMAKE_USE_PRIVATE += xkbcommon
WAYLANDCLIENTSOURCES += \ WAYLANDCLIENTSOURCES += \
../../../3rdparty/protocol/wayland.xml ../../../3rdparty/protocol/wayland.xml

4
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro
View File

@ -3,8 +3,8 @@ CONFIG += wayland-scanner
QMAKE_USE += wayland-client QMAKE_USE += wayland-client
qtConfig(xkbcommon-evdev): \ qtConfig(xkbcommon): \
QMAKE_USE += xkbcommon_evdev QMAKE_USE += xkbcommon
HEADERS += \ HEADERS += \
qwaylandxdgpopupv5_p.h \ qwaylandxdgpopupv5_p.h \

4
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro
View File

@ -2,8 +2,8 @@ QT += gui-private waylandclient-private
CONFIG += wayland-scanner CONFIG += wayland-scanner
QMAKE_USE += wayland-client QMAKE_USE += wayland-client
qtConfig(xkbcommon-evdev): \ qtConfig(xkbcommon): \
QMAKE_USE_PRIVATE += xkbcommon_evdev QMAKE_USE_PRIVATE += xkbcommon
WAYLANDCLIENTSOURCES += \ WAYLANDCLIENTSOURCES += \
../../../3rdparty/protocol/xdg-shell-unstable-v6.xml ../../../3rdparty/protocol/xdg-shell-unstable-v6.xml

4
src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/xdg-shell.pro
View File

@ -2,8 +2,8 @@ QT += gui-private waylandclient-private
CONFIG += wayland-scanner CONFIG += wayland-scanner
QMAKE_USE += wayland-client QMAKE_USE += wayland-client
qtConfig(xkbcommon-evdev): \ qtConfig(xkbcommon): \
QMAKE_USE_PRIVATE += xkbcommon_evdev QMAKE_USE_PRIVATE += xkbcommon
WAYLANDCLIENTSOURCES += \ WAYLANDCLIENTSOURCES += \
../../../3rdparty/protocol/xdg-decoration-unstable-v1.xml \ ../../../3rdparty/protocol/xdg-decoration-unstable-v1.xml \

22
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -70,7 +70,7 @@
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
#include <xkbcommon/xkbcommon-compose.h> #include <xkbcommon/xkbcommon-compose.h>
#endif #endif
@ -84,7 +84,7 @@ QWaylandInputDevice::Keyboard::Keyboard(QWaylandInputDevice *p)
connect(&mRepeatTimer, SIGNAL(timeout()), this, SLOT(repeatKey())); connect(&mRepeatTimer, SIGNAL(timeout()), this, SLOT(repeatKey()));
} }
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
bool QWaylandInputDevice::Keyboard::createDefaultKeyMap() bool QWaylandInputDevice::Keyboard::createDefaultKeyMap()
{ {
if (mXkbContext && mXkbMap && mXkbState) { if (mXkbContext && mXkbMap && mXkbState) {
@ -156,7 +156,7 @@ void QWaylandInputDevice::Keyboard::releaseComposeState()
QWaylandInputDevice::Keyboard::~Keyboard() QWaylandInputDevice::Keyboard::~Keyboard()
{ {
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
releaseComposeState(); releaseComposeState();
releaseKeyMap(); releaseKeyMap();
#endif #endif
@ -344,7 +344,7 @@ Qt::KeyboardModifiers QWaylandInputDevice::Keyboard::modifiers() const
{ {
Qt::KeyboardModifiers ret = Qt::NoModifier; Qt::KeyboardModifiers ret = Qt::NoModifier;
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
if (!mXkbState) if (!mXkbState)
return ret; return ret;
@ -625,7 +625,7 @@ void QWaylandInputDevice::Pointer::pointer_axis(uint32_t time, uint32_t axis, in
void QWaylandInputDevice::Keyboard::keyboard_keymap(uint32_t format, int32_t fd, uint32_t size) void QWaylandInputDevice::Keyboard::keyboard_keymap(uint32_t format, int32_t fd, uint32_t size)
{ {
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
close(fd); close(fd);
return; return;
@ -728,7 +728,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time,
if (isDown) if (isDown)
mParent->mQDisplay->setLastInputDevice(mParent, serial, window); mParent->mQDisplay->setLastInputDevice(mParent, serial, window);
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
if (!createDefaultKeyMap()) { if (!createDefaultKeyMap()) {
return; return;
} }
@ -771,7 +771,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time,
#endif #endif
if (state == WL_KEYBOARD_KEY_STATE_PRESSED if (state == WL_KEYBOARD_KEY_STATE_PRESSED
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
&& xkb_keymap_key_repeats(mXkbMap, code) && xkb_keymap_key_repeats(mXkbMap, code)
#endif #endif
) { ) {
@ -779,7 +779,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time,
mRepeatCode = code; mRepeatCode = code;
mRepeatTime = time; mRepeatTime = time;
mRepeatText = text; mRepeatText = text;
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
mRepeatSym = sym; mRepeatSym = sym;
#endif #endif
mRepeatTimer.setInterval(400); mRepeatTimer.setInterval(400);
@ -793,7 +793,7 @@ void QWaylandInputDevice::Keyboard::repeatKey()
{ {
mRepeatTimer.setInterval(25); mRepeatTimer.setInterval(25);
sendKey(mFocus->window(), mRepeatTime, QEvent::KeyRelease, mRepeatKey, modifiers(), mRepeatCode, sendKey(mFocus->window(), mRepeatTime, QEvent::KeyRelease, mRepeatKey, modifiers(), mRepeatCode,
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
mRepeatSym, mNativeModifiers, mRepeatSym, mNativeModifiers,
#else #else
0, 0, 0, 0,
@ -801,7 +801,7 @@ void QWaylandInputDevice::Keyboard::repeatKey()
mRepeatText, true); mRepeatText, true);
sendKey(mFocus->window(), mRepeatTime, QEvent::KeyPress, mRepeatKey, modifiers(), mRepeatCode, sendKey(mFocus->window(), mRepeatTime, QEvent::KeyPress, mRepeatKey, modifiers(), mRepeatCode,
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
mRepeatSym, mNativeModifiers, mRepeatSym, mNativeModifiers,
#else #else
0, 0, 0, 0,
@ -816,7 +816,7 @@ void QWaylandInputDevice::Keyboard::keyboard_modifiers(uint32_t serial,
uint32_t group) uint32_t group)
{ {
Q_UNUSED(serial); Q_UNUSED(serial);
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
if (mXkbState) if (mXkbState)
xkb_state_update_mask(mXkbState, xkb_state_update_mask(mXkbState,
mods_depressed, mods_latched, mods_locked, mods_depressed, mods_latched, mods_locked,

10
src/plugins/platforms/wayland/qwaylandinputdevice_p.h
View File

@ -65,7 +65,7 @@
#include <QtWaylandClient/private/qwayland-wayland.h> #include <QtWaylandClient/private/qwayland-wayland.h>
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-keysyms.h> #include <xkbcommon/xkbcommon-keysyms.h>
#endif #endif
@ -77,7 +77,7 @@
struct wl_cursor_image; struct wl_cursor_image;
#endif #endif
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
struct xkb_compose_state; struct xkb_compose_state;
struct xkb_compose_table; struct xkb_compose_table;
#endif #endif
@ -209,7 +209,7 @@ public:
QWaylandInputDevice *mParent = nullptr; QWaylandInputDevice *mParent = nullptr;
QPointer<QWaylandWindow> mFocus; QPointer<QWaylandWindow> mFocus;
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
xkb_context *mXkbContext = nullptr; xkb_context *mXkbContext = nullptr;
xkb_keymap *mXkbMap = nullptr; xkb_keymap *mXkbMap = nullptr;
xkb_state *mXkbState = nullptr; xkb_state *mXkbState = nullptr;
@ -222,7 +222,7 @@ public:
uint32_t mRepeatCode; uint32_t mRepeatCode;
uint32_t mRepeatTime; uint32_t mRepeatTime;
QString mRepeatText; QString mRepeatText;
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
xkb_keysym_t mRepeatSym; xkb_keysym_t mRepeatSym;
#endif #endif
QTimer mRepeatTimer; QTimer mRepeatTimer;
@ -233,7 +233,7 @@ private slots:
void repeatKey(); void repeatKey();
private: private:
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
bool createDefaultKeyMap(); bool createDefaultKeyMap();
void releaseKeyMap(); void releaseKeyMap();
void createComposeState(); void createComposeState();

10
src/plugins/platforms/wayland/shared/qwaylandxkb.cpp
View File

@ -43,13 +43,13 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QString> #include <QString>
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
#include <xkbcommon/xkbcommon-keysyms.h> #include <xkbcommon/xkbcommon-keysyms.h>
#endif #endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
static const uint32_t KeyTbl[] = { static const uint32_t KeyTbl[] = {
XKB_KEY_Escape, Qt::Key_Escape, XKB_KEY_Escape, Qt::Key_Escape,
XKB_KEY_Tab, Qt::Key_Tab, XKB_KEY_Tab, Qt::Key_Tab,
@ -297,7 +297,7 @@ static xkb_keysym_t toKeysymFromTable(uint32_t key)
std::pair<int, QString> QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::KeyboardModifiers &modifiers) std::pair<int, QString> QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::KeyboardModifiers &modifiers)
{ {
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
QString text; QString text;
uint utf32 = xkb_keysym_to_utf32(keysym); uint utf32 = xkb_keysym_to_utf32(keysym);
if (utf32) if (utf32)
@ -339,7 +339,7 @@ std::pair<int, QString> QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::Keyb
Qt::KeyboardModifiers QWaylandXkb::modifiers(struct xkb_state *state) Qt::KeyboardModifiers QWaylandXkb::modifiers(struct xkb_state *state)
{ {
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
Qt::KeyboardModifiers modifiers = Qt::NoModifier; Qt::KeyboardModifiers modifiers = Qt::NoModifier;
xkb_state_component cstate = static_cast<xkb_state_component>(XKB_STATE_DEPRESSED | XKB_STATE_LATCHED | XKB_STATE_LOCKED); xkb_state_component cstate = static_cast<xkb_state_component>(XKB_STATE_DEPRESSED | XKB_STATE_LATCHED | XKB_STATE_LOCKED);
@ -367,7 +367,7 @@ QEvent::Type QWaylandXkb::toQtEventType(uint32_t state)
QVector<xkb_keysym_t> QWaylandXkb::toKeysym(QKeyEvent *event) QVector<xkb_keysym_t> QWaylandXkb::toKeysym(QKeyEvent *event)
{ {
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
QVector<xkb_keysym_t> keysyms; QVector<xkb_keysym_t> keysyms;
if (event->key() >= Qt::Key_F1 && event->key() <= Qt::Key_F35) { if (event->key() >= Qt::Key_F1 && event->key() <= Qt::Key_F35) {
keysyms.append(XKB_KEY_F1 + (event->key() - Qt::Key_F1)); keysyms.append(XKB_KEY_F1 + (event->key() - Qt::Key_F1));

2
src/plugins/platforms/wayland/shared/qwaylandxkb_p.h
View File

@ -45,7 +45,7 @@
#include <Qt> #include <Qt>
#include <QEvent> #include <QEvent>
#if QT_CONFIG(xkbcommon_evdev) #if QT_CONFIG(xkbcommon)
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#else #else
typedef quint32 xkb_keysym_t; typedef quint32 xkb_keysym_t;