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

[Lukáš Tinkl]

Apply default device keymap

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

Apply default device keymap (thereby fixing lp:1626435 - Keyboard layout not applied on the shell)

Drop unused code from SurfaceObserver

Needs unity-api branch: https://code.launchpad.net/~lukas-kde/unity-api/defaultKeymap/+merge/307309

And a small patch for unity8: https://code.launchpad.net/~lukas-kde/unity8/defaultKeymap/+merge/306761

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

FAILED: Continuous integration, rev:565
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/386/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2965/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2993
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2851
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2851/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2851
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2851/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2851
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2851/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2851
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2851/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2851/console
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2851/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2851
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2851/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2851
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2851/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2851
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2851/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2851
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2851/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:566
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/387/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2970
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2998
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2856
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2856/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2856
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2856/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2856
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2856/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2856
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2856/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2856
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2856/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2856
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2856/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2856
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2856/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2856
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2856/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2856
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2856/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

+++ src/platforms/mirserver/inputdeviceobserver.cpp
+#include <QDebug>
logging.h includes this.

I see lots of namespace qualifiers here. Could you please do
using mi = mir::input
just to mask the worst of the noise.

+MirInputDeviceObserver::~MirInputDeviceObserver()
+{
+ m_devices.clear();
+}
redundant? QVector effectively does this in destruction anyway, no?

+++ src/platforms/mirserver/inputdeviceobserver.h
+class MirInputDeviceObserver
Please stick this into the qtmir namespace.

+ std::shared_ptr<mir::input::InputDeviceHub> m_hub;
I don't see this being used anywhere.

Other cleanups are nice, thanks, but mixing them with a new feature is a possible danger. Say if cleanup breaks something, the whole commit gets reverted/removed from the silo, so we loose the feature.

But overall very nice!

review: Needs Fixing

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

FAILED: Continuous integration, rev:567
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/388/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3014/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3042
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2899
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2899/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2899
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2899/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2899
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2899/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2899
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2899/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2899
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2899/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2899
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2899/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2899
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2899/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2899
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2899/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2899
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2899/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

In src/platforms/mirserver/inputdeviceobserver.h:

"""
namespace mi = mir::input;
"""

Not a fan of aliasing namespaces in headers as that will contaminate any cpp file that #includes this header. Theoretically some cpp file might already use "mi" for something else and you would cause a collision, which is exactly what namespaces are there for.

Aliasing namespaces is a decision that only implementation code should make, locally.

[Daniel d'Andrada (dandrader)]

In src/platforms/mirserver/mirsingleton.h:

"""
Q_PROPERTY(QString currentKeymap READ currentKeymap WRITE setCurrentKeymap NOTIFY currentKeymapChanged)
"""

This has to go into unity/shell/application/Mir.h interface from unity-api.

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

> In src/platforms/mirserver/inputdeviceobserver.h:
>
> """
> namespace mi = mir::input;
> """
>
> Not a fan of aliasing namespaces in headers as that will contaminate any cpp
> file that #includes this header. Theoretically some cpp file might already use
> "mi" for something else and you would cause a collision, which is exactly what
> namespaces are there for.
>
> Aliasing namespaces is a decision that only implementation code should make,
> locally.

Although I agree in general, this is what Gerry suggested above :)

[Lukáš Tinkl (lukas-kde)]

> In src/platforms/mirserver/mirsingleton.h:
>
> """
> Q_PROPERTY(QString currentKeymap READ currentKeymap WRITE setCurrentKeymap
> NOTIFY currentKeymapChanged)
> """
>
> This has to go into unity/shell/application/Mir.h interface from unity-api.

Yup, I can definitely move it over there if you insist but isn't this too implementation specific?

