Merge lp:~gerboland/unity8/fix-osk-restart-reconnecting into lp:unity8

[Gerry Boland]

TopLevelWindowModel: connect to the OSK surface to know when it goes away so we can clean up after it.

This ensures when setLive(false) is called on the OSK surface, onSurfaceDied is called which will unset it as the internal input method surface.

[Gerry Boland (gerboland)]

Are there tests for TLWM? I couldn't find any

[Daniel d'Andrada (dandrader)]

> Are there tests for TLWM?

TopLevelWindowModel? No.

[Gerry Boland (gerboland)]

I'd appreciate guidance on how to test this then.

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

PASSED: Continuous integration, rev:2841
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3298/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4340
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2596
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2596
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4368
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4202
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4202/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4202
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4202/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4202
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4202/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4202
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4202/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4202
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4202/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4202
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4202/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

> I'd appreciate guidance on how to test this then.

1 - You feed it a fake ApplicationManager and a fake SurfaceManager.
2 - check that TopLevelWindowModel::inputMethodSurface() returns null
3 - Emit SurfaceManager::surfaceCreated with a fake MirSurface of type Mir::InputMethodType
4 - check that TopLevelWindowModel::inputMethodSurfaceChanged is emitted and that TopLevelWindowModel::inputMethodSurface() returns the afore mentioned surface
5 - Call setLive(false) on your fake input method MirSurface
6 - check that TopLevelWindowModel::inputMethodSurfaceChanged is emitted and that TopLevelWindowModel::inputMethodSurface() returns null

[Daniel d'Andrada (dandrader)]

test is sugar on top

review: Approve

=== modified file 'plugins/WindowManager/TopLevelWindowModel.cpp'
--- plugins/WindowManager/TopLevelWindowModel.cpp	2017-01-26 11:10:01 +0000
+++ plugins/WindowManager/TopLevelWindowModel.cpp	2017-03-07 13:43:08 +0000
@@ -341,6 +341,7 @@
         });
     } else {
         if (surface->type() == Mir::InputMethodType) {
+            connectSurface(surface);
             setInputMethodWindow(createWindow(surface));
         } else {
             auto *application = m_applicationManager->findApplicationWithSurface(surface);