← Back to branch summary

~mir-team/mir/touch-stream-rewriter

~mir-team/mir/touch-stream-rewriter

Viewing all changes in revision 2603.

Committer: Robert Carr
Date: 2015-06-03 19:21:05 UTC
mfrom: (2599.1.13 undo-event-masking)
Revision ID: robert.carr@canonical.com-20150603192105-3vszu0rjtbbu8rzk

Merge undo-event-masking

files added:
examples/client_helpers.cpp

examples/client_helpers.h

src/platforms/mesa/server/CMakeLists.txt

src/platforms/mesa/server/common

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

src/platforms/mesa/server/common/platform_common.h

src/platforms/mesa/server/kms

files removed:
include/client/mir_toolkit/mir_client_library_drm.h

include/server/mir/scene/surface_buffer_access.h

tests/integration-tests/test_drm_auth_magic.cpp

files renamed:
debian/libmirclient8.install => debian/libmirclient9.install

debian/libmircommon4.install => debian/libmircommon5.install

src/platforms/mesa/server/anonymous_shm_file.cpp => src/platforms/mesa/server/common/anonymous_shm_file.cpp

src/platforms/mesa/server/anonymous_shm_file.h => src/platforms/mesa/server/common/anonymous_shm_file.h

src/platforms/mesa/server/buffer_allocator.cpp => src/platforms/mesa/server/common/buffer_allocator.cpp

src/platforms/mesa/server/buffer_allocator.h => src/platforms/mesa/server/common/buffer_allocator.h

src/platforms/mesa/server/buffer_texture_binder.h => src/platforms/mesa/server/common/buffer_texture_binder.h

src/platforms/mesa/server/display_helpers.cpp => src/platforms/mesa/server/common/display_helpers.cpp

src/platforms/mesa/server/display_helpers.h => src/platforms/mesa/server/common/display_helpers.h

src/platforms/mesa/server/drm_authentication.h => src/platforms/mesa/server/common/drm_authentication.h

src/platforms/mesa/server/drm_close_threadsafe.cpp => src/platforms/mesa/server/common/drm_close_threadsafe.cpp

src/platforms/mesa/server/drm_close_threadsafe.h => src/platforms/mesa/server/common/drm_close_threadsafe.h

src/platforms/mesa/server/drm_mode_resources.cpp => src/platforms/mesa/server/common/drm_mode_resources.cpp

src/platforms/mesa/server/drm_mode_resources.h => src/platforms/mesa/server/common/drm_mode_resources.h

src/platforms/mesa/server/gbm_buffer.cpp => src/platforms/mesa/server/common/gbm_buffer.cpp

src/platforms/mesa/server/gbm_buffer.h => src/platforms/mesa/server/common/gbm_buffer.h

src/platforms/mesa/server/ipc_operations.cpp => src/platforms/mesa/server/common/ipc_operations.cpp

src/platforms/mesa/server/ipc_operations.h => src/platforms/mesa/server/common/ipc_operations.h

src/platforms/mesa/server/shm_buffer.cpp => src/platforms/mesa/server/common/shm_buffer.cpp

src/platforms/mesa/server/shm_buffer.h => src/platforms/mesa/server/common/shm_buffer.h

src/platforms/mesa/server/shm_file.h => src/platforms/mesa/server/common/shm_file.h

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

src/platforms/mesa/server/bypass.cpp => src/platforms/mesa/server/kms/bypass.cpp

src/platforms/mesa/server/bypass.h => src/platforms/mesa/server/kms/bypass.h

src/platforms/mesa/server/cursor.cpp => src/platforms/mesa/server/kms/cursor.cpp

src/platforms/mesa/server/cursor.h => src/platforms/mesa/server/kms/cursor.h

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

src/platforms/mesa/server/display.h => src/platforms/mesa/server/kms/display.h

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

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

src/platforms/mesa/server/guest_platform.cpp => src/platforms/mesa/server/kms/guest_platform.cpp

src/platforms/mesa/server/guest_platform.h => src/platforms/mesa/server/kms/guest_platform.h

src/platforms/mesa/server/kms_display_configuration.h => src/platforms/mesa/server/kms/kms_display_configuration.h

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

src/platforms/mesa/server/kms_output_container.h => src/platforms/mesa/server/kms/kms_output_container.h

src/platforms/mesa/server/kms_page_flipper.cpp => src/platforms/mesa/server/kms/kms_page_flipper.cpp

src/platforms/mesa/server/kms_page_flipper.h => src/platforms/mesa/server/kms/kms_page_flipper.h

src/platforms/mesa/server/linux_virtual_terminal.cpp => src/platforms/mesa/server/kms/linux_virtual_terminal.cpp

src/platforms/mesa/server/linux_virtual_terminal.h => src/platforms/mesa/server/kms/linux_virtual_terminal.h

src/platforms/mesa/server/nested_authentication.cpp => src/platforms/mesa/server/kms/nested_authentication.cpp