[Daniel d'Andrada (dandrader)]

> > In src/platforms/mirserver/mirsingleton.h:
> >
> > """
> > Q_PROPERTY(QString currentKeymap READ currentKeymap WRITE setCurrentKeymap
> > NOTIFY currentKeymapChanged)
> > """
> >
> > This has to go into unity/shell/application/Mir.h interface from unity-api.
>
> Yup, I can definitely move it over there if you insist but isn't this too
> implementation specific?

If unity8 uses it, it has to be in unity-api. That's the whole point of unity-api: define/expose the API that unity8 uses from qtmir.

[Daniel d'Andrada (dandrader)]

> > In src/platforms/mirserver/inputdeviceobserver.h:
> >
> > """
> > namespace mi = mir::input;
> > """
> >
> > Not a fan of aliasing namespaces in headers as that will contaminate any cpp
> > file that #includes this header. Theoretically some cpp file might already
> use
> > "mi" for something else and you would cause a collision, which is exactly
> what
> > namespaces are there for.
> >
> > Aliasing namespaces is a decision that only implementation code should make,
> > locally.
>
> Although I agree in general, this is what Gerry suggested above :)

You do that in src/platforms/mirserver/inputdeviceobserver.cpp, not in its header.

[Lukáš Tinkl (lukas-kde)]

> > > In src/platforms/mirserver/inputdeviceobserver.h:
> > >
> > > """
> > > namespace mi = mir::input;
> > > """
> > >
> > > Not a fan of aliasing namespaces in headers as that will contaminate any
> cpp
> > > file that #includes this header. Theoretically some cpp file might already
> > use
> > > "mi" for something else and you would cause a collision, which is exactly
> > what
> > > namespaces are there for.
> > >
> > > Aliasing namespaces is a decision that only implementation code should
> make,
> > > locally.
> >
> > Although I agree in general, this is what Gerry suggested above :)
>
> You do that in src/platforms/mirserver/inputdeviceobserver.cpp, not in its
> header.

Sure, fixed

[Lukáš Tinkl (lukas-kde)]

> > > In src/platforms/mirserver/mirsingleton.h:
> > >
> > > """
> > > Q_PROPERTY(QString currentKeymap READ currentKeymap WRITE setCurrentKeymap
> > > NOTIFY currentKeymapChanged)
> > > """
> > >
> > > This has to go into unity/shell/application/Mir.h interface from unity-
> api.
> >
> > Yup, I can definitely move it over there if you insist but isn't this too
> > implementation specific?
>
> If unity8 uses it, it has to be in unity-api. That's the whole point of unity-
> api: define/expose the API that unity8 uses from qtmir.

Yeah done; see also https://code.launchpad.net/~lukas-kde/unity-api/defaultKeymap/+merge/307309

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

FAILED: Continuous integration, rev:583
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/434/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3684/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3712
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3556/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3556/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3556/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3556/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3556/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3556/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

+ connect(Mir::instance(), &Mir::currentKeymapChanged, this, &MirInputDeviceObserver::setKeymap, Qt::DirectConnection);
Why specifying direct? Is it that the slot doesn't live in an object belonging to a QThread (which has no event loop, so queued signal/slot fails to work).

+MirInputDeviceObserver::~MirInputDeviceObserver()
+{
+ m_devices.clear();
+}
is this necessary? Surely the deletion of the QVector will achieve this too?

+ const QString layout = stringList.at(0);
could this be a reference and save a string copy? Similar for variant.

I'm a bit concerned about thread safety. The device_{add,chang,remov}ed
methods are called by Mir, and that is usually done on some Mir internal thread. The object itself belongs to that thread too. However the Mir::currentKeymapChanged signal fires on the QtGui thread, so it is possible for those 2 threads to call applyKeymap almost simultaneously.

I think a little locking is necessary for safety.

Also, could you please add comments on each method explaining the thread situation, as this stuff is super easy to forget.

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

> +MirInputDeviceObserver::~MirInputDeviceObserver()
> +{
> + m_devices.clear();
> +}
> is this necessary? Surely the deletion of the QVector will achieve this too?

I think so, QVector imo doesn't do that by itself.

[Lukáš Tinkl (lukas-kde)]

> + const QString layout = stringList.at(0);
> could this be a reference and save a string copy? Similar for variant.

Done for layout, variant might be empty so it won't work there

[Gerry Boland (gerboland)]

Ok, much improved, thank you.

But please add comments explaining the thread situation. We remember it now, but someone else won't have a clue, and could introduce subtle errors if they forget the locking, or remove the DirectConnection specifier thinking it extraneous.

