Mir

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

Proposed by Daniel van Vugt on 2016-12-02
Status: Merged
Approved by: Daniel van Vugt on 2016-12-05
Approved revision: 3862
Merged at revision: 3863
Proposed branch: lp:~vanvugt/mir/fix-1646700
Merge into: lp:mir
Diff against target: 16 lines (+7/-0)
1 file modified
playground/demo-shell/window_manager.cpp (+7/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1646700
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Approve on 2016-12-02
Andreas Pokorny (community) 2016-12-02 Approve on 2016-12-02
Mir CI Bot continuous-integration Approve on 2016-12-02
Review via email: mp+312325@code.launchpad.net

Commit message

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.

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

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) wrote :

ok

review: Approve
Kevin DuBois (kdub) wrote :

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) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'playground/demo-shell/window_manager.cpp'
2--- playground/demo-shell/window_manager.cpp 2016-07-26 03:56:14 +0000
3+++ playground/demo-shell/window_manager.cpp 2016-12-02 07:54:42 +0000
4@@ -570,6 +570,13 @@
5 max_fingers = 0;
6
7 old_cursor = cursor;
8+
9+ /*
10+ * For now we reserve all 3 or 4 finger gestures for window manipulation.
11+ * Make sure clients don't receive spurious events in the process...
12+ */
13+ handled |= (max_fingers == 3 || max_fingers == 4);
14+
15 return handled;
16 }
17

Subscribers

People subscribed via source and target branches