Merge lp:~dandrader/unity8/cursorConfinement into lp:unity8

[Daniel d'Andrada]

Implement cursor confinement

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/unity-api/cursorConfinement/+merge/303984
https://code.launchpad.net/~dandrader/qtmir/cursorConfinement/+merge/303987

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

For testing, build and run this application: lp:~dandrader/+junk/confinedCursor

Clicking on its big button will turn cursor confinement on/off

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

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

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

FAILED: Continuous integration, rev:2600
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2039/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2675/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2703
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2576
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2576
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2576
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2570/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2570/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2570/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2570/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2570/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2570/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2570/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2570/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2570/console

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

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

+ itemConfiningMouseCursor: ...

I'd prefer this being an inline binding, instead of the returns. How about sth like:

itemConfiningMouseCursor: priv.focusedAppDelegate && priv.focusedAppDelegate.surface &&
                          priv.focusedAppDelegate.surface.confinesMousePointer ?
                          priv.focusedAppDelegate.clientAreaItem : null;

review: Needs Information

[Daniel d'Andrada (dandrader)]

On 26/08/2016 11:20, Lukáš Tinkl wrote:
> Review: Needs Information
>
> + itemConfiningMouseCursor: ...
>
> I'd prefer this being an inline binding, instead of the returns. How about sth like:
>
> itemConfiningMouseCursor: priv.focusedAppDelegate && priv.focusedAppDelegate.surface &&
> priv.focusedAppDelegate.surface.confinesMousePointer ?
> priv.focusedAppDelegate.clientAreaItem : null;
>
>
Done.

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

FAILED: Continuous integration, rev:2601
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2042/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2684/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2712
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2585
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2585
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2585
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2578/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2578/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2578/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2578/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2578/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2578/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2578/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2578/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2578/console

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

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

What happens, when the window moves under cursor (e.g. press Ctrl+Super+Right to semi maximize on the right edge)? Will the cursor be still captured correctly?

review: Needs Information

[Daniel d'Andrada (dandrader)]

> What happens, when the window moves under cursor (e.g. press Ctrl+Super+Right
> to semi maximize on the right edge)? Will the cursor be still captured
> correctly?

I'm guessing what you mean is this:

1 - mouse is confined to a non-fullscreen window, positioned over the left side of the desktop
2 - You press Ctrl+Super+Right

What will happen is that the cursor will jump to be within the window client area the next time you start to move the mouse.

[Lukáš Tinkl (lukas-kde)]

> > What happens, when the window moves under cursor (e.g. press
> Ctrl+Super+Right
> > to semi maximize on the right edge)? Will the cursor be still captured
> > correctly?
>
> I'm guessing what you mean is this:
>
> 1 - mouse is confined to a non-fullscreen window, positioned over the left
> side of the desktop
> 2 - You press Ctrl+Super+Right
>
> What will happen is that the cursor will jump to be within the window client
> area the next time you start to move the mouse.

Yeah I kinda expected that... do you think it makes sense to improve the situation when the window gets moved/resized under the cursor?

[Lukáš Tinkl (lukas-kde)]

Explanation, I know you can't resize the window when the cursor is confined, but you're still able to resize it/ move it using for example the touch controls, that's my main concern.

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

FAILED: Continuous integration, rev:2602
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2064/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2710/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2738
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2611
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2611
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2611

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

On 30/08/2016 11:39, Lukáš Tinkl wrote:
> [...]
> Yeah I kinda expected that... do you think it makes sense to improve the situation when the window gets moved/resized under the cursor?

Don't think this corner case is worth the extra complexity involved.
It's not simply tracking changes to the x,y,width,height of the client
area (eg: its x,y won't change when the window moves around). Would have
to add a signal to AbstractStage that would say "hey, client area
changed its geometry in scene coords" and in Shell.qml I would wire it
to some update function in Cursor. Then in DesktopStage I would emit
this signal whenever the focused window changed its geometry.

But if you think this is relevant enough, I can look into it.

[Daniel d'Andrada (dandrader)]

On 30/08/2016 11:40, Lukáš Tinkl wrote:
> Explanation, I know you can't resize the window when the cursor is confined, but you're still able to resize it/ move it using for example the touch controls, that's my main concern.

Have you tried moving or resizing the window with touch while at the
same time moving the cursor with a mouse/touchpad? It's a disaster :)

Maybe we should report a bug on it...

[Lukáš Tinkl (lukas-kde)]

> On 30/08/2016 11:39, Lukáš Tinkl wrote:
> > [...]
> > Yeah I kinda expected that... do you think it makes sense to improve the
> situation when the window gets moved/resized under the cursor?
>
> Don't think this corner case is worth the extra complexity involved.
> It's not simply tracking changes to the x,y,width,height of the client
> area (eg: its x,y won't change when the window moves around). Would have
> to add a signal to AbstractStage that would say "hey, client area
> changed its geometry in scene coords" and in Shell.qml I would wire it
> to some update function in Cursor. Then in DesktopStage I would emit
> this signal whenever the focused window changed its geometry.
>
> But if you think this is relevant enough, I can look into it.

I don't know... I guess not since this is highly dependent on the intended use case (I assume this is meant mainly for fullscreen apps, like games?)

[Lukáš Tinkl (lukas-kde)]

Alright then, this sounds good for the initial iteration

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

Yes, with the demo provided (no real app using this to my knowledge)

* Did CI run pass? If not, please explain why.

No, due to unity-api bump

review: Approve

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

FAILED: Continuous integration, rev:2606
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2091/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2739/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2767
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2640
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2640
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2640
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2632/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2632/console

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

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Yup, still good

review: Approve

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

FAILED: Continuous integration, rev:2607
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2093/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2741/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2769
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2642
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2642
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2642
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2634/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2634/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2634/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2634/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2634/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2634/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2634/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2634/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2634/console

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/cursorConfinement]

2606. By CI Train Bot Account on 2016-09-02

Resync trunk.

2607. By Launchpad Translations on behalf of unity-team on 2016-09-03

Launchpad automatic translations update.

[Lukáš Tinkl (lukas-kde)]

Needs updating tests/mocks/Cursor/Cursor.qml

+ property Item confiningItem

review: Needs Fixing

[lp:~dandrader/unity8/cursorConfinement]

2608. By Daniel d'Andrada on 2016-09-06

merge lp:~mterry/unity8/default-wallpaper

2609. By dobey on 2016-09-06

Set progress bar indeterminate when processing signal received.

2610. By Daniel d'Andrada on 2016-09-06

Implement cursor confinement

[Daniel d'Andrada (dandrader)]

On 05/09/2016 18:16, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Needs updating tests/mocks/Cursor/Cursor.qml
>
> + property Item confiningItem

Fixed.

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

FAILED: Continuous integration, rev:2610
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2097/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2758/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2786
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2646/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2646/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2646/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2646/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2646/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2646/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2646/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2646/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2646/console

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

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Seems good now

review: Approve

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2610
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2139/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2811
    ABORTED: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1557/console
    ABORTED: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1557/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1557
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2839
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2698/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2698
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2698/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2610
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2147/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2824
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1567
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1567
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1567
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2852
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2710
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2710/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2710
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2710/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2710
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2710/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2710
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2710/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2710
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2710/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2710
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2710/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2710
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2710/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2710
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2710/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2710
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2710/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-22 16:58:28 +0000
+++ CMakeLists.txt	2016-09-06 17:42:34 +0000
@@ -57,7 +57,7 @@
 find_package(Qt5Concurrent 5.4 REQUIRED)
 find_package(Qt5Sql 5.4 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=21)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=22)
 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-09-06 17:42:33 +0000
+++ debian/control	2016-09-06 17:42:34 +0000
@@ -37,7 +37,7 @@
                libubuntugestures5-private-dev (>= 1.3.2030),
                libudev-dev,
                libudm-common-dev,
-               libunity-api-dev (>= 7.118),
+               libunity-api-dev (>= 7.119),
                libusermetricsoutput1-dev,
 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                libx11-dev[!arm64 !armhf],
@@ -157,7 +157,7 @@
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
          ubuntu-thumbnailer-impl-0,
          ubuntu-wallpapers,
-         unity-application-impl-21,
+         unity-application-impl-22,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-12,
@@ -203,7 +203,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-21,
+          unity-application-impl-22,
 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell

=== modified file 'plugins/Cursor/MousePointer.cpp'
--- plugins/Cursor/MousePointer.cpp	2016-06-20 07:27:19 +0000
+++ plugins/Cursor/MousePointer.cpp	2016-09-06 17:42:34 +0000
@@ -56,7 +56,6 @@
         Q_EMIT pushedRightBoundary(newX - (parentItem()->width() - 1), buttons);
         newX = parentItem()->width() - 1;
     }
-    setX(newX);
 
     qreal newY = y() + appliedMovement.y();
     if (newY < 0) {
@@ -64,6 +63,10 @@
     } else if (newY >= parentItem()->height()) {
         newY = parentItem()->height() - 1;
     }
+
+    applyItemConfinement(newX, newY);
+
+    setX(newX);
     setY(newY);
 
     QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));
@@ -71,6 +74,31 @@
         buttons, modifiers);
 }
 