review: Needs Fixing

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

FAILED: Continuous integration, rev:584
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/435/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3689/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3717
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3561/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3561/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3561/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3561/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3561/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3561/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:585
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/436/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3690/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3718
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3562/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3562/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3562/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3562/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3562/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3562/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

> > +MirInputDeviceObserver::~MirInputDeviceObserver()
> > +{
> > + m_devices.clear();
> > +}
> > is this necessary? Surely the deletion of the QVector will achieve this too?
>
> I think so, QVector imo doesn't do that by itself.

/me was curious, looked at the source:

template <typename T>
class QVector
{
    typedef QTypedArrayData<T> Data;
    Data *d;

public:
    inline ~QVector() { if (!d->ref.deref()) freeData(d); }

};

template <typename T>
void QVector<T>::freeData(Data *x)
{
    destruct(x->begin(), x->end());
    Data::deallocate(x);
}

template <typename T>
void QVector<T>::destruct(T *from, T *to)
{
    if (QTypeInfo<T>::isComplex) {
        while (from != to) {
            from++->~T();
        }
    }
}

It does look like ~QVector calls freeData(Data*), which calls destruct() that explicitly calls the destructor of each member of the type T in the container (if T is complex which I think std::shared_ptr is).

How clear() works is less obvious to me, I think we both trust it does.

I'd be surprised that a container would leak its members on destruction, requiring us to explicitly clear() it before letting it go out of scope. Is why I suspect the clear() is unnecessary.

[Lukáš Tinkl (lukas-kde)]

Addressed the above comments

[Gerry Boland (gerboland)]

Perfect, thanks!

review: Approve

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

FAILED: Continuous integration, rev:586
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/437/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3691/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3719
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3563/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3563/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3563
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3563/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3563/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3563
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3563/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3563/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:587
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/444/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3794/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3822
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3665
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3665/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3665
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3665/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3665
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3665/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3665/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3665
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3665/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3665/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:587
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/445/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3800/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3828
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3671
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3671/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3671
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3671/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3671
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3671/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3671/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3671
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3671/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3671/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:587
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/447/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3819
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3847
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3690
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3690/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3690
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3690/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3690
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3690/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3690
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3690/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3690
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3690/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3690
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3690/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

CI good again

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-16 08:24:29 +0000
+++ CMakeLists.txt	2017-01-04 17:43:31 +0000
@@ -88,7 +88,7 @@
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
 pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=25)
 pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
 pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)
 

=== modified file 'debian/control'
--- debian/control	2016-12-13 15:51:14 +0000
+++ debian/control	2017-01-04 17:43:31 +0000
@@ -25,7 +25,7 @@
                libubuntu-app-launch2-dev (>= 0.9),
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 8.0),
+               libunity-api-dev (>= 8.1),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2017-01-04 17:43:31 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2017-01-04 17:43:31 +0000
@@ -89,8 +89,8 @@
     void cursor_image_set_to(mir::graphics::CursorImage const&) override;
     void orientation_set_to(MirOrientation) override {}
     void client_surface_close_requested() override {}
-    void keymap_changed(MirInputDeviceId, std::string const& model, std::string const& layout,
-                        std::string const& variant, std::string const& options) override;
+    void keymap_changed(MirInputDeviceId, std::string const&, std::string const&,
+                        std::string const&, std::string const&) override {}
     void renamed(char const * name) override;
     void cursor_image_removed() override;
 
@@ -1142,12 +1142,6 @@
     Q_EMIT cursorChanged(qcursor);
 }
 
