Mir

Merge lp:mir/0.24 into lp:mir/ubuntu

0.24
Merge into ubuntu

Proposed by Kevin DuBois on 2016-07-20

Status:	Merged
Approved by:	Kevin DuBois on 2016-08-11
Approved revision:	3622
Merged at revision:	1289
Proposed branch:	lp:mir/0.24
Merge into:	lp:mir/ubuntu
Prerequisite:	lp:mir/0.23
Diff against target:	29624 lines (+13565/-4898) 458 files modified .bzrignore (+2/-0) 3rd_party/android-deps/android/input.h (+4/-1) 3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h (+12/-0) 3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h (+17/-5) 3rd_party/android-input/android/frameworks/base/services/input/Input.cpp (+18/-0) 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp (+74/-13) CMakeLists.txt (+51/-6) cmake/MirCommon.cmake (+3/-7) debian/changelog (+110/-0) debian/control (+11/-10) debian/libmirplatform13.install (+1/-1) debian/libmirserver41.install (+1/-1) debian/mir-platform-graphics-android10.install (+1/-1) debian/mir-platform-graphics-mesa-kms10.install (+1/-1) debian/mir-platform-graphics-mesa-x10.install (+1/-1) debian/mir-test-tools.install (+2/-0) debian/mir-utils.install (+1/-0) doc/mainpage.md (+1/-0) doc/measuring_latency.md (+24/-0) examples/CMakeLists.txt (+3/-3) examples/eglplasma.c (+19/-33) examples/graphics_utils.cpp (+2/-0) examples/image_renderer.cpp (+2/-0) examples/mir_demo_server_loader.cpp (+5/-5) examples/render_surfaces.cpp (+17/-7) examples/server_example.cpp (+43/-5) examples/server_example_adorning_compositor.cpp (+10/-8) examples/server_example_canonical_window_manager.cpp (+18/-4) examples/server_example_tiling_window_manager.cpp (+0/-640) examples/server_example_tiling_window_manager.h (+0/-124) examples/server_example_window_management.cpp (+2/-8) examples/server_example_window_management_info.cpp (+27/-18) examples/server_example_window_management_info.h (+3/-1) include/client/mir/event_printer.h (+1/-0) include/client/mir/events/event_builders.h (+14/-0) include/client/mir_toolkit/client_types.h (+2/-1) include/client/mir_toolkit/events/event.h (+14/-0) include/client/mir_toolkit/events/input_device_state_event.h (+135/-0) include/client/mir_toolkit/events/surface_output_event.h (+3/-2) include/client/mir_toolkit/mir_surface.h (+27/-5) include/common/mir/geometry/dimensions.h (+0/-5) include/common/mir/input/keymap.h (+73/-0) include/common/mir/optional_value.h (+8/-1) include/common/mir_toolkit/common.h (+10/-0) include/platform/mir/graphics/platform.h (+0/-3) include/platform/mir/input/event_builder.h (+2/-0) include/platform/mir/input/input_sink.h (+22/-0) include/server/mir/frontend/buffer_sink.h (+3/-0) include/server/mir/frontend/buffer_stream.h (+7/-3) include/server/mir/frontend/session.h (+6/-0) include/server/mir/input/device.h (+3/-0) include/server/mir/input/keyboard_configuration.h (+49/-0) include/server/mir/scene/application_not_responding_detector_wrapper.h (+49/-0) include/server/mir/scene/buffer_stream_factory.h (+5/-3) include/server/mir/scene/session.h (+4/-0) include/server/mir/scene/surface.h (+3/-0) include/server/mir/scene/surface_creation_parameters.h (+1/-0) include/server/mir/server.h (+20/-6) include/server/mir/shell/abstract_shell.h (+7/-1) include/server/mir/shell/surface_specification.h (+1/-0) include/test/mir/test/doubles/mock_egl.h (+7/-4) include/test/mir/test/doubles/null_platform.h (+0/-5) include/test/mir/test/doubles/stub_input_device.h (+10/-0) include/test/mir/test/doubles/stub_session.h (+4/-0) include/test/mir/test/doubles/stub_surface.h (+2/-0) include/test/mir/test/event_matchers.h (+36/-4) playground/CMakeLists.txt (+8/-0) playground/demo-shell/CMakeLists.txt (+0/-1) playground/demo-shell/default_window_manager.cpp (+0/-150) playground/demo-shell/default_window_manager.h (+0/-86) playground/demo-shell/demo_compositor.cpp (+2/-2) playground/demo-shell/demo_renderer.cpp (+4/-0) playground/demo-shell/demo_shell.cpp (+5/-53) playground/demo-shell/typo/CMakeLists.txt (+1/-3) playground/demo-shell/typo/typo_glcache.cpp (+1/-1) playground/mir_demo_client_chain_jumping_buffers.c (+260/-0) playground/mir_demo_client_prerendered_frames.c (+15/-4) playground/server_configuration.cpp (+0/-8) playground/server_configuration.h (+0/-6) src/CMakeLists.txt (+1/-3) src/client/CMakeLists.txt (+1/-0) src/client/atomic_callback.h (+5/-0) src/client/buffer.cpp (+23/-8) src/client/buffer.h (+33/-28) src/client/buffer_factory.cpp (+23/-12) src/client/buffer_factory.h (+7/-6) src/client/buffer_receiver.h (+0/-45) src/client/buffer_stream.cpp (+3/-3) src/client/buffer_vault.cpp (+7/-8) src/client/buffer_vault.h (+8/-8) src/client/client_buffer_stream.h (+3/-2) src/client/connection_surface_map.h (+13/-8) src/client/error_buffer.cpp (+78/-0) src/client/error_buffer.h (+63/-0) src/client/error_chain.cpp (+0/-20) src/client/error_chain.h (+0/-5) src/client/event.cpp (+77/-0) src/client/event_printer.cpp (+31/-1) src/client/events/event_builders.cpp (+23/-3) src/client/input/android/android_input_lexicon.cpp (+6/-0) src/client/input/android/android_input_receiver.cpp (+1/-4) src/client/input/xkb_mapper.cpp (+236/-88) src/client/logging/rpc_report.cpp (+3/-3) src/client/mir_buffer.h (+65/-0) src/client/mir_buffer_api.cpp (+59/-16) src/client/mir_connection.cpp (+40/-40) src/client/mir_connection.h (+3/-5) src/client/mir_presentation_chain.h (+4/-8) src/client/mir_presentation_chain_api.cpp (+2/-1) src/client/mir_surface.cpp (+20/-18) src/client/mir_surface.h (+8/-2) src/client/mir_surface_api.cpp (+10/-0) src/client/presentation_chain.cpp (+2/-39) src/client/presentation_chain.h (+0/-8) src/client/rpc/mir_protobuf_rpc_channel.cpp (+3/-3) src/client/surface_map.cpp (+18/-6) src/client/surface_map.h (+10/-6) src/client/symbols.map (+33/-1) src/common/CMakeLists.txt (+0/-3) src/common/events/CMakeLists.txt (+1/-0) src/common/events/event.cpp (+17/-3) src/common/events/input_device_state_event.cpp (+223/-0) src/common/fatal/fatal.cpp (+1/-1) src/common/symbols.map (+33/-0) src/gl/program.cpp (+2/-0) src/include/client/mir/client_context.h (+1/-0) src/include/client/mir_toolkit/client_types_nbs.h (+1/-1) src/include/client/mir_toolkit/mir_buffer.h (+48/-0) src/include/client/mir_toolkit/mir_presentation_chain.h (+0/-21) src/include/common/mir/events/event.h (+3/-0) src/include/common/mir/events/event_private.h (+1/-0) src/include/common/mir/events/input_device_state_event.h (+75/-0) src/include/common/mir/input/key_mapper.h (+101/-0) src/include/common/mir/input/xkb_mapper.h (+40/-19) src/include/gl/mir/gl/primitive.h (+1/-1) src/include/gl/mir/gl/program.h (+1/-1) src/include/gl/mir/gl/texture.h (+1/-1) src/include/platform/mir/graphics/egl_extensions.h (+2/-3) src/include/platform/mir/options/configuration.h (+1/-2) src/include/server/mir/default_server_configuration.h (+11/-3) src/include/server/mir/input/seat.h (+10/-0) src/include/server/mir/server_configuration.h (+3/-1) src/include/server/mir/shell/canonical_window_manager.h (+3/-1) src/include/server/mir/shell/window_management_info.h (+1/-0) src/platform/CMakeLists.txt (+3/-2) src/platform/graphics/CMakeLists.txt (+1/-1) src/platform/graphics/egl_error.cpp (+21/-0) src/platform/graphics/egl_extensions.cpp (+7/-0) src/platform/options/default_configuration.cpp (+3/-6) src/platform/symbols.map (+3/-10) src/platforms/CMakeLists.txt (+7/-3) src/platforms/android/client/android_client_platform.cpp (+14/-35) src/platforms/android/client/client_platform_factory.cpp (+6/-6) src/platforms/android/common/CMakeLists.txt (+1/-0) src/platforms/android/common/mir_native_window.cpp (+55/-6) src/platforms/android/common/native_window_report.cpp (+170/-0) src/platforms/android/include/egl_sync_extensions.h (+2/-0) src/platforms/android/include/mir_native_window.h (+7/-1) src/platforms/android/include/native_window_report.h (+81/-0) src/platforms/android/server/buffer.h (+2/-0) src/platforms/android/server/device_quirks.cpp (+72/-8) src/platforms/android/server/device_quirks.h (+9/-0) src/platforms/android/server/display.cpp (+8/-2) src/platforms/android/server/display.h (+3/-0) src/platforms/android/server/hwc_fallback_gl_renderer.cpp (+4/-2) src/platforms/android/server/hwc_layers.cpp (+4/-4) src/platforms/android/server/platform.cpp (+55/-39) src/platforms/android/server/platform.h (+3/-1) src/platforms/android/utils/CMakeLists.txt (+3/-1) src/platforms/android/utils/render_overlays.cpp (+68/-29) src/platforms/common/server/CMakeLists.txt (+4/-2) src/platforms/common/server/kms-utils/CMakeLists.txt (+14/-0) src/platforms/common/server/kms-utils/drm_mode_resources.cpp (+404/-74) src/platforms/common/server/kms-utils/drm_mode_resources.h (+108/-8) src/platforms/common/server/kms-utils/kms_connector.cpp (+233/-0) src/platforms/common/server/kms-utils/kms_connector.h (+60/-0) src/platforms/common/server/shm_buffer.cpp (+12/-2) src/platforms/eglstream-kms/CMakeLists.txt (+2/-0) src/platforms/eglstream-kms/client/CMakeLists.txt (+39/-0) src/platforms/eglstream-kms/client/client_buffer.cpp (+159/-0) src/platforms/eglstream-kms/client/client_buffer.h (+67/-0) src/platforms/eglstream-kms/client/client_buffer_factory.cpp (+36/-0) src/platforms/eglstream-kms/client/client_buffer_factory.h (+45/-0) src/platforms/eglstream-kms/client/client_platform.cpp (+77/-0) src/platforms/eglstream-kms/client/client_platform.h (+52/-0) src/platforms/eglstream-kms/client/client_platform_factory.cpp (+59/-0) src/platforms/eglstream-kms/client/symbols.map (+7/-0) src/platforms/eglstream-kms/server/CMakeLists.txt (+55/-0) src/platforms/eglstream-kms/server/buffer_allocator.cpp (+69/-0) src/platforms/eglstream-kms/server/buffer_allocator.h (+48/-0) src/platforms/eglstream-kms/server/display.cpp (+363/-0) src/platforms/eglstream-kms/server/display.h (+82/-0) src/platforms/eglstream-kms/server/egl_output.cpp (+359/-0) src/platforms/eglstream-kms/server/egl_output.h (+79/-0) src/platforms/eglstream-kms/server/kms_display_configuration.cpp (+331/-0) src/platforms/eglstream-kms/server/kms_display_configuration.h (+70/-0) src/platforms/eglstream-kms/server/platform.cpp (+157/-0) src/platforms/eglstream-kms/server/platform.h (+64/-0) src/platforms/eglstream-kms/server/platform_symbols.cpp (+189/-0) src/platforms/eglstream-kms/server/symbols.map.in (+10/-0) src/platforms/evdev/libinput_device.cpp (+1/-1) src/platforms/evdev/platform.cpp (+1/-1) src/platforms/mesa/CMakeLists.txt (+1/-0) src/platforms/mesa/client/client_platform_factory.cpp (+8/-6) src/platforms/mesa/server/CMakeLists.txt (+22/-2) src/platforms/mesa/server/buffer_allocator.cpp (+4/-2) src/platforms/mesa/server/common/CMakeLists.txt (+0/-21) src/platforms/mesa/server/display_helpers.cpp (+19/-5) src/platforms/mesa/server/display_helpers.h (+0/-1) src/platforms/mesa/server/kms/CMakeLists.txt (+8/-4) src/platforms/mesa/server/kms/display_buffer.cpp (+1/-1) src/platforms/mesa/server/kms/guest_platform.cpp (+0/-5) src/platforms/mesa/server/kms/guest_platform.h (+0/-1) src/platforms/mesa/server/kms/platform.cpp (+0/-5) src/platforms/mesa/server/kms/platform.h (+0/-2) src/platforms/mesa/server/kms/platform_symbols.cpp (+14/-0) src/platforms/mesa/server/kms/real_kms_display_configuration.cpp (+8/-9) src/platforms/mesa/server/kms/real_kms_display_configuration.h (+2/-1) src/platforms/mesa/server/kms/real_kms_output.cpp (+47/-159) src/platforms/mesa/server/kms/real_kms_output.h (+3/-3) src/platforms/mesa/server/kms/symbols.map.in (+0/-6) src/platforms/mesa/server/x11/CMakeLists.txt (+1/-1) src/platforms/mesa/server/x11/graphics/CMakeLists.txt (+2/-2) src/platforms/mesa/server/x11/graphics/display.cpp (+42/-7) src/platforms/mesa/server/x11/graphics/display.h (+13/-2) src/platforms/mesa/server/x11/graphics/display_buffer.cpp (+8/-1) src/platforms/mesa/server/x11/graphics/display_configuration.cpp (+2/-3) src/platforms/mesa/server/x11/graphics/display_configuration.h (+4/-1) src/platforms/mesa/server/x11/graphics/guest_platform.cpp (+0/-5) src/platforms/mesa/server/x11/graphics/guest_platform.h (+0/-1) src/platforms/mesa/server/x11/graphics/platform.cpp (+2/-7) src/platforms/mesa/server/x11/graphics/platform.h (+0/-1) src/platforms/mesa/server/x11/input/input_device.cpp (+12/-12) src/platforms/mesa/server/x11/input/input_platform.cpp (+7/-1) src/protobuf/mir_protobuf.proto (+2/-0) src/renderers/gl/program_family.cpp (+2/-1) src/renderers/gl/program_family.h (+1/-1) src/renderers/gl/renderer.cpp (+10/-5) src/renderers/gl/renderer.h (+1/-1) src/server/CMakeLists.txt (+3/-4) src/server/compositor/buffer_map.cpp (+12/-7) src/server/compositor/buffer_map.h (+0/-3) src/server/compositor/buffer_stream_factory.cpp (+10/-4) src/server/compositor/buffer_stream_factory.h (+4/-2) src/server/compositor/buffer_stream_surfaces.cpp (+6/-13) src/server/compositor/buffer_stream_surfaces.h (+2/-3) src/server/compositor/screencast_display_buffer.h (+2/-1) src/server/compositor/stream.cpp (+16/-26) src/server/compositor/stream.h (+5/-5) src/server/default_server_configuration.cpp (+7/-2) src/server/display_server.cpp (+5/-1) src/server/frontend/event_sender.cpp (+11/-0) src/server/frontend/event_sender.h (+1/-0) src/server/frontend/session_mediator.cpp (+29/-18) src/server/graphics/CMakeLists.txt (+1/-2) src/server/graphics/default_configuration.cpp (+3/-15) src/server/graphics/nested/CMakeLists.txt (+1/-0) src/server/graphics/nested/display.cpp (+12/-13) src/server/graphics/nested/display.h (+2/-11) src/server/graphics/nested/display_buffer.cpp (+7/-41) src/server/graphics/nested/display_buffer.h (+4/-9) src/server/graphics/nested/host_connection.h (+8/-0) src/server/graphics/nested/input_platform.cpp (+325/-0) src/server/graphics/nested/input_platform.h (+75/-0) src/server/graphics/nested/mir_client_host_connection.cpp (+69/-169) src/server/graphics/nested/mir_client_host_connection.h (+29/-18) src/server/graphics/offscreen/CMakeLists.txt (+0/-12) src/server/graphics/offscreen/display.cpp (+0/-197) src/server/graphics/offscreen/display.h (+0/-115) src/server/graphics/offscreen/display_buffer.cpp (+0/-173) src/server/graphics/offscreen/display_buffer.h (+0/-91) src/server/graphics/offscreen/display_configuration.cpp (+0/-84) src/server/graphics/offscreen/display_configuration.h (+0/-51) src/server/graphics/surfaceless_egl_context.cpp (+5/-1) src/server/input/android/input_sender.cpp (+28/-19) src/server/input/basic_seat.cpp (+34/-2) src/server/input/basic_seat.h (+14/-1) src/server/input/default_configuration.cpp (+45/-44) src/server/input/default_device.cpp (+25/-2) src/server/input/default_device.h (+7/-1) src/server/input/default_event_builder.cpp (+11/-2) src/server/input/default_event_builder.h (+6/-1) src/server/input/default_input_device_hub.cpp (+30/-5) src/server/input/default_input_device_hub.h (+9/-2) src/server/input/seat_input_device_tracker.cpp (+126/-62) src/server/input/seat_input_device_tracker.h (+25/-6) src/server/input/surface_input_dispatcher.cpp (+3/-74) src/server/input/surface_input_dispatcher.h (+1/-14) src/server/report/logging/display_report.cpp (+3/-3) src/server/scene/CMakeLists.txt (+1/-0) src/server/scene/application_not_responding_detector_wrapper.cpp (+54/-0) src/server/scene/application_session.cpp (+30/-6) src/server/scene/application_session.h (+8/-1) src/server/scene/basic_surface.cpp (+14/-1) src/server/scene/basic_surface.h (+6/-0) src/server/scene/default_configuration.cpp (+12/-3) src/server/scene/gl_pixel_buffer.cpp (+2/-2) src/server/scene/gl_pixel_buffer.h (+1/-1) src/server/scene/global_event_sender.cpp (+4/-0) src/server/scene/global_event_sender.h (+1/-1) src/server/scene/session_manager.cpp (+6/-3) src/server/scene/session_manager.h (+4/-1) src/server/scene/surface_allocator.cpp (+2/-0) src/server/server.cpp (+74/-4) src/server/shell/abstract_shell.cpp (+24/-1) src/server/shell/canonical_window_manager.cpp (+20/-3) src/server/shell/default_configuration.cpp (+3/-2) src/server/symbols.map (+21/-3) src/utils/CMakeLists.txt (+4/-0) src/utils/run.cpp (+1/-0) src/utils/vanity.c (+807/-0) tests/CMakeLists.txt (+4/-0) tests/acceptance-tests/CMakeLists.txt (+3/-0) tests/acceptance-tests/server_configuration_options.cpp (+1/-1) tests/acceptance-tests/server_configuration_wrapping.cpp (+13/-0) tests/acceptance-tests/server_stop_callback.cpp (+63/-0) tests/acceptance-tests/test_application_not_responding_detection.cpp (+79/-0) tests/acceptance-tests/test_buffer_stream_arrangement.cpp (+72/-11) tests/acceptance-tests/test_client_input.cpp (+7/-5) tests/acceptance-tests/test_client_library.cpp (+18/-0) tests/acceptance-tests/test_client_surface_events.cpp (+132/-1) tests/acceptance-tests/test_client_surface_visibility.cpp (+20/-8) tests/acceptance-tests/test_confined_pointer.cpp (+214/-0) tests/acceptance-tests/test_latency.cpp (+4/-6) tests/acceptance-tests/test_nested_input.cpp (+83/-11) tests/acceptance-tests/test_nested_mir.cpp (+238/-34) tests/acceptance-tests/test_persistent_surface_store.cpp (+84/-0) tests/acceptance-tests/test_server_shutdown.cpp (+3/-5) tests/acceptance-tests/test_surface_modifications.cpp (+8/-8) tests/acceptance-tests/test_surface_placement.cpp (+3/-2) tests/acceptance-tests/test_surface_specification.cpp (+7/-7) tests/acceptance-tests/test_system_compositor_window_manager.cpp (+69/-13) tests/acceptance-tests/throwback/test_presentation_chain.cpp (+80/-17) tests/include/mir/test/doubles/mock_buffer_stream.h (+2/-3) tests/include/mir/test/doubles/mock_client_context.h (+1/-0) tests/include/mir/test/doubles/mock_drm.h (+8/-0) tests/include/mir/test/doubles/mock_event_sink.h (+1/-1) tests/include/mir/test/doubles/mock_gl.h (+1/-0) tests/include/mir/test/doubles/mock_input_seat.h (+8/-0) tests/include/mir/test/doubles/mock_input_sink.h (+2/-0) tests/include/mir/test/doubles/mock_key_mapper.h (+51/-0) tests/include/mir/test/doubles/mock_mir_buffer.h (+68/-0) tests/include/mir/test/doubles/mock_scene_session.h (+4/-0) tests/include/mir/test/doubles/mock_surface.h (+1/-0) tests/include/mir/test/doubles/mock_x11.h (+4/-0) tests/include/mir/test/doubles/null_event_sink.h (+1/-0) tests/include/mir/test/doubles/stub_buffer_stream.h (+2/-3) tests/include/mir/test/doubles/stub_buffer_stream_factory.h (+31/-2) tests/include/mir/test/doubles/stub_gbm_native_buffer.h (+1/-1) tests/include/mir/test/doubles/stub_host_connection.h (+19/-0) tests/include/mir/test/doubles/stub_scene_surface.h (+3/-0) tests/include/mir/test/doubles/stub_session.h (+14/-0) tests/integration-tests/CMakeLists.txt (+2/-2) tests/integration-tests/graphics/mesa/CMakeLists.txt (+2/-2) tests/integration-tests/graphics/mesa/test_buffer_integration.cpp (+2/-0) tests/integration-tests/input/test_single_seat_setup.cpp (+18/-9) tests/integration-tests/session_management.cpp (+26/-14) tests/integration-tests/surface_composition.cpp (+1/-0) tests/integration-tests/test_buffer_scheduling.cpp (+10/-11) tests/integration-tests/test_exchange_buffer.cpp (+4/-2) tests/integration-tests/test_session.cpp (+3/-2) tests/integration-tests/test_surface_stack_with_compositor.cpp (+1/-0) tests/integration-tests/test_swapinterval.cpp (+7/-2) tests/integration-tests/test_test_framework.cpp (+16/-9) tests/mir_test/CMakeLists.txt (+4/-0) tests/mir_test_doubles/CMakeLists.txt (+7/-3) tests/mir_test_doubles/mock_drm.cpp (+40/-0) tests/mir_test_doubles/mock_egl.cpp (+5/-5) tests/mir_test_doubles/mock_event_sink_factory.cpp (+7/-0) tests/mir_test_doubles/mock_gl.cpp (+8/-1) tests/mir_test_doubles/mock_x11.cpp (+23/-0) tests/mir_test_framework/CMakeLists.txt (+9/-4) tests/mir_test_framework/async_server_runner.cpp (+1/-1) tests/mir_test_framework/executable_path.cpp (+15/-1) tests/mir_test_framework/fake_input_device_impl.cpp (+8/-8) tests/mir_test_framework/platform_graphics_dummy.cpp (+8/-4) tests/mir_test_framework/platform_graphics_throw.cpp (+1/-12) tests/mir_test_framework/stub_client_platform_module.cpp (+5/-1) tests/mir_test_framework/stub_session.cpp (+15/-0) tests/mir_test_framework/stub_surface.cpp (+10/-0) tests/mir_test_framework/stubbed_graphics_platform.cpp (+9/-16) tests/mirtest.pc.in (+1/-1) tests/performance-tests/CMakeLists.txt (+19/-0) tests/performance-tests/performance_tests.sh (+3/-1) tests/performance-tests/test_client_startup.cpp (+115/-0) tests/performance-tests/test_compositor.cpp (+222/-0) tests/unit-tests/CMakeLists.txt (+14/-3) tests/unit-tests/client/CMakeLists.txt (+1/-0) tests/unit-tests/client/android/test_android_native_window.cpp (+27/-28) tests/unit-tests/client/input/test_xkb_mapper.cpp (+297/-38) tests/unit-tests/client/mesa/CMakeLists.txt (+1/-1) tests/unit-tests/client/mesa/test_client_platform.cpp (+4/-0) tests/unit-tests/client/test_buffer_vault.cpp (+8/-29) tests/unit-tests/client/test_client_mir_surface.cpp (+48/-0) tests/unit-tests/client/test_client_platform.cpp (+84/-32) tests/unit-tests/client/test_connection_resource_map.cpp (+7/-10) tests/unit-tests/client/test_error_buffer.cpp (+77/-0) tests/unit-tests/client/test_mir_buffer.cpp (+19/-1) tests/unit-tests/client/test_mir_connection.cpp (+10/-79) tests/unit-tests/client/test_presentation_chain.cpp (+17/-205) tests/unit-tests/client/test_probing_client_platform_factory.cpp (+194/-65) tests/unit-tests/client/test_protobuf_rpc_channel.cpp (+19/-15) tests/unit-tests/compositor/test_buffer_stream.cpp (+0/-12) tests/unit-tests/compositor/test_client_buffers.cpp (+14/-3) tests/unit-tests/compositor/test_stream.cpp (+18/-9) tests/unit-tests/frontend/test_event_sender.cpp (+42/-0) tests/unit-tests/frontend/test_session_mediator.cpp (+29/-14) tests/unit-tests/graphics/CMakeLists.txt (+1/-1) tests/unit-tests/graphics/android/CMakeLists.txt (+1/-0) tests/unit-tests/graphics/android/test_anw_logger.cpp (+107/-0) tests/unit-tests/graphics/android/test_device_detection.cpp (+37/-9) tests/unit-tests/graphics/android/test_display.cpp (+34/-1) tests/unit-tests/graphics/android/test_display_buffer.cpp (+3/-1) tests/unit-tests/graphics/android/test_display_generic.cpp (+7/-6) tests/unit-tests/graphics/android/test_display_hotplug.cpp (+2/-0) tests/unit-tests/graphics/android/test_hwc_layers.cpp (+2/-2) tests/unit-tests/graphics/android/test_platform.cpp (+10/-16) tests/unit-tests/graphics/android/test_server_interpreter.cpp (+6/-2) tests/unit-tests/graphics/kms-utils/CMakeLists.txt (+6/-0) tests/unit-tests/graphics/kms-utils/test_connector_utils.cpp (+216/-0) tests/unit-tests/graphics/kms-utils/test_drm_mode_resources.cpp (+206/-0) tests/unit-tests/graphics/mesa/CMakeLists.txt (+13/-3) tests/unit-tests/graphics/mesa/common/CMakeLists.txt (+0/-15) tests/unit-tests/graphics/mesa/kms/CMakeLists.txt (+1/-1) tests/unit-tests/graphics/mesa/kms/test_buffer_allocator.cpp (+1/-1) tests/unit-tests/graphics/mesa/kms/test_display.cpp (+3/-1) tests/unit-tests/graphics/mesa/kms/test_display_configuration.cpp (+1/-0) tests/unit-tests/graphics/mesa/kms/test_gbm_buffer.cpp (+2/-2) tests/unit-tests/graphics/mesa/kms/test_platform.cpp (+47/-8) tests/unit-tests/graphics/mesa/kms/test_real_kms_output.cpp (+50/-0) tests/unit-tests/graphics/mesa/test_drm_helper.cpp (+1/-1) tests/unit-tests/graphics/mesa/test_ipc_operations.cpp (+2/-2) tests/unit-tests/graphics/mesa/x11/test_display.cpp (+90/-3) tests/unit-tests/graphics/nested/test_nested_display.cpp (+1/-2) tests/unit-tests/graphics/offscreen/CMakeLists.txt (+0/-6) tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp (+0/-175) tests/unit-tests/graphics/test_platform_prober.cpp (+15/-7) tests/unit-tests/input/CMakeLists.txt (+1/-0) tests/unit-tests/input/android/test_android_input_sender.cpp (+48/-5) tests/unit-tests/input/android/test_input_consumer.cpp (+120/-13) tests/unit-tests/input/evdev/test_libinput_device.cpp (+10/-1) tests/unit-tests/input/test_default_device.cpp (+30/-6) tests/unit-tests/input/test_default_input_device_hub.cpp (+3/-1) tests/unit-tests/input/test_event_builders.cpp (+97/-1) tests/unit-tests/input/test_key_repeat_dispatcher.cpp (+3/-0) tests/unit-tests/input/test_nested_input_platform.cpp (+182/-0) tests/unit-tests/input/test_seat_input_device_tracker.cpp (+75/-69) tests/unit-tests/input/test_surface_input_dispatcher.cpp (+0/-91) tests/unit-tests/input/test_x11_platform.cpp (+3/-1) tests/unit-tests/scene/test_abstract_shell.cpp (+31/-2) tests/unit-tests/scene/test_application_session.cpp (+24/-13) tests/unit-tests/scene/test_basic_surface.cpp (+8/-2) tests/unit-tests/scene/test_session_manager.cpp (+11/-3) tests/unit-tests/scene/test_surface.cpp (+4/-1) tests/unit-tests/scene/test_surface_impl.cpp (+3/-1) tests/unit-tests/scene/test_surface_stack.cpp (+14/-0) tests/unit-tests/test_fatal.cpp (+2/-0) tools/valgrind_suppressions_libhybris (+0/-10)
To merge this branch:	bzr merge lp:mir/0.24
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-08-09
Daniel van Vugt		2016-07-20	Approve on 2016-08-01
Alexandros Frantzis (community)			Abstain on 2016-07-26
Review via email: mp+300589@code.launchpad.net

