Mir

Merge lp://staging/~kdub/mir/fix-1670876 into lp://staging/mir

  1. fix-1670876
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 4077
Proposed branch: lp://staging/~kdub/mir/fix-1670876
Merge into: lp://staging/mir
Diff against target: 124 lines (+74/-2)
4 files modified
src/server/frontend/session_mediator.cpp (+2/-1)
src/server/shell/surface_specification.cpp (+3/-1)
tests/acceptance-tests/test_custom_window_management.cpp (+47/-0)
tests/unit-tests/frontend/test_session_mediator.cpp (+22/-0)
To merge this branch: bzr merge lp://staging/~kdub/mir/fix-1670876
Reviewer Review Type Date Requested Status
Gerry Boland (community) functional Approve
Mir CI Bot continuous-integration Approve
Alan Griffiths Approve
Review via email: mp+319317@code.staging.launchpad.net

Commit message

Do not send empty input_shape to the shell/wm policy if the user did not configure input shapes in MirWindowSpec.

fixes LP: #1670876

Description of the change

Do not send empty input_shape to the shell/wm policy if the user did not configure input shapes in MirWindowSpec.

fixes LP: #1670876

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Are we not just swapping a new problem for the old one: How can the client reset the input shape and restore the default behaviour?

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

yeah, good point. Unclear part of API imo, can fix in this MP.

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

> yeah, good point. Unclear part of API imo, can fix in this MP.

Wrote a test to show how to reset input regions, and its alright without further modifications. If the client user calls:
mir_window_spec_set_input_region(spec, nullptr, 0);

The client code will set the input region field on the modification, and that will get passed through to the shell.

The problem here was that the user wasn't setting the field, and the frontend code was always sending down the empty list as a set field.

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4074
https://mir-jenkins.ubuntu.com/job/mir-ci/3113/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4175/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4262
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4252
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4252
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4252
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4202/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4202/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4202/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4202/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4202/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/4202
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4202/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4202/console

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

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

> > yeah, good point. Unclear part of API imo, can fix in this MP.
>
> Wrote a test to show how to reset input regions, and its alright without
> further modifications. If the client user calls:
> mir_window_spec_set_input_region(spec, nullptr, 0);
>
> The client code will set the input region field on the modification, and that
> will get passed through to the shell.

Great. Thanks!

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4076
https://mir-jenkins.ubuntu.com/job/mir-ci/3115/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4178
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4265
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4255
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4255
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4255
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4205
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4205/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/4205
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4205/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4205
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4205/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/4205
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4205/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/4205
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4205/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/4205
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4205/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

Fixes the bug

review: Approve (functional)

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