-void MirSurface::SurfaceObserverImpl::keymap_changed(MirInputDeviceId, const std::string &, const std::string &layout,
-                                                     const std::string &variant, const std::string &)
-{
-    Q_EMIT keymapChanged(QString::fromStdString(layout), QString::fromStdString(variant));
-}
-
 QCursor MirSurface::SurfaceObserverImpl::createQCursorFromMirCursorImage(const mir::graphics::CursorImage &cursorImage) {
     if (cursorImage.as_argb_8888() == nullptr) {
         // Must be a named cursor

=== modified file 'src/platforms/mirserver/CMakeLists.txt'
--- src/platforms/mirserver/CMakeLists.txt	2016-11-03 20:17:46 +0000
+++ src/platforms/mirserver/CMakeLists.txt	2017-01-04 17:43:31 +0000
@@ -101,6 +101,7 @@
     mirserverintegration.cpp
     miropenglcontext.cpp
     offscreensurface.cpp
+    inputdeviceobserver.cpp
     promptsessionmanager.cpp promptsessionmanager.h promptsession.h
 # We need to run moc on these headers
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h

=== added file 'src/platforms/mirserver/inputdeviceobserver.cpp'
--- src/platforms/mirserver/inputdeviceobserver.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/inputdeviceobserver.cpp	2017-01-04 17:43:31 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2016-2017 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mir/input/device.h>
+#include <mir/input/device_capability.h>
+#include <mir/input/keyboard_configuration.h>
+
+#include <Qt>
+#include <QTimer>
+
+#include "inputdeviceobserver.h"
+#include "mirsingleton.h"
+#include "logging.h"
+
+using namespace qtmir;
+namespace mi = mir::input;
+
+// Note: MirInputDeviceObserver has affinity to a Mir thread, but it is expected setKeymap will be called from the Qt GUI thread
+
+MirInputDeviceObserver::MirInputDeviceObserver(QObject *parent):
+    QObject(parent)
+{
+    // NB: have to use a Direct connection here, as it's called from Qt GUI thread
+    connect(Mir::instance(), &Mir::currentKeymapChanged, this, &MirInputDeviceObserver::setKeymap, Qt::DirectConnection);
+}
+
+void MirInputDeviceObserver::setKeymap(const QString &keymap)
+{
+    QMutexLocker locker(&m_mutex); // lock so that Qt and Mir don't apply the keymap at the same time
+
+    if (keymap != m_keymap) {
+        qCDebug(QTMIR_MIR_KEYMAP) << "SET KEYMAP" << keymap;
+        m_keymap = keymap;
+        applyKeymap();
+    }
+}
+
+void MirInputDeviceObserver::applyKeymap()
+{
+    Q_FOREACH(const auto &device, m_devices) {
+        applyKeymap(device);
+    }
+}
+
+void MirInputDeviceObserver::device_added(const std::shared_ptr<mi::Device> &device)
+{
+    QMutexLocker locker(&m_mutex);  // lock so that Qt and Mir don't apply the keymap at the same time
+
+    if (mir::contains(device->capabilities(), mi::DeviceCapability::keyboard) &&
+            mir::contains(device->capabilities(), mi::DeviceCapability::alpha_numeric)) {
+        qCDebug(QTMIR_MIR_KEYMAP) << "Device added" << device->id();
+        m_devices.append(device);
+        applyKeymap(device);
+    }
+}
+
+void MirInputDeviceObserver::device_removed(const std::shared_ptr<mi::Device> &device)
+{
+    QMutexLocker locker(&m_mutex);  // lock so that Qt and Mir don't apply the keymap at the same time
+
+    if (device && m_devices.contains(device)) {
+        qCDebug(QTMIR_MIR_KEYMAP) << "Device removed" << device->id();
+        m_devices.removeAll(device);
+    }
+}
+
+void MirInputDeviceObserver::applyKeymap(const std::shared_ptr<mi::Device> &device)
+{
+    if (!m_keymap.isEmpty()) {
+        const QStringList stringList = m_keymap.split('+', QString::SkipEmptyParts);
+
+        const QString &layout = stringList.at(0);
+        QString variant;
+
+        if (stringList.count() > 1) {
+            variant = stringList.at(1);
+        }
+
+        qCDebug(QTMIR_MIR_KEYMAP) << "Applying keymap" <<  layout << variant << "on" << device->id() << QString::fromStdString(device->name());
+        mi::KeyboardConfiguration oldConfig;
+        mi::Keymap keymap;
+        if (device->keyboard_configuration().is_set()) { // preserve the model and options
+            oldConfig = device->keyboard_configuration().value();
+            keymap.model = oldConfig.device_keymap.model;
+            keymap.options = oldConfig.device_keymap.options;
+        }
+        keymap.layout = layout.toStdString();
+        keymap.variant = variant.toStdString();
+
+        device->apply_keyboard_configuration(std::move(keymap));
+        qCDebug(QTMIR_MIR_KEYMAP) << "Keymap applied";
+    }
+}

=== added file 'src/platforms/mirserver/inputdeviceobserver.h'
--- src/platforms/mirserver/inputdeviceobserver.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/inputdeviceobserver.h	2017-01-04 17:43:31 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016-2017 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INPUTDEVICEOBSERVER_H
+#define INPUTDEVICEOBSERVER_H
+
+#include <mir/input/input_device_observer.h>
+
+#include <QObject>
+#include <QString>
+#include <QVector>
+#include <QMutex>
+
+namespace qtmir {
+
+class MirInputDeviceObserver: public QObject, public mir::input::InputDeviceObserver
+{
+    Q_OBJECT
+public:
+    MirInputDeviceObserver(QObject * parent = nullptr);
+    ~MirInputDeviceObserver() = default;
+
+protected:
+    void device_added(std::shared_ptr<mir::input::Device> const& device) override;
+    void device_changed(std::shared_ptr<mir::input::Device> const& /*device*/) override {}
+    void device_removed(std::shared_ptr<mir::input::Device> const& device) override;
+    void changes_complete() override {}
+
+private Q_SLOTS:
+    void setKeymap(const QString &keymap);
+
+private:
+    void applyKeymap();
+    void applyKeymap(const std::shared_ptr<mir::input::Device> &device);
+    QString m_keymap;
+    QVector<std::shared_ptr<mir::input::Device>> m_devices;
+    QMutex m_mutex;
+};
+
+} // namespace qtmir
+
+#endif

=== modified file 'src/platforms/mirserver/logging.cpp'
--- src/platforms/mirserver/logging.cpp	2016-07-01 16:15:54 +0000
+++ src/platforms/mirserver/logging.cpp	2017-01-04 17:43:31 +0000
@@ -21,6 +21,7 @@
 Q_LOGGING_CATEGORY(QTMIR_SURFACES, "qtmir.surfaces")
 Q_LOGGING_CATEGORY(QTMIR_MIR_INPUT, "qtmir.mir.input", QtWarningMsg)
 Q_LOGGING_CATEGORY(QTMIR_MIR_MESSAGES, "qtmir.mir")
+Q_LOGGING_CATEGORY(QTMIR_MIR_KEYMAP, "qtmir.mir.keymap")
 Q_LOGGING_CATEGORY(QTMIR_CLIPBOARD, "qtmir.clipboard")
 Q_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES, "qtmir.sensor")
 Q_LOGGING_CATEGORY(QTMIR_SCREENS, "qtmir.screens")

=== modified file 'src/platforms/mirserver/logging.h'
--- src/platforms/mirserver/logging.h	2016-07-01 16:15:54 +0000
+++ src/platforms/mirserver/logging.h	2017-01-04 17:43:31 +0000
@@ -24,6 +24,7 @@
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_MESSAGES)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_INPUT)
+Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_KEYMAP)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_CLIPBOARD)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_SCREENS)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_DBUS)