Commit Message

Mir 0.24.0 release.

Description of the Change

Mir 0.24 release. (branched at rev 3602)

Note 1: This is the second time branching from trunk, so that bugfixes could be picked up. The first branch that was being used is now at lp:~mir-team/mir/0.24-before-rebranch, if anyone's still interested in that.

Note 2: There's a mir 0.23.4 release in flight that needs to land before this one.

Mir CI Bot (mir-ci-bot) wrote on 2016-07-20:

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

review: Approve (continuous-integration)

lp:mir/0.24 updated on 2016-07-20

3608. By Kevin DuBois on 2016-07-20: pick up the 0.23.4 changelog entry. we already have patch for that change in this branch

Mir CI Bot (mir-ci-bot) wrote on 2016-07-20:

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

review: Approve (continuous-integration)

lp:mir/0.24 updated on 2016-07-21

3609. By Daniel van Vugt on 2016-07-21: debian/changelog: Correct grammar of new entries

Mir CI Bot (mir-ci-bot) wrote on 2016-07-21:

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

review: Needs Fixing (continuous-integration)

Daniel van Vugt (vanvugt) wrote on 2016-07-21:

Network unreachable on one of the hosts. Try again.

lp:mir/0.24 updated on 2016-07-21

3610. By Daniel van Vugt on 2016-07-21: Try again.
3611. By Daniel van Vugt on 2016-07-21: debian/changelog: Correction; NBS is not enabled by default

Mir CI Bot (mir-ci-bot) wrote on 2016-07-21:

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

review: Needs Fixing (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2016-07-21:

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

review: Needs Fixing (continuous-integration)

Kevin DuBois (kdub) wrote on 2016-07-21:

@Daniel, thanks for noticing. This release should have nbs on by default, it being off was a result of a mis-merge with lp:mir/ubuntu in rev 3603

lp:mir/0.24 updated on 2016-07-21

3612. By Kevin DuBois on 2016-07-21: enable nbs and correct changelog to reflect NBS being enabled

Mir CI Bot (mir-ci-bot) wrote on 2016-07-21:

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

review: Needs Fixing (continuous-integration)

lp:mir/0.24 updated on 2016-07-21

3613. By Kevin DuBois on 2016-07-21: merge in lp:mir/ubuntu again for 0.23.4 changes, fix 1 conflict

Mir CI Bot (mir-ci-bot) wrote on 2016-07-21:

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

review: Needs Fixing (continuous-integration)

Kevin DuBois (kdub) wrote on 2016-07-21:

Alright, built in silo 36.

I've started testing on some devices, so please don't upload new changes without coordination and rebuilding of the silo. Tracking testing using a google doc: https://docs.google.com/document/d/1TqGBDN2ndz6kZ8YgxhqBzRhN9EgM6YRVXZK4oLgCiMk/edit#

Kevin DuBois (kdub) wrote on 2016-07-21:

Actually, probably need this link to edit: https://docs.google.com/a/canonical.com/document/d/1TqGBDN2ndz6kZ8YgxhqBzRhN9EgM6YRVXZK4oLgCiMk/edit?usp=sharing

Daniel van Vugt (vanvugt) wrote on 2016-07-26:

The changelog is wrong. We bumped to 10:

. mirplatformgraphics ABI unchanged at 9

review: Needs Fixing

Alexandros Frantzis (afrantzis) wrote on 2016-07-26:

Also:

7870 +set(MIR_SERVER_GRAPHICS_PLATFORM_STANZA_VERSION 0.25)

Should be 0.24.

We reverted from 0.25 to 0.24 in https://bazaar.launchpad.net/~mir-team/mir/development-branch/revision/3603 but missed this.

review: Needs Fixing

lp:mir/0.24 updated on 2016-07-26

3614. By Kevin DuBois on 2016-07-26: update changelog
3615. By Kevin DuBois on 2016-07-26: change variable in CMakeLists.txt to be 0.24

Mir CI Bot (mir-ci-bot) wrote on 2016-07-26:

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

review: Approve (continuous-integration)

Alexandros Frantzis (afrantzis) wrote on 2016-07-26:

Haven't performed a thorough review, but my previous concern has been addressed.

review: Abstain

Daniel van Vugt (vanvugt) wrote on 2016-07-27:

I concur.

review: Abstain

Kevin DuBois (kdub) wrote on 2016-07-27:

the 0.24 release is currently blocked on two fronts:

1) 0.23.5 should be released first
2) the usc/repowerd revert fallout needs to be addressed in order to release the USC compatibility branch that 0.24 needs (this generated the need for 1)

Daniel van Vugt (vanvugt) wrote on 2016-07-28:

I'd say 0.23.5 should not be released at all. It's poor discipline and project management to enable major new features in a stable point release...

https://bugs.launchpad.net/canonical-devices-system-image/+bug/1590765/comments/32

Daniel van Vugt (vanvugt) wrote on 2016-08-01:

Let's do this. Incidentally, it's been two months since release 0.23.0.

review: Approve

lp:mir/0.24 updated on 2016-08-03

3616. By Daniel van Vugt on 2016-08-03: Merge latest lp:mir/ubuntu and fix conflicts (which results in
zero diff)

Daniel van Vugt (vanvugt) wrote on 2016-08-03:

It might also be a good idea to pull in the updated debian/changelog I put in lp:mir/0.23 today.

Mir CI Bot (mir-ci-bot) wrote on 2016-08-03:

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

review: Approve (continuous-integration)

lp:mir/0.24 updated on 2016-08-03

3617. By Kevin DuBois on 2016-08-03: pull in changelog retrospective changelog modifications present in lp:mir/0.23

Kevin DuBois (kdub) wrote on 2016-08-03:

sure, don't mind pulling those in

lp:mir/0.24 updated on 2016-08-03

3618. By Kevin DuBois on 2016-08-03: correct changelog by removing bugs that were fixed in previous releasese (LP: #1578159, LP: #1578159, LP: #1579076, LP: #1584601, LP: #1584784, LP: #1590765, LP: #1581368, LP: #1602199)

Mir CI Bot (mir-ci-bot) wrote on 2016-08-03:

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

review: Needs Fixing (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2016-08-03:

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

review: Approve (continuous-integration)

Kevin DuBois (kdub) wrote on 2016-08-04:

In addition to being blocked by the repowerd un-revert (silo0), mir and USC are now both blocked by an issue with gmock (lp: #1609793). So, in order to land this:

1) gmock patch has to be accepted
2) the no-change-rebuild that boost generated on us has to produce binaries and move to main.
3) usc in silo0 has to land to recorrect the situation there
4) this silo can land.

lp:mir/0.24 updated on 2016-08-09

3619. By Kevin DuBois on 2016-08-09: pick up changelog from no-change rebuild
3620. By Kevin DuBois on 2016-08-09: port over fix for gcc6 from trunk mir rev 3626
3621. By Kevin DuBois on 2016-08-09: port over fix for LP: #1610215
3622. By Kevin DuBois on 2016-08-09: note bug fixes to build in changelog

Mir CI Bot (mir-ci-bot) wrote on 2016-08-09:

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

review: Needs Fixing (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2016-08-09:

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

review: Approve (continuous-integration)

lp:mir/0.24 updated on 2016-08-12

3623. By Kevin DuBois on 2016-08-12: port fix for lp: #1612256 to 0.24 series
3624. By Kevin DuBois on 2016-08-12: note fix in changelog

Kevin DuBois (kdub) wrote on 2016-08-15:

built with known fixes (encountered some general chaos in yakkety)... please don't push to branch without ensuring the whole silo rebuilds.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Mir development team

 === added file '.bzrignore'
 --- .bzrignore	1970-01-01 00:00:00 +0000
 +++ .bzrignore	2016-08-12 14:07:23 +0000
@@ -0,0 +1,2 @@
++.idea
++include/server/mir/version.h
 === modified file '3rd_party/android-deps/android/input.h'
 --- 3rd_party/android-deps/android/input.h	2013-09-20 11:55:05 +0000
 +++ 3rd_party/android-deps/android/input.h	2016-08-12 14:07:23 +0000
@@ -141,7 +141,10 @@
      AINPUT_EVENT_TYPE_KEY = 1,
      /* Indicates that the input event is a motion event. */
--    AINPUT_EVENT_TYPE_MOTION = 2
++    AINPUT_EVENT_TYPE_MOTION = 2,
++
++    /* Indicates that the event contains a raw buffer. */
++    AINPUT_EVENT_TYPE_BUFFER = 3
  };
  /*
 === modified file '3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h'
 --- 3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h	2016-03-23 06:39:56 +0000
 +++ 3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h	2016-08-12 14:07:23 +0000
@@ -571,6 +571,13 @@
      Vector<PointerCoords> mSamplePointerCoords;
  };
++struct RawBufferEvent : public InputEvent {
++
++    virtual int32_t getType() const { return AINPUT_EVENT_TYPE_BUFFER; }
++    virtual ~RawBufferEvent() { }
++    std::string buffer;
++};
++
  /*
   * Input event factory.
   */
@@ -583,6 +590,7 @@
      virtual KeyEvent* createKeyEvent() = 0;
      virtual MotionEvent* createMotionEvent() = 0;
++    virtual RawBufferEvent* createRawBufferEvent() = 0;
  };
  /*
@@ -596,10 +604,12 @@
      virtual KeyEvent* createKeyEvent() { return & mKeyEvent; }
      virtual MotionEvent* createMotionEvent() { return & mMotionEvent; }
++    virtual RawBufferEvent* createRawBufferEvent() { return &mRawEvent; }
  private:
      KeyEvent mKeyEvent;
      MotionEvent mMotionEvent;
++    RawBufferEvent mRawEvent;
  };
  /*
@@ -612,6 +622,7 @@
      virtual KeyEvent* createKeyEvent();
      virtual MotionEvent* createMotionEvent();
++    virtual RawBufferEvent* createRawBufferEvent();
      void recycle(InputEvent* event);
@@ -620,6 +631,7 @@
      Vector<KeyEvent*> mKeyEventPool;
      Vector<MotionEvent*> mMotionEventPool;
++    Vector<RawBufferEvent*> mRawBufferEventPool;
  };
  } // namespace android
 === modified file '3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h'
 --- 3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h	2016-04-11 16:56:16 +0000
 +++ 3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h	2016-08-12 14:07:23 +0000
@@ -46,21 +46,26 @@
   */
  struct InputMessage {
      InputMessage();
++    InputMessage(uint32_t seq, std::string const& buffer);
++    InputMessage(InputMessage const& cp);
++    InputMessage& operator=(InputMessage const& cp);
      enum {
          TYPE_KEY = 1,
          TYPE_MOTION = 2,
--        TYPE_FINISHED = 3
++        TYPE_FINISHED = 3,
++        TYPE_BUFFER = 4
      };
      struct Header {
          uint32_t type;
--        uint32_t padding; // 8 byte alignment for the body that follows
++        uint32_t seq;
++        uint32_t size; // size of the Body
++        uint32_t padding; // padding for 8byte tokens in Body
      } header;
      union Body {
          struct Key {
--            uint32_t seq;
              int64_t eventTime;
              mir::cookie::Blob cookieBlob;
              int32_t deviceId;
@@ -79,7 +84,6 @@
          } key;
          struct Motion {
--            uint32_t seq;
              int64_t eventTime;
              mir::cookie::Blob cookieBlob;
              int32_t deviceId;
@@ -113,17 +117,22 @@
          } motion;
          struct Finished {
--            uint32_t seq;
              bool handled;
              inline size_t size() const {
                  return sizeof(Finished);
+             }
          } finished;
++
++        struct Buffer {
++            uint8_t buffer[sizeof(Motion)];
++        } buffer;
      } body;
      bool isValid(size_t actualSize) const;
      size_t size() const;
++
++    static const size_t raw_event_payload = sizeof(body.buffer);
  };
  /*
@@ -188,6 +197,8 @@
      /* Gets the underlying input channel. */
      inline sp<InputChannel> getChannel() { return mChannel; }
