Mir

Merge lp://qastaging/~vanvugt/mir/fix-1207145 into lp://qastaging/~mir-team/mir/trunk

  1. fix-1207145
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 909
Proposed branch: lp://qastaging/~vanvugt/mir/fix-1207145
Merge into: lp://qastaging/~mir-team/mir/trunk
Diff against target: 132 lines (+82/-15)
2 files modified
examples/eglapp.c (+49/-13)
examples/fingerpaint.c (+33/-2)
To merge this branch: bzr merge lp://qastaging/~vanvugt/mir/fix-1207145
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Robert Ancell Approve
Alexandros Frantzis (community) Approve
Review via email: mp+177992@code.qastaging.launchpad.net

Commit message

Fix crashing demo clients, since the introduction of multimonitor.
(LP: #1207145)

Description of the change

In future, when the fullscreen state is hooked up to surface resizing (which does not exist yet), this logic will no longer be necessary. The server will resize fullscreen surfaces accordingly. But until then, clients have to figure out what the fullscreen size is...

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

PASSED: Continuous integration, rev:909
http://jenkins.qa.ubuntu.com/job/mir-ci/1161/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/399
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/399/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

8 + if (out->connected &&
19 + out->num_modes &&
20 + out->current_mode < out->num_modes)

We should also (or, actually, primarily) check whether the output is 'out->used'. Right now our default configuration policy uses all connected outputs, but any server/shell can override this policy.

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

Looks good.

In some multi-monitor scenarios (e.g. when cloning) this may not have the expected result because we are just taking a single (the first active) output into account, but I think this is enough for demo purposes.

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Yeah, I thought of that. But I think this is enough until Mir supports resizing or at least automatic creation of fullscreen surfaces.

Revision history for this message
Robert Ancell (robert-ancell) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:910
http://jenkins.qa.ubuntu.com/job/mir-ci/1163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/401
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/401/artifact/work/output/*zip*/output.zip

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

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

LGTM

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