lp:~andreas-pokorny/mir/nested-hardware-cursor

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:mir

Mir CI Bot: Needs Fixing (continuous-integration) on 2016-09-12

Andreas Pokorny (community): Disapprove on 2016-09-12

Diff: 1199 lines (+407/-117)

28 files modified

debian/control (+2/-2)
debian/libmirserver42.install (+1/-1)
examples/render_surfaces.cpp (+2/-0)
include/server/mir/server_status_listener.h (+2/-0)
src/include/platform/mir/options/configuration.h (+1/-0)
src/include/server/mir/default_server_status_listener.h (+8/-0)
src/platform/options/default_configuration.cpp (+3/-0)
src/platform/symbols.map (+1/-0)
src/platforms/mesa/server/kms/bypass.cpp (+3/-1)
src/renderers/gl/renderer.cpp (+1/-0)
src/server/CMakeLists.txt (+1/-1)
src/server/graphics/default_configuration.cpp (+6/-2)
src/server/graphics/nested/cursor.cpp (+2/-1)
src/server/graphics/nested/display_buffer.cpp (+1/-0)
src/server/graphics/nested/host_connection.h (+2/-0)
src/server/graphics/nested/input_platform.cpp (+3/-0)
src/server/graphics/nested/mir_client_host_connection.cpp (+195/-43)
src/server/graphics/nested/mir_client_host_connection.h (+11/-1)
src/server/input/default_configuration.cpp (+2/-1)
src/server/input/default_input_device_hub.cpp (+16/-1)
src/server/input/default_input_device_hub.h (+5/-1)
src/server/symbols.map (+2/-8)
tests/acceptance-tests/test_nested_mir.cpp (+103/-50)
tests/include/mir/test/doubles/mock_server_status_listener.h (+2/-0)
tests/include/mir/test/doubles/stub_host_connection.h (+5/-2)
tests/integration-tests/input/test_single_seat_setup.cpp (+3/-1)
tests/mir_test_framework/testing_server_options.cpp (+2/-0)
tests/unit-tests/input/test_default_input_device_hub.cpp (+22/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3656. By Andreas Pokorny on 2016-09-13

Trying with 10 seconds now

3655. By Andreas Pokorny on 2016-09-13

merge ci fixes

3654. By Andreas Pokorny on 2016-09-12

merge lp:mir

3653. By Andreas Pokorny on 2016-09-07

Merge nested display changes from lp:mir

3652. By Andreas Pokorny on 2016-09-02

merge ci fix

3651. By Andreas Pokorny on 2016-09-01

merge startup race fixes

3650. By Andreas Pokorny on 2016-09-01

merge shutdown race fixes

3649. By Andreas Pokorny on 2016-09-01

merge lp:mir

3648. By Andreas Pokorny on 2016-08-16

Update cursor size needed to calculate cursor image bounds

3647. By Andreas Pokorny on 2016-08-13

merged bypass fix and more dbugging