++    status_t publishEventBuffer(uint32_t seq, std::string const& buffer);
++
      /* Publishes a key event to the input channel.
+      *
       * Returns OK on success.
@@ -430,6 +441,7 @@
      static void initializeKeyEvent(KeyEvent* event, const InputMessage* msg);
      static void initializeMotionEvent(MotionEvent* event, const InputMessage* msg);
++    static void initializeBufferEvent(RawBufferEvent* event, const InputMessage* msg);
      static void addSample(MotionEvent* event, const InputMessage* msg);
      static bool canAddSample(const Batch& batch, const InputMessage* msg);
      static ssize_t findSampleNoLaterThan(const Batch& batch, std::chrono::nanoseconds time);
 === modified file '3rd_party/android-input/android/frameworks/base/services/input/Input.cpp'
 --- 3rd_party/android-input/android/frameworks/base/services/input/Input.cpp	2016-03-23 06:39:56 +0000
 +++ 3rd_party/android-input/android/frameworks/base/services/input/Input.cpp	2016-08-12 14:07:23 +0000
@@ -612,6 +612,9 @@
      for (size_t i = 0; i < mMotionEventPool.size(); i++) {
          delete mMotionEventPool.itemAt(i);
+     }
++    for (size_t i = 0; i < mRawBufferEventPool.size(); i++) {
++        delete mRawBufferEventPool.itemAt(i);
++    }
+ }
  KeyEvent* PooledInputEventFactory::createKeyEvent() {
@@ -632,8 +635,23 @@
      return new MotionEvent();
+ }
++RawBufferEvent* PooledInputEventFactory::createRawBufferEvent() {
++    if (!mRawBufferEventPool.isEmpty()) {
++        RawBufferEvent* event = mRawBufferEventPool.top();
++        mRawBufferEventPool.pop();
++        return event;
++    }
++    return new RawBufferEvent();
++}
++
  void PooledInputEventFactory::recycle(InputEvent* event) {
      switch (event->getType()) {
++    case AINPUT_EVENT_TYPE_BUFFER:
++        if (mRawBufferEventPool.size() < mMaxPoolSize) {
++            mRawBufferEventPool.push(static_cast<RawBufferEvent*>(event));
++            return;
++        }
++        break;
      case AINPUT_EVENT_TYPE_KEY:
          if (mKeyEventPool.size() < mMaxPoolSize) {
              mKeyEventPool.push(static_cast<KeyEvent*>(event));
 === modified file '3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp'
 --- 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp	2016-04-11 16:56:16 +0000
 +++ 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp	2016-08-12 14:07:23 +0000
@@ -29,6 +29,9 @@
  #include <sys/socket.h>
  #include <math.h>
++#include <boost/throw_exception.hpp>
++#include <stdexcept>
++
  namespace android {
@@ -62,16 +65,32 @@
      memset(this, 0, sizeof(InputMessage));
+ }
++InputMessage::InputMessage(uint32_t seq, std::string const& buffer)
++{
++    memset(this, 0, sizeof(InputMessage));
++    header.type = TYPE_BUFFER;
++    header.seq = seq;
++    header.size = buffer.size();
++
++    if (raw_event_payload < buffer.size())
++        BOOST_THROW_EXCEPTION(std::runtime_error("raw buffer event exceeds payload"));
++    memcpy(body.buffer.buffer, buffer.data(), header.size);
++}
++
++InputMessage::InputMessage(InputMessage const& cp) = default;
++
++InputMessage& InputMessage::operator=(InputMessage const& cp) = default;
++
  bool InputMessage::isValid(size_t actualSize) const {
      if (size() == actualSize) {
          switch (header.type) {
++        case TYPE_FINISHED:
++        case TYPE_BUFFER:
          case TYPE_KEY:
              return true;
          case TYPE_MOTION:
              return body.motion.pointerCount > 0
                      && body.motion.pointerCount <= MAX_POINTERS;
--        case TYPE_FINISHED:
--            return true;
+         }
+     }
      return false;
@@ -85,11 +104,11 @@
          return sizeof(Header) + body.motion.size();
      case TYPE_FINISHED:
          return sizeof(Header) + body.finished.size();
++    case TYPE_BUFFER:
++        return sizeof(Header) + header.size;
+     }
      return sizeof(Header);
+ }
--
--
  // --- InputChannel ---
  InputChannel::InputChannel(const String8& name, int fd) :
@@ -197,6 +216,20 @@
  InputPublisher::~InputPublisher() {
+ }
++status_t InputPublisher::publishEventBuffer(uint32_t seq, std::string const& buffer) {
++#if DEBUG_TRANSPORT_ACTIONS
++    ALOGD("channel '%s' publisher ~ publishInputBuffer: seq=%u", c_str(mChannel->getName()), seq);
++#endif
++
++    if (!seq) {
++        ALOGE("Attempted to publish a buffer with sequence number 0.");
++        return BAD_VALUE;
++    }
++
++    InputMessage msg(seq, buffer);
++    return mChannel->sendMessage(&msg);
++}
++
  status_t InputPublisher::publishKeyEvent(
          uint32_t seq,
          int32_t deviceId,
@@ -226,7 +259,8 @@
      InputMessage msg;
      msg.header.type = InputMessage::TYPE_KEY;
--    msg.body.key.seq = seq;
++    msg.header.seq = seq;
++    msg.header.size = sizeof(msg.body.key);
      msg.body.key.deviceId = deviceId;
      msg.body.key.source = source;
      msg.body.key.action = action;
@@ -284,7 +318,7 @@
      InputMessage msg;
      msg.header.type = InputMessage::TYPE_MOTION;
--    msg.body.motion.seq = seq;
++    msg.header.seq = seq;
      msg.body.motion.deviceId = deviceId;
      msg.body.motion.source = source;
      msg.body.motion.action = action;
@@ -304,6 +338,8 @@
          msg.body.motion.pointers[i].properties.copyFrom(pointerProperties[i]);
          msg.body.motion.pointers[i].coords.copyFrom(pointerCoords[i]);
+     }
++
++    msg.header.size = msg.body.motion.size();
      return mChannel->sendMessage(&msg);
+ }
@@ -325,7 +361,7 @@
              c_str(mChannel->getName()), msg.header.type);
          return UNKNOWN_ERROR;
+     }
--    *outSeq = msg.body.finished.seq;
++    *outSeq = msg.header.seq;
      *outHandled = msg.body.finished.handled;
      return OK;
+ }
@@ -392,12 +428,25 @@
+         }
          switch (mMsg.header.type) {
++        case InputMessage::TYPE_BUFFER: {
++            RawBufferEvent* bufferEvent = factory->createRawBufferEvent();
++            if (!bufferEvent) return NO_MEMORY;
++
++            initializeBufferEvent(bufferEvent, &mMsg);
++            *outSeq = mMsg.header.seq;
++            *outEvent = bufferEvent;
++#if DEBUG_TRANSPORT_ACTIONS
++            ALOGD("channel '%s' consumer ~ consumed buffer event, seq=%u",
++                c_str(mChannel->getName()), *outSeq);
++#endif
++            break;
++        }
          case InputMessage::TYPE_KEY: {
              KeyEvent* keyEvent = factory->createKeyEvent();
              if (!keyEvent) return NO_MEMORY;
              initializeKeyEvent(keyEvent, &mMsg);
--            *outSeq = mMsg.body.key.seq;
++            *outSeq = mMsg.header.seq;
              *outEvent = keyEvent;
  #if DEBUG_TRANSPORT_ACTIONS
              ALOGD("channel '%s' consumer ~ consumed key event, seq=%u",
@@ -455,7 +504,7 @@
              updateTouchState(&mMsg);
              initializeMotionEvent(motionEvent, &mMsg);
--            *outSeq = mMsg.body.motion.seq;
++            *outSeq = mMsg.header.seq;
              *outEvent = motionEvent;
  #if DEBUG_TRANSPORT_ACTIONS
              ALOGD("channel '%s' consumer ~ consumed motion event, seq=%u",
@@ -519,14 +568,14 @@
          updateTouchState(&msg);
          if (i) {
              SeqChain seqChain;
--            seqChain.seq = msg.body.motion.seq;
++            seqChain.seq = msg.header.seq;
              seqChain.chain = chain;
              mSeqChains.push(seqChain);
              addSample(motionEvent, &msg);
          } else {
              initializeMotionEvent(motionEvent, &msg);
+         }
--        chain = msg.body.motion.seq;
++        chain = msg.header.seq;
+     }
      batch.samples.removeItemsAt(0, count);
@@ -721,6 +770,7 @@
      // Resample touch coordinates.
      touchState.lastResample.eventTime = sampleTime;
      touchState.lastResample.ids.clear();
++    bool coords_resampled = false;
      for (size_t i = 0; i < pointerCount; i++) {
          uint32_t id = event->getPointerId(i);
          touchState.lastResample.idToIndex[id] = i;
@@ -735,6 +785,9 @@
                      lerp(currentCoords.getX(), otherCoords.getX(), alpha));
              resampledCoords.setAxisValue(AMOTION_EVENT_AXIS_Y,
                      lerp(currentCoords.getY(), otherCoords.getY(), alpha));
++            coords_resampled = true;
++            // No coordinate resampling for tooltype mouse - if we intend to
++            // change that we must also resample RX, RY, HSCROLL, VSCROLL
  #if DEBUG_RESAMPLING
              ALOGD("[%d] - out (%0.3f, %0.3f), cur (%0.3f, %0.3f), "
                      "other (%0.3f, %0.3f), alpha %0.3f",
@@ -744,6 +797,8 @@
                      alpha);
  #endif
          } else {
++            // Before calling this method currentCoords was already part of the
++            // event -> no need to add them to the event.
              resampledCoords.copyFrom(currentCoords);
  #if DEBUG_RESAMPLING
              ALOGD("[%d] - out (%0.3f, %0.3f), cur (%0.3f, %0.3f)",
@@ -753,7 +808,8 @@
+         }
+     }
--    event->addSample(sampleTime, touchState.lastResample.pointers);
++    if (coords_resampled)
++        event->addSample(sampleTime, touchState.lastResample.pointers);
+ }
  bool InputConsumer::shouldResampleTool(int32_t toolType) {
@@ -809,7 +865,8 @@
  status_t InputConsumer::sendUnchainedFinishedSignal(uint32_t seq, bool handled) {
      InputMessage msg;
      msg.header.type = InputMessage::TYPE_FINISHED;
--    msg.body.finished.seq = seq;
++    msg.header.size = sizeof(msg.body.finished);
++    msg.header.seq = seq;
      msg.body.finished.handled = handled;
      return mChannel->sendMessage(&msg);
+ }
@@ -843,6 +900,10 @@
      return -1;
+ }
++void InputConsumer::initializeBufferEvent(RawBufferEvent* event, const InputMessage* msg) {
++    event->buffer.assign(msg->body.buffer.buffer, msg->body.buffer.buffer + msg->header.size);
++}
++
  void InputConsumer::initializeKeyEvent(KeyEvent* event, const InputMessage* msg) {
      event->initialize(
              msg->body.key.deviceId,
 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-08-12 14:07:21 +0000
 +++ CMakeLists.txt	2016-08-12 14:07:23 +0000
@@ -28,8 +28,8 @@
  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
  set(MIR_VERSION_MAJOR 0)
--set(MIR_VERSION_MINOR 23)
--set(MIR_VERSION_PATCH 6)
++set(MIR_VERSION_MINOR 24)
++set(MIR_VERSION_PATCH 0)
  add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
  add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})
@@ -62,6 +62,9 @@
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -g -Werror -Wall -pedantic -Wextra -fPIC")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -g -std=c++14 -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
++set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
++set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
  option(MIR_USE_LD_GOLD "Enables the \"gold\" linker." OFF)
  if(MIR_USE_LD_GOLD)
@@ -81,8 +84,8 @@
  option(MIR_LINK_TIME_OPTIMIZATION "Enables the linker to optimize binaries." OFF)
  if(MIR_LINK_TIME_OPTIMIZATION)
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto -ffat-lto-objects")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto -ffat-lto-objects")
    if(${CMAKE_COMPILER_IS_GNUCXX})
      set(CMAKE_NM "gcc-nm")
      set(CMAKE_AR "gcc-ar")
@@ -163,10 +166,10 @@
  # Default to KMS backend, but build all of them
  set(
    MIR_PLATFORM
--  mesa-kms;android;mesa-x11
++  mesa-kms;android;mesa-x11;eglstream-kms
    CACHE
    STRING
--  "a list of graphics backends to build (options are 'mesa-kms', 'android' or 'mesa-x11')"
++  "a list of graphics backends to build (options are 'mesa-kms', 'android', 'mesa-x11', or 'eglstream-kms')"
+ )
  list(GET MIR_PLATFORM 0 MIR_TEST_PLATFORM)
@@ -183,6 +186,9 @@
    if (platform STREQUAL "mesa-x11")
       set(MIR_BUILD_PLATFORM_MESA_X11 TRUE)
    endif()
++  if (platform STREQUAL "eglstream-kms")
++     set(MIR_BUILD_PLATFORM_EGLSTREAM_KMS TRUE)
++  endif()
  endforeach(platform)
  find_package(EGL REQUIRED)
@@ -199,6 +205,41 @@
  include_directories (SYSTEM ${EGL_INCLUDE_DIRS})
  include_directories (SYSTEM ${GLM_INCLUDE_DIRS})
++#
++# Full OpenGL support is possibly complete but not yet perfect. So is
++# presently disabled by default. See the TODOs in:
++#   src/platform/graphics/egl_extensions.cpp: glEGLImageTargetTexture2DOES
++#   src/platforms/common/server/shm_buffer.cpp: glTexImage2D
++#
++#if (TARGET_ARCH STREQUAL "x86_64-linux-gnu" OR
++#    TARGET_ARCH STREQUAL "i386-linux-gnu")
++#  set(DEFAULT_LIBGL "libGL")
++#else()
++  set(DEFAULT_LIBGL "libGLESv2")
++#endif()
++set(MIR_SERVER_LIBGL ${DEFAULT_LIBGL} CACHE STRING "OpenGL library to use in Mir servers {libGL,libGLESv2}")
++
++if (MIR_SERVER_LIBGL STREQUAL "libGL")
++  pkg_check_modules(GL REQUIRED gl)
++  add_definitions(
++    -DGL_GLEXT_PROTOTYPES
++    -DMIR_SERVER_GL_H=<GL/gl.h>
++    -DMIR_SERVER_GLEXT_H=<GL/glext.h>
++    -DMIR_SERVER_EGL_OPENGL_BIT=EGL_OPENGL_BIT
++    -DMIR_SERVER_EGL_OPENGL_API=EGL_OPENGL_API
++  )
++elseif (MIR_SERVER_LIBGL STREQUAL "libGLESv2")
++  pkg_check_modules(GL REQUIRED glesv2)
++  add_definitions(
++    -DMIR_SERVER_GL_H=<GLES2/gl2.h>
++    -DMIR_SERVER_GLEXT_H=<GLES2/gl2ext.h>
++    -DMIR_SERVER_EGL_OPENGL_BIT=EGL_OPENGL_ES2_BIT
++    -DMIR_SERVER_EGL_OPENGL_API=EGL_OPENGL_ES_API
++  )
++else()
++  message(FATAL_ERROR "Invalid MIR_SERVER_LIBGL value ${MIR_SERVER_LIBGL}")
++endif()
++
  if (MIR_BUILD_PLATFORM_ANDROID)
    find_package(AndroidProperties REQUIRED)
    find_package(LibHardware REQUIRED)
@@ -210,6 +251,10 @@
    pkg_check_modules( DRM REQUIRED libdrm )
  endif()
++if (MIR_BUILD_PLATFORM_EGLSTREAM_KMS)
++  pkg_check_modules(EPOXY REQUIRED epoxy)
++endif()
++
  set(MIR_ANDROID_INCLUDE_DIRECTORIES) # to be filled by android-input
  set(MIR_ANDROID_INPUT_COMPILE_FLAGS) # to be filled by android-input
  set(MIR_3RD_PARTY_INCLUDE_DIRECTORIES)
 === modified file 'cmake/MirCommon.cmake'
 --- cmake/MirCommon.cmake	2016-07-28 18:42:04 +0000
 +++ cmake/MirCommon.cmake	2016-08-12 14:07:23 +0000
@@ -118,10 +118,10 @@
    list_to_string("${test_cmd_no_memcheck}" "" discover_cmd_no_memcheck)
    file(APPEND ${CMAKE_BINARY_DIR}/discover_all_tests.sh
--    "sh ${CMAKE_SOURCE_DIR}/tools/discover_gtests.sh ${discover_env} -- ${discover_cmd}\n")
++    "sh ${CMAKE_SOURCE_DIR}/tools/discover_gtests.sh ${discover_env} --test-name ${test_name} -- ${discover_cmd}\n")
    if (test_no_memcheck_filter)
      file(APPEND ${CMAKE_BINARY_DIR}/discover_all_tests.sh
--      "sh ${CMAKE_SOURCE_DIR}/tools/discover_gtests.sh ${discover_env} -- ${discover_cmd_no_memcheck}\n")
++      "sh ${CMAKE_SOURCE_DIR}/tools/discover_gtests.sh ${discover_env} --test-name ${test_name}_no_memcheck -- ${discover_cmd_no_memcheck}\n")
    endif()
  endfunction ()
@@ -170,11 +170,7 @@
      set(TARGET_COMPILE_DEFINITIONS "$<$<BOOL:${TARGET_COMPILE_DEFINITIONS}>:-D$<JOIN:${TARGET_COMPILE_DEFINITIONS},\n-D>\n>")
      foreach(dir ${TARGET_INCLUDE_DIRECTORIES})
--      if (${dir} MATCHES "usr/include")
--        set(TARGET_INCLUDE_DIRECTORIES_STRING "${TARGET_INCLUDE_DIRECTORIES_STRING} -isystem ${dir}")
--      else()
--        set(TARGET_INCLUDE_DIRECTORIES_STRING "${TARGET_INCLUDE_DIRECTORIES_STRING} -I${dir}")
--      endif()
++      set(TARGET_INCLUDE_DIRECTORIES_STRING "${TARGET_INCLUDE_DIRECTORIES_STRING} -I${dir}")
      endforeach()
      # So.
 === modified file 'debian/changelog'
 --- debian/changelog	2016-08-12 14:07:21 +0000
 +++ debian/changelog	2016-08-12 14:07:23 +0000
@@ -1,3 +1,113 @@
++mir (0.24.0-0ubuntu1) UNRELEASED; urgency=medium
++
++  * New upstream release 0.24.0 (https://launchpad.net/mir/+milestone/0.24.0)
++    - ABI summary:
++      . mirclient ABI unchanged at 9
++      . mirserver ABI bumped to 41
++      . mircommon ABI unchanged at 6
++      . mirplatform ABI bumped to 12
++      . mirprotobuf ABI unchanged at 3
++      . mirplatformgraphics ABI bumped to 10
++      . mirclientplatform ABI unchanged at 5
++      . mirinputplatform ABI unchanged at 5
++    - Enhancements:
++      . Added a new tool 'mirvanity' which can use a high speed video camera
++        to measure client-to-screen latency.
++      . Added (build-time) support for desktop full OpenGL servers (disabled
++        by default in favor of GLESv2).
++      . Introduced new buffer semantics (NBS) and enabled it by default.
++      . Avoided using libmirserver in mir_demo_standalone_render_overlays,
++        making bringup traces less cluttered.
++      . Removed TilingWindowManager from example servers.
++      . Added two new mir_*_performance_test tools that are run as part of
++        'mir_performance_tests'.
++      . Added pointer confinement to the client API.
++      . Added new platform supporting software EGLStreams.
++      . Added an input platform that the nested server can use.
++      . Allow configuration of the application_not_responding_detector
++      . Handle server-side keymapping using XKBMapper.
++      . Remove the offscreen display.
++      . Add callback option to notify shells that the server is about to stop.
++      . Add logging for ANativeWindow events on Android.
++    - Bugs fixed:
++      . usage of std:call_once in mirclient causes TLS collisions with some
++        android devices (LP: #1599867)
++      . AltGr not working on external keyboards (LP: #1565236)
++      . [regression] unity8 fails to start when built with 0.24 series (lp:mir)
++        (LP: #1597717)
++      . CI failure in MirSurfaceVisibilityEvent.exposed_received_when_surface_
++        raised_over_occluding_surface [called twice - over-saturated and active]
++        (LP: #1556045)
++      . package-built mir_demo_server does not start on device (LP: #1577357)
++      . During surface creation, first stream in spec becomes default stream.
++        (LP: #1577967)
++      . mouse is getting stuck on a phantom edge (LP: #1580774)
++      . [testsfail] in MirSurfaceVisibilityEvent.exposed_received_when_surface_
++        raised_over_occluding_surface [never called] (LP: #1581385)
++      . [enhancement] Add support for full OpenGL compositing (LP: #1420581)
++      . [testsfail] ServerSignal.terminate_handler_is_called_for_SIGINT|SIGTERM
++        (LP: #1570353)
++      . [testsfail] ClientLatency.triple_buffered_client_has_less_than_two_
++        frames_latency (LP: #1576690)
++      . [testsfail] NestedServer.when_monitor_plugged_in_client_is_notified_of_
++        new_display_configuration (LP: #1576760)
++      . mir server crashed in what(): drmModeMoveCursor failed (returned -13)
++        (LP: #1579630)
++      . mirtest-dev is hard to use as the objects used are compiled with LTO
++        (LP: #1583536)
++      . [testsfail] ClientLogging.reports_performance [Value of: lag]
++        (LP: #1583970)
++      . [ FAILED ] ClientLogging.reports_performance (Value of: nbuffers)
++        (LP: #1584603)
++      . [ FAILED ] ClientLogging.reports_performance (Value of: render)
++        (LP: #1584605)
++      . ClientCredsTestFixture.session_authorizer_receives_pid_of_connecting_
++        clients failure (LP: #1587604)
++      . Mir on X11 ignores mir::graphics::GLConfig depth & stencil buffer size
++        (LP: #1589632)
++      . Need to support pointer confinement (LP: #1590099)
++      . [tests] given_nested_server_set_base_display_configuration_when_
++        monitor_plugged_in_configuration_is_reset fails (LP: #1591354)
++      . CI failure in DemoInProcessServerWithStubClientPlatform.surface_
++        creation_does_not_leak_fds (LP: #1598802)
++      . Screen is squashed/distorted when rotated in Mir-on-X11 (LP: #1577262)
++      . --display-report=log shows some invalid uninitialized EGL attribute
++        values (LP: #1582066)
++      . mir_demo_client_eglplasma falls back to software rendering on i915
++        (Intel Atoms), which explains why it's so slow (LP: #1583532)
++      . [regression] x11 platform only draws to a small part of the x11 window
++        (LP: #1598267)
++      . mir ftbfs in yakkety builders (LP: #1600343)
++      . Autolanding keeps failing: mock_egl.h:89:7: error: type 'struct
++        MockEGL' violates one definition rule [-Werror=odr] (LP: #1603303)
++      . [regression] The Super/Windows key doesn't work any more (LP: #1602966)
++      . mir_acceptance_tests.bin: double free or corruption (fasttop)
++        (LP: #1603114)
++      . ftbfs in linking libmir-test-assist.a in xenial+overlay and
++        yakkety+overlay (LP: #1601810)
++      . [testsfail] failure in NestedInput.on_input_device_state_nested_*
++        (LP: #1602646)
++      . mirtest-dev provides an incorrect .pc file (LP: #1603080)
++      . mir_test_framework::server_platform_path(),
++        mir_test_framework::server_platform() don't support use in a downstream
++        test built against mir-test-assist (LP: #1603091)
++      . Servers based on Mir need a hook to execute code when the server is
++        closing (LP: #1593655)
++      . Android graphics platform doesn't get packaged for arm64 (LP: #157866)
++      . memory leaks in unit tests on android (LP: #1253486)
++      . Physical "screen" size reported by the X11 backend is same as pixel
++        count, fixing dpi to 25.4 (LP: #1596051)
++      . Mir build and test failures with gcc-6 and LTO (LP: #1610215)
++      . [regression] Trust prompt not shown when starting camera (LP: #1612256)
++
++ -- Kevin DuBois <kevin.dubois@canonical.com>  Thu, 07 Jul 2016 09:30:44 -0400
++
++mir (0.23.5+16.10.20160729-0ubuntu2) yakkety; urgency=medium
++
++  * No-change rebuild for boost soname change.
++
++ -- Matthias Klose <doko@ubuntu.com>  Thu, 04 Aug 2016 08:25:48 +0000
++
  mir (0.23.5+16.10.20160729-0ubuntu1) yakkety; urgency=medium
    * New upstream release 0.23.5 (https://launchpad.net/mir/+milestone/0.23.5)
 === modified file 'debian/control'
 --- debian/control	2016-07-19 16:12:03 +0000
 +++ debian/control	2016-08-12 14:07:23 +0000
@@ -19,6 +19,7 @@
                 libdrm-dev,
                 libegl1-mesa-dev,
                 libgles2-mesa-dev,
++               libgl1-mesa-dev [amd64 i386],
                 libgbm-dev,
                 libglm-dev,
                 libprotobuf-dev,
@@ -67,7 +68,7 @@
  #TODO: Packaging infrastructure for better dependency generation,
  #      ala pkg-xorg's xviddriver:Provides and ABI detection.
--Package: libmirserver40
++Package: libmirserver41
  Section: libs
  Architecture: linux-any
  Multi-Arch: same
@@ -80,7 +81,7 @@
+  .
   Contains the shared library needed by server applications for Mir.
--Package: libmirplatform11
++Package: libmirplatform13
  Section: libs
  Architecture: linux-any
  Multi-Arch: same
@@ -116,7 +117,7 @@
  Architecture: linux-any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
--Depends: libmirplatform11 (= ${binary:Version}),
++Depends: libmirplatform13 (= ${binary:Version}),
           libmircommon-dev,
           libboost-program-options-dev,
           ${misc:Depends},
@@ -133,7 +134,7 @@
  Architecture: linux-any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
--Depends: libmirserver40 (= ${binary:Version}),
++Depends: libmirserver41 (= ${binary:Version}),
           libmirplatform-dev (= ${binary:Version}),
           libmircommon-dev (= ${binary:Version}),
           libglm-dev,
@@ -301,7 +302,7 @@
   Contains the shared libraries required for the Mir server and client.
  # Longer-term these drivers should move out-of-tree
--Package: mir-platform-graphics-mesa-x9
++Package: mir-platform-graphics-mesa-x10
  Section: libs
  Architecture: linux-any
  Multi-Arch: same
@@ -315,7 +316,7 @@
   Contains the shared libraries required for the Mir server to interact with
   the X11 platform using the Mesa drivers.
--Package: mir-platform-graphics-mesa-kms9
++Package: mir-platform-graphics-mesa-kms10
  Section: libs
  Architecture: linux-any
  Multi-Arch: same
@@ -329,7 +330,7 @@
   Contains the shared libraries required for the Mir server to interact with
   the hardware platform using the Mesa drivers.
--Package: mir-platform-graphics-android9
++Package: mir-platform-graphics-android10
  Section: libs
  Architecture: i386 amd64 armhf arm64
  Multi-Arch: same
@@ -405,8 +406,8 @@
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${misc:Depends},
--         mir-platform-graphics-mesa-kms9,
--         mir-platform-graphics-mesa-x9,
++         mir-platform-graphics-mesa-kms10,
++         mir-platform-graphics-mesa-x10,
           mir-client-platform-mesa5,
           mir-platform-input-evdev5,
  Description: Display server for Ubuntu - desktop driver metapackage
@@ -422,7 +423,7 @@
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${misc:Depends},
--         mir-platform-graphics-android9,
++         mir-platform-graphics-android10,
           mir-client-platform-android5,
           mir-platform-input-evdev5,
  Description: Display server for Ubuntu - android driver metapackage
 === renamed file 'debian/libmirplatform11.install' => 'debian/libmirplatform13.install'
 --- debian/libmirplatform11.install	2016-01-29 08:18:22 +0000
 +++ debian/libmirplatform13.install	2016-08-12 14:07:23 +0000
@@ -1,1 +1,1 @@
--usr/lib/*/libmirplatform.so.11
++usr/lib/*/libmirplatform.so.13
 === renamed file 'debian/libmirserver40.install' => 'debian/libmirserver41.install'
 --- debian/libmirserver40.install	2016-04-29 17:25:33 +0000
 +++ debian/libmirserver41.install	2016-08-12 14:07:23 +0000
@@ -1,1 +1,1 @@
--usr/lib/*/libmirserver.so.40
++usr/lib/*/libmirserver.so.41
 === renamed file 'debian/mir-platform-graphics-android9.install' => 'debian/mir-platform-graphics-android10.install'
 --- debian/mir-platform-graphics-android9.install	2016-04-21 07:33:07 +0000
 +++ debian/mir-platform-graphics-android10.install	2016-08-12 14:07:23 +0000
@@ -1,1 +1,1 @@
--usr/lib/*/mir/server-platform/graphics-android.so.9
++usr/lib/*/mir/server-platform/graphics-android.so.10
 === renamed file 'debian/mir-platform-graphics-mesa-kms9.install' => 'debian/mir-platform-graphics-mesa-kms10.install'
 --- debian/mir-platform-graphics-mesa-kms9.install	2016-04-21 07:33:07 +0000
 +++ debian/mir-platform-graphics-mesa-kms10.install	2016-08-12 14:07:23 +0000
@@ -1,1 +1,1 @@
--usr/lib/*/mir/server-platform/graphics-mesa-kms.so.9
++usr/lib/*/mir/server-platform/graphics-mesa-kms.so.10
 === renamed file 'debian/mir-platform-graphics-mesa-x9.install' => 'debian/mir-platform-graphics-mesa-x10.install'
 --- debian/mir-platform-graphics-mesa-x9.install	2016-04-21 07:33:07 +0000
 +++ debian/mir-platform-graphics-mesa-x10.install	2016-08-12 14:07:23 +0000
@@ -1,1 +1,1 @@
--usr/lib/*/mir/server-platform/server-mesa-x11.so.9
++usr/lib/*/mir/server-platform/server-mesa-x11.so.10
 === modified file 'debian/mir-test-tools.install'
 --- debian/mir-test-tools.install	2016-04-22 03:37:10 +0000
 +++ debian/mir-test-tools.install	2016-08-12 14:07:23 +0000
@@ -6,6 +6,8 @@
  usr/bin/mir_integration_tests*
  usr/bin/mir_performance_tests
  usr/bin/mir_glmark2_performance_test
++usr/bin/mir_compositor_performance_test
++usr/bin/mir_client_startup_performance_test
  usr/bin/mir_privileged_tests
  usr/bin/mir_test_reload_protobuf
  usr/bin/mir_test_client_*
 === modified file 'debian/mir-utils.install'
 --- debian/mir-utils.install	2016-04-11 16:56:16 +0000
 +++ debian/mir-utils.install	2016-08-12 14:07:23 +0000
@@ -1,4 +1,5 @@
  usr/bin/mirping
++usr/bin/mirvanity
  usr/bin/mirout
  usr/bin/mirin
  usr/bin/mirscreencast
 === modified file 'doc/mainpage.md'
 --- doc/mainpage.md	2016-01-29 08:18:22 +0000
 +++ doc/mainpage.md	2016-08-12 14:07:23 +0000
@@ -113,3 +113,4 @@
   - \ref dso_versioning_guide
   - \ref abi_compatibility_tools
   - \ref mir_performance_framework
++ - \ref latency "Measuring visual latency"
 === added file 'doc/measuring_latency.md'
 --- doc/measuring_latency.md	1970-01-01 00:00:00 +0000
 +++ doc/measuring_latency.md	2016-08-12 14:07:23 +0000
@@ -0,0 +1,24 @@
++Measuring Visual Latency {#latency}
++========================
++
++Mir includes a utility called `mirvanity` that can use a high speed camera
++to measure the visual latency of your display (from client rendering to
++your eye).
++
++It is called "mirvanity" because it works by rendering a pattern to the
++screen and then looking at the screen itself via the camera. In theory you
++could also use a laptop screen and webcam with a mirror, however laptop
++webcams tend to be too slow for this task. In order to use `mirvanity` you
++need a high speed camera supported by Linux, such as a PlayStation Eye.
++
++How to use mirvanity
++--------------------
++
++  1. Start your Mir server
++  2. Plug in your camera
++  3. Position the camera on a stable surface so that it does not move
++     during the test, and such that it is primarily looking at your
++     display only. The camera must be centred on the display.
++  4. Run `mirvanity`
++  5. Wait until the output (in the console/stdout for now) shows that the
++     test is complete (which means enough data has been gathered).
 === modified file 'examples/CMakeLists.txt'
 --- examples/CMakeLists.txt	2016-03-26 15:38:30 +0000
 +++ examples/CMakeLists.txt	2016-08-12 14:07:23 +0000
@@ -27,7 +27,6 @@
    server_example_log_options.cpp
    server_example_input_filter.cpp
    server_example_host_lifecycle_event.cpp
--  server_example_tiling_window_manager.cpp
    server_example_window_management.cpp
    server_example_window_management_info.cpp
    server_example_window_management_info.h
@@ -168,20 +167,20 @@
  target_link_libraries(mir_demo_client_scroll
    eglapp
    mirdraw
++  ${GLESv2_LIBRARIES}
+ )
  mir_add_wrapped_executable(mir_demo_client_prompt_session prompt_session.c)
  target_link_libraries(mir_demo_client_prompt_session mirclient)
  add_library(mirdraw STATIC graphics_utils.cpp)
--target_link_libraries(mirdraw ${GLESv2_LIBRARIES})
  include_directories(
    ${PROJECT_SOURCE_DIR}/include/server
    ${PROJECT_SOURCE_DIR}/include/client
    ${PROJECT_SOURCE_DIR}/include/platform
    ${PROJECT_SOURCE_DIR}/include/renderers/gl
--  ${GLESv2_INCLUDE_DIRS}
++  ${GL_INCLUDE_DIRS}
+ )
  mir_add_wrapped_executable(mir_demo_standalone_render_to_fb
@@ -191,6 +190,7 @@
  target_link_libraries(mir_demo_standalone_render_to_fb
      mirserver
      mirdraw
++    ${GL_LIBRARIES}
      ${Boost_LIBRARIES}
+ )
 === modified file 'examples/eglplasma.c'
 --- examples/eglplasma.c	2014-03-05 09:26:01 +0000
 +++ examples/eglplasma.c	2016-08-12 14:07:23 +0000
@@ -61,40 +61,23 @@
      const char fshadersrc[] =
          "precision mediump float;                                \n"
--        "uniform float theta;                                    \n"
++        "uniform vec4 theta;                                     \n"
          "varying vec2 texcoord;                                  \n"
          "uniform vec3 low_color, high_color;                     \n"
          "                                                        \n"
--        "vec3 gradient(float x)                                  \n"
--        "{                                                       \n"
--        "    vec3 col;                                           \n"
--        "    const vec3 white = vec3(1.0, 1.0, 1.0);             \n"
--        "    if (x < 0.333)                                      \n"
--        "        col = x * low_color / 0.333;                    \n"
--        "    else if (x < 0.666)                                 \n"
--        "        col = (x - 0.333) * (high_color - low_color) /  \n"
--        "              0.333 + low_color;                        \n"
--        "    else                                                \n"
--        "        col = (x - 0.666) * (white - high_color) /      \n"
--        "              0.333 + high_color;                       \n"
--        "    return col;                                         \n"
--        "}                                                       \n"
--        "                                                        \n"
          "void main()                                             \n"
          "{                                                       \n"
          "    const float pi2 = 6.283185308;                      \n"
--        "    float u = texcoord.x * pi2;                         \n"
--        "    float v = texcoord.y * pi2;                         \n"
--        "    float us = (cos(1.1 * u + 7.0 * theta) +            \n"
--        "                cos(2.3 * v * cos(1.0 * theta)) +       \n"
--        "                cos(0.3 * u * cos(3.0 * theta))         \n"
--        "               ) / 3.0;                                 \n"
--        "    float vs = (cos(2.3 * v + 8.0 * theta) +            \n"
--        "                cos(1.3 * u * cos(3.0 * theta)) +       \n"
--        "                cos(1.7 * v * cos(2.0 * theta))         \n"
--        "               ) / 3.0;                                 \n"
--        "    float x = (us * vs + 1.0) / 2.0;                    \n"
--        "    gl_FragColor = vec4(gradient(x), 1.0);              \n"
++        "    float x = texcoord.x * pi2;                         \n"
++        "    float y = texcoord.y * pi2;                         \n"
++        "    float a = cos(1.0 * (x + theta.x));                 \n"
++        "    float b = cos(2.0 * (y + theta.y + a));             \n"
++        "    float c = cos(2.0 * (2.0*x + theta.z + b));         \n"
++        "    float d = cos(1.0 * (3.0*y + theta.w + c));         \n"
++        "    float v = (a+b+c+d + 4.0) / 8.0;                    \n"
++        "    vec3 color = v * (high_color - low_color) +         \n"
++        "                 low_color;                             \n"
++        "    gl_FragColor = vec4(color, 1.0);                    \n"
          "}                                                       \n";
      const GLfloat vertices[] =
@@ -108,7 +91,7 @@
      GLuint vshader, fshader, prog;
      GLint linked, low_color, high_color, vpos, theta;
      unsigned int width = 0, height = 0;
--    GLfloat angle = 0.0f;
++    GLfloat angle[4] = {3.1f, 4.1f, 5.9f, 2.6f};
      if (!mir_eglapp_init(argc, argv, &width, &height))
          return 1;
@@ -149,10 +132,13 @@
      while (mir_eglapp_running())
+     {
--        glUniform1f(theta, angle);
--        angle += 0.005f;
--        if (angle > pi2)
--            angle -= pi2;
++        glUniform4fv(theta, 1, angle);
++        angle[0] += 0.00345f;
++        angle[1] += 0.01947f;
++        angle[2] += 0.03758f;
++        angle[3] += 0.01711f;
++        for (int a = 0; a < 4; ++a)
++            if (angle[a] > pi2) angle[a] -= pi2;
          glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
          mir_eglapp_swap_buffers();
+     }
 === modified file 'examples/graphics_utils.cpp'
 --- examples/graphics_utils.cpp	2013-04-24 05:22:20 +0000
 +++ examples/graphics_utils.cpp	2016-08-12 14:07:23 +0000
@@ -38,7 +38,9 @@
  static const GLchar *frag_shader_src =
+ {
++    "#ifdef GL_ES\n"
      "precision mediump float;\n"
++    "#endif\n"
      "uniform sampler2D tex;\n"
      "varying vec2 texcoord;\n"
      "void main() {\n"
 === modified file 'examples/image_renderer.cpp'
 --- examples/image_renderer.cpp	2015-07-16 07:03:19 +0000
 +++ examples/image_renderer.cpp	2016-08-12 14:07:23 +0000
@@ -49,7 +49,9 @@
  const GLchar* fragment_shader_src =
+ {
++    "#ifdef GL_ES\n"
      "precision mediump float;\n"
++    "#endif\n"
      "uniform sampler2D tex;\n"
      "varying vec2 v_texcoord;\n"
      "void main() {\n"
 === modified file 'examples/mir_demo_server_loader.cpp'
 --- examples/mir_demo_server_loader.cpp	2016-03-23 06:39:56 +0000
 +++ examples/mir_demo_server_loader.cpp	2016-08-12 14:07:23 +0000
@@ -19,7 +19,7 @@
  #include <dlfcn.h>
  #include <stdexcept>
  #include <iostream>
--#include <pthread.h>
++#include <thread>
  namespace
+ {
@@ -28,14 +28,14 @@
  // Work around gold (or gcc/libstdc++-4.9 bug, it's not yet clear) bug
  // https://sourceware.org/bugzilla/show_bug.cgi?id=16417 by ensuring the
--// executable links with libpthread.
++// executable links with libpthread. A similar problem, where the pthread
++// link dependency mysteriously disappears, also exists when using LTO
++// with ld.bfd.
  struct GoldBug16417Workaround
+ {
      GoldBug16417Workaround()
+     {
--        pthread_attr_t attr;
--        pthread_attr_init(&attr);
--        pthread_attr_destroy(&attr);
++        std::thread{[]{}}.join();
+     }
  } gold_bug_16417_workaround;
+ }
 === modified file 'examples/render_surfaces.cpp'
 --- examples/render_surfaces.cpp	2016-04-18 17:45:54 +0000
 +++ examples/render_surfaces.cpp	2016-08-12 14:07:23 +0000
@@ -33,6 +33,7 @@
  #include "mir/scene/surface_factory.h"
  #include "mir/shell/surface_stack.h"
  #include "mir/frontend/buffer_sink.h"
++#include "mir/frontend/client_buffers.h"
  #include "mir/server.h"
  #include "mir/report_exception.h"
@@ -142,10 +143,10 @@
      Moveable(std::shared_ptr<ms::Surface> const& s, const geom::Size& display_size,
               float dx, float dy, const glm::vec3& rotation_axis, float alpha_offset)
          : surface(s), display_size(display_size),
--          x{s->top_left().x.as_float()},
--          y{s->top_left().y.as_float()},
--          w{s->size().width.as_float()},
--          h{s->size().height.as_float()},
++          x(s->top_left().x.as_int()),
++          y(s->top_left().y.as_int()),
++          w(s->size().width.as_int()),
++          h(s->size().height.as_int()),
            dx{dx},
            dy{dy},
            rotation_axis(rotation_axis),
@@ -376,17 +377,26 @@
                  void add_buffer(mg::Buffer&) override {}
                  void remove_buffer(mg::Buffer&) override {}
                  void update_buffer(mg::Buffer&) override {}
++                void error_buffer(mg::BufferProperties const&, std::string const&) override {}
              };
--            auto const stream = buffer_stream_factory->create_buffer_stream(
--                mf::BufferStreamId{}, std::make_shared<NullBufferSink>(), properties);
--            auto const surface = surface_factory->create_surface({ ms::StreamInfo{ stream, {0, 0}, {} } }, params);
++            auto buffers = buffer_stream_factory->create_buffer_map(std::make_shared<NullBufferSink>());
++            auto const stream = buffer_stream_factory->create_buffer_stream({}, buffers, properties);
++            auto const surface = surface_factory->create_surface(
++                {ms::StreamInfo{stream, {}, {}}}, params);
              surface_stack->add_surface(surface, params.input_mode);
+             {
                  mg::Buffer* buffer{nullptr};
                  auto const complete = [&](mg::Buffer* new_buf){ buffer = new_buf; };
++
                  surface->primary_buffer_stream()->swap_buffers(buffer, complete); // Fetch buffer for rendering
++                if (!buffer)
++                {
++                    auto buffer_id = buffers->add_buffer(properties);
++                    buffer = (*buffers)[buffer_id].get();
++                }
++
+                 {
                      gl_context->make_current();
 === modified file 'examples/server_example.cpp'
 --- examples/server_example.cpp	2016-04-07 02:10:16 +0000
 +++ examples/server_example.cpp	2016-08-12 14:07:23 +0000
@@ -27,6 +27,7 @@
  #include "server_example_cursor_images.h"
  #include "server_example_input_device_config.h"
++#include "mir/abnormal_exit.h"
  #include "mir/server.h"
  #include "mir/main_loop.h"
  #include "mir/fd.h"
@@ -34,6 +35,8 @@
  #include "mir/report_exception.h"
  #include "mir/options/option.h"
++#include <boost/exception/diagnostic_information.hpp>
++
  #include <chrono>
  #include <cstdlib>
@@ -65,17 +68,19 @@
          const auto options = server.get_options();
          if (options->is_set(launch_child_opt))
+         {
++            unsetenv("DISPLAY");                                // Discourage toolkits from using X11
++            setenv("GDK_BACKEND", "mir", true);                 // configure GTK to use Mir
++            setenv("QT_QPA_PLATFORM", "ubuntumirclient", true); // configure Qt to use Mir
++            unsetenv("QT_QPA_PLATFORMTHEME");                   // Discourage Qt from unsupported theme
++            setenv("SDL_VIDEODRIVER", "mir", true);             // configure SDL to use Mir
++
              auto const value = options->get<std::string>(launch_child_opt);
              for (auto i = begin(value); i != end(value); )
+             {
                  auto const j = find(i, end(value), '&');
--                auto const cmd ="DISPLAY= "             // Discourage toolkits from using X11
--                    "GDK_BACKEND=mir "                  // configure GTK to use Mir
--                    "QT_QPA_PLATFORM=ubuntumirclient "  // configure Qt to use Mir
--                    "SDL_VIDEODRIVER=mir "              // configure SDL to use Mir
--                    "MIR_SOCKET=" + connection(server.open_client_socket()) + " " +
++                auto const cmd ="MIR_SOCKET=" + connection(server.open_client_socket()) + " " +
                      std::string{i, j} + "&";
                  auto ignore = std::system(cmd.c_str());
@@ -104,6 +109,37 @@
+         }
      });
+ }
++
++void exception_handler()
++try
++{
++    throw;
++}
++catch (mir::AbnormalExit const& /*error*/)
++{
++}
++catch (std::exception const& error)
++{
++    char const command_fmt[] = "/usr/share/apport/recoverable_problem --pid %d";
++    char command[sizeof(command_fmt)+32];
++    snprintf(command, sizeof(command), command_fmt, getpid());
++    char const options[] = "we";
++    char const key[] = "UnhandledException";
++    auto const value = boost::diagnostic_information(error);
++
++    if (auto const output = popen(command, options))
++    {
++        fwrite(key, sizeof(key), 1, output);            // the null terminator is used intentionally as a separator
++        fwrite(value.c_str(), value.size(), 1, output);
++        pclose(output);
++    }
++
++    mir::report_exception();
++}
++catch (...)
++{
++    mir::report_exception();
++}
+ }
  int main(int argc, char const* argv[])