=== modified file 'src/platforms/mirserver/mirserverhooks.cpp'
--- src/platforms/mirserver/mirserverhooks.cpp	2016-11-03 20:17:46 +0000
+++ src/platforms/mirserver/mirserverhooks.cpp	2017-01-04 17:43:31 +0000
@@ -23,11 +23,13 @@
 #include "promptsessionlistener.h"
 #include "screenscontroller.h"
 #include "logging.h"
+#include "inputdeviceobserver.h"
 
 // mir
 #include <mir/server.h>
 #include <mir/graphics/cursor.h>
 #include <mir/scene/prompt_session_listener.h>
+#include <mir/input/input_device_hub.h>
 
 namespace mg = mir::graphics;
 namespace ms = mir::scene;
@@ -74,6 +76,7 @@
     std::weak_ptr<mir::graphics::Display> m_mirDisplay;
     std::weak_ptr<mir::shell::DisplayConfigurationController> m_mirDisplayConfigurationController;
     std::weak_ptr<mir::scene::PromptSessionManager> m_mirPromptSessionManager;
+    std::weak_ptr<mir::input::InputDeviceHub> m_inputDeviceHub;
 };
 
 qtmir::MirServerHooks::MirServerHooks() :
@@ -104,6 +107,7 @@
             self->m_mirDisplay = server.the_display();
             self->m_mirDisplayConfigurationController = server.the_display_configuration_controller();
             self->m_mirPromptSessionManager = server.the_prompt_session_manager();