src/platforms/mesa/server/nested_authentication.h => src/platforms/mesa/server/kms/nested_authentication.h

src/platforms/mesa/server/page_flipper.h => src/platforms/mesa/server/kms/page_flipper.h

src/platforms/mesa/server/platform.cpp => src/platforms/mesa/server/kms/platform.cpp

src/platforms/mesa/server/platform.h => src/platforms/mesa/server/kms/platform.h

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

src/platforms/mesa/server/real_kms_display_configuration.h => src/platforms/mesa/server/kms/real_kms_display_configuration.h

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

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

src/platforms/mesa/server/real_kms_output_container.cpp => src/platforms/mesa/server/kms/real_kms_output_container.cpp

src/platforms/mesa/server/real_kms_output_container.h => src/platforms/mesa/server/kms/real_kms_output_container.h

src/platforms/mesa/server/symbols.map => src/platforms/mesa/server/kms/symbols.map

src/platforms/mesa/server/virtual_terminal.h => src/platforms/mesa/server/kms/virtual_terminal.h

files modified:
debian/changelog

debian/control

examples/CMakeLists.txt

examples/eglsquare.cpp

examples/server_example_canonical_window_manager.cpp

include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_screencast.h

include/client/mir_toolkit/mir_surface.h

include/server/mir/scene/surface.h

src/client/CMakeLists.txt

src/client/events/event_builders.cpp

src/client/input/android/event_conversion_helpers.cpp

src/client/input/input_event.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/mir_screencast_api.cpp

src/client/mir_surface_api.cpp

src/client/rpc/mir_basic_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/rpc/mir_protobuf_rpc_channel.h

src/client/symbols-debug.map

src/client/symbols.map

src/common/CMakeLists.txt

src/common/symbols.map

src/include/common/mir/events/event_private.h

src/include/common/mir/input/android/event_conversion_helpers.h

src/include/platform/mir/options/default_configuration.h

src/platform/options/default_configuration.cpp

src/platforms/android/server/android_alloc_adaptor.cpp

src/platforms/android/server/android_alloc_adaptor.h

src/platforms/android/server/android_buffer_allocator.cpp

src/platforms/android/server/android_graphic_buffer_allocator.h

src/platforms/android/server/device_quirks.cpp

src/platforms/android/server/device_quirks.h

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/hal_component_factory.h

src/platforms/android/server/platform.cpp

src/platforms/android/server/platform.h

src/server/compositor/buffer_queue.cpp

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/input_sender.cpp

src/server/scene/application_session.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/legacy_scene_change_notification.cpp

src/server/scene/snapshot_strategy.h

src/server/scene/threaded_snapshot_strategy.cpp

src/server/scene/threaded_snapshot_strategy.h

src/server/server.cpp

src/server/shell/canonical_window_manager.cpp

src/server/symbols.map

tests/acceptance-tests/test_client_library.cpp

tests/client-language/c99.c

tests/include/mir_test/gmock_fixes.h

tests/include/mir_test_doubles/mock_virtual_terminal.h

tests/include/mir_test_doubles/null_snapshot_strategy.h

tests/include/mir_test_doubles/null_virtual_terminal.h

tests/include/mir_test_doubles/stub_gbm_native_buffer.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/graphics/android/test_buffer_integration.cpp

tests/integration-tests/graphics/android/test_client_render.cpp

tests/integration-tests/graphics/android/test_display_integration.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/platform_factory.cpp

tests/mir_test_framework/command_line_server_configuration.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/android_input/test_eventhub.cpp

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/compositor/test_buffer_queue.cpp

tests/unit-tests/dispatch/test_threaded_dispatcher.cpp

tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp

tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp

tests/unit-tests/graphics/android/test_device_detection.cpp

tests/unit-tests/graphics/android/test_output_builder.cpp

tests/unit-tests/graphics/android/test_platform.cpp

tests/unit-tests/graphics/mesa/mock_kms_output.h

tests/unit-tests/graphics/mesa/test_anonymous_shm_file.cpp

tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp

tests/unit-tests/graphics/mesa/test_bypass.cpp

tests/unit-tests/graphics/mesa/test_cursor.cpp

tests/unit-tests/graphics/mesa/test_display.cpp

tests/unit-tests/graphics/mesa/test_display_buffer.cpp

tests/unit-tests/graphics/mesa/test_display_configuration.cpp

tests/unit-tests/graphics/mesa/test_drm_helper.cpp

tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp

tests/unit-tests/graphics/mesa/test_guest_platform.cpp

tests/unit-tests/graphics/mesa/test_ipc_operations.cpp

tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp

tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp

tests/unit-tests/graphics/mesa/test_nested_authentication.cpp

tests/unit-tests/graphics/mesa/test_platform.cpp

tests/unit-tests/graphics/mesa/test_real_kms_output.cpp