@@ -125,6 +161,8 @@
      add_timeout_option_to(server);
      me::add_x_cursor_images(server);
++    server.set_exception_handler(exception_handler);
++
      me::ClientContext context;
      me::add_test_client_option_to(server, context);
 === modified file 'examples/server_example_adorning_compositor.cpp'
 --- examples/server_example_adorning_compositor.cpp	2016-03-23 06:39:56 +0000
 +++ examples/server_example_adorning_compositor.cpp	2016-08-12 14:07:23 +0000
@@ -29,7 +29,7 @@
  #include <stdexcept>
  #include <boost/throw_exception.hpp>
--#include <GLES2/gl2.h>
++#include MIR_SERVER_GL_H
  namespace me = mir::examples;
  namespace mg = mir::graphics;
@@ -85,7 +85,9 @@
          "}"
      },
      frag_shader_src{
--        "precision mediump float;"
++        "#ifdef GL_ES\n"
++        "precision mediump float;\n"
++        "#endif\n"
          "varying vec2 texcoord;"
          "uniform sampler2D tex;"
          "uniform float alpha;"
@@ -187,8 +189,8 @@
      //      we'll always use GLES.
      render_target->make_current();
--    auto display_width  = db.view_area().size.width.as_float();
--    auto display_height = db.view_area().size.height.as_float();
++    auto display_width  = db.view_area().size.width.as_int();
++    auto display_height = db.view_area().size.height.as_int();
      glUseProgram(program.program);
      glViewport(0, 0, display_width, display_height);
@@ -206,10 +208,10 @@
          auto const renderable = element->renderable();
          renderable_list.push_back(renderable);
--        float width  = renderable->screen_position().size.width.as_float();
--        float height = renderable->screen_position().size.height.as_float();
--        float x = renderable->screen_position().top_left.x.as_float() - db.view_area().top_left.x.as_float();
--        float y = renderable->screen_position().top_left.y.as_float() - db.view_area().top_left.y.as_float();
++        float width  = renderable->screen_position().size.width.as_int();
++        float height = renderable->screen_position().size.height.as_int();
++        float x = renderable->screen_position().top_left.x.as_int() - db.view_area().top_left.x.as_int();
++        float y = renderable->screen_position().top_left.y.as_int() - db.view_area().top_left.y.as_int();
          float scale[2] {
              width/display_width * 2,
              height/display_height * -2};
 === modified file 'examples/server_example_canonical_window_manager.cpp'
 --- examples/server_example_canonical_window_manager.cpp	2016-04-28 09:07:56 +0000
 +++ examples/server_example_canonical_window_manager.cpp	2016-08-12 14:07:23 +0000
@@ -276,7 +276,7 @@
              surface_map.emplace(titlebar, SurfaceInfo{session, titlebar, {}}).first->second;
      titlebar_info.is_titlebar = true;
      titlebar_info.parent = surface;
--    titlebar_info.init_titlebar(titlebar);
++    titlebar_info.init_titlebar(session, titlebar);
+ }
  void me::CanonicalWindowManagerPolicyCopy::handle_new_surface(std::shared_ptr<ms::Session> const& session, std::shared_ptr<ms::Surface> const& surface)
@@ -416,11 +416,17 @@
          auto const state = handle_set_state(surface, modifications.state.value());
          surface->configure(mir_surface_attrib_state, state);
+     }
++
++    if (modifications.confine_pointer.is_set())
++    {
++        surface->set_confine_pointer_state(modifications.confine_pointer.value());
++    }
+ }
  void me::CanonicalWindowManagerPolicyCopy::handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
+ {
      fullscreen_surfaces.erase(surface);
++    bool const is_active_surface{surface.lock() == active_surface()};
      auto& info = tools->info_for(surface);
@@ -457,11 +463,19 @@
+         }
+     }
--    if (surfaces.empty() && session == tools->focused_session())
++    if (is_active_surface)
+     {
          active_surface_.reset();
--        tools->focus_next_session();
--        select_active_surface(tools->focused_surface());
++
++        if (surfaces.empty())
++        {
++            tools->focus_next_session();
++            select_active_surface(tools->focused_surface());
++        }
++        else
++        {
++            select_active_surface(surfaces[0].lock());
++        }
+     }
+ }
 === removed file 'examples/server_example_tiling_window_manager.cpp'
 --- examples/server_example_tiling_window_manager.cpp	2016-04-15 03:41:28 +0000
 +++ examples/server_example_tiling_window_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,640 +0,0 @@
--/*
-- * Copyright © 2015 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
-- * as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored By: Alan Griffiths <alan@octopull.co.uk>
-- */
--
--#include "server_example_tiling_window_manager.h"
--
--#include "mir/scene/session.h"
--#include "mir/scene/surface.h"
--#include "mir/scene/surface_creation_parameters.h"
--#include "mir/shell/surface_specification.h"
--#include "mir/shell/surface_stack.h"
--#include "mir/shell/surface_ready_observer.h"
--#include "mir/geometry/displacement.h"
--
--#include <linux/input.h>
--#include <csignal>
--
--namespace me = mir::examples;
--namespace ms = mir::scene;
--namespace mf = mir::frontend;
--using namespace mir::geometry;
--
--///\example server_example_tiling_window_manager.cpp
--/// Demonstrate implementing a simple tiling algorithm
--
--me::TilingWindowManagerPolicy::TilingWindowManagerPolicy(WindowManagerTools* const tools) :
--    tools{tools}
--{
--}
--
--void me::TilingWindowManagerPolicy::click(Point cursor)
--{
--    auto const session = session_under(cursor);
--    auto const surface = tools->surface_at(cursor);
--    select_active_surface(session, surface);
--}
--
--void me::TilingWindowManagerPolicy::handle_session_info_updated(SessionInfoMap& session_info, Rectangles const& displays)
--{
--    update_tiles(session_info, displays);
--}
--
--void me::TilingWindowManagerPolicy::handle_displays_updated(SessionInfoMap& session_info, Rectangles const& displays)
--{
--    update_tiles(session_info, displays);
--}
--
--void me::TilingWindowManagerPolicy::resize(Point cursor)
--{
--    if (auto const session = session_under(cursor))
--    {
--        if (session == session_under(old_cursor))
--        {
--            if (auto const surface = select_active_surface(session, tools->surface_at(old_cursor)))
--            {
--                resize(surface, cursor, old_cursor, tools->info_for(session).tile);
--            }
--        }
--    }
--}
--
--auto me::TilingWindowManagerPolicy::handle_place_new_surface(
--    std::shared_ptr<ms::Session> const& session,
--    ms::SurfaceCreationParameters const& request_parameters)
---> ms::SurfaceCreationParameters
--{
--    auto parameters = request_parameters;
--
--    Rectangle const& tile = tools->info_for(session).tile;
--    parameters.top_left = parameters.top_left + (tile.top_left - Point{0, 0});
--
--    if (auto const parent = parameters.parent.lock())
--    {
--        auto const width = parameters.size.width.as_int();
--        auto const height = parameters.size.height.as_int();
--
--        if (parameters.aux_rect.is_set() && parameters.edge_attachment.is_set())
--        {
--            auto const edge_attachment = parameters.edge_attachment.value();
--            auto const aux_rect = parameters.aux_rect.value();
--            auto const parent_top_left = parent->top_left();
--            auto const top_left = aux_rect.top_left     -Point{} + parent_top_left;
--            auto const top_right= aux_rect.top_right()  -Point{} + parent_top_left;
--            auto const bot_left = aux_rect.bottom_left()-Point{} + parent_top_left;
--
--            if (edge_attachment & mir_edge_attachment_vertical)
--            {
--                if (tile.contains(top_right + Displacement{width, height}))
--                {
--                    parameters.top_left = top_right;
--                }
--                else if (tile.contains(top_left + Displacement{-width, height}))
--                {
--                    parameters.top_left = top_left + Displacement{-width, 0};
--                }
--            }
--
--            if (edge_attachment & mir_edge_attachment_horizontal)
--            {
--                if (tile.contains(bot_left + Displacement{width, height}))
--                {
--                    parameters.top_left = bot_left;
--                }
--                else if (tile.contains(top_left + Displacement{width, -height}))
--                {
--                    parameters.top_left = top_left + Displacement{0, -height};
--                }
--            }
--        }
--        else
--        {
--            auto const parent_top_left = parent->top_left();
--            auto const centred = parent_top_left
--                                 + 0.5*(as_displacement(parent->size()) - as_displacement(parameters.size))
--                                 - DeltaY{(parent->size().height.as_int()-height)/6};
--
--            parameters.top_left = centred;
--        }
--    }
--
--    clip_to_tile(parameters, tile);
--    return parameters;
--}
--
--void me::TilingWindowManagerPolicy::generate_decorations_for(
--    std::shared_ptr<ms::Session> const&,
--    std::shared_ptr<ms::Surface> const&,
--    SurfaceInfoMap&,
--    std::function<mf::SurfaceId(std::shared_ptr<ms::Session> const&, ms::SurfaceCreationParameters const&)> const&)
--{
--}
--
--void me::TilingWindowManagerPolicy::handle_new_surface(std::shared_ptr<ms::Session> const& session, std::shared_ptr<ms::Surface> const& surface)
--{
--    tools->info_for(session).surfaces.push_back(surface);
--
--    auto& surface_info = tools->info_for(surface);
--    if (auto const parent = surface_info.parent.lock())
--    {
--        tools->info_for(parent).children.push_back(surface);
--    }
--
--    if (surface_info.can_be_active())
--    {
--        surface->add_observer(std::make_shared<shell::SurfaceReadyObserver>(
--            [this](std::shared_ptr<scene::Session> const& session, std::shared_ptr<scene::Surface> const& surface)
--                { select_active_surface(session, surface); },
--            session,
--            surface));
--    }
--}
--
--void me::TilingWindowManagerPolicy::handle_modify_surface(
--    std::shared_ptr<scene::Session> const& /*session*/,
--    std::shared_ptr<scene::Surface> const& surface,
--    shell::SurfaceSpecification const& modifications)
--{
--    if (modifications.name.is_set())
--        surface->rename(modifications.name.value());
--}
--
--void me::TilingWindowManagerPolicy::handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
--{
--    auto& info = tools->info_for(surface);
--
--    if (auto const parent = info.parent.lock())
--    {
--        auto& siblings = tools->info_for(parent).children;
--
--        for (auto i = begin(siblings); i != end(siblings); ++i)
--        {
--            if (surface.lock() == i->lock())
--            {
--                siblings.erase(i);
--                break;
--            }
--        }
--    }
--
--    auto& surfaces = tools->info_for(session).surfaces;
--
--    for (auto i = begin(surfaces); i != end(surfaces); ++i)
--    {
--        if (surface.lock() == i->lock())
--        {
--            surfaces.erase(i);
--            break;
--        }
--    }
--
--    session->destroy_surface(surface);
--
--    if (surfaces.empty() && session == tools->focused_session())
--    {
--        tools->focus_next_session();
--        select_active_surface(tools->focused_session(), tools->focused_surface());
--    }
--}
--
--int me::TilingWindowManagerPolicy::handle_set_state(std::shared_ptr<ms::Surface> const& surface, MirSurfaceState value)
--{
--    auto& info = tools->info_for(surface);
--
--    switch (value)
--    {
--    case mir_surface_state_restored:
--    case mir_surface_state_maximized:
--    case mir_surface_state_vertmaximized:
--    case mir_surface_state_horizmaximized:
--        break;
--
--    default:
--        return info.state;
--    }
--
--    if (info.state == mir_surface_state_restored)
--    {
--        info.restore_rect = {surface->top_left(), surface->size()};
--    }
--
--    if (info.state == value)
--    {
--        return info.state;
--    }
--
--    auto const& tile = tools->info_for(info.session).tile;
--
--    switch (value)
--    {
--    case mir_surface_state_restored:
--        surface->resize(info.restore_rect.size);
--        drag(surface, info.restore_rect.top_left, surface->top_left(), tile);
--        break;
--
--    case mir_surface_state_maximized:
--        surface->resize(tile.size);
--        drag(surface, tile.top_left, surface->top_left(), tile);
--        break;
--
--    case mir_surface_state_horizmaximized:
--        surface->resize({tile.size.width, info.restore_rect.size.height});
--        drag(surface, {tile.top_left.x, info.restore_rect.top_left.y}, surface->top_left(), tile);
--        break;
--
--    case mir_surface_state_vertmaximized:
--        surface->resize({info.restore_rect.size.width, tile.size.height});
--        drag(surface, {info.restore_rect.top_left.x, tile.top_left.y}, surface->top_left(), tile);
--        break;
--
--    default:
--        break;
--    }
--
--    return info.state = value;
--}
--
--void me::TilingWindowManagerPolicy::drag(Point cursor)
--{
--    if (auto const session = session_under(cursor))
--    {
--        if (session == session_under(old_cursor))
--        {
--            if (auto const surface = select_active_surface(session, tools->surface_at(old_cursor)))
--            {
--                drag(surface, cursor, old_cursor, tools->info_for(session).tile);
--            }
--        }
--    }
--}
--
--void me::TilingWindowManagerPolicy::handle_raise_surface(
--    std::shared_ptr<ms::Session> const& session,
--    std::shared_ptr<ms::Surface> const& surface)
--{
--    select_active_surface(session, surface);
--}
--
--bool me::TilingWindowManagerPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
--{
--    auto const action = mir_keyboard_event_action(event);
--    auto const scan_code = mir_keyboard_event_scan_code(event);
--    auto const modifiers = mir_keyboard_event_modifiers(event) & modifier_mask;
--
--    if (action == mir_keyboard_action_down && scan_code == KEY_F11)
--    {
--        switch (modifiers & modifier_mask)
--        {
--        case mir_input_event_modifier_alt:
--            toggle(mir_surface_state_maximized);
--            return true;
--
--        case mir_input_event_modifier_shift:
--            toggle(mir_surface_state_vertmaximized);
--            return true;
--
--        case mir_input_event_modifier_ctrl:
--            toggle(mir_surface_state_horizmaximized);
--            return true;
--
--        default:
--            break;
--        }
--    }
--    else if (action == mir_keyboard_action_down && scan_code == KEY_F4)
--    {
--        if (auto const session = tools->focused_session())
--        {
--            switch (modifiers & modifier_mask)
--            {
--            case mir_input_event_modifier_alt:
--                kill(session->process_id(), SIGTERM);
--                return true;
--
--            case mir_input_event_modifier_ctrl:
--                if (auto const surf = session->default_surface())
--                {
--                    surf->request_client_surface_close();
--                    return true;
--                }
--
--            default:
--                break;
--            }
--        }
--    }
--    else if (action == mir_keyboard_action_down &&
--            modifiers == mir_input_event_modifier_alt &&
--            scan_code == KEY_TAB)
--    {
--        tools->focus_next_session();
--        select_active_surface(tools->focused_session(), tools->focused_surface());
--
--        return true;
--    }
--    else if (action == mir_keyboard_action_down &&
--            modifiers == mir_input_event_modifier_alt &&
--            scan_code == KEY_GRAVE)
--    {
--        if (auto const prev = tools->focused_surface())
--        {
--            if (auto const app = tools->focused_session())
--                if (auto const surface = app->surface_after(prev))
--                {
--                    select_active_surface(app, surface);
--                }
--        }
--
--        return true;
--    }
--
--    return false;
--}
--
--bool me::TilingWindowManagerPolicy::handle_touch_event(MirTouchEvent const* event)
--{
--    auto const count = mir_touch_event_point_count(event);
--
--    long total_x = 0;
--    long total_y = 0;
--
--    for (auto i = 0U; i != count; ++i)
--    {
--        total_x += mir_touch_event_axis_value(event, i, mir_touch_axis_x);
--        total_y += mir_touch_event_axis_value(event, i, mir_touch_axis_y);
--    }
--
--    Point const cursor{total_x/count, total_y/count};
--
--    bool is_drag = true;
--    for (auto i = 0U; i != count; ++i)
--    {
--        switch (mir_touch_event_action(event, i))
--        {
--        case mir_touch_action_up:
--            return false;
--
--        case mir_touch_action_down:
--            is_drag = false;
--
--        case mir_touch_action_change:
--            continue;
--        }
--    }
--
--    bool consumes_event = false;
--    if (is_drag)
--    {
--        switch (count)
--        {
--        case 2:
--            resize(cursor);
--            consumes_event = true;
--            break;
--
--        case 3:
--            drag(cursor);
--            consumes_event = true;
--            break;
--        }
--    }
--
--    old_cursor = cursor;
--    return consumes_event;
--}
--
--bool me::TilingWindowManagerPolicy::handle_pointer_event(MirPointerEvent const* event)
--{
--    auto const action = mir_pointer_event_action(event);
--    auto const modifiers = mir_pointer_event_modifiers(event) & modifier_mask;
--    Point const cursor{
--        mir_pointer_event_axis_value(event, mir_pointer_axis_x),
--        mir_pointer_event_axis_value(event, mir_pointer_axis_y)};
--
--    bool consumes_event = false;
--
--    if (action == mir_pointer_action_button_down)
--    {
--        click(cursor);
--    }
--    else if (action == mir_pointer_action_motion &&
--             modifiers == mir_input_event_modifier_alt)
--    {
--        if (mir_pointer_event_button_state(event, mir_pointer_button_primary))
--        {
--            drag(cursor);
--            consumes_event = true;
--        }
--        else if (mir_pointer_event_button_state(event, mir_pointer_button_tertiary))
--        {
--            resize(cursor);
--            consumes_event = true;
--        }
--    }
--
--    old_cursor = cursor;
--    return consumes_event;
--}
--
--void me::TilingWindowManagerPolicy::toggle(MirSurfaceState state)
--{
--    if (auto const session = tools->focused_session())
--    {
--        if (auto const surface = session->default_surface())
--        {
--            if (surface->state() == state)
--                state = mir_surface_state_restored;
--
--            auto const value = handle_set_state(surface, MirSurfaceState(state));
--            surface->configure(mir_surface_attrib_state, value);
--        }
--    }
--}
--
--std::shared_ptr<ms::Session> me::TilingWindowManagerPolicy::session_under(Point position)
--{
--    return tools->find_session([&](SessionInfo const& info) { return info.tile.contains(position);});
--}
--
--void me::TilingWindowManagerPolicy::update_tiles(
--    SessionInfoMap& session_info,
--    Rectangles const& displays)
--{
--    if (session_info.size() < 1 || displays.size() < 1) return;
--
--    auto const sessions = session_info.size();
--
--    auto const bounding_rect = displays.bounding_rectangle();
--
--    auto const total_width  = bounding_rect.size.width.as_int();
--    auto const total_height = bounding_rect.size.height.as_int();
--
--    auto index = 0;
--
--    for (auto& info : session_info)
--    {
--        auto const x = (total_width*index)/sessions;
--        ++index;
--        auto const dx = (total_width*index)/sessions - x;
--
--        auto const old_tile = info.second.tile;
--        Rectangle const new_tile{{x, 0}, {dx, total_height}};
--
--        update_surfaces(info.first, old_tile, new_tile);
--
--        info.second.tile = new_tile;
--    }
--}
--
--void me::TilingWindowManagerPolicy::update_surfaces(std::weak_ptr<ms::Session> const& session, Rectangle const& old_tile, Rectangle const& new_tile)
--{
--    auto displacement = new_tile.top_left - old_tile.top_left;
--    auto& info = tools->info_for(session);
--
--    for (auto const& ps : info.surfaces)
--    {
--        if (auto const surface = ps.lock())
--        {
--            auto const old_pos = surface->top_left();
--            surface->move_to(old_pos + displacement);
--
--            fit_to_new_tile(*surface, old_tile, new_tile);
--        }
--    }
--}
--
--void me::TilingWindowManagerPolicy::clip_to_tile(ms::SurfaceCreationParameters& parameters, Rectangle const& tile)
--{
--    auto const displacement = parameters.top_left - tile.top_left;
--
--    auto width = std::min(tile.size.width.as_int()-displacement.dx.as_int(), parameters.size.width.as_int());
--    auto height = std::min(tile.size.height.as_int()-displacement.dy.as_int(), parameters.size.height.as_int());
--
--    parameters.size = Size{width, height};
--}
--
--void me::TilingWindowManagerPolicy::fit_to_new_tile(ms::Surface& surface, Rectangle const& old_tile, Rectangle const& new_tile)
--{
--    auto const displacement = surface.top_left() - new_tile.top_left;
--
--    // For now just scale if was filling width/height of tile
--    auto const old_size = surface.size();
--    auto const scaled_width = old_size.width == old_tile.size.width ? new_tile.size.width : old_size.width;
--    auto const scaled_height = old_size.height == old_tile.size.height ? new_tile.size.height : old_size.height;
--
--    auto width = std::min(new_tile.size.width.as_int()-displacement.dx.as_int(), scaled_width.as_int());
--    auto height = std::min(new_tile.size.height.as_int()-displacement.dy.as_int(), scaled_height.as_int());
--
--    surface.resize({width, height});
--}
--
--void me::TilingWindowManagerPolicy::drag(std::shared_ptr<ms::Surface> surface, Point to, Point from, Rectangle bounds)
--{
--    if (surface && surface->input_area_contains(from))
--    {
--        auto movement = to - from;
--
--        constrained_move(surface, movement, bounds);
--
--        for (auto const& child: tools->info_for(surface).children)
--        {
--            auto move = movement;
--            constrained_move(child.lock(), move, bounds);
--        }
--    }
--}
--
--void me::TilingWindowManagerPolicy::constrained_move(
--    std::shared_ptr<scene::Surface> const& surface,
--    Displacement& movement,
--    Rectangle const& bounds)
--{
--    auto const top_left = surface->top_left();
--    auto const surface_size = surface->size();
--    auto const bottom_right = top_left + as_displacement(surface_size);
--
--    if (movement.dx < DeltaX{0})
--            movement.dx = std::max(movement.dx, (bounds.top_left - top_left).dx);
--
--    if (movement.dy < DeltaY{0})
--            movement.dy = std::max(movement.dy, (bounds.top_left - top_left).dy);
--
--    if (movement.dx > DeltaX{0})
--            movement.dx = std::min(movement.dx, (bounds.bottom_right() - bottom_right).dx);
--
--    if (movement.dy > DeltaY{0})
--            movement.dy = std::min(movement.dy, (bounds.bottom_right() - bottom_right).dy);
--
--    auto new_pos = surface->top_left() + movement;
--
--    surface->move_to(new_pos);
--}
--
--void me::TilingWindowManagerPolicy::resize(std::shared_ptr<ms::Surface> surface, Point cursor, Point old_cursor, Rectangle bounds)
--{
--    if (surface && surface->input_area_contains(old_cursor))
--    {
--        auto const top_left = surface->top_left();
--
--        auto const old_displacement = old_cursor - top_left;
--        auto const new_displacement = cursor - top_left;
--
--        auto const scale_x = new_displacement.dx.as_float()/std::max(1.0f, old_displacement.dx.as_float());
--        auto const scale_y = new_displacement.dy.as_float()/std::max(1.0f, old_displacement.dy.as_float());
--
--        if (scale_x <= 0.0f || scale_y <= 0.0f) return;
--
--        auto const old_size = surface->size();
--        Size new_size{scale_x*old_size.width, scale_y*old_size.height};
--
--        auto const size_limits = as_size(bounds.bottom_right() - top_left);
--
--        if (new_size.width > size_limits.width)
--            new_size.width = size_limits.width;
--
--        if (new_size.height > size_limits.height)
--            new_size.height = size_limits.height;
--
--        surface->resize(new_size);
--    }
--}
--
--std::shared_ptr<ms::Surface> me::TilingWindowManagerPolicy::select_active_surface(std::shared_ptr<ms::Session> const& session, std::shared_ptr<scene::Surface> const& surface)
--{
--    if (!surface)
--    {
--        tools->set_focus_to({}, {});
--        return surface;
--    }
--
--    auto const& info_for = tools->info_for(surface);
--
--    if (info_for.can_be_active())
--    {
--        tools->set_focus_to(session, surface);
--        tools->raise_tree(surface);
--        return surface;
--    }
--    else
--    {
--        // Cannot have input focus - try the parent
--        if (auto const parent = info_for.parent.lock())
--            return select_active_surface(session, parent);
--
--        return {};
--    }
--}
 === removed file 'examples/server_example_tiling_window_manager.h'
 --- examples/server_example_tiling_window_manager.h	2016-04-15 03:41:28 +0000
 +++ examples/server_example_tiling_window_manager.h	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
