Mir

Merge lp://qastaging/~afrantzis/mir/fix-1260612 into lp://qastaging/mir

  1. fix-1260612
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 1469
Proposed branch: lp://qastaging/~afrantzis/mir/fix-1260612
Merge into: lp://qastaging/mir
Diff against target: 257 lines (+159/-55)
3 files modified
src/server/input/nested_input_relay.cpp (+34/-55)
tests/integration-tests/input/CMakeLists.txt (+1/-0)
tests/integration-tests/input/test_nested_input.cpp (+124/-0)
To merge this branch: bzr merge lp://qastaging/~afrantzis/mir/fix-1260612
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Approve
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+209947@code.qastaging.launchpad.net

Commit message

input: Ensure relayed input events in nested servers go through the full
dispatching process (LP: #1260612)

Description of the change

Events added through InputDispatcher::injectInputEvent() don't go through the full event preprocessing/filtering etc. This MP changes the nested input relay to dispatch events using the same mechanism as the EventHub (notifyKey, notifyMotion).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1458
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1013/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/745
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/750
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/750/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/747
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/706
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4586

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/1013/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Doesn't seem quite right (although it does seem to get some events through).

On N4 a 3-finger gesture seems to drag egltriangle but doesn't resize.

review: Needs Fixing
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

> Doesn't seem quite right (although it does seem to get some events through).
> On N4 a 3-finger gesture seems to drag egltriangle but doesn't resize.

I can't reproduce this problem, I can move and resize fine. How are you running the servers and the client?

After stopping usc and unity8 (sudo stop lightdm), from within my dev dir on the phone containing cross-compiled binaries/libs, I run:

$ ./mir_demo_server_basic -f /tmp/mir_host &
$ ./mir_demo_server_shell --host-socket /tmp/mir_host -f /tmp/mir_nested &
$ ./mir_demo_client_egltriangle -m /tmp/mir_nested

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> > Doesn't seem quite right (although it does seem to get some events through).
> > On N4 a 3-finger gesture seems to drag egltriangle but doesn't resize.
>
> I can't reproduce this problem, I can move and resize fine. How are you
> running the servers and the client?

# sudo -u phablet -i stop unity8
# ./mir_demo_server_shell &
# ./mir_demo_server_basic --host-socket /run/user/0/mir_socket --no-file --launch-client ./mir_demo_client_egltriangle

> After stopping usc and unity8 (sudo stop lightdm), from within my dev dir on
> the phone containing cross-compiled binaries/libs, I run:
>
> $ ./mir_demo_server_basic -f /tmp/mir_host &
> $ ./mir_demo_server_shell --host-socket /tmp/mir_host -f /tmp/mir_nested &
> $ ./mir_demo_client_egltriangle -m /tmp/mir_nested

That scenario seems to work. Weird - it shouldn't behave differently.

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Ah. _basic doesn't have gesture support.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

FWIW this is probably the simplest test incantation:

# ./mir_demo_server_basic --no-file --launch-client ./mir_demo_server_shell&
# ./mir_demo_client_egltriangle

Revision history for this message
Kevin DuBois (kdub) wrote :

seems okay

review: Approve

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