+            self->m_inputDeviceHub = server.the_input_device_hub();
         });
 }
 
@@ -131,12 +135,25 @@
     throw std::logic_error("No display available. Server not running?");
 }
 
+std::shared_ptr<mir::input::InputDeviceHub> qtmir::MirServerHooks::theInputDeviceHub() const
+{
+    if (auto result = self->m_inputDeviceHub.lock())
+        return result;
+
+    throw std::logic_error("No input device hub available. Server not running?");
+}
+
 QSharedPointer<ScreensController> qtmir::MirServerHooks::createScreensController(QSharedPointer<ScreensModel> const &screensModel) const
 {
     return QSharedPointer<ScreensController>(
         new ScreensController(screensModel, theMirDisplay(), self->m_mirDisplayConfigurationController.lock()));
 }
 
+void qtmir::MirServerHooks::createInputDeviceObserver()
+{
+    theInputDeviceHub()->add_observer(std::make_shared<qtmir::MirInputDeviceObserver>());
+}
+
 PromptSessionListenerImpl::~PromptSessionListenerImpl() = default;
 
 void PromptSessionListenerImpl::starting(std::shared_ptr<ms::PromptSession> const& prompt_session)

=== modified file 'src/platforms/mirserver/mirserverhooks.h'
--- src/platforms/mirserver/mirserverhooks.h	2016-11-03 20:17:46 +0000
+++ src/platforms/mirserver/mirserverhooks.h	2017-01-04 17:43:31 +0000
@@ -25,6 +25,7 @@
 namespace mir { class Server; }
 namespace mir { namespace scene { class PromptSessionManager; }}
 namespace mir { namespace graphics { class Display; }}
+namespace mir { namespace input { class InputDeviceHub; } }
 
 class PromptSessionListener;
 class ScreensController;
@@ -42,8 +43,10 @@
     PromptSessionListener *promptSessionListener() const;
     std::shared_ptr<mir::scene::PromptSessionManager> thePromptSessionManager() const;
     std::shared_ptr<mir::graphics::Display> theMirDisplay() const;
+    std::shared_ptr<mir::input::InputDeviceHub> theInputDeviceHub() const;
 
     QSharedPointer<ScreensController> createScreensController(QSharedPointer<ScreensModel> const &screensModel) const;
+    void createInputDeviceObserver();
 
 private:
     struct Self;

=== modified file 'src/platforms/mirserver/mirsingleton.cpp'
--- src/platforms/mirserver/mirsingleton.cpp	2016-11-03 20:17:46 +0000
+++ src/platforms/mirserver/mirsingleton.cpp	2017-01-04 17:43:31 +0000
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015-2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "mirsingleton.h"
 
 qtmir::Mir *qtmir::Mir::m_instance = nullptr;
@@ -32,3 +48,17 @@
 {
     return m_cursorName;
 }
+
+QString qtmir::Mir::currentKeymap() const
+{
+    return m_currentKeymap;
+}
+
+void qtmir::Mir::setCurrentKeymap(const QString &currentKeymap)
+{
+    if (m_currentKeymap == currentKeymap)
+        return;
+
+    m_currentKeymap = currentKeymap;
+    Q_EMIT currentKeymapChanged(m_currentKeymap);
+}

=== modified file 'src/platforms/mirserver/mirsingleton.h'
--- src/platforms/mirserver/mirsingleton.h	2015-09-22 20:22:20 +0000
+++ src/platforms/mirserver/mirsingleton.h	2017-01-04 17:43:31 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015-2016 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -33,11 +33,15 @@
     void setCursorName(const QString &cursorName) override;
     QString cursorName() const override;
 
