Mir

Merge lp://qastaging/~mir-team/mir/relative-pointer-events into lp://qastaging/mir

relative-pointer-events
Merge into development-branch

Proposed by Robert Carr on 2015-07-21

Status:

Merged

Approved by:

Robert Carr on 2015-07-22

Approved revision:

no longer in the source branch.

Merged at revision:

2770

Proposed branch:

lp://qastaging/~mir-team/mir/relative-pointer-events

Merge into:

lp://qastaging/mir

Diff against target:

356 lines (+120/-17)

17 files modified

3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp (+3/-0)
3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp (+3/-2)
include/client/mir/events/event_builders.h (+8/-0)
include/client/mir_toolkit/events/input/pointer_event.h (+6/-1)
include/test/mir/test/event_matchers.h (+14/-0)
src/client/event_printer.cpp (+2/-0)
src/client/events/event_builders.cpp (+14/-1)
src/client/input/android/android_input_lexicon.cpp (+3/-1)
src/client/input/input_event.cpp (+4/-0)
src/include/common/mir/events/event_private.h (+2/-0)
src/server/input/android/input_sender.cpp (+2/-0)
src/server/input/android/input_translator.cpp (+11/-7)
src/server/input/surface_input_dispatcher.cpp (+3/-2)
tests/acceptance-tests/test_client_input.cpp (+34/-0)
tests/mir_test_framework/fake_input_device_impl.cpp (+3/-1)
tests/unit-tests/input/android/test_android_input_sender.cpp (+1/-1)
tests/unit-tests/input/android/test_input_translator.cpp (+7/-1)

To merge this branch:

bzr merge lp://qastaging/~mir-team/mir/relative-pointer-events

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2015-07-21	Approve on 2015-07-23
Chris Halse Rogers			Approve on 2015-07-22
Kevin DuBois (community)		2015-07-21	Approve on 2015-07-21
Andreas Pokorny		2015-07-21	Pending
Cemil Azizoglu		2015-07-21	Pending
Review via email: mp+265424@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-07-16.

Commit message

Provide relative cursor axes as a way to allow Unity8 to draw the pointer.
(LP: #1276322)

Description of the change

Resubmit without prereq

====

Provide relative cursor axes as a way to allow Unity8 to draw the cursor.

This is provided in lieu of the full raw events API we have discussed. The raw events API may still come at a later time other use cases. I wanted to avoid hacking up the android input layer too much when we are intending to replace it soon though.

I have a concern with this branch in that it leaks the location of clients in some cases. If a client receives a stream of input events where dx/dy is changing but x/y is constant then they now know they are on the edge of the screen. I wonder if this is a real problem? If so we could only allow fullscreen surfaces to receive relative coordinates...or brainstorm for more solutions!

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-15: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4326/rebuild

review: Approve (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-07-16: Posted in a previous version of this proposal

It would be nice to also have a test case that moves the mouse beyond the border of the screen, and verify that even when - from the pov of the pointer controller - the mouse did not move due to the screen boundaries we still send out relative position changes.

From a short dive through our pointer controller - we seem to override that position related filtering.

review: Approve

Revision history for this message

Robert Carr (robertcarr) wrote on 2015-07-16: Posted in a previous version of this proposal

Good idea Andreas I manually tested this but something came up in doing the automated testing! Notably it turns out we are batching pointer events which made verifying large streams of events difficult (e.g. sometimes I would get (0,0) -> (1, 1) -> (2, 2) and sometimes (0, 0) -> (2, 2)).

I've updated the test to feature your suggestion and proposed a dependency branch which ensures only touch events are batched.

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2015-07-16: Posted in a previous version of this proposal

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-16: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2752
http://jenkins.qa.ubuntu.com/job/mir-ci/4338/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3189
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/42/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/487
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/487/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3137
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5943
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21930

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4338/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-07-17: Posted in a previous version of this proposal

still looks good

review: Approve

Revision history for this message

Kevin DuBois (kdub) wrote on 2015-07-17: Posted in a previous version of this proposal

some of the x/y coords like:
32 + float x_axis_value, float y_axis_value,
could make use of some of the mir::geometry stuff, but probably more in line with the existing code's style to have them as floats.

229 + mir_pointer_event_axis_value(pev,mir_pointer_axis_vscroll),
space after comma

323 + const float dx = 7.0f;
324 + const float dy = 9.3f;
const ordering

suppose the last two are hygenic/nits, and the first is a minor suggestion for improvement, so approve overall

review: Approve

Revision history for this message

Robert Carr (robertcarr) wrote on 2015-07-20: Posted in a previous version of this proposal

In order to avoid controversy I've merged prevent-cursor-batching back out of this branch and implemented a workaround using MIR_CLIENT_INPUT_RATE=0

MIR_CLIENT_INPUT_RATE only disables RESAMPLING and not BATCHING so I've modified that in r2755 to allow disabling batching.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-20: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2755
http://jenkins.qa.ubuntu.com/job/mir-ci/4364/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3223
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/748/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3171/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/513/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3171/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4364/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-20: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2756
http://jenkins.qa.ubuntu.com/job/mir-ci/4365/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3224
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/749/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3172/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/514/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3172/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4365/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-21:

FAILED: Continuous integration, rev:2756
http://jenkins.qa.ubuntu.com/job/mir-ci/4384/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3250
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/103/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/775/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3198/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/533/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3198/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4384/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2015-07-21:

229 + mir_pointer_event_axis_value(pev,mir_pointer_axis_vscroll),
space after comma

323 + const float dx = 7.0f;
324 + const float dy = 9.3f;
const ordering

suppose the last two are hygenic/nits, and the first is a minor suggestion for improvement, so approve overall

review: Approve

Revision history for this message

Chris Halse Rogers (raof) wrote on 2015-07-22:

Looks sensible, although I thought we'd be exposing these as a different form of opt-in event?

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4397/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2015-07-22:

Jenkins error unrelated.

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2015-07-23:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Emanuele Antonio Faraone

Gerry Boland

Mir development team