--/*
-- * Copyright © 2015 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
-- * as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored By: Alan Griffiths <alan@octopull.co.uk>
-- */
--
--#ifndef MIR_EXAMPLE_TILING_WINDOW_MANAGER_H_
--#define MIR_EXAMPLE_TILING_WINDOW_MANAGER_H_
--
--#include "server_example_basic_window_manager.h"
--
--///\example server_example_tiling_window_manager.h
--/// Demonstrate implementing a simple tiling algorithm
--
--namespace mir
--{
--namespace examples
--{
--// simple tiling algorithm:
--//  o Switch apps: tap or click on the corresponding tile
--//  o Move window: Alt-leftmousebutton drag (three finger drag)
--//  o Resize window: Alt-middle_button drag (two finger drag)
--//  o Maximize/restore current window (to tile size): Alt-F11
--//  o Maximize/restore current window (to tile height): Shift-F11
--//  o Maximize/restore current window (to tile width): Ctrl-F11
--//  o client requests to maximize, vertically maximize & restore
--class TilingWindowManagerPolicy : public WindowManagementPolicy
--{
--public:
--    explicit TilingWindowManagerPolicy(WindowManagerTools* const tools);
--
--    void click(geometry::Point cursor);
--
--    void handle_session_info_updated(SessionInfoMap& session_info, geometry::Rectangles const& displays);
--
--    void handle_displays_updated(SessionInfoMap& session_info, geometry::Rectangles const& displays);
--
--    void resize(geometry::Point cursor);
--
--    auto handle_place_new_surface(
--        std::shared_ptr<scene::Session> const& session,
--        scene::SurfaceCreationParameters const& request_parameters)
--    -> scene::SurfaceCreationParameters;
--
--    void handle_new_surface(std::shared_ptr<scene::Session> const& session, std::shared_ptr<scene::Surface> const& surface);
--
--    void handle_modify_surface(
--        std::shared_ptr<scene::Session> const& session,
--        std::shared_ptr<scene::Surface> const& surface,
--        shell::SurfaceSpecification const& modifications);
--
--    void handle_delete_surface(std::shared_ptr<scene::Session> const& session, std::weak_ptr<scene::Surface> const& surface);
--
--    int handle_set_state(std::shared_ptr<scene::Surface> const& surface, MirSurfaceState value);
--
--    void drag(geometry::Point cursor);
--
--    bool handle_keyboard_event(MirKeyboardEvent const* event);
--
--    bool handle_touch_event(MirTouchEvent const* event);
--
--    bool handle_pointer_event(MirPointerEvent const* event);
--
--    void handle_raise_surface(
--        std::shared_ptr<scene::Session> const& session,
--        std::shared_ptr<scene::Surface> const& surface);
--
--    void generate_decorations_for(
--        std::shared_ptr<scene::Session> const& session, std::shared_ptr<scene::Surface> const& surface,
--        SurfaceInfoMap& surface_info,
--        std::function<frontend::SurfaceId(std::shared_ptr<scene::Session> const&, scene::SurfaceCreationParameters const&)> const& build);
--
--private:
--    static const int modifier_mask =
--        mir_input_event_modifier_alt |
--        mir_input_event_modifier_shift |
--        mir_input_event_modifier_sym |
--        mir_input_event_modifier_ctrl |
--        mir_input_event_modifier_meta;
--
--    void toggle(MirSurfaceState state);
--
--    std::shared_ptr<scene::Session> session_under(geometry::Point position);
--
--    void update_tiles(
--        SessionInfoMap& session_info,
--        geometry::Rectangles const& displays);
--
--    void update_surfaces(std::weak_ptr<scene::Session> const& session, geometry::Rectangle const& old_tile, geometry::Rectangle const& new_tile);
--
--    static void clip_to_tile(scene::SurfaceCreationParameters& parameters, geometry::Rectangle const& tile);
--
--    static void fit_to_new_tile(scene::Surface& surface, geometry::Rectangle const& old_tile, geometry::Rectangle const& new_tile);
--
--    void drag(std::shared_ptr<scene::Surface> surface, geometry::Point to, geometry::Point from, geometry::Rectangle bounds);
--
--    static void resize(std::shared_ptr<scene::Surface> surface, geometry::Point cursor, geometry::Point old_cursor, geometry::Rectangle bounds);
--
--    static void constrained_move(std::shared_ptr<scene::Surface> const& surface, geometry::Displacement& movement, geometry::Rectangle const& bounds);
--
--    std::shared_ptr<scene::Surface> select_active_surface(std::shared_ptr<scene::Session> const& session, std::shared_ptr<scene::Surface> const& surface);
--
--    WindowManagerTools* const tools;
--
--    geometry::Point old_cursor{};
--};
--
--using TilingWindowManager = WindowManagerBuilder<TilingWindowManagerPolicy>;
--}
--}
--
--#endif /* MIR_EXAMPLE_TILING_WINDOW_MANAGER_H_ */
 === modified file 'examples/server_example_window_management.cpp'
 --- examples/server_example_window_management.cpp	2016-04-15 03:41:28 +0000
 +++ examples/server_example_window_management.cpp	2016-08-12 14:07:23 +0000
@@ -18,7 +18,6 @@
  #include "server_example_window_management.h"
--#include "server_example_tiling_window_manager.h"
  #include "server_example_canonical_window_manager.h"
  #include "mir/abnormal_exit.h"
@@ -44,9 +43,8 @@
  namespace
+ {
  char const* const wm_option = "window-manager";
--char const* const wm_description = "window management strategy [{tiling|fullscreen|canonical|system-compositor}]";
++char const* const wm_description = "window management strategy [{canonical|fullscreen|system-compositor}]";
--char const* const wm_tiling = "tiling";
  char const* const wm_fullscreen = "fullscreen";
  char const* const wm_canonical = "canonical";
  char const* const wm_system_compositor = "system-compositor";
@@ -130,11 +128,7 @@
              auto const options = server.get_options();
              auto const selection = options->get<std::string>(wm_option);
--            if (selection == wm_tiling)
--            {
--                return std::make_shared<TilingWindowManager>(focus_controller);
--            }
--            else if (selection == wm_fullscreen)
++            if (selection == wm_fullscreen)
+             {
                  return std::make_shared<FullscreenWindowManager>(focus_controller, server.the_shell_display_layout());
+             }
 === modified file 'examples/server_example_window_management_info.cpp'
 --- examples/server_example_window_management_info.cpp	2016-04-27 11:53:16 +0000
 +++ examples/server_example_window_management_info.cpp	2016-08-12 14:07:23 +0000
@@ -20,6 +20,7 @@
  #include "mir/scene/surface.h"
  #include "mir/scene/surface_creation_parameters.h"
++#include "mir/scene/session.h"
  #include "mir/graphics/buffer.h"
@@ -172,6 +173,8 @@
          buffer_stream{buffer_stream}, buffer{nullptr}
+     {
          swap_buffers(nullptr);
++        if (!buffer)
++            throw std::runtime_error("no buffer after swap");
+     }
      void swap_buffers(graphics::Buffer* buf)
@@ -204,55 +207,61 @@
  struct mir::examples::SurfaceInfo::AllocatingPainter
      : mir::examples::SurfaceInfo::StreamPainter
+ {
--    AllocatingPainter(std::shared_ptr<frontend::BufferStream> const& buffer_stream, Size size) :
++    AllocatingPainter(
++        std::shared_ptr<frontend::BufferStream> const& buffer_stream,
++        std::shared_ptr<scene::Session> const& session,
++        Size size) :
          buffer_stream(buffer_stream),
++        session(session),
          properties({
              size,
              buffer_stream->pixel_format(),
              mg::BufferUsage::software
          }),
--        front_buffer(buffer_stream->allocate_buffer(properties)),
--        back_buffer(buffer_stream->allocate_buffer(properties))
++        front_buffer(session->create_buffer(properties)),
++        back_buffer(session->create_buffer(properties))
+     {
+     }
      void paint(int intensity) override
+     {
--        buffer_stream->with_buffer(back_buffer,
--            [this, intensity](graphics::Buffer& buffer)
--            {
--                auto const format = buffer.pixel_format();
--                auto const sz = buffer.size().height.as_int() *
--                                buffer.size().width.as_int() * MIR_BYTES_PER_PIXEL(format);
--                std::vector<unsigned char> pixels(sz, intensity);
--                buffer.write(pixels.data(), sz);
--                buffer_stream->swap_buffers(&buffer, [](mg::Buffer*){});
--            });
++        auto buffer = session->get_buffer(back_buffer);
++
++        auto const format = buffer->pixel_format();
++        auto const sz = buffer->size().height.as_int() *
++                        buffer->size().width.as_int() * MIR_BYTES_PER_PIXEL(format);
++        std::vector<unsigned char> pixels(sz, intensity);
++        buffer->write(pixels.data(), sz);
++        buffer_stream->swap_buffers(buffer.get(), [](mg::Buffer*){});
++
          std::swap(front_buffer, back_buffer);
+     }
      ~AllocatingPainter()
+     {
--        buffer_stream->remove_buffer(front_buffer);
--        buffer_stream->remove_buffer(back_buffer);
++        session->destroy_buffer(front_buffer);
++        session->destroy_buffer(back_buffer);
+     }
      std::shared_ptr<frontend::BufferStream> const buffer_stream;
++    std::shared_ptr<scene::Session> const session;
      mg::BufferProperties properties;
      mg::BufferID front_buffer;
      mg::BufferID back_buffer;
  };
--void mir::examples::SurfaceInfo::init_titlebar(std::shared_ptr<scene::Surface> const& surface)
++void mir::examples::SurfaceInfo::init_titlebar(
++    std::shared_ptr<scene::Session> const& session,
++    std::shared_ptr<scene::Surface> const& surface)
+ {
      auto stream = surface->primary_buffer_stream();
      try
+     {
--        stream_painter = std::make_shared<AllocatingPainter>(stream, surface->size());
++        stream_painter = std::make_shared<SwappingPainter>(stream);
+     }
      catch (...)
+     {
--        stream_painter = std::make_shared<SwappingPainter>(stream);
++        stream_painter = std::make_shared<AllocatingPainter>(stream, session, surface->size());
+     }
+ }
 === modified file 'examples/server_example_window_management_info.h'
 --- examples/server_example_window_management_info.h	2016-04-15 03:41:28 +0000
 +++ examples/server_example_window_management_info.h	2016-08-12 14:07:23 +0000
@@ -77,7 +77,9 @@
      mir::optional_value<shell::SurfaceAspectRatio> max_aspect;
      mir::optional_value<graphics::DisplayConfigurationOutputId> output_id;
--    void init_titlebar(std::shared_ptr <scene::Surface> const& surface);
++    void init_titlebar(
++        std::shared_ptr<scene::Session> const& session,
++        std::shared_ptr<scene::Surface> const& surface);
      void paint_titlebar(int intensity);
 === modified file 'include/client/mir/event_printer.h'
 --- include/client/mir/event_printer.h	2015-05-19 21:34:34 +0000
 +++ include/client/mir/event_printer.h	2016-08-12 14:07:23 +0000
@@ -47,6 +47,7 @@
  std::ostream& operator<<(std::ostream& out, MirCloseSurfaceEvent const& event);
  std::ostream& operator<<(std::ostream& out, MirKeymapEvent const& event);
  std::ostream& operator<<(std::ostream& out, MirSurfaceEvent const& event);
++std::ostream& operator<<(std::ostream& out, MirInputDeviceStateEvent const& event);
  std::ostream& operator<<(std::ostream& out, MirEvent const& event);
+ }
 === modified file 'include/client/mir/events/event_builders.h'
 --- include/client/mir/events/event_builders.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir/events/event_builders.h	2016-08-12 14:07:23 +0000
@@ -133,6 +133,20 @@
  // Input configuration event
  EventUPtr make_event(MirInputConfigurationAction action,
      MirInputDeviceId id, std::chrono::nanoseconds time);
++
++struct InputDeviceState
++{
++    MirInputDeviceId id;
++    std::vector<uint32_t> pressed_keys;
++    MirPointerButtons buttons;
++};
++
++EventUPtr make_event(std::chrono::nanoseconds timestamp,
++                     MirPointerButtons pointer_buttons,
++                     MirInputEventModifiers modifiers,
++                     float x_axis_value,
++                     float y_axis_value,
++                     std::vector<InputDeviceState>&& device_states);
+ }
+ }
 === modified file 'include/client/mir_toolkit/client_types.h'
 --- include/client/mir_toolkit/client_types.h	2016-04-29 16:12:21 +0000
 +++ include/client/mir_toolkit/client_types.h	2016-08-12 14:07:23 +0000
@@ -200,7 +200,8 @@
  typedef enum MirPlatformType
+ {
      mir_platform_type_gbm,
--    mir_platform_type_android
++    mir_platform_type_android,
++    mir_platform_type_eglstream,
  } MirPlatformType;
  typedef struct MirPlatformPackage
 === modified file 'include/client/mir_toolkit/events/event.h'
 --- include/client/mir_toolkit/events/event.h	2016-03-29 23:37:32 +0000
 +++ include/client/mir_toolkit/events/event.h	2016-08-12 14:07:23 +0000
@@ -46,6 +46,7 @@
      mir_event_type_keymap,
      mir_event_type_input_configuration,
      mir_event_type_surface_output,
++    mir_event_type_input_device_state,
  } MirEventType;
  typedef struct MirSurfaceEvent MirSurfaceEvent;
@@ -57,6 +58,7 @@
  typedef struct MirKeymapEvent MirKeymapEvent;
  typedef struct MirInputConfigurationEvent MirInputConfigurationEvent;
  typedef struct MirSurfaceOutputEvent MirSurfaceOutputEvent;
++typedef struct MirInputDeviceStateEvent MirInputDeviceStateEvent;
  typedef struct MirCookie MirCookie;
@@ -75,6 +77,7 @@
  #include "mir_toolkit/events/keymap_event.h"
  #include "mir_toolkit/events/input_configuration_event.h"
  #include "mir_toolkit/events/surface_output_event.h"
++#include "mir_toolkit/events/input_device_state_event.h"
  #ifdef __cplusplus
  /**
@@ -195,6 +198,17 @@
   */
  MirSurfaceOutputEvent const* mir_event_get_surface_output_event(MirEvent const* ev);
++/**
++ * Retrieve the MirInputDeviceStateEvent associated with a MirEvent of
++ * type mir_event_type_input_device_state. The event signifies that the
++ * client has not received the most recent input events, and thus receives
++ * a state update for all attached devices.
++ *
++ * \param [in] event The event
++ * \return           The associated MirInputConfigurationEvent
++ */
++MirInputDeviceStateEvent const* mir_event_get_input_device_state_event(MirEvent const* ev);
++
  /*
+  *
   * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 === added file 'include/client/mir_toolkit/events/input_device_state_event.h'
 --- include/client/mir_toolkit/events/input_device_state_event.h	1970-01-01 00:00:00 +0000
 +++ include/client/mir_toolkit/events/input_device_state_event.h	2016-08-12 14:07:23 +0000
@@ -0,0 +1,135 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
++ */
++
++#ifndef MIR_TOOLKIT_EVENTS_INPUT_DEVICE_STATE_EVENT_H_
++#define MIR_TOOLKIT_EVENTS_INPUT_DEVICE_STATE_EVENT_H_
++
++#include <mir_toolkit/events/event.h>
++
++#ifdef __cplusplus
++/**
++ * \addtogroup mir_toolkit
++ * @{
++ */
++extern "C" {
++#endif
++
++/**
++ * MirInputDeviceStateEvent informs clients about the current state of the
++ * input devices. This is necessary when the client did not receive the most
++ * recent input events. The event is sent when the server was resumed after
++ * a pause, or when the client just received the input focus.
++ *
++ * The event contains a single pointer button state and the current cursor
++ * position and the pressed modifier keys. Additionally for key and pointer
++ * devices the pressed keys and buttons are supplied individually.
++ */
++
++/**
++ * Retrieve the button state.
++ *
++ * \param[in] ev The input device state event
++ * \return       The combined pointer button state
++ */
++MirPointerButtons mir_input_device_state_event_pointer_buttons(
++    MirInputDeviceStateEvent const* ev);
++
++/**
++ * Retrieve the pointer position
++ *
++ * \param[in] ev   The input device state event
++ * \param[in] axis The pointer axis: mir_pointer_axis_x or mir_pointer_axis_y
++ * \return         The pointer position
++ */
++float mir_input_device_state_event_pointer_axis(
++    MirInputDeviceStateEvent const* ev, MirPointerAxis axis);
++
++/**
++ * Retrieve the time associated with a MirInputDeviceStateEvent
++ *
++ * \param[in] ev The input device state event
++ * \return       The time in nanoseconds since epoch
++ */
++int64_t mir_input_device_state_event_time(
++    MirInputDeviceStateEvent const* ev);
++
++/**
++ * Retrieve the modifier keys pressed on all input devices.
++ *
++ * \param[in] ev The input device state event
++ * \return       The modifier mask
++ */
++MirInputEventModifiers mir_input_device_state_event_modifiers(
++    MirInputDeviceStateEvent const* ev);
++
++/**
++ * Retrieve the number of attached input devices.
++ *
++ * \param[in] ev The input device state event
++ * \return       The time in nanoseconds since epoch
++ */
++uint32_t mir_input_device_state_event_device_count(
++    MirInputDeviceStateEvent const* ev);
++
++/**
++ * Retrieve the device id
++ *
++ * \param[in] ev The input device state event
++ * \param[in] index The index of the input device
++ * \return    The device id
++ */
++MirInputDeviceId mir_input_device_state_event_device_id(
++    MirInputDeviceStateEvent const* ev, uint32_t index);
++
++/**
++ * Retrieve an array of pressed keys on the device identified by the \a index.
++ * The keys are encoded as scan codes.
++ *
++ * \param[in] ev The input device state event
++ * \param[in] index The index of the input device
++ * \return    An array of pressed keys
++ */
++uint32_t const* mir_input_device_state_event_device_pressed_keys(
++    MirInputDeviceStateEvent const* ev, uint32_t index);
++
++/**
++ * Retrieve the size of scan code array of the device identified by the \a index.
++ *
++ * \param[in] ev The input device state event
++ * \param[in] index The index of the input device
++ * \return    Size of the pressed keys array
++ */
++uint32_t mir_input_device_state_event_device_pressed_keys_count(
++    MirInputDeviceStateEvent const* ev, uint32_t index);
++
++/**
++ * Retrieve the pointer button state of the device identified by the \a index
++ *
++ * \param[in] ev The input device state event
++ * \param[in] index The index of the input device
++ * \return    The pointer button state of the device
++ */
++MirPointerButtons mir_input_device_state_event_device_pointer_buttons(
++    MirInputDeviceStateEvent const* ev, uint32_t index);
++
++#ifdef __cplusplus
++}
++/**@}*/
++#endif
++
++#endif /* MIR_TOOLKIT_EVENTS_INPUT_DEVICE_STATE_EVENT_H_ */
 === modified file 'include/client/mir_toolkit/events/surface_output_event.h'
 --- include/client/mir_toolkit/events/surface_output_event.h	2016-01-29 08:18:22 +0000
 +++ include/client/mir_toolkit/events/surface_output_event.h	2016-08-12 14:07:23 +0000
@@ -46,10 +46,11 @@
  MirFormFactor mir_surface_output_event_get_form_factor(MirSurfaceOutputEvent const* ev);
  /**
-- * Retrieve the form factor of the new output configuration of a MirSurfaceOutputEvent
++ * Retrieve the suggested scaling factor of the new output configuration of a
++ * MirSurfaceOutputEvent.
+  *
   * \param [in] ev   The event
-- * \return          The new form factor of the output the surface is primarily on.
++ * \return          The new scaling factor of the output the surface is primarily on.
   */
  float mir_surface_output_event_get_scale(MirSurfaceOutputEvent const* ev);
 === modified file 'include/client/mir_toolkit/mir_surface.h'
 --- include/client/mir_toolkit/mir_surface.h	2016-03-23 06:39:56 +0000
 +++ include/client/mir_toolkit/mir_surface.h	2016-08-12 14:07:23 +0000
@@ -521,6 +521,16 @@
  void mir_surface_spec_set_shell_chrome(MirSurfaceSpec* spec, MirShellChrome style);
  /**
++ * Attempts to set the pointer confinement spec for this surface
++ *
++ * This will request the window manager to confine the pointer to the surfaces region.
++ *
++ * \param [in] spec  The spec to accumulate the request in.
++ * \param [in] state The state you would like the pointer confinement to be in.
++ */
++void mir_surface_spec_set_pointer_confinement(MirSurfaceSpec* spec, MirPointerConfinementState state);
++
++/**
   * Set the event handler to be called when events arrive for a surface.
   *   \warning event_handler could be called from another thread. You must do
   *            any locking appropriate to protect your data accessed in the
@@ -538,7 +548,14 @@
  /**
   * Retrieve the primary MirBufferStream associated with a surface (to advance buffers,
   * obtain EGLNativeWindow, etc...)
-- *
++ *
++ *   \deprecated Users should use mir_surface_spec_set_streams() to arrange
++ *               the content of a surface, instead of relying on a stream
++ *               being created by default.
++ *   \warning If the surface was created with, or modified to have a
++ *            MirSurfaceSpec containing streams added through
++ *            mir_surface_spec_set_streams(), the default stream will
++ *            be removed, and this function will return NULL.
   *   \param[in] surface The surface
   */
  MirBufferStream* mir_surface_get_buffer_stream(MirSurface *surface);
@@ -618,9 +635,13 @@
  MirSurfaceState mir_surface_get_state(MirSurface *surface);
  /**
-- * Set the swapinterval for mir_surface_swap_buffers. EGL users should use
-- * eglSwapInterval directly.
-- * At the time being, only swapinterval of 0 or 1 is supported.
++ * Set the swapinterval for the default stream.
++ *   \warning EGL users should use eglSwapInterval directly.
++ *   \warning Only swapinterval of 0 or 1 is supported.
++ *   \warning If the surface was created with, or modified to have a
++ *            MirSurfaceSpec containing streams added through
++ *            mir_surface_spec_set_streams(), the default stream will
++ *            be removed, and this function will return NULL.
   *   \param [in] surface  The surface to operate on
   *   \param [in] interval The number of vblank signals that
   *                        mir_surface_swap_buffers will wait for
@@ -634,7 +655,8 @@
   * The default interval is 1.
   *   \param [in] surface  The surface to operate on
   *   \return              The swapinterval value that the client is operating with.
-- *                        Returns -1 if surface is invalid.
++ *                        Returns -1 if surface is invalid, or if the default stream
++ *                        was removed by use of mir_surface_spec_set_streams().
   */
  int mir_surface_get_swapinterval(MirSurface* surface);
 === modified file 'include/common/mir/geometry/dimensions.h'
 --- include/common/mir/geometry/dimensions.h	2016-04-26 10:37:20 +0000
 +++ include/common/mir/geometry/dimensions.h	2016-08-12 14:07:23 +0000
@@ -55,11 +55,6 @@
          return value;
+     }
--    constexpr float as_float() const
--    {
--        return value;
--    }
--
  private:
      ValueType value;
  };
 === added directory 'include/common/mir/input'
 === added file 'include/common/mir/input/keymap.h'
 --- include/common/mir/input/keymap.h	1970-01-01 00:00:00 +0000
 +++ include/common/mir/input/keymap.h	2016-08-12 14:07:23 +0000
@@ -0,0 +1,73 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by:
++ *   Andreas Pokorny <andreas.pokorny@canonical.com>
++ */
++
++#ifndef MIR_INPUT_KEYMAP_H_
++#define MIR_INPUT_KEYMAP_H_
++
++#include <string>
++
++namespace mir
++{
++namespace input
++{
++
++struct Keymap
++{
++    Keymap() = default;
++    Keymap(std::string&& model,
++           std::string&& layout,
++           std::string&& variant,
++           std::string&& options)
++        : model{model}, layout{layout}, variant{variant}, options{options}
++    {
++    }
++
++    Keymap(std::string const& model,
++           std::string const& layout,
++           std::string const& variant,
++           std::string const& options)
++        : model{model}, layout{layout}, variant{variant}, options{options}
++    {
++    }
++
++    std::string model{"pc105+inet"};
++    std::string layout{"us"};
++    std::string variant;
++    std::string options;
++
++};
++
++inline bool operator==(Keymap const& lhs, Keymap const& rhs)
++{
++    return lhs.model == rhs.model &&
++        lhs.layout == rhs.layout &&
++        lhs.variant == rhs.variant &&
++        lhs.options == rhs.options;
++}
++
++inline bool operator!=(Keymap const& lhs, Keymap const& rhs)
++{
++    return !(lhs == rhs);
++}
++
++}
++}
++
++#endif
++
 === modified file 'include/common/mir/optional_value.h'
 --- include/common/mir/optional_value.h	2016-03-25 20:55:55 +0000
 +++ include/common/mir/optional_value.h	2016-08-12 14:07:23 +0000
@@ -39,7 +39,14 @@
+     }
      bool is_set() const { return is_set_; }
--    T value() const
++
++    T const& value() const
++    {
++        die_if_unset();
++        return value_;
++    }
++
++    T& value()
+     {
          die_if_unset();
          return value_;
 === modified file 'include/common/mir_toolkit/common.h'
 --- include/common/mir_toolkit/common.h	2016-03-28 23:15:00 +0000
 +++ include/common/mir_toolkit/common.h	2016-08-12 14:07:23 +0000
@@ -221,6 +221,16 @@
      mir_shell_chrome_low,
  } MirShellChrome;
++/**
++ * Pointer Confinement
++ */
++
++typedef enum MirPointerConfinementState
++{
++    mir_pointer_unconfined,
++    mir_pointer_confined_to_surface,
++} MirPointerConfinementState;
++
  /**@}*/
  #endif
 === modified file 'include/platform/mir/graphics/platform.h'
 --- include/platform/mir/graphics/platform.h	2016-01-29 08:18:22 +0000
 +++ include/platform/mir/graphics/platform.h	2016-08-12 14:07:23 +0000
@@ -21,7 +21,6 @@
  #define MIR_GRAPHICS_PLATFORM_H_
  #include <boost/program_options/options_description.hpp>
--#include <EGL/egl.h>
  #include "mir/module_properties.h"
  #include "mir/module_deleter.h"
@@ -89,8 +88,6 @@
       * before they are sent or after they are recieved accross IPC
       */
      virtual UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const = 0;
--
--    virtual EGLNativeDisplayType egl_native_display() const = 0;
  };
  /**
 === modified file 'include/platform/mir/input/event_builder.h'
 --- include/platform/mir/input/event_builder.h	2016-01-29 08:18:22 +0000
 +++ include/platform/mir/input/event_builder.h	2016-08-12 14:07:23 +0000
@@ -51,6 +51,8 @@
      virtual EventUPtr configuration_event(Timestamp timestamp, MirInputConfigurationAction action) = 0;
++    virtual EventUPtr device_state_event(float cursor_x, float cursor_y) = 0;
++
  protected:
      EventBuilder(EventBuilder const&) = delete;
      EventBuilder& operator=(EventBuilder const&) = delete;
 === modified file 'include/platform/mir/input/input_sink.h'
 --- include/platform/mir/input/input_sink.h	2016-01-29 08:18:22 +0000
 +++ include/platform/mir/input/input_sink.h	2016-08-12 14:07:23 +0000
@@ -24,6 +24,8 @@
  #include "mir/geometry/rectangle.h"
  #include "mir/geometry/displacement.h"
++#include <vector>
++
  namespace mir
+ {
  namespace input
@@ -39,6 +41,26 @@
       */
      virtual mir::geometry::Rectangle bounding_rectangle() const = 0;
