From 9b6222598c990512c78bd42f55d7d6dc635c8b48 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <takao.fujiwara1@gmail.com>
Date: Mon, 25 Mar 2019 17:09:28 +0900
Subject: Calculate Qt::Key from keysym for IBus ForwardKeyEvent signal

QKeyEvent instance requires Qt::Key but currently X11 keysym is assigned
and the IBus QT module forwards the wrong key events.
Now QXkbCommon::keysymToQtKey() can generate Qt::Key from keysym and
forward the correct key events.

Change-Id: I25f0a9e9319b4a5f42847f8592ad3a30f6c9349d
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
---
 src/plugins/platforminputcontexts/ibus/ibus.pro            |  2 +-
 .../ibus/qibusplatforminputcontext.cpp                     | 14 ++++++++++----
 .../platforminputcontexts/platforminputcontexts.pro        | 11 ++++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro
index 52836bb8b6..9ba2297e38 100644
--- a/src/plugins/platforminputcontexts/ibus/ibus.pro
+++ b/src/plugins/platforminputcontexts/ibus/ibus.pro
@@ -1,6 +1,6 @@
 TARGET = ibusplatforminputcontextplugin
 
-QT += dbus gui-private
+QT += dbus gui-private xkbcommon_support-private
 SOURCES += $$PWD/qibusplatforminputcontext.cpp \
            $$PWD/qibusproxy.cpp \
            $$PWD/qibusproxyportal.cpp \
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index 7e66439ea7..f2429f24ff 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -51,6 +51,8 @@
 
 #include <QtGui/private/qguiapplication_p.h>
 
+#include <QtXkbCommonSupport/private/qxkbcommon_p.h>
+
 #include "qibusproxy.h"
 #include "qibusproxyportal.h"
 #include "qibusinputcontextproxy.h"
@@ -335,14 +337,12 @@ void QIBusPlatformInputContext::forwardKeyEvent(uint keyval, uint keycode, uint
     if (!input)
         return;
 
-    if (debug)
-        qDebug() << "forwardKeyEvent" << keyval << keycode << state;
-
     QEvent::Type type = QEvent::KeyPress;
     if (state & IBUS_RELEASE_MASK)
         type = QEvent::KeyRelease;
 
     state &= ~IBUS_RELEASE_MASK;
+    keycode += 8;
 
     Qt::KeyboardModifiers modifiers = Qt::NoModifier;
     if (state & IBUS_SHIFT_MASK)
@@ -354,7 +354,13 @@ void QIBusPlatformInputContext::forwardKeyEvent(uint keyval, uint keycode, uint
     if (state & IBUS_META_MASK)
         modifiers |= Qt::MetaModifier;
 
-    QKeyEvent event(type, keyval, modifiers, QString(keyval));
+    int qtcode = QXkbCommon::keysymToQtKey(keyval, modifiers);
+    QString text = QXkbCommon::lookupStringNoKeysymTransformations(keyval);
+
+    if (debug)
+        qDebug() << "forwardKeyEvent" << keyval << keycode << state << modifiers << qtcode << text;
+
+    QKeyEvent event(type, qtcode, modifiers, keycode, keyval, state, text);
     QCoreApplication::sendEvent(input, &event);
 }
 
diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro
index 68f6792377..56a39a49e7 100644
--- a/src/plugins/platforminputcontexts/platforminputcontexts.pro
+++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro
@@ -1,10 +1,11 @@
 TEMPLATE = subdirs
 QT_FOR_CONFIG += gui-private
 
-qtHaveModule(dbus) {
-!mac:!win32:SUBDIRS += ibus
-}
-
-qtConfig(xkbcommon): SUBDIRS += compose
+qtConfig(xkbcommon) {
+    SUBDIRS += compose
 
+    qtHaveModule(dbus) {
+        !macos:!win32:SUBDIRS += ibus
+    }
+}
 
-- 
cgit v1.2.3