tests/unit-tests/graphics/mesa/test_shm_buffer.cpp

tests/unit-tests/input/android/test_input_translator.cpp

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_legacy_scene_change_notification.cpp

tests/unit-tests/scene/test_threaded_snapshot_strategy.cpp

tests/unit-tests/test_glib_main_loop.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/libmirclient9.install

debian/libmircommon5.install

examples/CMakeLists.txt

examples/client_helpers.cpp

examples/client_helpers.h

examples/eglsquare.cpp

examples/server_example_canonical_window_manager.cpp

include/client/mir_toolkit/mir_client_library_drm.h

include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_screencast.h

include/client/mir_toolkit/mir_surface.h

include/server/mir/scene/surface.h

include/server/mir/scene/surface_buffer_access.h

src/client/CMakeLists.txt

src/client/events/event_builders.cpp

src/client/input/android/event_conversion_helpers.cpp

src/client/input/input_event.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/mir_screencast_api.cpp

src/client/mir_surface_api.cpp

src/client/rpc/mir_basic_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/rpc/mir_protobuf_rpc_channel.h

src/client/symbols-debug.map

src/client/symbols.map

src/common/CMakeLists.txt

src/common/symbols.map

src/include/common/mir/events/event_private.h

src/include/common/mir/input/android/event_conversion_helpers.h

src/include/platform/mir/options/default_configuration.h

src/platform/options/default_configuration.cpp

src/platforms/android/server/android_alloc_adaptor.cpp

src/platforms/android/server/android_alloc_adaptor.h

src/platforms/android/server/android_buffer_allocator.cpp

src/platforms/android/server/android_graphic_buffer_allocator.h

src/platforms/android/server/device_quirks.cpp

src/platforms/android/server/device_quirks.h

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/hal_component_factory.h

src/platforms/android/server/platform.cpp

src/platforms/android/server/platform.h

src/platforms/mesa/server/CMakeLists.txt

src/platforms/mesa/server/common/

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

src/platforms/mesa/server/common/buffer_allocator.h

src/platforms/mesa/server/common/platform_common.h

src/platforms/mesa/server/kms/

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

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

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

src/server/compositor/buffer_queue.cpp

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/input_sender.cpp

src/server/scene/application_session.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/legacy_scene_change_notification.cpp

src/server/scene/snapshot_strategy.h

src/server/scene/threaded_snapshot_strategy.cpp

src/server/scene/threaded_snapshot_strategy.h

src/server/server.cpp

src/server/shell/canonical_window_manager.cpp

src/server/symbols.map

tests/acceptance-tests/test_client_library.cpp

tests/client-language/c99.c

tests/include/mir_test/gmock_fixes.h

tests/include/mir_test_doubles/mock_virtual_terminal.h

tests/include/mir_test_doubles/null_snapshot_strategy.h

tests/include/mir_test_doubles/null_virtual_terminal.h

tests/include/mir_test_doubles/stub_gbm_native_buffer.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/graphics/android/test_buffer_integration.cpp

tests/integration-tests/graphics/android/test_client_render.cpp

tests/integration-tests/graphics/android/test_display_integration.cpp

tests/integration-tests/test_drm_auth_magic.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/platform_factory.cpp

tests/mir_test_framework/command_line_server_configuration.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/android_input/test_eventhub.cpp

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/compositor/test_buffer_queue.cpp

tests/unit-tests/dispatch/test_threaded_dispatcher.cpp

tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp

tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp

tests/unit-tests/graphics/android/test_device_detection.cpp

tests/unit-tests/graphics/android/test_output_builder.cpp

tests/unit-tests/graphics/android/test_platform.cpp

tests/unit-tests/graphics/mesa/mock_kms_output.h

tests/unit-tests/graphics/mesa/test_anonymous_shm_file.cpp

tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp

tests/unit-tests/graphics/mesa/test_bypass.cpp

tests/unit-tests/graphics/mesa/test_cursor.cpp

tests/unit-tests/graphics/mesa/test_display.cpp

tests/unit-tests/graphics/mesa/test_display_buffer.cpp

tests/unit-tests/graphics/mesa/test_display_configuration.cpp

tests/unit-tests/graphics/mesa/test_drm_helper.cpp

tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp

tests/unit-tests/graphics/mesa/test_guest_platform.cpp

tests/unit-tests/graphics/mesa/test_ipc_operations.cpp

tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp

tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp

tests/unit-tests/graphics/mesa/test_nested_authentication.cpp

tests/unit-tests/graphics/mesa/test_platform.cpp

tests/unit-tests/graphics/mesa/test_real_kms_output.cpp

tests/unit-tests/graphics/mesa/test_shm_buffer.cpp

tests/unit-tests/input/android/test_input_translator.cpp

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_legacy_scene_change_notification.cpp

tests/unit-tests/scene/test_threaded_snapshot_strategy.cpp

tests/unit-tests/test_glib_main_loop.cpp

Older »