++    /**
++     * \name Device State interface of InputSink
++     *
++     * In scenarios in which the system is not capable of receiving all changes as they occur,
++     * these method should be used to update the input device state as needed
++     * \{
++     */
++    /**
++     * Set all pressed scan codes.
++     * \param scan_codes currently pressed
++     */
++    virtual void key_state(std::vector<uint32_t> const& scan_codes) = 0;
++    /**
++     * Set button state of a pointing device.
++     * \param buttons mask of the buttons currently pressed
++     */
++    virtual void pointer_state(MirPointerButtons buttons) = 0;
++    /**
++     * \}
++     */
  private:
      InputSink(InputSink const&) = delete;
      InputSink& operator=(InputSink const&) = delete;
 === modified file 'include/server/mir/frontend/buffer_sink.h'
 --- include/server/mir/frontend/buffer_sink.h	2016-03-22 17:00:04 +0000
 +++ include/server/mir/frontend/buffer_sink.h	2016-08-12 14:07:23 +0000
@@ -21,6 +21,8 @@
  #include "mir/frontend/buffer_stream_id.h"
  #include "mir/graphics/platform_ipc_operations.h"
++#include "mir/graphics/buffer_properties.h"
++#include <string>
  namespace mir
+ {
@@ -34,6 +36,7 @@
      virtual void send_buffer(frontend::BufferStreamId id, graphics::Buffer& buffer, graphics::BufferIpcMsgType) = 0;
      virtual void add_buffer(graphics::Buffer&) = 0;
++    virtual void error_buffer(graphics::BufferProperties const&, std::string const&) = 0;
      virtual void remove_buffer(graphics::Buffer&) = 0;
      virtual void update_buffer(graphics::Buffer&) = 0;
 === modified file 'include/server/mir/frontend/buffer_stream.h'
 --- include/server/mir/frontend/buffer_stream.h	2016-01-29 08:18:22 +0000
 +++ include/server/mir/frontend/buffer_stream.h	2016-08-12 14:07:23 +0000
@@ -54,9 +54,13 @@
      virtual MirPixelFormat pixel_format() const = 0;
--    virtual graphics::BufferID allocate_buffer(graphics::BufferProperties const&) = 0;
--    virtual void remove_buffer(graphics::BufferID) = 0;
--    virtual void with_buffer(graphics::BufferID id, std::function<void(graphics::Buffer&)> const& fn) = 0;
++    //TODO: associate/disassociate_buffer are only used for timeout framedropping policy decisions.
++    //      They will be removed once timeout framedropping policy moves to the client side.
++    virtual void associate_buffer(graphics::BufferID) = 0;
++    virtual void disassociate_buffer(graphics::BufferID) = 0;
++
++    //TODO: framedropping for swapinterval-0 can probably be effectively managed from the client
++    //      side once we only support the NBS system.
      virtual void allow_framedropping(bool) = 0;
      virtual void set_scale(float scale) = 0;
  protected:
 === renamed file 'src/include/server/mir/frontend/client_buffers.h' => 'include/server/mir/frontend/client_buffers.h'
 === modified file 'include/server/mir/frontend/session.h'
 --- include/server/mir/frontend/session.h	2016-03-23 06:39:56 +0000
 +++ include/server/mir/frontend/session.h	2016-08-12 14:07:23 +0000
@@ -21,6 +21,7 @@
  #include "mir_toolkit/common.h"
  #include "mir/frontend/surface_id.h"
++#include "mir/graphics/buffer_id.h"
  #include "mir/frontend/buffer_stream_id.h"
  #include <memory>
@@ -32,6 +33,7 @@
+ {
  class DisplayConfiguration;
  struct BufferProperties;
++class Buffer;
+ }
  namespace frontend
@@ -50,6 +52,10 @@
      virtual BufferStreamId create_buffer_stream(graphics::BufferProperties const& props) = 0;
      virtual void destroy_buffer_stream(BufferStreamId stream) = 0;
++    virtual graphics::BufferID create_buffer(graphics::BufferProperties const& properties) = 0;
++    virtual void destroy_buffer(graphics::BufferID) = 0;
++    virtual std::shared_ptr<graphics::Buffer> get_buffer(graphics::BufferID) = 0;
++
      virtual std::string name() const = 0;
      virtual void send_display_config(graphics::DisplayConfiguration const&) = 0;
 === modified file 'include/server/mir/input/device.h'
 --- include/server/mir/input/device.h	2016-01-29 08:18:22 +0000
 +++ include/server/mir/input/device.h	2016-08-12 14:07:23 +0000
@@ -33,6 +33,7 @@
  class PointerConfiguration;
  class TouchpadConfiguration;
++class KeyboardConfiguration;
  class Device
+ {
@@ -50,6 +51,8 @@
      virtual mir::optional_value<TouchpadConfiguration> touchpad_configuration() const = 0;
      virtual void apply_touchpad_configuration(TouchpadConfiguration const&) = 0;
++    virtual optional_value<KeyboardConfiguration> keyboard_configuration() const = 0;
++    virtual void apply_keyboard_configuration(KeyboardConfiguration const&) = 0;
  private:
      Device(Device const&) = delete;
      Device& operator=(Device const&) = delete;
 === added file 'include/server/mir/input/keyboard_configuration.h'
 --- include/server/mir/input/keyboard_configuration.h	1970-01-01 00:00:00 +0000
 +++ include/server/mir/input/keyboard_configuration.h	2016-08-12 14:07:23 +0000
@@ -0,0 +1,49 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by:
++ *   Andreas Pokorny <andreas.pokorny@canonical.com>
++ */
++
++#ifndef MIR_INPUT_KEYBOARD_CONFIGURATION_H_
++#define MIR_INPUT_KEYBOARD_CONFIGURATION_H_
++
++#include "mir_toolkit/common.h"
++#include "mir_toolkit/mir_input_device.h"
++#include "mir/input/keymap.h"
++
++namespace mir
++{
++namespace input
++{
++
++/*
++ * Keyboard device configuration.
++ */
++struct KeyboardConfiguration
++{
++    KeyboardConfiguration() = default;
++    KeyboardConfiguration(Keymap&& keymap)
++        : device_keymap{keymap}
++    {
++    }
++
++    Keymap device_keymap;
++};
++
++}
++}
++
++#endif
 === added file 'include/server/mir/scene/application_not_responding_detector_wrapper.h'
 --- include/server/mir/scene/application_not_responding_detector_wrapper.h	1970-01-01 00:00:00 +0000
 +++ include/server/mir/scene/application_not_responding_detector_wrapper.h	2016-08-12 14:07:23 +0000
@@ -0,0 +1,49 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Alan Griffiths <alan@octopull.co.uk>
++ */
++
++#ifndef MIR_SCENE_APPLICATION_NOT_RESPONDING_DETECTOR_WRAPPER_H_
++#define MIR_SCENE_APPLICATION_NOT_RESPONDING_DETECTOR_WRAPPER_H_
++
++#include "mir/scene/application_not_responding_detector.h"
++
++#include <memory>
++
++namespace mir
++{
++namespace scene
++{
++class ApplicationNotRespondingDetectorWrapper : public ApplicationNotRespondingDetector
++{
++public:
++    ApplicationNotRespondingDetectorWrapper(std::shared_ptr<ApplicationNotRespondingDetector> const& wrapped);
++    ~ApplicationNotRespondingDetectorWrapper();
++
++    virtual void register_session(frontend::Session const* session, std::function<void()> const& pinger) override;
++    virtual void unregister_session(frontend::Session const* session) override;
++    virtual void pong_received(frontend::Session const* received_for) override;
++    virtual void register_observer(std::shared_ptr<Observer> const& observer) override;
++    virtual void unregister_observer(std::shared_ptr<Observer> const& observer) override;
++
++protected:
++    std::shared_ptr<ApplicationNotRespondingDetector> const wrapped;
++};
++}
++}
++
++
++#endif //MIR_SCENE_APPLICATION_NOT_RESPONDING_DETECTOR_WRAPPER_H_
 === modified file 'include/server/mir/scene/buffer_stream_factory.h'
 --- include/server/mir/scene/buffer_stream_factory.h	2016-01-29 08:18:22 +0000
 +++ include/server/mir/scene/buffer_stream_factory.h	2016-08-12 14:07:23 +0000
@@ -28,7 +28,7 @@
+ {
  namespace compositor { class BufferStream; }
  namespace graphics { struct BufferProperties; }
--namespace frontend { class BufferSink; }
++namespace frontend { class ClientBuffers; class BufferSink; }
  namespace scene
+ {
  class BufferStreamFactory
@@ -37,11 +37,13 @@
      virtual ~BufferStreamFactory() = default;
      virtual std::shared_ptr<compositor::BufferStream> create_buffer_stream(
--        frontend::BufferStreamId, std::shared_ptr<frontend::BufferSink> const& sink,
++        frontend::BufferStreamId, std::shared_ptr<frontend::ClientBuffers> const& sink,
          int nbuffers, graphics::BufferProperties const& buffer_properties) = 0;
      virtual std::shared_ptr<compositor::BufferStream> create_buffer_stream(
--        frontend::BufferStreamId, std::shared_ptr<frontend::BufferSink> const& sink,
++        frontend::BufferStreamId, std::shared_ptr<frontend::ClientBuffers> const& sink,
          graphics::BufferProperties const& buffer_properties) = 0;
++    virtual std::shared_ptr<frontend::ClientBuffers> create_buffer_map(
++        std::shared_ptr<frontend::BufferSink> const& sink) = 0;
  protected:
      BufferStreamFactory() = default;
 === modified file 'include/server/mir/scene/session.h'
 --- include/server/mir/scene/session.h	2016-04-06 08:44:01 +0000
 +++ include/server/mir/scene/session.h	2016-08-12 14:07:23 +0000
@@ -68,6 +68,10 @@
      virtual void configure_streams(Surface& surface, std::vector<shell::StreamSpecification> const& config) = 0;
      virtual void destroy_surface(std::weak_ptr<Surface> const& surface) = 0;
      virtual void send_input_device_change(std::vector<std::shared_ptr<input::Device>> const& devices) = 0;
++
++    virtual graphics::BufferID create_buffer(graphics::BufferProperties const& properties) = 0;
++    virtual void destroy_buffer(graphics::BufferID) = 0;
++    virtual std::shared_ptr<graphics::Buffer> get_buffer(graphics::BufferID) = 0;
  };
+ }
+ }
 === modified file 'include/server/mir/scene/surface.h'
 --- include/server/mir/scene/surface.h	2016-04-21 17:36:10 +0000
 +++ include/server/mir/scene/surface.h	2016-08-12 14:07:23 +0000
@@ -115,6 +115,9 @@
                              std::string const& variant, std::string const& options) = 0;
      virtual void rename(std::string const& title) = 0;
      virtual void set_streams(std::list<StreamInfo> const& streams) = 0;
++
++    virtual void set_confine_pointer_state(MirPointerConfinementState state) = 0;
++    virtual MirPointerConfinementState confine_pointer_state() const = 0;
  };
+ }
+ }
 === modified file 'include/server/mir/scene/surface_creation_parameters.h'
 --- include/server/mir/scene/surface_creation_parameters.h	2016-04-13 01:27:36 +0000
 +++ include/server/mir/scene/surface_creation_parameters.h	2016-08-12 14:07:23 +0000
@@ -102,6 +102,7 @@
      mir::optional_value<std::vector<geometry::Rectangle>> input_shape;
      mir::optional_value<MirShellChrome> shell_chrome;
      mir::optional_value<std::vector<shell::StreamSpecification>> streams;
++    mir::optional_value<MirPointerConfinementState> confine_pointer;
  };
  bool operator==(const SurfaceCreationParameters& lhs, const SurfaceCreationParameters& rhs);
 === modified file 'include/server/mir/server.h'
 --- include/server/mir/server.h	2016-01-29 08:18:22 +0000
 +++ include/server/mir/server.h	2016-08-12 14:07:23 +0000
@@ -46,6 +46,7 @@
  class FocusController;
  class HostLifecycleEventListener;
  class InputTargeter;
++class PersistentSurfaceStore;
  class Shell;
  class SurfaceStack;
+ }
@@ -86,12 +87,6 @@
      /// This must remain valid while apply_settings() and run() are called.
      void set_command_line(int argc, char const* argv[]);
--    /// Sets an override functor for creating the cookie authority.
--    /// A secret can be saved and any process this secret is shared
--    /// with can verify Mir-generated cookies, or produce their own.
--    void override_the_cookie_authority(
--        std::function<std::shared_ptr<cookie::Authority>()> const& cookie_authority_builder);
--
      /// Applies any configuration options, hooks, or custom implementations.
      /// Must be called before calling run() or accessing any mir subsystems.
      void apply_settings();
@@ -193,6 +188,10 @@
      /// If multiple callbacks are added they will be invoked in the sequence added.
      void add_init_callback(std::function<void()> const& init_callback);
++    /// Add a callback to be invoked when the server is about to stop,
++    /// If multiple callbacks are added they will be invoked in the reverse sequence added.
++    void add_stop_callback(std::function<void()> const& stop_callback);
++
      /// Set a handler for exceptions. This is invoked in a catch (...) block and
      /// the exception can be re-thrown to retrieve type information.
      /// The default action is to call mir::report_exception(std::cerr)
@@ -247,6 +246,11 @@
      /// Sets an override functor for creating the gl config.
      void override_the_gl_config(Builder<graphics::GLConfig> const& gl_config_builder);
++    /// Sets an override functor for creating the cookie authority.
++    /// A secret can be saved and any process this secret is shared
++    /// with can verify Mir-generated cookies, or produce their own.
++    void override_the_cookie_authority(Builder<cookie::Authority> const& cookie_authority_builder);
++
      /// Sets an override functor for creating the coordinate translator.
      void override_the_coordinate_translator(
          Builder<scene::CoordinateTranslator> const& coordinate_translator_builder);
@@ -289,6 +293,9 @@
      void override_the_application_not_responding_detector(
          Builder<scene::ApplicationNotRespondingDetector> const& anr_detector_builder);
++    /// Sets an override functor for creating the persistent_surface_store
++    void override_the_persistent_surface_store(Builder<shell::PersistentSurfaceStore> const& persistent_surface_store);
++
      /// Each of the wrap functions takes a wrapper functor of the same form
      template<typename T> using Wrapper = std::function<std::shared_ptr<T>(std::shared_ptr<T> const&)>;
@@ -310,6 +317,9 @@
      /// Sets a wrapper functor for creating the surface stack.
      void wrap_surface_stack(Wrapper<shell::SurfaceStack> const& surface_stack);
++
++    /// Sets a wrapper functor for creating the application not responding detector.
++    void wrap_application_not_responding_detector(Wrapper<scene::ApplicationNotRespondingDetector> const & anr_detector);
  /** @} */
  /** @name Getting access to Mir subsystems
@@ -395,6 +405,10 @@
      /// \return the application not responding detector
      auto the_application_not_responding_detector() const ->
          std::shared_ptr<scene::ApplicationNotRespondingDetector>;
++
++    /// \return the persistent surface store
++    auto the_persistent_surface_store() const -> std::shared_ptr<shell::PersistentSurfaceStore>;
++
  /** @} */
  /** @name Client side support
 === modified file 'include/server/mir/shell/abstract_shell.h'
 --- include/server/mir/shell/abstract_shell.h	2016-01-29 08:18:22 +0000
 +++ include/server/mir/shell/abstract_shell.h	2016-08-12 14:07:23 +0000
@@ -26,6 +26,10 @@
  namespace mir
+ {
++namespace input
++{
++class Seat;
++}
  namespace shell
+ {
  class ShellReport;
@@ -41,7 +45,8 @@
          std::shared_ptr<scene::SessionCoordinator> const& session_coordinator,
          std::shared_ptr<scene::PromptSessionManager> const& prompt_session_manager,
          std::shared_ptr<ShellReport> const& report,
--        WindowManagerBuilder const& wm_builder);
++        WindowManagerBuilder const& wm_builder,
++        std::shared_ptr<input::Seat> const& seat);
      ~AbstractShell() noexcept;
@@ -122,6 +127,7 @@
      std::shared_ptr<scene::SessionCoordinator> const session_coordinator;
      std::shared_ptr<scene::PromptSessionManager> const prompt_session_manager;
      std::shared_ptr<WindowManager> const window_manager;
++    std::shared_ptr<input::Seat> const seat;
  private:
      std::shared_ptr<ShellReport> const report;
 === modified file 'include/server/mir/shell/surface_specification.h'
 --- include/server/mir/shell/surface_specification.h	2016-04-21 17:36:10 +0000
 +++ include/server/mir/shell/surface_specification.h	2016-08-12 14:07:23 +0000
@@ -83,6 +83,7 @@
      //    it also has size instead of width + height
      // Maybe SurfaceCreationParameters /HasA/ SurfaceSpecification?
      mir::optional_value<MirShellChrome> shell_chrome;
++    optional_value<MirPointerConfinementState> confine_pointer;
  };
+ }
+ }
 === modified file 'include/test/mir/test/doubles/mock_egl.h'
 --- include/test/mir/test/doubles/mock_egl.h	2016-01-29 08:18:22 +0000
 +++ include/test/mir/test/doubles/mock_egl.h	2016-08-12 14:07:23 +0000
@@ -25,7 +25,9 @@
  #include <thread>
  #include <unordered_map>
++#ifndef GL_GLEXT_PROTOTYPES
  #define GL_GLEXT_PROTOTYPES
++#endif
  #define EGL_EGLEXT_PROTOTYPES
  #include <EGL/egl.h>
  #include <EGL/eglext.h>
@@ -100,8 +102,9 @@
      void provide_stub_platform_buffer_swapping();
      typedef void (*generic_function_pointer_t)(void);
++    typedef void* AnyNativeType;
--    MOCK_METHOD1(eglGetDisplay, EGLDisplay(NativeDisplayType));
++    MOCK_METHOD1(eglGetDisplay, EGLDisplay(AnyNativeType));
      MOCK_METHOD3(eglInitialize, EGLBoolean(EGLDisplay,EGLint*,EGLint*));
      MOCK_METHOD1(eglTerminate, EGLBoolean(EGLDisplay));
      MOCK_METHOD2(eglQueryString,const char*(EGLDisplay, EGLint));
@@ -114,8 +117,8 @@
      MOCK_METHOD4(eglGetConfigAttrib, EGLBoolean(EGLDisplay,EGLConfig,EGLint,EGLint*));
      // Surface management
--    MOCK_METHOD4(eglCreateWindowSurface, EGLSurface(EGLDisplay,EGLConfig,NativeWindowType,const EGLint*));
--    MOCK_METHOD4(eglCreatePixmapSurface, EGLSurface(EGLDisplay,EGLConfig,NativePixmapType,const EGLint*));
++    MOCK_METHOD4(eglCreateWindowSurface, EGLSurface(EGLDisplay,EGLConfig,AnyNativeType,const EGLint*));
++    MOCK_METHOD4(eglCreatePixmapSurface, EGLSurface(EGLDisplay,EGLConfig,AnyNativeType,const EGLint*));
      MOCK_METHOD3(eglCreatePbufferSurface, EGLSurface(EGLDisplay,EGLConfig,const EGLint*));
      MOCK_METHOD2(eglDestroySurface, EGLBoolean(EGLDisplay,EGLSurface));
      MOCK_METHOD4(eglQuerySurface, EGLBoolean(EGLDisplay,EGLSurface,EGLint,EGLint*));
@@ -139,7 +142,7 @@
      MOCK_METHOD0(eglWaitGL, EGLBoolean());
      MOCK_METHOD1(eglWaitNative, EGLBoolean(EGLint));
      MOCK_METHOD2(eglSwapBuffers, EGLBoolean(EGLDisplay,EGLSurface));
--    MOCK_METHOD3(eglCopyBuffers, EGLBoolean(EGLDisplay,EGLSurface,NativePixmapType));
++    MOCK_METHOD3(eglCopyBuffers, EGLBoolean(EGLDisplay,EGLSurface,AnyNativeType));
      MOCK_METHOD0(eglGetError, EGLint (void));
 === modified file 'include/test/mir/test/doubles/null_platform.h'
 --- include/test/mir/test/doubles/null_platform.h	2016-04-20 07:18:17 +0000
 +++ include/test/mir/test/doubles/null_platform.h	2016-08-12 14:07:23 +0000
@@ -50,11 +50,6 @@
+     {
          return mir::make_module_ptr<NullPlatformIpcOperations>();
+     }
--
--    EGLNativeDisplayType egl_native_display() const override
--    {
--        return EGLNativeDisplayType();
--    }
  };
+ }
+ }
 === modified file 'include/test/mir/test/doubles/stub_input_device.h'
 --- include/test/mir/test/doubles/stub_input_device.h	2016-02-01 15:54:51 +0000
 +++ include/test/mir/test/doubles/stub_input_device.h	2016-08-12 14:07:23 +0000
@@ -23,6 +23,7 @@
  #include "mir/input/device_capability.h"
  #include "mir/input/pointer_configuration.h"
  #include "mir/input/touchpad_configuration.h"
++#include "mir/input/keyboard_configuration.h"
  #include "mir/optional_value.h"
  namespace mir
@@ -69,6 +70,15 @@
+     {
+     }
++    mir::optional_value<input::KeyboardConfiguration> keyboard_configuration() const override
++    {
++        return {};
++    }
++
++    void apply_keyboard_configuration(input::KeyboardConfiguration const&) override
++    {
++    }
++
      MirInputDeviceId device_id;
      input::DeviceCapabilities device_capabilities;
      std::string device_name;
 === modified file 'include/test/mir/test/doubles/stub_session.h'
 --- include/test/mir/test/doubles/stub_session.h	2016-04-06 08:44:01 +0000
 +++ include/test/mir/test/doubles/stub_session.h	2016-08-12 14:07:23 +0000
@@ -89,6 +89,10 @@
      void send_input_device_change(std::vector<std::shared_ptr<input::Device>> const& devices) override;
++    graphics::BufferID create_buffer(graphics::BufferProperties const& properties);
++    void destroy_buffer(graphics::BufferID);
++    std::shared_ptr<graphics::Buffer> get_buffer(graphics::BufferID);
++
      pid_t pid;
  };
+ }
 === modified file 'include/test/mir/test/doubles/stub_surface.h'
 --- include/test/mir/test/doubles/stub_surface.h	2016-01-29 08:18:22 +0000
 +++ include/test/mir/test/doubles/stub_surface.h	2016-08-12 14:07:23 +0000
@@ -70,6 +70,8 @@
      void set_keymap(MirInputDeviceId id, std::string const& model, std::string const& layout,
                      std::string const& variant, std::string const& options) override;
      void rename(std::string const& title) override;
++    void set_confine_pointer_state(MirPointerConfinementState state) override;
++    MirPointerConfinementState confine_pointer_state() const override;
  };
+ }
+ }
 === modified file 'include/test/mir/test/event_matchers.h'
 --- include/test/mir/test/event_matchers.h	2016-04-28 12:32:52 +0000
 +++ include/test/mir/test/event_matchers.h	2016-08-12 14:07:23 +0000
@@ -261,9 +261,9 @@
          return false;
      if (mir_pointer_event_button_state(pev, static_cast<MirPointerButton>(button)) == false)
          return false;
--    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_x) != pos.x.as_float())
++    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_x) != pos.x.as_int())
          return false;
--    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_y) != pos.y.as_float())
++    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_y) != pos.y.as_int())
          return false;
      return true;
+ }
@@ -295,9 +295,9 @@
          return false;
      if (mir_pointer_event_button_state(pev, button) == true)
          return false;
--    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_x) != pos.x.as_float())
++    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_x) != pos.x.as_int())
          return false;
--    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_y) != pos.y.as_float())
++    if (mir_pointer_event_axis_value(pev, mir_pointer_axis_y) != pos.y.as_int())
          return false;
      return true;
+ }
@@ -503,6 +503,38 @@
      return false;
+ }
++MATCHER(InputDeviceStateEvent, "")
++{
++    auto as_address = to_address(arg);
++    if (mir_event_get_type(as_address) == mir_event_type_input_device_state)
++        return true;
++    return false;
++}
++
++MATCHER_P(DeviceStateWithPressedKeys, keys, "")
++{
++    auto as_address = to_address(arg);
++    if (mir_event_get_type(as_address) != mir_event_type_input_device_state)
++        return false;
++    auto device_state = mir_event_get_input_device_state_event(as_address);
++    for (size_t index = 0, count = mir_input_device_state_event_device_count(device_state);
++         index != count; ++index)
++    {
++        auto key_count = mir_input_device_state_event_device_pressed_keys_count(device_state, index);
++        auto it_keys = begin(keys);
++        auto end_keys = end(keys);
++        decltype(key_count) num_required_keys = distance(it_keys, end_keys);
++        if (num_required_keys != key_count)
++            continue;
++
++        auto pressed_keys = mir_input_device_state_event_device_pressed_keys(device_state, index);
++        if (!std::equal(it_keys, end_keys, pressed_keys))
++            continue;
++        return true;
++    }
++    return false;
++}
++
  MATCHER(InputDeviceConfigurationChangedEvent, "")
+ {
      auto as_address = to_address(arg);
 === modified file 'playground/CMakeLists.txt'
 --- playground/CMakeLists.txt	2016-03-23 06:39:56 +0000
 +++ playground/CMakeLists.txt	2016-08-12 14:07:23 +0000
@@ -28,3 +28,11 @@
      mirclient
+     m
+ )
++
++mir_add_wrapped_executable(mir_demo_client_chain_jumping_buffers
++    mir_demo_client_chain_jumping_buffers.c
++)
++
++target_link_libraries(mir_demo_client_chain_jumping_buffers
++    mirclient
++)
 === modified file 'playground/demo-shell/CMakeLists.txt'
 --- playground/demo-shell/CMakeLists.txt	2015-06-24 03:00:56 +0000
 +++ playground/demo-shell/CMakeLists.txt	2016-08-12 14:07:23 +0000
@@ -2,7 +2,6 @@
    demo_compositor.cpp
    demo_renderer.cpp
    window_manager.cpp
--  default_window_manager.cpp
+ )
  add_subdirectory(typo)
 === removed file 'playground/demo-shell/default_window_manager.cpp'
 --- playground/demo-shell/default_window_manager.cpp	2016-01-29 08:18:22 +0000
 +++ playground/demo-shell/default_window_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
--/*
-- * Copyright © 2015 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
-- * as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored By: Alan Griffiths <alan@octopull.co.uk>
-- */
--
--#include "default_window_manager.h"
--
--#include "mir/scene/session.h"
--#include "mir/scene/session_coordinator.h"
--#include "mir/scene/surface.h"
--#include "mir/scene/surface_creation_parameters.h"
--#include "mir/shell/display_layout.h"
--#include "mir/shell/focus_controller.h"
--#include "mir/shell/surface_ready_observer.h"
--#include "mir/shell/surface_specification.h"
--
--#include "mir_toolkit/client_types.h"
--
--namespace mf = mir::frontend;
--namespace ms = mir::scene;
--namespace msh = mir::shell;
--namespace me = mir::examples;
--namespace geom = mir::geometry;
--
--me::DefaultWindowManager::DefaultWindowManager(
--    msh::FocusController* focus_controller,
--    std::shared_ptr<shell::DisplayLayout> const& display_layout,
--    std::shared_ptr<scene::SessionCoordinator> const& session_coordinator) :
--    focus_controller{focus_controller},
--    display_layout{display_layout},
--    session_coordinator{session_coordinator}
--{
--}
--
--void me::DefaultWindowManager::add_session(std::shared_ptr<scene::Session> const& session)
--{
--    focus_controller->set_focus_to(session, {});
--}
--
--void me::DefaultWindowManager::remove_session(std::shared_ptr<scene::Session> const& /*session*/)
--{
--    auto const next_session = session_coordinator->successor_of({});
--    if (next_session)
--        focus_controller->set_focus_to(next_session, next_session->default_surface());
--    else
--        focus_controller->set_focus_to(next_session, {});
--}
--
--auto me::DefaultWindowManager::add_surface(
--    std::shared_ptr<scene::Session> const& session,
--    scene::SurfaceCreationParameters const& request_parameters,
--    std::function<frontend::SurfaceId(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params)> const& build)
---> frontend::SurfaceId
--{
--    mir::graphics::DisplayConfigurationOutputId const output_id_invalid{
--        mir_display_output_id_invalid};
--    auto placed_parameters = request_parameters;
--
--    geom::Rectangle rect{request_parameters.top_left, request_parameters.size};
--
--    if (request_parameters.output_id != output_id_invalid)
--    {
--        display_layout->place_in_output(request_parameters.output_id, rect);
--    }
--
--    placed_parameters.top_left = rect.top_left;
--    placed_parameters.size = rect.size;
--
--    auto const result = build(session, placed_parameters);
--    auto const surface = session->surface(result);
--
--    surface->add_observer(std::make_shared<msh::SurfaceReadyObserver>(
--        [this](std::shared_ptr<scene::Session> const& session,
--               std::shared_ptr<scene::Surface> const& surface)
--            {
--                focus_controller->set_focus_to(session, surface);
--            },
--        session,
--        surface));
--
--    return result;
--}
--
--void me::DefaultWindowManager::modify_surface(
--    std::shared_ptr<scene::Session> const& /*session*/,
--    std::shared_ptr<scene::Surface> const& surface,
--    msh::SurfaceSpecification const& modifications)
--{
--    if (modifications.name.is_set())
--        surface->rename(modifications.name.value());
--}
--
--void me::DefaultWindowManager::remove_surface(
--    std::shared_ptr<scene::Session> const& session,
--    std::weak_ptr<scene::Surface> const& surface)
--{
--    session->destroy_surface(surface);
--}
--
--void me::DefaultWindowManager::add_display(geometry::Rectangle const& /*area*/)
--{
--}
--
--void me::DefaultWindowManager::remove_display(geometry::Rectangle const& /*area*/)
--{
--}
--
--void me::DefaultWindowManager::handle_raise_surface(
--    std::shared_ptr<scene::Session> const& /*session*/,
--    std::shared_ptr<scene::Surface> const& /*surface*/,
--    uint64_t /*timestamp*/)
--{
--}
--
--bool me::DefaultWindowManager::handle_keyboard_event(MirKeyboardEvent const* /*event*/)
--{
--    return false;
--}
--
--bool me::DefaultWindowManager::handle_touch_event(MirTouchEvent const* /*event*/)
--{
--    return false;
--}
--
--bool me::DefaultWindowManager::handle_pointer_event(MirPointerEvent const* /*event*/)
--{
--    return false;
--}
--
--int me::DefaultWindowManager::set_surface_attribute(
--    std::shared_ptr<scene::Session> const& /*session*/,
--    std::shared_ptr<scene::Surface> const& surface,
--    MirSurfaceAttrib attrib,
--    int value)
--{
--    return surface->configure(attrib, value);
--}
 === removed file 'playground/demo-shell/default_window_manager.h'
 --- playground/demo-shell/default_window_manager.h	2016-01-29 08:18:22 +0000
 +++ playground/demo-shell/default_window_manager.h	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
