Merge lp:~lukas-kde/qtubuntu/kbdLayout into lp:qtubuntu

[Lukáš Tinkl]

Support for switching kbd layouts

Support for switching kbd layouts

Fixup UTF-8 text and add support for dead keys

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:308
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/8/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:308
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/301/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/92/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/301/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

You need to link with xkbcommon, like you did in qtmir.

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

> You need to link with xkbcommon, like you did in qtmir.

Did you really need it? It compiled and linked just fine without

[Michael Terry (mterry)]

As mentioned on IRC (not sure if you saw it), yes it's needed here. Note how jenkins fails to build without it.

[lp:~lukas-kde/qtubuntu/kbdLayout]

309. By Lukáš Tinkl on 2016-02-01

explicitely link against xkbcommon

[Lukáš Tinkl (lukas-kde)]

> As mentioned on IRC (not sure if you saw it), yes it's needed here. Note how
> jenkins fails to build without it.

Done

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:309
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/9/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/9/rebuild

review: Approve (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:309
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/10/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/10/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:309
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/302/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/93/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/302/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

LGTM!

review: Approve

[lp:~lukas-kde/qtubuntu/kbdLayout]

310. By Lukáš Tinkl on 2016-02-25

merge trunk

311. By Lukáš Tinkl on 2016-03-11

add support for right_alt modifier

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2016-02-02 11:07:38 +0000
+++ src/ubuntumirclient/input.cpp	2016-03-11 13:29:40 +0000
@@ -30,6 +30,7 @@
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatforminputcontext.h>
 #include <qpa/qwindowsysteminterface.h>
+#include <QTextCodec>
 
 #include <xkbcommon/xkbcommon.h>
 #include <xkbcommon/xkbcommon-keysyms.h>
@@ -108,6 +109,27 @@
     XKB_KEY_MultipleCandidate,       Qt::Key_MultipleCandidate,
     XKB_KEY_PreviousCandidate,       Qt::Key_PreviousCandidate,
 
+    // dead keys
+    XKB_KEY_dead_grave,              Qt::Key_Dead_Grave,
+    XKB_KEY_dead_acute,              Qt::Key_Dead_Acute,
+    XKB_KEY_dead_circumflex,         Qt::Key_Dead_Circumflex,
+    XKB_KEY_dead_tilde,              Qt::Key_Dead_Tilde,
+    XKB_KEY_dead_macron,             Qt::Key_Dead_Macron,
+    XKB_KEY_dead_breve,              Qt::Key_Dead_Breve,
+    XKB_KEY_dead_abovedot,           Qt::Key_Dead_Abovedot,
+    XKB_KEY_dead_diaeresis,          Qt::Key_Dead_Diaeresis,
+    XKB_KEY_dead_abovering,          Qt::Key_Dead_Abovering,
+    XKB_KEY_dead_doubleacute,        Qt::Key_Dead_Doubleacute,
+    XKB_KEY_dead_caron,              Qt::Key_Dead_Caron,
+    XKB_KEY_dead_cedilla,            Qt::Key_Dead_Cedilla,
+    XKB_KEY_dead_ogonek,             Qt::Key_Dead_Ogonek,
+    XKB_KEY_dead_iota,               Qt::Key_Dead_Iota,
+    XKB_KEY_dead_voiced_sound,       Qt::Key_Dead_Voiced_Sound,
+    XKB_KEY_dead_semivoiced_sound,   Qt::Key_Dead_Semivoiced_Sound,
+    XKB_KEY_dead_belowdot,           Qt::Key_Dead_Belowdot,
+    XKB_KEY_dead_hook,               Qt::Key_Dead_Hook,
+    XKB_KEY_dead_horn,               Qt::Key_Dead_Horn,
+
     XKB_KEY_Mode_switch,             Qt::Key_Mode_switch,
     XKB_KEY_script_switch,           Qt::Key_Mode_switch,
     XKB_KEY_XF86AudioRaiseVolume,    Qt::Key_VolumeUp,
@@ -352,27 +374,26 @@
             mTouchDevice, touchPoints);
 }
 
-static uint32_t translateKeysym(uint32_t sym, char *string, size_t size)
-{
-    Q_UNUSED(size);
-    string[0] = '\0';
+static uint32_t translateKeysym(uint32_t sym, const QString &text) {
+    int code = 0;
 
-    if (sym >= XKB_KEY_F1 && sym <= XKB_KEY_F35)
+    QTextCodec *systemCodec = QTextCodec::codecForLocale();
+    if (sym < 128 || (sym < 256 && systemCodec->mibEnum() == 4)) {
+        // upper-case key, if known
+        code = isprint((int)sym) ? toupper((int)sym) : 0;
+    } else if (sym >= XKB_KEY_F1 && sym <= XKB_KEY_F35) {
         return Qt::Key_F1 + (int(sym) - XKB_KEY_F1);
-
-    if (sym == XKB_KEY_Return || sym == XKB_KEY_KP_Enter) {
-        string[0] = '\r';
-        string[1] = '\0';
-    }
-
-    for (int i = 0; KeyTable[i]; i += 2) {
-        if (sym == KeyTable[i])
-            return KeyTable[i + 1];
-    }
-
-    string[0] = sym;
-    string[1] = '\0';
-    return toupper(sym);
+    } else if (text.length() == 1 && text.unicode()->unicode() > 0x1f
+               && text.unicode()->unicode() != 0x7f
+               && !(sym >= XKB_KEY_dead_grave && sym <= XKB_KEY_dead_currency)) {
+        code = text.unicode()->toUpper().unicode();
+    } else {
+        for (int i = 0; KeyTable[i]; i += 2)
+            if (sym == KeyTable[i])
+                code = KeyTable[i + 1];
+    }
+
+    return code;
 }
 
 namespace
@@ -392,6 +413,9 @@
     if (modifiers & mir_input_event_modifier_meta) {
         q_modifiers |= Qt::MetaModifier;
     }
+    if (modifiers & mir_input_event_modifier_alt_right) {
+        q_modifiers |= Qt::GroupSwitchModifier;
+    }
     return q_modifiers;
 }
 }
@@ -415,9 +439,16 @@
     if (action == mir_keyboard_action_down)
         mLastFocusedWindow = window;
 
-    char s[2];
-    int sym = translateKeysym(xk_sym, s, sizeof(s));
-    QString text = QString::fromLatin1(s);
+    QString text;
+    QVarLengthArray<char, 32> chars(32);
+    {
+        int result = xkb_keysym_to_utf8(xk_sym, chars.data(), chars.size());
+
+        if (result > 0) {
+            text = QString::fromUtf8(chars.constData());
+        }
+    }
+    int sym = translateKeysym(xk_sym, text);
 
     bool is_auto_rep = action == mir_keyboard_action_repeat;
 

=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
--- src/ubuntumirclient/ubuntumirclient.pro	2016-01-04 17:18:51 +0000
+++ src/ubuntumirclient/ubuntumirclient.pro	2016-03-11 13:29:40 +0000
@@ -12,7 +12,7 @@
 QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined
 
 CONFIG += link_pkgconfig
-PKGCONFIG += egl mirclient ubuntu-platform-api
+PKGCONFIG += egl mirclient ubuntu-platform-api xkbcommon
 
 SOURCES = \
     backingstore.cpp \