Merge lp:~lukas-kde/unity8/defaultKeymap into lp:unity8

[Lukáš Tinkl]

Fix keymap not being applied on the shell itself

Prereq-archive: ppa:ci-train-ppa-service/2272

Bind the keymap to the global device keymap which is then applied to Mir's device config. Need to keep the old surface binding in place as well due to xmir/libertine apps.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

Yes, https://code.launchpad.net/~lukas-kde/qtmir/defaultKeymap/+merge/306519

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

 * If you changed the UI, has there been a design review?

N/A

[Gerry Boland (gerboland)]

Why the commented out bit?

review: Needs Information

[Lukáš Tinkl (lukas-kde)]

This is WIP, need to test it out together with the Mir fix (currently in https://bileto.ubuntu.com/#/ticket/2003) if it doesn't clash with our surface-based approach.

I'd appreciate if someone could look at https://code.launchpad.net/~lukas-kde/qtmir/defaultKeymap/+merge/306519 first :)

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

FAILED: Continuous integration, rev:2622
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2816/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3685/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3713
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3557/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3557/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3557/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3557/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3557/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3557/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Works well, and code is reasonable

review: Approve

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

FAILED: Continuous integration, rev:2622
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2908/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3793/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3821
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3664/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3664/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3664/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3664/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3664/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3664/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2622
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2930/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3825
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2219
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2219
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3853
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3696
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3696/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3696
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3696/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3696
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3696/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3696
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3696/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3696
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3696/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3696
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3696/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2622
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2977/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:2622
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2976/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3877
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2267
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2267
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3905
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3750
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3750/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3750
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3750/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3750
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3750/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3750
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3750/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3750
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3750/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3750
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3750/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-12 16:45:09 +0000
+++ CMakeLists.txt	2017-01-02 11:20:59 +0000
@@ -70,7 +70,7 @@
 find_package(Qt5Concurrent 5.4 REQUIRED)
 find_package(Qt5Sql 5.4 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=25)
 pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)

=== modified file 'debian/control'
--- debian/control	2016-12-12 16:45:09 +0000
+++ debian/control	2017-01-02 11:20:59 +0000
@@ -38,7 +38,7 @@
                libubuntugestures5-private-dev (>= 1.3.2030),
                libudev-dev,
                libudm-common-dev,
-               libunity-api-dev (>= 8.0),
+               libunity-api-dev (>= 8.1),
                libusermetricsoutput1-dev,
 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                libx11-dev[!arm64 !armhf],

=== modified file 'qml/Components/KeymapSwitcher.qml'
--- qml/Components/KeymapSwitcher.qml	2016-11-30 19:24:02 +0000
+++ qml/Components/KeymapSwitcher.qml	2017-01-02 11:20:59 +0000
@@ -51,6 +51,9 @@
             nextIndex = currentKeymapIndex + 1;
         }
         currentKeymapIndex = nextIndex;
+        if (actionGroup.currentAction.valid) {
+            actionGroup.currentAction.updateState(currentKeymapIndex);
+        }
     }
 
     function previousKeymap() {
@@ -60,30 +63,35 @@
             prevIndex = currentKeymapIndex - 1;
         }
         currentKeymapIndex = prevIndex;
+        if (actionGroup.currentAction.valid) {
+            actionGroup.currentAction.updateState(currentKeymapIndex);
+        }
     }
 
-    property Binding surfaceKeymapBinding: Binding {
+    property Binding surfaceKeymapBinding: Binding { // NB: needed mainly for xmir & libertine apps
         target: root.focusedSurface
         property: "keymap"
         value: root.currentKeymap
     }
 
+    property Binding unityKeymapBinding: Binding {
+        target: Mir
+        property: "currentKeymap"
+        value: root.currentKeymap
+    }
+
     // indicator
     property QDBusActionGroup actionGroup: QDBusActionGroup {
         busType: DBus.SessionBus
         busName: "com.canonical.indicator.keyboard"
         objectPath: "/com/canonical/indicator/keyboard"
 
-        property variant currentAction: action("current")
-        property variant activeAction: action("active")
+        property variant currentAction: action("current") // the one that's checked by the indicator
+        property variant activeAction: action("active")   // the one that we clicked
 
         Component.onCompleted: actionGroup.start();
     }
 
-    onCurrentKeymapIndexChanged: {
-        actionGroup.currentAction.updateState(currentKeymapIndex);
-    }
-
     readonly property int activeActionState: actionGroup.activeAction.valid ? actionGroup.activeAction.state : -1
 
     onActiveActionStateChanged: {

=== modified file 'tests/mocks/Unity/Application/MirMock.cpp'
--- tests/mocks/Unity/Application/MirMock.cpp	2016-10-20 14:37:34 +0000
+++ tests/mocks/Unity/Application/MirMock.cpp	2017-01-02 11:20:59 +0000
@@ -47,3 +47,16 @@
 {
     return m_cursorName;
 }
+
+QString MirMock::currentKeymap() const
+{
+    return m_keymap;
+}
+
+void MirMock::setCurrentKeymap(const QString &keymap)
+{
+    if (keymap != m_keymap) {
+        m_keymap = keymap;
+        Q_EMIT currentKeymapChanged(m_keymap);
+    }
+}

=== modified file 'tests/mocks/Unity/Application/MirMock.h'
--- tests/mocks/Unity/Application/MirMock.h	2016-10-20 14:37:34 +0000
+++ tests/mocks/Unity/Application/MirMock.h	2017-01-02 11:20:59 +0000
@@ -31,9 +31,13 @@
     void setCursorName(const QString &cursorName) override;
     QString cursorName() const override;
 
+    QString currentKeymap() const override;
+    void setCurrentKeymap(const QString &keymap) override;
+
 private:
     static MirMock *the_mir;
     QString m_cursorName;
+    QString m_keymap;
 };
 
 #endif