--/*
-- * Copyright © 2015 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3,
-- * as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored By: Alan Griffiths <alan@octopull.co.uk>
-- */
--
--#ifndef MIR_EXAMPLES_DEFAULT_WINDOW_MANAGER_H_
--#define MIR_EXAMPLES_DEFAULT_WINDOW_MANAGER_H_
--
--#include "mir/shell/window_manager.h"
--
--namespace mir
--{
--namespace scene { class SessionCoordinator; }
--
--namespace shell { class FocusController; class DisplayLayout; }
--
--namespace examples
--{
--class DefaultWindowManager : public shell::WindowManager
--{
--public:
--    explicit DefaultWindowManager(shell::FocusController* focus_controller,
--        std::shared_ptr<shell::DisplayLayout> const& display_layout,
--        std::shared_ptr<scene::SessionCoordinator> const& session_coordinator);
--
--    void add_session(std::shared_ptr<scene::Session> const& session) override;
--
--    void remove_session(std::shared_ptr<scene::Session> const& session) override;
--
--    frontend::SurfaceId add_surface(
--        std::shared_ptr<scene::Session> const& session,
--        scene::SurfaceCreationParameters const& params,
--        std::function<frontend::SurfaceId(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params)> const& build) override;
--
--    void modify_surface(
--        std::shared_ptr<scene::Session> const& session,
--        std::shared_ptr<scene::Surface> const& surface,
--        shell::SurfaceSpecification const& modifications) override;
--
--    void remove_surface(
--        std::shared_ptr<scene::Session> const& session,
--        std::weak_ptr<scene::Surface> const& surface) override;
--
--    void add_display(geometry::Rectangle const& area) override;
--
--    void remove_display(geometry::Rectangle const& area) override;
--
--    bool handle_keyboard_event(MirKeyboardEvent const* event) override;
--
--    bool handle_touch_event(MirTouchEvent const* event) override;
--
--    bool handle_pointer_event(MirPointerEvent const* event) override;
--
--    void handle_raise_surface(
--        std::shared_ptr<scene::Session> const& session,
--        std::shared_ptr<scene::Surface> const& surface,
--        uint64_t timestamp) override;
--
--    int set_surface_attribute(
--        std::shared_ptr<scene::Session> const& session,
--        std::shared_ptr<scene::Surface> const& surface,
--        MirSurfaceAttrib attrib,
--        int value) override;
--
--private:
--    shell::FocusController* const focus_controller;
--    std::shared_ptr<shell::DisplayLayout> const display_layout;
--    std::shared_ptr<scene::SessionCoordinator> const session_coordinator;
--};
--}
--}
--
--#endif /* MIR_SHELL_DEFAULT_WINDOW_MANAGER_H_ */
 === modified file 'playground/demo-shell/demo_compositor.cpp'
 --- playground/demo-shell/demo_compositor.cpp	2016-03-28 23:15:00 +0000
 +++ playground/demo-shell/demo_compositor.cpp	2016-08-12 14:07:23 +0000
@@ -186,8 +186,8 @@
          // Note the 0.5f. This is because cursors (and all input in general)
          // measures coordinates at the centre of a pixel. But GL measures to
          // the top-left corner of a pixel.
--        float screen_x = cursor_pos.x.as_float() + 0.5f - db_x;
--        float screen_y = cursor_pos.y.as_float() + 0.5f - db_y;
++        float screen_x = cursor_pos.x.as_int() + 0.5f - db_x;
++        float screen_y = cursor_pos.y.as_int() + 0.5f - db_y;
          float normal_x = screen_x / db_width;
          float normal_y = screen_y / db_height;
 === modified file 'playground/demo-shell/demo_renderer.cpp'
 --- playground/demo-shell/demo_renderer.cpp	2016-01-29 08:18:22 +0000
 +++ playground/demo-shell/demo_renderer.cpp	2016-08-12 14:07:23 +0000
@@ -152,7 +152,9 @@
  static const GLchar inverse_fshader[] =
+ {
++    "#ifdef GL_ES\n"
      "precision mediump float;\n"
++    "#endif\n"
      "uniform sampler2D tex;\n"
      "uniform float alpha;\n"
      "varying vec2 v_texcoord;\n"
@@ -164,7 +166,9 @@
  };
  static const GLchar contrast_fshader[] =
+ {
++    "#ifdef GL_ES\n"
      "precision mediump float;\n"
++    "#endif\n"
      "uniform sampler2D tex;\n"
      "uniform float alpha;\n"
      "varying vec2 v_texcoord;\n"
 === modified file 'playground/demo-shell/demo_shell.cpp'
 --- playground/demo-shell/demo_shell.cpp	2016-01-29 08:18:22 +0000
 +++ playground/demo-shell/demo_shell.cpp	2016-08-12 14:07:23 +0000
@@ -29,9 +29,6 @@
  #include "mir/compositor/display_buffer_compositor_factory.h"
  #include "mir/compositor/renderer_factory.h"
  #include "mir/options/option.h"
--#include "default_window_manager.h"
--#include "server_example_tiling_window_manager.h"
--#include "mir/shell/canonical_window_manager.h"
  #include "server_example_host_lifecycle_event_listener.h"
  #include <iostream>
@@ -71,13 +68,7 @@
  class DemoServerConfiguration : public mir::examples::ServerConfiguration
+ {
  public:
--    DemoServerConfiguration(int argc, char const* argv[],
--                            std::initializer_list<std::shared_ptr<mi::EventFilter>> const& filter_list)
--      : ServerConfiguration(argc, argv),
--        filter_list(filter_list)
--    {
--    }
--
++    using mir::examples::ServerConfiguration::ServerConfiguration;
      std::shared_ptr<compositor::DisplayBufferCompositorFactory> the_display_buffer_compositor_factory() override
+     {
@@ -89,45 +80,6 @@
              });
+     }
--    std::shared_ptr<mi::CompositeEventFilter> the_composite_event_filter() override
--    {
--        return composite_event_filter(
--            [this]() -> std::shared_ptr<mi::CompositeEventFilter>
--            {
--                auto composite_filter = ServerConfiguration::the_composite_event_filter();
--                for (auto const& filter : filter_list)
--                    composite_filter->append(filter);
--
--                return composite_filter;
--            });
--    }
--
--    auto the_window_manager_builder() -> shell::WindowManagerBuilder override
--    {
--        return [this](shell::FocusController* focus_controller)
--            -> std::shared_ptr<msh::WindowManager>
--            {
--                auto const options = the_options();
--                auto const selection = options->get<std::string>(wm_option);
--
--                if (selection == wm_tiling)
--                {
--                    return std::make_shared<TilingWindowManager>(focus_controller);
--                }
--                else if (selection == wm_canonical)
--                {
--                    return std::make_shared<msh::CanonicalWindowManager>(
--                        focus_controller,
--                        the_shell_display_layout());
--                }
--
--                return std::make_shared<DefaultWindowManager>(
--                    focus_controller,
--                    the_shell_display_layout(),
--                    the_session_coordinator());
--            };
--    }
--
      std::shared_ptr<msh::HostLifecycleEventListener> the_host_lifecycle_event_listener() override
+     {
         return host_lifecycle_event_listener(
@@ -136,9 +88,6 @@
                 return std::make_shared<HostLifecycleEventListener>(the_logger());
             });
+     }
--
--private:
--    std::vector<std::shared_ptr<mi::EventFilter>> const filter_list;
  };
+ }
@@ -147,8 +96,9 @@
  int main(int argc, char const* argv[])
  try
+ {
++    me::DemoServerConfiguration config(argc, argv);
++
      auto wm = std::make_shared<me::WindowManager>();
--    me::DemoServerConfiguration config(argc, argv, {wm});
      mir::run_mir(config, [&config, &wm](mir::DisplayServer&)
+         {
@@ -158,6 +108,8 @@
              wm->set_display(config.the_display());
              wm->set_compositor(config.the_compositor());
              wm->set_input_scene(config.the_input_scene());
++
++            config.the_composite_event_filter()->prepend(wm);
          });
      return 0;
+ }
 === modified file 'playground/demo-shell/typo/CMakeLists.txt'
 --- playground/demo-shell/typo/CMakeLists.txt	2015-02-19 09:30:02 +0000
 +++ playground/demo-shell/typo/CMakeLists.txt	2016-08-12 14:07:23 +0000
@@ -1,4 +1,3 @@
--find_package(GLESv2 REQUIRED)
  find_package(PkgConfig)
  pkg_search_module(FREETYPE freetype2)
@@ -13,8 +12,7 @@
    ${OPTIONAL_SRCS}
+ )
--target_link_libraries(typo ${GLESv2_LIBRARIES})
--include_directories(${GLESv2_INCLUDE_DIRS})
++target_link_libraries(typo ${GL_LIBRARIES})
  target_include_directories(typo PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
  if (FREETYPE_FOUND)
 === modified file 'playground/demo-shell/typo/typo_glcache.cpp'
 --- playground/demo-shell/typo/typo_glcache.cpp	2015-07-16 07:03:19 +0000
 +++ playground/demo-shell/typo/typo_glcache.cpp	2016-08-12 14:07:23 +0000
@@ -17,7 +17,7 @@
   */
  #include "typo_glcache.h"
--#include <GLES2/gl2.h>  // TODO: Support plain OpenGL too
++#include MIR_SERVER_GL_H
  using namespace mir::examples::typo;
 === added file 'playground/mir_demo_client_chain_jumping_buffers.c'
 --- playground/mir_demo_client_chain_jumping_buffers.c	1970-01-01 00:00:00 +0000
 +++ playground/mir_demo_client_chain_jumping_buffers.c	2016-08-12 14:07:23 +0000
@@ -0,0 +1,260 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ *
++ */
++
++#include <mir_toolkit/mir_connection.h>
++#include <mir_toolkit/mir_buffer_stream.h>
++#include <mir_toolkit/mir_surface.h>
++#include <mir_toolkit/mir_presentation_chain.h>
++#include <mir_toolkit/mir_buffer.h>
++#include <mir_toolkit/version.h>
++#include <sys/types.h>
++#include <signal.h>
++#include <string.h>
++#include <pthread.h>
++#include <math.h>
++#include <stdlib.h>
++#include <getopt.h>
++#include <unistd.h>
++#include <assert.h>
++
++#define PALETTE_SIZE 5
++
++void fill_buffer_diagonal_stripes(
++    MirBuffer* buffer, unsigned int fg, unsigned int bg)
++{
++    MirGraphicsRegion region = mir_buffer_get_graphics_region(buffer, mir_read_write);
++    if ((!region.vaddr) || (region.pixel_format != mir_pixel_format_abgr_8888))
++        return;
++
++    unsigned char* vaddr = (unsigned char*) region.vaddr;
++    int const num_stripes = 10;
++    int const stripes_thickness = region.width / num_stripes;
++    for(int i = 0; i < region.height; i++)
++    {
++        unsigned int* pixel = (unsigned int*) vaddr;
++        for(int j = 0; j < region.width ; j++)
++        {
++            if ((((i + j) / stripes_thickness) % stripes_thickness) % 2)
++                pixel[j] = bg;
++            else
++                pixel[j] = fg;
++        }
++        vaddr += region.stride;
++    }
++}
++
++typedef struct SubmissionInfo
++{
++    int available;
++    MirBuffer* buffer;
++    pthread_mutex_t lock;
++    pthread_cond_t cv;
++} SubmissionInfo;
++
++static void available_callback(MirBuffer* buffer, void* client_context)
++{
++    SubmissionInfo* info = (SubmissionInfo*) client_context;
++    pthread_mutex_lock(&info->lock);
++    info->available = 1;
++    info->buffer = buffer;
++    pthread_cond_broadcast(&info->cv);
++    pthread_mutex_unlock(&info->lock);
++}
++
++volatile sig_atomic_t rendering = 1;
++static void shutdown(int signum)
++{
++    if ((signum == SIGTERM) || (signum == SIGINT))
++        rendering = 0;
++}
++
++int main(int argc, char** argv)
++{
++    static char const *socket_file = NULL;
++    int arg = -1;
++    int width = 400;
++    int height = 400;
++    while ((arg = getopt (argc, argv, "m:s:h:")) != -1)
++    {
++        switch (arg)
++        {
++        case 'm':
++            socket_file = optarg;
++            break;
++        case 's':
++        {
++            unsigned int w, h;
++            if (sscanf(optarg, "%ux%u", &w, &h) == 2)
++            {
++                width = w;
++                height = h;
++            }
++            else
++            {
++                printf("Invalid size: %s, using default size\n", optarg);
++            }
++            break;
++        }
++        case 'h':
++        case '?':
++        default:
++            puts(argv[0]);
++            printf("Usage:\n");
++            printf("    -m <Mir server socket>\n");
++            printf("    -s WIDTHxHEIGHT of window\n");
++            printf("    -h help dialog\n");
++            return -1;
++        }
++    }
++
++
++    int const chain_width = width / 2;
++    int const chain_height = height / 2;
++
++    sigset_t signal_set;
++    sigemptyset(&signal_set);
++    sigaddset(&signal_set, SIGALRM);
++    sigprocmask(SIG_BLOCK, &signal_set, NULL);
++
++    struct sigaction action;
++    action.sa_handler = shutdown;
++    sigemptyset(&action.sa_mask);
++    action.sa_flags = 0;
++    sigaction(SIGINT, &action, NULL);
++    sigaction(SIGTERM, &action, NULL);
++
++
++    int displacement_x = 0;
++    int displacement_y = 0;
++
++    MirPixelFormat format = mir_pixel_format_abgr_8888;
++
++    MirConnection* connection = mir_connect_sync(socket_file, "prerendered_frames");
++    if (!mir_connection_is_valid(connection))
++    {
++        printf("could not connect to server file at: %s\n", socket_file);
++        return -1;
++    }
++
++    unsigned int const num_chains = 4;
++    unsigned int const num_buffers = num_chains + 1;
++    unsigned int const fg[PALETTE_SIZE] = {
++        0xFF14BEA0,
++        0xFF000000,
++        0xFF1111FF,
++        0xFFAAAAAA,
++        0xFFB00076
++    };
++    unsigned int const bg[PALETTE_SIZE] = {
++        0xFFDF2111,
++        0xFFFFFFFF,
++        0xFF11DDDD,
++        0xFF404040,
++        0xFFFFFF00
++    };
++    unsigned int spare_buffer = 0;
++
++    MirPresentationChain* chain[num_chains];
++    for(unsigned int i = 0u; i < num_chains; i++)
++    {
++        chain[i] =  mir_connection_create_presentation_chain_sync(connection);
++        if (!mir_presentation_chain_is_valid(chain[i]))
++        {
++            printf("could not create MirPresentationChain\n");
++
++            // TODO this is a frig to pass smoke tests until we support NBS by default
++#if (MIR_CLIENT_VERSION <= MIR_VERSION_NUMBER(3, 3, 0))
++            printf("This is currently an unreleased API - likely server support is switched off\n");
++            return 0;
++#else
++            return -1;
++#endif
++        }
++    }
++
++    //Arrange a 2x2 grid of chains within surface
++    MirSurfaceSpec* spec = mir_connection_create_spec_for_normal_surface(connection, width, height, format);
++    mir_surface_spec_add_presentation_chain(
++        spec, chain_width, chain_height, displacement_x, displacement_y, chain[0]);
++    mir_surface_spec_add_presentation_chain(
++        spec, chain_width, chain_height, chain_width, displacement_y, chain[1]);
++    mir_surface_spec_add_presentation_chain(
++        spec, chain_width, chain_height, displacement_x, chain_height, chain[2]);
++    mir_surface_spec_add_presentation_chain(
++        spec, chain_width, chain_height, chain_width, chain_height, chain[3]);
++    MirSurface* surface = mir_surface_create_sync(spec);
++    mir_surface_spec_release(spec);
++
++    MirBufferUsage usage = mir_buffer_usage_software;
++    SubmissionInfo buffer_available[num_buffers];
++
++    //prerender the frames
++    for (unsigned int i = 0u; i < num_buffers; i++)
++    {
++        pthread_cond_init(&buffer_available[i].cv, NULL);
++        pthread_mutex_init(&buffer_available[i].lock, NULL);
++        buffer_available[i].available = 0;
++        buffer_available[i].buffer = NULL;
++
++        mir_connection_allocate_buffer(
++            connection, width, height, format, usage, available_callback, &buffer_available[i]);
++
++        pthread_mutex_lock(&buffer_available[i].lock);
++        while(!buffer_available[i].buffer)
++            pthread_cond_wait(&buffer_available[i].cv, &buffer_available[i].lock);
++
++        fill_buffer_diagonal_stripes(buffer_available[i].buffer,
++            fg[i % PALETTE_SIZE], bg[i % PALETTE_SIZE]);
++
++        pthread_mutex_unlock(&buffer_available[i].lock);
++    }
++
++    while (rendering)
++    {
++        for(unsigned int i = 0u; i < num_chains; i++)
++        {
++            MirBuffer* b;
++            pthread_mutex_lock(&buffer_available[spare_buffer].lock);
++            while(!buffer_available[spare_buffer].available)
++                pthread_cond_wait(&buffer_available[spare_buffer].cv, &buffer_available[spare_buffer].lock);
++            buffer_available[spare_buffer].available = 0;
++            b = buffer_available[spare_buffer].buffer;
++            pthread_mutex_unlock(&buffer_available[spare_buffer].lock);
++
++            mir_presentation_chain_submit_buffer(chain[i], b);
++
++            //just looks like a blur if we don't slow things down
++            ualarm(500000, 0);
++            int sig;
++            sigwait(&signal_set, &sig);
++            if (!rendering) break;
++
++            if (++spare_buffer > num_chains)
++                spare_buffer = 0;
++        }
++    }
++
++    for (unsigned int i = 0u; i < num_buffers; i++)
++        mir_buffer_release(buffer_available[i].buffer);
++    for (unsigned int i = 0u; i < num_chains; i++)
++        mir_presentation_chain_release(chain[i]);
++    mir_surface_release_sync(surface);
++    mir_connection_release(connection);
++    return 0;
++}
 === modified file 'playground/mir_demo_client_prerendered_frames.c'
 --- playground/mir_demo_client_prerendered_frames.c	2016-04-15 03:41:28 +0000
 +++ playground/mir_demo_client_prerendered_frames.c	2016-08-12 14:07:23 +0000
@@ -71,9 +71,8 @@
      pthread_cond_t cv;
  } SubmissionInfo;
--static void available_callback(MirPresentationChain* chain, MirBuffer* buffer, void* client_context)
++static void available_callback(MirBuffer* buffer, void* client_context)
+ {
--    (void)chain;
      SubmissionInfo* info = (SubmissionInfo*) client_context;
      pthread_mutex_lock(&info->lock);
      info->available = 1;
@@ -162,6 +161,12 @@
      mir_surface_spec_add_presentation_chain(
          spec, width, height, displacement_x, displacement_y, chain);
      MirSurface* surface = mir_surface_create_sync(spec);
++    if (!mir_surface_is_valid(surface))
++    {
++        printf("could not create MirSurface\n");
++        return -1;
++    }
++
      mir_surface_spec_release(spec);
      int num_prerendered_frames = 20;
@@ -175,13 +180,19 @@
          buffer_available[i].available = 0;
          buffer_available[i].buffer = NULL;
--        mir_presentation_chain_allocate_buffer(
--            chain, width, height, format, usage, available_callback, &buffer_available[i]);
++        mir_connection_allocate_buffer(
++            connection, width, height, format, usage, available_callback, &buffer_available[i]);
          pthread_mutex_lock(&buffer_available[i].lock);
          while(!buffer_available[i].buffer)
              pthread_cond_wait(&buffer_available[i].cv, &buffer_available[i].lock);
++        if (!mir_buffer_is_valid(buffer_available[i].buffer))
++        {
++            printf("could not create MirBuffer\n");
++            return -1;
++        }
++
          float max_radius = distance(0, 0, width, height) / 2.0f;
          float radius_i = ((float) i + 1) / num_prerendered_frames * max_radius;
          fill_buffer_with_centered_circle_abgr(buffer_available[i].buffer, radius_i, fg, bg);
 === modified file 'playground/server_configuration.cpp'
 --- playground/server_configuration.cpp	2015-06-25 13:43:43 +0000
 +++ playground/server_configuration.cpp	2016-08-12 14:07:23 +0000
@@ -28,12 +28,6 @@
  namespace me = mir::examples;
  namespace mg = mir::graphics;
--char const* const me::wm_option = "window-manager";
--char const* const me::wm_description = "window management strategy [{legacy|canonical|tiling}]";
--char const* const me::wm_tiling = "tiling";
--char const* const me::wm_legacy = "legacy";
--char const* const me::wm_canonical = "canonical";
--
  me::ServerConfiguration::ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options) :
      DefaultServerConfiguration(configuration_options)
+ {
@@ -42,8 +36,6 @@
      configuration_options->add_options()
          (me::display_config_opt, po::value<std::string>()->default_value(me::clone_opt_val),
              me::display_config_descr);
--    configuration_options->add_options()
--        (wm_option, po::value<std::string>()->default_value(wm_legacy), wm_description);
+ }
  me::ServerConfiguration::ServerConfiguration(int argc, char const** argv) :
 === modified file 'playground/server_configuration.h'
 --- playground/server_configuration.h	2015-06-17 05:20:42 +0000
 +++ playground/server_configuration.h	2016-08-12 14:07:23 +0000
@@ -43,12 +43,6 @@
  private:
      std::shared_ptr<input::EventFilter> quit_filter;
  };
--
--extern char const* const wm_option;
--extern char const* const wm_description;
--extern char const* const wm_tiling;
--extern char const* const wm_legacy;
--extern char const* const wm_canonical;
+ }
+ }
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2016-03-23 06:39:56 +0000
 +++ src/CMakeLists.txt	2016-08-12 14:07:23 +0000
@@ -1,5 +1,5 @@
  # We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
--set(MIRPLATFORM_ABI 11)
++set(MIRPLATFORM_ABI 13)
  # Add the cookie implementation before exposing any APIs
  add_subdirectory(cookie/)
@@ -42,8 +42,6 @@
  set(MIR_SERVER_REFERENCES ${MIR_SERVER_REFERENCES} PARENT_SCOPE)
  set(MIR_PLATFORM_OBJECTS ${MIR_PLATFORM_OBJECTS} PARENT_SCOPE)
  set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
--set(MIR_COMMON_OBJECTS ${MIR_COMMON_OBJECTS} PARENT_SCOPE)
--set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
  set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
  set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)
 === modified file 'src/client/CMakeLists.txt'
 --- src/client/CMakeLists.txt	2016-04-18 17:45:54 +0000
 +++ src/client/CMakeLists.txt	2016-08-12 14:07:23 +0000
@@ -79,6 +79,7 @@
    error_stream.cpp
    error_chain.cpp
    buffer.cpp
++  error_buffer.cpp
    presentation_chain.cpp
    mir_presentation_chain_api.cpp
    mir_buffer_api.cpp
 === modified file 'src/client/atomic_callback.h'
 --- src/client/atomic_callback.h	2016-01-29 08:18:22 +0000
 +++ src/client/atomic_callback.h	2016-08-12 14:07:23 +0000
@@ -35,6 +35,11 @@
+     {
+     }
++    AtomicCallback(std::function<void(Args...)> const& fn)
++        : callback(fn)
++    {
++    }
++
      ~AtomicCallback() = default;
      void set_callback(std::function<void(Args...)> const& fn)
 === modified file 'src/client/buffer.cpp'
 --- src/client/buffer.cpp	2016-04-13 10:48:30 +0000
 +++ src/client/buffer.cpp	2016-08-12 14:07:23 +0000
@@ -26,14 +26,13 @@
      mir_buffer_callback cb, void* context,
      int buffer_id,
      std::shared_ptr<ClientBuffer> const& buffer,
--    MirPresentationChain* chain,
++    MirConnection* connection,
      MirBufferUsage usage) :
--    cb(cb),
--    cb_context(context),
      buffer_id(buffer_id),
      buffer(buffer),
++    cb([this, cb, context]{ (*cb)(reinterpret_cast<::MirBuffer*>(this), context); }),
      owned(false),
--    chain(chain),
++    connection(connection),
      usage(usage)
+ {
+ }
@@ -60,8 +59,8 @@
          if (!owned)
              owned = true;
+     }
--    cb(nullptr, reinterpret_cast<MirBuffer*>(this), cb_context);
++    cb();
+ }
  void mcl::Buffer::received(MirBufferPackage const& update_package)
@@ -74,7 +73,8 @@
              buffer->update_from(update_package);
