Merge lp:~vanvugt/mir/fix-1646700 into lp:mir

[Daniel van Vugt]

Don't leak touch events to clients once we've recognised a window
manipulation gesture is in progress (3 or 4 fingers) (LP: #1646700)

This closes the door on events spuriously reaching clients, or the wrong
event filter.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3862
https://mir-jenkins.ubuntu.com/job/mir-ci/2311/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3009
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3074
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3066
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3066
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3066
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3038
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3038/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3038
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3038/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3038
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3038/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3038
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3038/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3038
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3038/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3038
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3038/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2311/rebuild

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

ok

review: Approve

[Kevin DuBois (kdub)]

Its probably not news that I think we should port the proving server to the public places (esp now with miral), but alright.

review: Approve

[Daniel van Vugt (vanvugt)]

Contributions welcome... Nobody wants it using "old interfaces", but those complaining about it using old interfaces need to step up and actually point out what those old interfaces are so we can make progress.

=== modified file 'playground/demo-shell/window_manager.cpp'
--- playground/demo-shell/window_manager.cpp	2016-07-26 03:56:14 +0000
+++ playground/demo-shell/window_manager.cpp	2016-12-02 07:54:42 +0000
@@ -570,6 +570,13 @@
         max_fingers = 0;
 
     old_cursor = cursor;
+
+    /*
+     * For now we reserve all 3 or 4 finger gestures for window manipulation.
+     * Make sure clients don't receive spurious events in the process...
+     */
+    handled |= (max_fingers == 3 || max_fingers == 4);
+
     return handled;
 }