lp:~brandontschaefer/mir/deprecate-set-event-handler

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:mir

Alan Griffiths: Abstain on 2017-01-09

Daniel van Vugt: Disapprove on 2017-01-09

Mir CI Bot: Needs Fixing (continuous-integration) on 2017-01-07

Cemil Azizoglu: Pending requested 2017-01-07

Diff: 605 lines (+120/-33)

23 files modified

benchmarks/frame-uniformity/touch_measuring_client.cpp (+5/-3)
examples/camera.c (+11/-8)
examples/client_touch_validator.cpp (+4/-1)
examples/demo_client_display_config.c (+4/-1)
examples/eglapp.c (+1/-3)
examples/eglsquare.cpp (+4/-1)
examples/fingerpaint.c (+8/-5)
examples/pointer_confinement.c (+1/-1)
examples/target.c (+8/-2)
include/client/mir_toolkit/mir_surface.h (+1/-0)
src/client/mir_surface_api.cpp (+4/-0)
src/server/graphics/nested/mir_client_host_connection.cpp (+4/-1)
src/utils/vanity.c (+9/-2)
tests/acceptance-tests/test_client_input.cpp (+6/-0)
tests/acceptance-tests/test_client_library.cpp (+3/-0)
tests/acceptance-tests/test_client_surface_events.cpp (+12/-0)
tests/acceptance-tests/test_client_surface_visibility.cpp (+3/-0)
tests/acceptance-tests/test_confined_pointer.cpp (+6/-0)
tests/acceptance-tests/test_nested_input.cpp (+7/-1)
tests/acceptance-tests/test_nested_mir.cpp (+6/-0)
tests/acceptance-tests/test_surface_raise.cpp (+7/-4)
tests/acceptance-tests/test_system_compositor_window_manager.cpp (+3/-0)
tests/privileged-tests/test_input_events.cpp (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3909. By Brandon Schaefer on 2017-01-07

* Merge parent, fix conflicts

3908. By Brandon Schaefer on 2017-01-06

* Merge parent

3907. By Brandon Schaefer on 2017-01-06

* Deprecate mir_surface_set_event_handler

3906. By Kevin DuBois on 2017-01-05

fix extension convention in the gbm_buffer extension. (bit of a landing race).

Approved by mir-ci-bot, Chris Halse Rogers, Brandon Schaefer.

3905. By Brandon Schaefer on 2017-01-05

If we take *any* rectangles for our set region we can sometimes get the base set region of 0,0,100,100 of the window. We need to first expect 0,0,100,100 then we then expect our 0,0,200,100.
(LP: #1606418). Fixes: https://bugs.launchpad.net/bugs/1606418.

Approved by Daniel van Vugt, mir-ci-bot.

3904. By Alan Griffiths on 2017-01-05

Move mir_input_device_types.h from the (unpublished) include/common/mir_toolkit/ directory to where it /1/ gets published and /2/ can be accessed by the various public headers that use it. Fixes: https://bugs.launchpad.net/bugs/1654023.

Approved by mir-ci-bot, Daniel van Vugt, Brandon Schaefer.

3903. By Daniel van Vugt on 2017-01-05

Work around a race in the SurfaceScaling test that could cause spurious
failures on server swap interval 0.

The issue being that in swap interval 0 if the server process happens
to be slow then it's likely the first frame the client submits will
get replaced by the second one before the server has composited the
first. And that's correct for the mailbox algorithm; the only
requirement is that the newest frame gets output, not that all frames
get output.

Approved by Alan Griffiths, mir-ci-bot.

3902. By Daniel van Vugt on 2017-01-04

doc/demo_server_controls.md: Corrections to key combo documentation.

Approved by Alan Griffiths, mir-ci-bot.

3901. By Brandon Schaefer on 2017-01-04

Be sure to call the expect call before the real call.
(LP: #1653789). Fixes: https://bugs.launchpad.net/bugs/1653789.

Approved by Daniel van Vugt, mir-ci-bot.

3900. By Brandon Schaefer on 2016-12-23

Add the two of the missing functions needed to remove the old display configuration API.

Approved by mir-ci-bot, Chris Halse Rogers, Alan Griffiths.