+    QString currentKeymap() const override;
+    void setCurrentKeymap(const QString &currentKeymap) override;
+
 private:
     Mir();
     Q_DISABLE_COPY(Mir)
 
     QString m_cursorName;
+    QString m_currentKeymap;
     static qtmir::Mir *m_instance;
 };
 

=== modified file 'src/platforms/mirserver/qmirserver_p.cpp'
--- src/platforms/mirserver/qmirserver_p.cpp	2016-11-16 17:39:06 +0000
+++ src/platforms/mirserver/qmirserver_p.cpp	2017-01-04 17:43:31 +0000
@@ -117,6 +117,7 @@
     {
         screensModel->update();
         screensController = m_mirServerHooks.createScreensController(screensModel);
+        m_mirServerHooks.createInputDeviceObserver();
     });
 
     runner.add_start_callback(startCallback);

=== modified file 'src/platforms/mirserver/qteventfeeder.cpp'
--- src/platforms/mirserver/qteventfeeder.cpp	2016-11-03 20:17:46 +0000
+++ src/platforms/mirserver/qteventfeeder.cpp	2017-01-04 17:43:31 +0000
@@ -27,7 +27,6 @@
 #include <qpa/qplatformintegration.h>
 #include <qpa/qwindowsysteminterface_p.h>
 #include <QGuiApplication>
-#include <private/qguiapplication_p.h>
 #include <QTextCodec>
 #include <QDebug>
 
@@ -677,22 +676,6 @@
     }
     int keyCode = translateKeysym(xk_sym, text);
 
-    QPlatformInputContext* context = QGuiApplicationPrivate::platformIntegration()->inputContext();
-    if (context) {
-        // TODO: consider event.repeat_count
-        QKeyEvent qKeyEvent(keyType, keyCode, modifiers,
-                            mir_keyboard_event_scan_code(kev),
-                            mir_keyboard_event_key_code(kev),
-                            mir_keyboard_event_modifiers(kev),
-                            text, is_auto_rep);
-        qKeyEvent.setTimestamp(timestamp.count());
-        if (context->filterEvent(&qKeyEvent)) {
-            qCDebug(QTMIR_MIR_INPUT) << "Received" << qPrintable(mirKeyboardEventToString(kev))
-                << "but not dispatching as it was filtered out by input context";
-            return;
-        }
-    }
-
     qCDebug(QTMIR_MIR_INPUT).nospace() << "Received " << qPrintable(mirKeyboardEventToString(kev))
         << ". Dispatching to " << mQtWindowSystem->focusedWindow();
 

=== modified file 'src/platforms/mirserver/surfaceobserver.h'
--- src/platforms/mirserver/surfaceobserver.h	2016-12-13 15:31:26 +0000
+++ src/platforms/mirserver/surfaceobserver.h	2017-01-04 17:43:31 +0000
@@ -50,7 +50,6 @@
     void attributeChanged(const MirSurfaceAttrib attribute, const int value);
     void framesPosted();
     void resized(const QSize &size);
-    void keymapChanged(const QString &rules, const QString &variant);
     void nameChanged(const QString &name);
     void cursorChanged(const QCursor &cursor);
 

=== modified file 'tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h'
--- tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h	2016-06-23 13:22:42 +0000
+++ tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h	2017-01-04 17:43:31 +0000
@@ -28,14 +28,25 @@
     MOCK_METHOD1(getWindowForTouchPoint, QWindow*(const QPoint &point));
     MOCK_METHOD0(lastWindow, QWindow*());
     MOCK_METHOD0(focusedWindow, QWindow*());
+    // ignores the last parameter count, due to parameter limit in gmock
+    MOCK_METHOD10(handleExtendedKeyEvent,
+                  void(QWindow *window, ulong timestamp, QEvent::Type type,
+                       int key, Qt::KeyboardModifiers modifiers,
+                       quint32 nativeScanCode, quint32 nativeVirtualKey,
+                       quint32 nativeModifiers, const QString &text,
+                       bool autorep));
 
