← Back to branch summary

~vanvugt/mir/nested-subpixel-arrangement

~vanvugt/mir/nested-subpixel-arrangement

Viewing all changes in revision 4048.

Committer: Daniel van Vugt
Date: 2017-03-13 08:12:52 UTC
mfrom: (4041.1.39 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20170313081252-obamvkstacga9cy9

Merge latest trunk

files removed:
src/include/server/mir/input/input_region.h

src/server/input/display_input_region.cpp

src/server/input/display_input_region.h

tests/include/mir/test/doubles/mock_input_region.h

tests/unit-tests/input/test_display_input_region.cpp

files renamed:
include/test/mir_test_framework/connected_client_with_a_surface.h => include/test/mir_test_framework/connected_client_with_a_window.h

tests/mir_test_framework/connected_client_with_a_surface.cpp => tests/mir_test_framework/connected_client_with_a_window.cpp

files modified:
examples/eglapp.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/events/event.h

include/client/mir_toolkit/extensions/android_buffer.h

include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_input_device.h

include/client/mir_toolkit/rs/mir_render_surface.h

include/core/mir_toolkit/mir_input_device_types.h

include/platform/mir/input/input_sink.h

include/platform/mir/input/touchscreen_settings.h

include/server/mir/frontend/client_buffers.h

include/test/mir_test_framework/fake_input_device.h

playground/demo-shell/window_manager.cpp

src/client/event.cpp

src/client/mir_input_device_api.cpp

src/client/mir_presentation_chain_api.cpp

src/client/mir_render_surface_api.cpp

src/client/symbols.map

src/include/server/mir/default_server_configuration.h

src/include/server/mir/input/seat.h

src/platforms/android/client/android_client_platform.cpp

src/platforms/android/client/android_client_platform.h

src/platforms/evdev/libinput_device.cpp

src/platforms/evdev/libinput_device.h

src/platforms/mesa/server/display_helpers.cpp

src/platforms/mesa/server/display_helpers.h

src/platforms/mesa/server/kms/CMakeLists.txt

src/platforms/mesa/server/kms/display.cpp

src/platforms/mesa/server/kms/display_buffer.cpp

src/platforms/mesa/server/kms/display_buffer.h

src/platforms/mesa/server/kms/kms_output.h

src/platforms/mesa/server/kms/real_kms_display_configuration.cpp

src/platforms/mesa/server/kms/real_kms_output.cpp

src/platforms/mesa/server/kms/real_kms_output.h

src/platforms/mesa/server/x11/symbols.map.in

src/server/compositor/buffer_map.cpp

src/server/compositor/buffer_map.h

src/server/compositor/dropping_schedule.cpp

src/server/compositor/dropping_schedule.h

src/server/compositor/queueing_schedule.cpp

src/server/compositor/queueing_schedule.h

src/server/compositor/schedule.h

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/graphics/nested/input_platform.cpp

src/server/input/CMakeLists.txt

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/scene/application_session.cpp

src/server/scene/default_configuration.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

src/server/scene/surface_stack.cpp

src/server/shell/surface_specification.cpp

src/server/symbols.map

tests/acceptance-tests/buffer_stream_arrangement.h

tests/acceptance-tests/test_buffer_stream_arrangement.cpp

tests/acceptance-tests/test_client_cookie.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_scaling.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_swap_buffers.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_mirblob.cpp

tests/acceptance-tests/test_new_display_configuration.cpp

tests/acceptance-tests/test_persistent_surface_store.cpp

tests/acceptance-tests/test_presentation_chain.cpp

tests/acceptance-tests/test_render_override.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/acceptance-tests/test_surface_modifications.cpp

tests/include/mir/test/doubles/mock_input_seat.h

tests/include/mir/test/doubles/mock_input_sink.h

tests/include/mir/test/doubles/mock_libinput.h

tests/include/mir/test/doubles/stub_buffer_stream_factory.h

tests/integration-tests/input/test_single_seat_setup.cpp

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_submit_buffer.cpp

tests/mir_test_doubles/mock_libinput.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/mir_test_framework/libinput_environment.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_frame_clock.cpp

tests/unit-tests/compositor/test_client_buffers.cpp

tests/unit-tests/compositor/test_dropping_schedule.cpp

tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp

tests/unit-tests/compositor/test_queueing_schedule.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/CMakeLists.txt

tests/unit-tests/input/evdev/test_libinput_device.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_default_input_manager.cpp

tests/unit-tests/input/test_seat_input_device_tracker.cpp

tests/unit-tests/platforms/android/client/test_android_client_platform.cpp

tests/unit-tests/platforms/mesa/kms/mock_kms_output.h

tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp

tests/unit-tests/platforms/mesa/kms/test_display_configuration.cpp

tests/unit-tests/platforms/mesa/kms/test_real_kms_output.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

examples/eglapp.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/events/event.h

include/client/mir_toolkit/extensions/android_buffer.h

include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_input_device.h

include/client/mir_toolkit/rs/mir_render_surface.h

include/core/mir_toolkit/mir_input_device_types.h

include/platform/mir/input/input_sink.h

include/platform/mir/input/touchscreen_settings.h

include/server/mir/frontend/client_buffers.h

include/test/mir_test_framework/connected_client_with_a_window.h

include/test/mir_test_framework/fake_input_device.h

playground/demo-shell/window_manager.cpp

src/client/event.cpp

src/client/mir_input_device_api.cpp

src/client/mir_presentation_chain_api.cpp

src/client/mir_render_surface_api.cpp

src/client/symbols.map

src/include/server/mir/default_server_configuration.h

src/include/server/mir/input/input_region.h

src/include/server/mir/input/seat.h

src/platforms/android/client/android_client_platform.cpp

src/platforms/android/client/android_client_platform.h

src/platforms/evdev/libinput_device.cpp

src/platforms/evdev/libinput_device.h

src/platforms/mesa/server/display_helpers.cpp

src/platforms/mesa/server/display_helpers.h

src/platforms/mesa/server/kms/CMakeLists.txt

src/platforms/mesa/server/kms/display.cpp

src/platforms/mesa/server/kms/display_buffer.cpp

src/platforms/mesa/server/kms/display_buffer.h

src/platforms/mesa/server/kms/kms_output.h

src/platforms/mesa/server/kms/real_kms_display_configuration.cpp

src/platforms/mesa/server/kms/real_kms_output.cpp

src/platforms/mesa/server/kms/real_kms_output.h

src/platforms/mesa/server/x11/symbols.map.in

src/server/compositor/buffer_map.cpp

src/server/compositor/buffer_map.h

src/server/compositor/dropping_schedule.cpp

src/server/compositor/dropping_schedule.h

src/server/compositor/queueing_schedule.cpp

src/server/compositor/queueing_schedule.h

src/server/compositor/schedule.h

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/graphics/nested/input_platform.cpp

src/server/input/CMakeLists.txt

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/display_input_region.cpp

src/server/input/display_input_region.h

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/scene/application_session.cpp

src/server/scene/default_configuration.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

src/server/scene/surface_stack.cpp

src/server/shell/surface_specification.cpp

src/server/symbols.map

tests/acceptance-tests/buffer_stream_arrangement.h

tests/acceptance-tests/test_buffer_stream_arrangement.cpp

tests/acceptance-tests/test_client_cookie.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_scaling.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_swap_buffers.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_mirblob.cpp

tests/acceptance-tests/test_new_display_configuration.cpp

tests/acceptance-tests/test_persistent_surface_store.cpp

tests/acceptance-tests/test_presentation_chain.cpp

tests/acceptance-tests/test_render_override.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/acceptance-tests/test_surface_modifications.cpp

tests/include/mir/test/doubles/mock_input_region.h

tests/include/mir/test/doubles/mock_input_seat.h

tests/include/mir/test/doubles/mock_input_sink.h

tests/include/mir/test/doubles/mock_libinput.h

tests/include/mir/test/doubles/stub_buffer_stream_factory.h

tests/integration-tests/input/test_single_seat_setup.cpp

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_submit_buffer.cpp

tests/mir_test_doubles/mock_libinput.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/connected_client_with_a_window.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/mir_test_framework/libinput_environment.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_frame_clock.cpp

tests/unit-tests/compositor/test_client_buffers.cpp

tests/unit-tests/compositor/test_dropping_schedule.cpp

tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp

tests/unit-tests/compositor/test_queueing_schedule.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/CMakeLists.txt

tests/unit-tests/input/evdev/test_libinput_device.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_default_input_manager.cpp

tests/unit-tests/input/test_display_input_region.cpp

tests/unit-tests/input/test_seat_input_device_tracker.cpp

tests/unit-tests/platforms/android/client/test_android_client_platform.cpp

tests/unit-tests/platforms/mesa/kms/mock_kms_output.h

tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp

tests/unit-tests/platforms/mesa/kms/test_display_configuration.cpp

tests/unit-tests/platforms/mesa/kms/test_real_kms_output.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Older »