+         }
+     }
--    cb(nullptr, reinterpret_cast<MirBuffer*>(this), cb_context);
++
++    cb();
+ }
  MirGraphicsRegion mcl::Buffer::map_region()
@@ -110,9 +110,9 @@
      return buffer->wait_fence(access, timeout);
+ }
--MirPresentationChain* mcl::Buffer::allocating_chain() const
++MirConnection* mcl::Buffer::allocating_connection() const
+ {
--    return chain;
++    return connection;
+ }
  MirBufferUsage mcl::Buffer::buffer_usage() const
@@ -138,3 +138,18 @@
+ {
      buffer->increment_age();
+ }
++
++bool mcl::Buffer::valid() const
++{
++    return true;
++}
++
++char const* mcl::Buffer::error_message() const
++{
++    return "";
++}
++
++void mcl::Buffer::set_callback(mir_buffer_callback callback, void* context)
++{
++    cb.set_callback([&, callback, context]{ (*callback)(reinterpret_cast<::MirBuffer*>(this), context); });
++}
 === modified file 'src/client/buffer.h'
 --- src/client/buffer.h	2016-04-13 10:48:30 +0000
 +++ src/client/buffer.h	2016-08-12 14:07:23 +0000
@@ -21,6 +21,8 @@
  #include "mir_toolkit/mir_buffer.h"
  #include "mir/geometry/size.h"
++#include "atomic_callback.h"
++#include "mir_buffer.h"
  #include <memory>
  #include <chrono>
  #include <mutex>
@@ -31,47 +33,50 @@
+ {
  class ClientBuffer;
  class MemoryRegion;
--//this is the type backing MirBuffer*
--class Buffer
++class Buffer : public MirBuffer
+ {
  public:
      Buffer(
          mir_buffer_callback cb, void* context,
          int buffer_id,
          std::shared_ptr<ClientBuffer> const& buffer,
--        MirPresentationChain* chain,
++        MirConnection* connection,
          MirBufferUsage usage);
--    int rpc_id() const;
--
--    void submitted();
--    void received();
--    void received(MirBufferPackage const& update_message);
--
--    MirNativeBuffer* as_mir_native_buffer() const;
--    std::shared_ptr<ClientBuffer> client_buffer() const;
--    MirGraphicsRegion map_region();
--
--    void set_fence(MirNativeFence*, MirBufferAccess);
--    MirNativeFence* get_fence() const;
--    bool wait_fence(MirBufferAccess, std::chrono::nanoseconds);
--
--    MirBufferUsage buffer_usage() const;
--    MirPixelFormat pixel_format() const;
--    geometry::Size size() const;
--
--    MirPresentationChain* allocating_chain() const;
--
--    void increment_age();
++
++    int rpc_id() const override;
++
++    void submitted() override;
++    void received() override;
++    void received(MirBufferPackage const& update_message) override;
++
++    MirNativeBuffer* as_mir_native_buffer() const override;
++    std::shared_ptr<ClientBuffer> client_buffer() const override;
++    MirGraphicsRegion map_region() override;
++
++    void set_fence(MirNativeFence*, MirBufferAccess) override;
++    MirNativeFence* get_fence() const override;
++    bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) override;
++
++    MirBufferUsage buffer_usage() const override;
++    MirPixelFormat pixel_format() const override;
++    geometry::Size size() const override;
++
++    MirConnection* allocating_connection() const override;
++
++    void increment_age() override;
++    bool valid() const override;
++    char const* error_message() const override;
++    void set_callback(mir_buffer_callback callback, void* context) override;
  private:
--    mir_buffer_callback cb;
--    void* cb_context;
      int const buffer_id;
--    std::shared_ptr<ClientBuffer> buffer;
++    std::shared_ptr<ClientBuffer> const buffer;
++
++    AtomicCallback<> cb;
      std::mutex mutex;
      bool owned;
      std::shared_ptr<MemoryRegion> mapped_region;
--    MirPresentationChain* const chain;
++    MirConnection* const connection;
      MirBufferUsage const usage;
  };
+ }
 === modified file 'src/client/buffer_factory.cpp'
 --- src/client/buffer_factory.cpp	2016-04-11 14:14:38 +0000
 +++ src/client/buffer_factory.cpp	2016-08-12 14:07:23 +0000
@@ -18,6 +18,7 @@
  #include "mir/client_buffer_factory.h"
  #include "buffer_factory.h"
++#include "error_buffer.h"
  #include <algorithm>
  #include <boost/throw_exception.hpp>
  #include "protobuf_to_native_buffer.h"
@@ -27,11 +28,11 @@
  mcl::BufferFactory::AllocationRequest::AllocationRequest(
      std::shared_ptr<mcl::ClientBufferFactory> const& native_buffer_factory,
--    MirPresentationChain* chain,
++    MirConnection* connection,
      geom::Size size, MirPixelFormat format, MirBufferUsage usage,
      mir_buffer_callback cb, void* cb_context) :
      native_buffer_factory(native_buffer_factory),
--    chain(chain),
++    connection(connection),
      size(size),
      format(format),
      usage(usage),
@@ -42,7 +43,7 @@
  void mcl::BufferFactory::expect_buffer(
      std::shared_ptr<mcl::ClientBufferFactory> const& factory,
--    MirPresentationChain* chain,
++    MirConnection* connection,
      geometry::Size size,
      MirPixelFormat format,
      MirBufferUsage usage,
@@ -51,10 +52,10 @@
+ {
      std::lock_guard<decltype(mutex)> lk(mutex);
      allocation_requests.emplace_back(
--        std::make_unique<AllocationRequest>(factory, chain, size, format, usage, cb, cb_context));
++        std::make_unique<AllocationRequest>(factory, connection, size, format, usage, cb, cb_context));
+ }
--std::unique_ptr<mcl::Buffer> mcl::BufferFactory::generate_buffer(mir::protobuf::Buffer const& buffer)
++std::unique_ptr<mcl::MirBuffer> mcl::BufferFactory::generate_buffer(mir::protobuf::Buffer const& buffer)
+ {
      std::lock_guard<decltype(mutex)> lk(mutex);
      auto request_it = std::find_if(allocation_requests.begin(), allocation_requests.end(),
@@ -66,13 +67,23 @@
      if (request_it == allocation_requests.end())
          BOOST_THROW_EXCEPTION(std::logic_error("unrequested buffer received"));
--    auto b = std::make_unique<Buffer>(
--        (*request_it)->cb, (*request_it)->cb_context,
--        buffer.buffer_id(),
--        (*request_it)->native_buffer_factory->create_buffer(
--            mcl::protobuf_to_native_buffer(buffer),
--            (*request_it)->size, (*request_it)->format),
--            (*request_it)->chain, (*request_it)->usage);
++    std::unique_ptr<mcl::MirBuffer> b;
++    if (buffer.has_error())
++    {
++        b = std::make_unique<ErrorBuffer>(
++            buffer.error(), error_id--,
++            (*request_it)->cb, (*request_it)->cb_context, (*request_it)->connection);
++    }
++    else
++    {
++        b = std::make_unique<Buffer>(
++            (*request_it)->cb, (*request_it)->cb_context,
++            buffer.buffer_id(),
++            (*request_it)->native_buffer_factory->create_buffer(
++                mcl::protobuf_to_native_buffer(buffer),
++                (*request_it)->size, (*request_it)->format),
++                (*request_it)->connection, (*request_it)->usage);
++    }
      allocation_requests.erase(request_it);
      return std::move(b);
 === modified file 'src/client/buffer_factory.h'
 --- src/client/buffer_factory.h	2016-04-11 14:14:38 +0000
 +++ src/client/buffer_factory.h	2016-08-12 14:07:23 +0000
@@ -36,10 +36,10 @@
      virtual ~AsyncBufferFactory() = default;
      AsyncBufferFactory() = default;
--    virtual std::unique_ptr<Buffer> generate_buffer(mir::protobuf::Buffer const& buffer) = 0;
++    virtual std::unique_ptr<MirBuffer> generate_buffer(mir::protobuf::Buffer const& buffer) = 0;
      virtual void expect_buffer(
          std::shared_ptr<ClientBufferFactory> const& native_buffer_factory,
--        MirPresentationChain* chain,
++        MirConnection* connection,
          geometry::Size size,
          MirPixelFormat format,
          MirBufferUsage usage,
@@ -55,10 +55,10 @@
  class BufferFactory : public AsyncBufferFactory
+ {
  public:
--    std::unique_ptr<Buffer> generate_buffer(mir::protobuf::Buffer const& buffer) override;
++    std::unique_ptr<MirBuffer> generate_buffer(mir::protobuf::Buffer const& buffer) override;
      void expect_buffer(
          std::shared_ptr<ClientBufferFactory> const& native_buffer_factory,
--        MirPresentationChain* chain,
++        MirConnection* connection,
          geometry::Size size,
          MirPixelFormat format,
          MirBufferUsage usage,
@@ -68,11 +68,12 @@
  private:
      std::mutex mutex;
++    int error_id { -1 };
      struct AllocationRequest
+     {
          AllocationRequest(
              std::shared_ptr<ClientBufferFactory> const& native_buffer_factory,
--            MirPresentationChain* chain,
++            MirConnection* connection,
              geometry::Size size,
              MirPixelFormat format,
              MirBufferUsage usage,
@@ -80,7 +81,7 @@
              void* cb_context);
          std::shared_ptr<ClientBufferFactory> const native_buffer_factory;
--        MirPresentationChain* chain;
++        MirConnection* connection;
          geometry::Size size;
          MirPixelFormat format;
          MirBufferUsage usage;
 === removed file 'src/client/buffer_receiver.h'
 --- src/client/buffer_receiver.h	2016-02-05 19:47:01 +0000
 +++ src/client/buffer_receiver.h	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
--/*
-- * Copyright © 2016 Canonical Ltd.
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU Lesser General Public License version 3,
-- * as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
-- */
--
--#ifndef MIR_CLIENT_BUFFER_RECEIVER_H_
--#define MIR_CLIENT_BUFFER_RECEIVER_H_
--
--namespace mir
--{
--namespace protobuf
--{
--class Buffer;
--}
--namespace client
--{
--
--class BufferReceiver
--{
--public:
--    virtual void buffer_available(mir::protobuf::Buffer const& buffer) = 0;
--    virtual void buffer_unavailable() = 0;
--protected:
--    virtual ~BufferReceiver() = default;
--    BufferReceiver() = default;
--    BufferReceiver(const BufferReceiver&) = delete;
--    BufferReceiver& operator=(const BufferReceiver&) = delete;
--};
--
--}
--}
--#endif /* MIR_CLIENT_BUFFER_RECEIVER_H_ */
 === modified file 'src/client/buffer_stream.cpp'
 --- src/client/buffer_stream.cpp	2016-06-02 13:03:43 +0000
 +++ src/client/buffer_stream.cpp	2016-08-12 14:07:23 +0000
@@ -274,7 +274,7 @@
              google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));
+     }
--    void submit_buffer(mcl::Buffer& buffer) override
++    void submit_buffer(mcl::MirBuffer& buffer) override
+     {
          mp::BufferRequest request;
          request.mutable_id()->set_value(stream_id);
@@ -405,8 +405,8 @@
      mcl::BufferVault vault;
      std::mutex mutable mutex;
--    std::shared_ptr<mcl::Buffer> current{nullptr};
--    mir::client::NoTLSFuture<std::shared_ptr<mcl::Buffer>> future;
++    std::shared_ptr<mcl::MirBuffer> current{nullptr};
++    mir::client::NoTLSFuture<std::shared_ptr<mcl::MirBuffer>> future;
      MirWaitHandle scale_wait_handle;
      int current_swap_interval = 1;
      geom::Size size_;
 === modified file 'src/client/buffer_vault.cpp'
 --- src/client/buffer_vault.cpp	2016-07-27 12:35:58 +0000
 +++ src/client/buffer_vault.cpp	2016-08-12 14:07:23 +0000
@@ -45,7 +45,7 @@
  namespace
+ {
--void incoming_buffer(MirPresentationChain*, MirBuffer* buffer, void* context)
++void incoming_buffer(MirBuffer* buffer, void* context)
+ {
      auto vault = static_cast<mcl::BufferVault*>(context);
      vault->wire_transfer_inbound(reinterpret_cast<mcl::Buffer*>(buffer)->rpc_id());
@@ -108,7 +108,7 @@
      alloc_buffer(size, format, usage);
+ }
--std::shared_ptr<mcl::Buffer> mcl::BufferVault::checked_buffer_from_map(int id)
++std::shared_ptr<mcl::MirBuffer> mcl::BufferVault::checked_buffer_from_map(int id)
+ {
      auto map = surface_map.lock();
      if (!map)
@@ -120,7 +120,6 @@
          BOOST_THROW_EXCEPTION(std::logic_error("no buffer in map"));
+ }
--
  mcl::BufferVault::BufferMap::iterator mcl::BufferVault::available_buffer()
+ {
      auto it = std::find_if(buffers.begin(), buffers.end(),
@@ -136,10 +135,10 @@
      return it;
+ }
--mcl::NoTLSFuture<std::shared_ptr<mcl::Buffer>> mcl::BufferVault::withdraw()
++mcl::NoTLSFuture<std::shared_ptr<mcl::MirBuffer>> mcl::BufferVault::withdraw()
+ {
--    std::unique_lock<std::mutex> lk(mutex);
      std::vector<int> free_ids;
++    std::unique_lock<std::mutex> lk(mutex);
      if (disconnected_)
          BOOST_THROW_EXCEPTION(std::logic_error("server_disconnected"));
@@ -159,7 +158,7 @@
+         }
+     }
--    mcl::NoTLSPromise<std::shared_ptr<mcl::Buffer>> promise;
++    mcl::NoTLSPromise<std::shared_ptr<mcl::MirBuffer>> promise;
      auto it = available_buffer();
      auto future = promise.get_future();
      if (it != buffers.end())
@@ -187,7 +186,7 @@
      return future;
+ }
--void mcl::BufferVault::deposit(std::shared_ptr<mcl::Buffer> const& buffer)
++void mcl::BufferVault::deposit(std::shared_ptr<mcl::MirBuffer> const& buffer)
+ {
      std::lock_guard<std::mutex> lk(mutex);
      auto it = buffers.find(buffer->rpc_id());
@@ -199,7 +198,7 @@
+ }
  MirWaitHandle* mcl::BufferVault::wire_transfer_outbound(
--    std::shared_ptr<mcl::Buffer> const& buffer, std::function<void()> const& done)
++    std::shared_ptr<mcl::MirBuffer> const& buffer, std::function<void()> const& done)
+ {
      std::unique_lock<std::mutex> lk(mutex);
      auto it = buffers.find(buffer->rpc_id());
 === modified file 'src/client/buffer_vault.h'
 --- src/client/buffer_vault.h	2016-07-27 12:35:58 +0000
 +++ src/client/buffer_vault.h	2016-08-12 14:07:23 +0000
@@ -34,7 +34,7 @@
  namespace client
+ {
  class ClientBuffer;
--class Buffer;
++class MirBuffer;
  class AsyncBufferFactory;
  class SurfaceMap;
@@ -43,7 +43,7 @@
  public:
      virtual void allocate_buffer(geometry::Size size, MirPixelFormat format, int usage) = 0;
      virtual void free_buffer(int buffer_id) = 0;
--    virtual void submit_buffer(Buffer&) = 0;
++    virtual void submit_buffer(MirBuffer&) = 0;
      virtual ~ServerBufferRequests() = default;
  protected:
      ServerBufferRequests() = default;
@@ -65,11 +65,11 @@
          unsigned int initial_nbuffers);
      ~BufferVault();
--    NoTLSFuture<std::shared_ptr<Buffer>> withdraw();
--    void deposit(std::shared_ptr<Buffer> const& buffer);
++    NoTLSFuture<std::shared_ptr<MirBuffer>> withdraw();
++    void deposit(std::shared_ptr<MirBuffer> const& buffer);
      void wire_transfer_inbound(int buffer_id);
      MirWaitHandle* wire_transfer_outbound(
--        std::shared_ptr<Buffer> const& buffer, std::function<void()> const&);
++        std::shared_ptr<MirBuffer> const& buffer, std::function<void()> const&);
      void set_size(geometry::Size);
      void disconnected();
      void set_scale(float scale);
@@ -85,9 +85,9 @@
      void alloc_buffer(geometry::Size size, MirPixelFormat format, int usage);
      void free_buffer(int free_id);
      void realloc_buffer(int free_id, geometry::Size size, MirPixelFormat format, int usage);
--    void set_size(std::unique_lock<std::mutex>const& lk, geometry::Size new_size);
++    std::shared_ptr<MirBuffer> checked_buffer_from_map(int id);
++    void set_size(std::unique_lock<std::mutex> const& lk, geometry::Size new_size);
--    std::shared_ptr<Buffer> checked_buffer_from_map(int id);
      std::shared_ptr<ClientBufferFactory> const platform_factory;
      std::shared_ptr<AsyncBufferFactory> const buffer_factory;
@@ -98,7 +98,7 @@
      std::mutex mutex;
      BufferMap buffers;
--    std::deque<NoTLSPromise<std::shared_ptr<Buffer>>> promises;
++    std::deque<NoTLSPromise<std::shared_ptr<MirBuffer>>> promises;
      geometry::Size size;
      bool disconnected_;
      size_t current_buffer_count;
 === modified file 'src/client/client_buffer_stream.h'
 --- src/client/client_buffer_stream.h	2016-03-23 06:39:56 +0000
 +++ src/client/client_buffer_stream.h	2016-08-12 14:07:23 +0000
@@ -19,7 +19,6 @@
  #ifndef MIR_CLIENT_CLIENT_BUFFER_STREAM_H_
  #define MIR_CLIENT_CLIENT_BUFFER_STREAM_H_
--#include "buffer_receiver.h"
  #include "mir/frontend/buffer_stream_id.h"
  #include "mir/geometry/size.h"
@@ -66,7 +65,7 @@
  class ClientBuffer;
  class MemoryRegion;
--class ClientBufferStream : public BufferReceiver
++class ClientBufferStream
+ {
  public:
      virtual ~ClientBufferStream() = default;
@@ -93,6 +92,8 @@
      virtual char const* get_error_message() const = 0;
      virtual MirConnection* connection() const = 0;
++    virtual void buffer_available(mir::protobuf::Buffer const& buffer) = 0;
++    virtual void buffer_unavailable() = 0;
  protected:
      ClientBufferStream() = default;
      ClientBufferStream(const ClientBufferStream&) = delete;
 === modified file 'src/client/connection_surface_map.h'
 --- src/client/connection_surface_map.h	2016-04-01 17:26:51 +0000
 +++ src/client/connection_surface_map.h	2016-08-12 14:07:23 +0000
@@ -24,11 +24,12 @@
  #include <shared_mutex>
  #include <unordered_map>
++class MirPresentationChain;
  namespace mir
+ {
  namespace client
+ {
--class Buffer;
++class MirBuffer;
  class PresentationChain;
  class ConnectionSurfaceMap : public SurfaceMap
+ {
@@ -37,22 +38,26 @@
      void insert(frontend::SurfaceId surface_id, std::shared_ptr<MirSurface> const& surface);
      void erase(frontend::SurfaceId surface_id);
--    void with_stream_do(frontend::BufferStreamId stream_id, std::function<void(BufferReceiver*)> const& exec) const override;
--    void with_all_streams_do(std::function<void(BufferReceiver*)> const&) const override;
++    void with_stream_do(frontend::BufferStreamId stream_id, std::function<void(ClientBufferStream*)> const& exec) const override;
++    void with_all_streams_do(std::function<void(ClientBufferStream*)> const&) const override;
--    void insert(frontend::BufferStreamId stream_id, std::shared_ptr<BufferReceiver> const& stream);
++    void insert(frontend::BufferStreamId stream_id, std::shared_ptr<ClientBufferStream> const& chain);
++    void insert(frontend::BufferStreamId stream_id, std::shared_ptr<MirPresentationChain> const& chain);
      void erase(frontend::BufferStreamId surface_id);
      //TODO: should have a mf::BufferID
--    void insert(int buffer_id, std::shared_ptr<Buffer> const& buffer) override;
++    void insert(int buffer_id, std::shared_ptr<MirBuffer> const& buffer) override;
      void erase(int buffer_id) override;
--    std::shared_ptr<Buffer> buffer(int buffer_id) const override;
++    std::shared_ptr<MirBuffer> buffer(int buffer_id) const override;
  private:
      std::shared_timed_mutex mutable guard;
      std::unordered_map<frontend::SurfaceId, std::shared_ptr<MirSurface>> surfaces;
--    std::unordered_map<frontend::BufferStreamId, std::shared_ptr<BufferReceiver>> streams;
--    std::unordered_map<int, std::shared_ptr<Buffer>> buffers;
++    std::shared_timed_mutex mutable stream_guard;
++    std::unordered_map<frontend::BufferStreamId, std::shared_ptr<ClientBufferStream>> streams;
++    std::unordered_map<frontend::BufferStreamId, std::shared_ptr<MirPresentationChain>> chains;
++    std::shared_timed_mutex mutable buffer_guard;
++    std::unordered_map<int, std::shared_ptr<MirBuffer>> buffers;
  };
+ }
 === added file 'src/client/error_buffer.cpp'
 --- src/client/error_buffer.cpp	1970-01-01 00:00:00 +0000
 +++ src/client/error_buffer.cpp	2016-08-12 14:07:23 +0000
@@ -0,0 +1,78 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++#include "error_buffer.h"
++#include <boost/throw_exception.hpp>
++
++namespace mcl = mir::client;
++namespace geom = mir::geometry;
++
++mcl::ErrorBuffer::ErrorBuffer(
++    std::string const& msg, int buffer_id,
++    mir_buffer_callback cb, void* context,
++    MirConnection* connection) :
++    error_msg(msg),
++    buffer_id(buffer_id),
++    cb(cb),
++    cb_context(context),
++    connection(connection)
++{
++}
++
++bool mcl::ErrorBuffer::valid() const
++{
++    return false;
++}
++
++char const* mcl::ErrorBuffer::error_message() const
++{
++    return error_msg.c_str();
++}
++
++void mcl::ErrorBuffer::received()
++{
++    cb(reinterpret_cast<::MirBuffer*>(static_cast<mcl::MirBuffer*>(this)), cb_context);
++}
++
++int mcl::ErrorBuffer::rpc_id() const
++{
++    return buffer_id;
++}
++
++MirConnection* mcl::ErrorBuffer::allocating_connection() const
++{
++    return connection;
++}
++
++#define THROW_EXCEPTION \
++{ \
++    BOOST_THROW_EXCEPTION(std::logic_error("error: use of MirBuffer when mir_buffer_is_valid() is false"));\
++}
++void mcl::ErrorBuffer::submitted() THROW_EXCEPTION
++void mcl::ErrorBuffer::received(MirBufferPackage const&) THROW_EXCEPTION
++MirNativeBuffer* mcl::ErrorBuffer::as_mir_native_buffer() const THROW_EXCEPTION
++std::shared_ptr<mcl::ClientBuffer> mcl::ErrorBuffer::client_buffer() const THROW_EXCEPTION
++MirGraphicsRegion mcl::ErrorBuffer::map_region() THROW_EXCEPTION
++void mcl::ErrorBuffer::set_fence(MirNativeFence*, MirBufferAccess) THROW_EXCEPTION
++MirNativeFence* mcl::ErrorBuffer::get_fence() const THROW_EXCEPTION
++bool mcl::ErrorBuffer::wait_fence(MirBufferAccess, std::chrono::nanoseconds) THROW_EXCEPTION
++MirBufferUsage mcl::ErrorBuffer::buffer_usage() const THROW_EXCEPTION
++MirPixelFormat mcl::ErrorBuffer::pixel_format() const THROW_EXCEPTION
++geom::Size mcl::ErrorBuffer::size() const THROW_EXCEPTION
++void mcl::ErrorBuffer::increment_age() THROW_EXCEPTION
++void mcl::ErrorBuffer::set_callback(mir_buffer_callback, void*) THROW_EXCEPTION
 === added file 'src/client/error_buffer.h'
 --- src/client/error_buffer.h	1970-01-01 00:00:00 +0000
 +++ src/client/error_buffer.h	2016-08-12 14:07:23 +0000
@@ -0,0 +1,63 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
++ */
++
++#ifndef MIR_CLIENT_ERROR_BUFFER_H
++#define MIR_CLIENT_ERROR_BUFFER_H
++
++#include "mir_buffer.h"
++
++namespace mir
++{
++namespace client
++{
++class ErrorBuffer : public MirBuffer
++{
++public:
++    ErrorBuffer(
++        std::string const& error_msg, int buffer_id,
++        mir_buffer_callback cb, void* context, MirConnection* connection);
++
++    int rpc_id() const override;
++    void submitted() override;
++    void received() override;
++    void received(MirBufferPackage const& update_message) override;
++    MirNativeBuffer* as_mir_native_buffer() const override;
++    std::shared_ptr<ClientBuffer> client_buffer() const override;
++    MirGraphicsRegion map_region() override;
++    void set_fence(MirNativeFence*, MirBufferAccess) override;
++    MirNativeFence* get_fence() const override;
++    bool wait_fence(MirBufferAccess, std::chrono::nanoseconds) override;
++    MirBufferUsage buffer_usage() const override;
++    MirPixelFormat pixel_format() const override;
++    geometry::Size size() const override;
++    MirConnection* allocating_connection() const override;
++    void increment_age() override;
++    void set_callback(mir_buffer_callback callback, void* context) override;
++
++    bool valid() const override;
++    char const* error_message() const override;
++private:
++    std::string const error_msg;
++    int const buffer_id;
++    mir_buffer_callback const cb;
++    void* const cb_context;
++    MirConnection* connection;
++};
++}
++}
++#endif /* MIR_CLIENT_BUFFER_H_ */
 === modified file 'src/client/error_chain.cpp'
 --- src/client/error_chain.cpp	2016-03-23 06:39:56 +0000
 +++ src/client/error_chain.cpp	2016-08-12 14:07:23 +0000
@@ -21,7 +21,6 @@
  namespace mcl = mir::client;
  namespace geom = mir::geometry;
--namespace mp = mir::protobuf;
  mcl::ErrorChain::ErrorChain(
      MirConnection* connection,
@@ -48,26 +47,7 @@
      return stream_id;
+ }
--void mcl::ErrorChain::allocate_buffer(
--    geometry::Size, MirPixelFormat, MirBufferUsage, mir_buffer_callback, void*)
--{
--    BOOST_THROW_EXCEPTION(std::logic_error("Cannot allocate: invalid MirPresentationChain"));
--}
--
  void mcl::ErrorChain::submit_buffer(MirBuffer*)
+ {
      BOOST_THROW_EXCEPTION(std::logic_error("Cannot submit: invalid MirPresentationChain"));
+ }
--
--void mcl::ErrorChain::release_buffer(MirBuffer*)
--{
--    BOOST_THROW_EXCEPTION(std::logic_error("Cannot release: invalid MirPresentationChain"));
--}
--
--void mcl::ErrorChain::buffer_available(mir::protobuf::Buffer const&)
--{
--}
--
--void mcl::ErrorChain::buffer_unavailable()
--{
--}
 === modified file 'src/client/error_chain.h'
 --- src/client/error_chain.h	2016-03-23 06:39:56 +0000
 +++ src/client/error_chain.h	2016-08-12 14:07:23 +0000
@@ -34,12 +34,7 @@
          MirConnection* connection,
          int id,
          std::string const& error_msg);
--    void allocate_buffer(
--        geometry::Size size, MirPixelFormat format, MirBufferUsage usage, mir_buffer_callback, void*) override;
      void submit_buffer(MirBuffer* buffer) override;
--    void release_buffer(MirBuffer* buffer) override;
--    void buffer_available(mir::protobuf::Buffer const& buffer) override;
--    void buffer_unavailable() override;
      MirConnection* connection() const override;
      int rpc_id() const override;