-    // Wanted to use GMock, but MOCK_METHOD11 not implemented
-    void handleExtendedKeyEvent(QWindow */*window*/, ulong /*timestamp*/, QEvent::Type /*type*/, int /*key*/,
-            Qt::KeyboardModifiers /*modifiers*/,
-            quint32 /*nativeScanCode*/, quint32 /*nativeVirtualKey*/,
-            quint32 /*nativeModifiers*/,
-            const QString& /*text*/ = QString(), bool /*autorep*/ = false,
-            ushort /*count*/ = 1) {}
+    void handleExtendedKeyEvent(QWindow *window, ulong timestamp, QEvent::Type type, int key,
+            Qt::KeyboardModifiers modifiers,
+            quint32 nativeScanCode, quint32 nativeVirtualKey,
+            quint32 nativeModifiers,
+            const QString& text, bool autorep,
+            ushort /*count*/ )
+    {
+        handleExtendedKeyEvent(window, timestamp, type, key, modifiers,
+                               nativeScanCode, nativeVirtualKey,
+                               nativeModifiers, text, autorep);
+    }
 
     MOCK_METHOD5(handleTouchEvent, void(QWindow *window, ulong timestamp, QTouchDevice *device,
             const QList<struct QWindowSystemInterface::TouchPoint> &points,

=== modified file 'tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp'
--- tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2016-05-30 10:23:52 +0000
+++ tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2017-01-04 17:43:31 +0000
@@ -27,6 +27,9 @@
 
 #include "mock_qtwindowsystem.h"
 
+#include <linux/input.h>
+#include <xkbcommon/xkbcommon-keysyms.h>
+
 using ::testing::_;
 using ::testing::AllOf;
 using ::testing::AnyNumber;
@@ -280,3 +283,42 @@
     qtEventFeeder->dispatch(*ev2);
     ASSERT_TRUE(Mock::VerifyAndClearExpectations(mockWindowSystem));
 }
+
+TEST_F(QtEventFeederTest, composeKeysNotFilteredOut)
+{
+    auto down = mir_keyboard_action_down;
+    auto up = mir_keyboard_action_up;
+
+    auto dispatch_key_event = [&](MirKeyboardAction action, int scan_code, xkb_keysym_t key_sym)
+    {
+        qtEventFeeder->dispatch(*mev::make_event(
+                MirInputDeviceId{0}, std::chrono::nanoseconds{0}, std::vector<uint8_t>{},
+                action, key_sym, scan_code, mir_input_event_modifier_none));
+    };
+
+    InSequence seq;
+    EXPECT_CALL(
+        *mockWindowSystem,
+        handleExtendedKeyEvent(_, _, QEvent::KeyPress, _, _, KEY_RIGHTSHIFT,
+                               XKB_KEY_Shift_R, _, _, _));
+    EXPECT_CALL(*mockWindowSystem,
+                handleExtendedKeyEvent(_, _, QEvent::KeyPress, _, _,
+                                       KEY_APOSTROPHE, XKB_KEY_NoSymbol,
+                                       _, _, _));
+    EXPECT_CALL(*mockWindowSystem,
+                handleExtendedKeyEvent(_, _, QEvent::KeyRelease, _, _,
+                                       KEY_APOSTROPHE, XKB_KEY_NoSymbol,
+                                       _, _, _));
+    EXPECT_CALL(
+        *mockWindowSystem,
+        handleExtendedKeyEvent(_, _, QEvent::KeyRelease, _, _, KEY_RIGHTSHIFT,
+                               XKB_KEY_Shift_R, _, _, _));
+    EXPECT_CALL(*mockWindowSystem,
+                handleExtendedKeyEvent(_, _, QEvent::KeyPress, _, _, KEY_U,
+                                       XKB_KEY_udiaeresis, _, _, _));
+    dispatch_key_event(down, KEY_RIGHTSHIFT, XKB_KEY_Shift_R);
+    dispatch_key_event(down, KEY_APOSTROPHE, XKB_KEY_NoSymbol);
+    dispatch_key_event(up, KEY_APOSTROPHE, XKB_KEY_NoSymbol);
+    dispatch_key_event(up, KEY_RIGHTSHIFT, XKB_KEY_Shift_R);
+    dispatch_key_event(down, KEY_U, XKB_KEY_udiaeresis);
+}