+void MousePointer::applyItemConfinement(qreal &newX, qreal &newY)
+{
+    Q_ASSERT(parentItem() != nullptr);
+
+    if (m_confiningItem.isNull()) {
+        return;
+    }
+
+    QRectF confiningItemGeometry(0, 0, m_confiningItem->width(), m_confiningItem->height());
+
+    QRectF confiningRect = m_confiningItem->mapRectToItem(parentItem(), confiningItemGeometry);
+
+    if (newX < confiningRect.x()) {
+        newX = confiningRect.x();
+    } else if (newX > confiningRect.right()) {
+        newX = confiningRect.right();
+    }
+
+    if (newY < confiningRect.y()) {
+        newY = confiningRect.y();
+    } else if (newY > confiningRect.bottom()) {
+        newY = confiningRect.bottom();
+    }
+}
+
 void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers)
 {
     if (!parentItem()) {
@@ -156,3 +184,16 @@
 {
     CursorImageProvider::instance()->setCustomCursor(customCursor);
 }
+
+QQuickItem* MousePointer::confiningItem() const
+{
+    return m_confiningItem.data();
+}
+
+void MousePointer::setConfiningItem(QQuickItem *item)
+{
+    if (item != m_confiningItem) {
+        m_confiningItem = item;
+        Q_EMIT confiningItemChanged();
+    }
+}

=== modified file 'plugins/Cursor/MousePointer.h'
--- plugins/Cursor/MousePointer.h	2016-06-17 01:13:22 +0000
+++ plugins/Cursor/MousePointer.h	2016-09-06 17:42:34 +0000
@@ -27,6 +27,9 @@
 
 class MousePointer : public MirMousePointerInterface {
     Q_OBJECT
+
+    Q_PROPERTY(QQuickItem* confiningItem READ confiningItem WRITE setConfiningItem NOTIFY confiningItemChanged)
+
 public:
     MousePointer(QQuickItem *parent = nullptr);
 
@@ -38,6 +41,9 @@
 
     void setCustomCursor(const QCursor &) override;
 
+    QQuickItem* confiningItem() const;
+    void setConfiningItem(QQuickItem*);
+
 public Q_SLOTS:
     void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
             Qt::KeyboardModifiers modifiers) override;
@@ -47,6 +53,7 @@
     void pushedLeftBoundary(qreal amount, Qt::MouseButtons buttons);
     void pushedRightBoundary(qreal amount, Qt::MouseButtons buttons);
     void mouseMoved();
+    void confiningItemChanged();
 
 protected:
     void itemChange(ItemChange change, const ItemChangeData &value) override;
@@ -56,6 +63,7 @@
 
 private:
     void registerWindow(QWindow *window);
+    void applyItemConfinement(qreal &newX, qreal &newY);
 
     QPointer<QWindow> m_registeredWindow;
     QPointer<QScreen> m_registeredScreen;
@@ -64,6 +72,8 @@
 
     // Accumulated, unapplied, mouse movement.
     QPointF m_accumulatedMovement;
+
+    QPointer<QQuickItem> m_confiningItem;
 };
 
 #endif // MOUSEPOINTER_H

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-09-06 17:42:33 +0000
+++ qml/Shell.qml	2016-09-06 17:42:34 +0000
@@ -814,6 +814,8 @@
         visible: shell.hasMouse
         z: itemGrabber.z + 1
 
+        confiningItem: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.itemConfiningMouseCursor : null
+
         property bool mouseNeverMoved: true
         Binding {
             target: cursor; property: "x"; value: shell.width / 2

=== modified file 'qml/Stages/AbstractStage.qml'
--- qml/Stages/AbstractStage.qml	2016-07-12 09:43:50 +0000
+++ qml/Stages/AbstractStage.qml	2016-09-06 17:42:34 +0000
@@ -55,6 +55,9 @@
                                       | Qt.InvertedPortraitOrientation
                                       | Qt.InvertedLandscapeOrientation
 
+    property Item itemConfiningMouseCursor: null
+
+
     signal stageAboutToBeUnloaded
     signal itemSnapshotRequested(Item item)
 

=== modified file 'qml/Stages/DecoratedWindow.qml'
--- qml/Stages/DecoratedWindow.qml	2016-08-08 11:18:19 +0000
+++ qml/Stages/DecoratedWindow.qml	2016-09-06 17:42:34 +0000
@@ -53,6 +53,8 @@
 
     property alias overlayShown: decoration.overlayShown
 
+    readonly property Item clientAreaItem: applicationWindow
+
     signal closeClicked()
     signal maximizeClicked()
     signal maximizeHorizontallyClicked()

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2016-09-06 17:42:33 +0000
+++ qml/Stages/DesktopStage.qml	2016-09-06 17:42:34 +0000
@@ -52,6 +52,11 @@
 
     orientationChangesEnabled: true
 
+
+    itemConfiningMouseCursor: !spreadShown && priv.focusedAppDelegate && priv.focusedAppDelegate.surface &&
+                              priv.focusedAppDelegate.surface.confinesMousePointer ?
+                              priv.focusedAppDelegate.clientAreaItem : null;
+
     GlobalShortcut {
         id: showSpreadShortcut
         shortcut: Qt.MetaModifier|Qt.Key_W
@@ -335,6 +340,7 @@
                 readonly property alias focusedSurface: decoratedWindow.focusedSurface
 
                 readonly property bool isDash: model.application.appId == "unity8-dash"
+                readonly property alias clientAreaItem: decoratedWindow.clientAreaItem
 
                 function claimFocus() {
                     if (spread.state == "altTab") {

=== modified file 'tests/mocks/Cursor/Cursor.qml'
--- tests/mocks/Cursor/Cursor.qml	2015-12-03 15:40:07 +0000
+++ tests/mocks/Cursor/Cursor.qml	2016-09-06 17:42:34 +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 General Public License as published by
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 
 Item {
+    property Item confiningItem
     signal pushedLeftBoundary(real amount, int buttons)
     signal pushedRightBoundary(real amount, int buttons)
     signal mouseMoved()

=== modified file 'tests/mocks/Unity/Application/MirSurface.h'
--- tests/mocks/Unity/Application/MirSurface.h	2016-08-22 16:58:28 +0000
+++ tests/mocks/Unity/Application/MirSurface.h	2016-09-06 17:42:34 +0000
@@ -106,6 +106,8 @@
     bool focused() const override;
     QRect inputBounds() const override;
 
+    bool confinesMousePointer() const override { return false; }
+
     Q_INVOKABLE void requestFocus() override;
 
     Q_INVOKABLE void close() override;