← Back to branch summary

~raof/mir/provide-event-fd

~raof/mir/provide-event-fd

Viewing all changes in revision 2362.

Committer: Christopher James Halse Rogers
Date: 2015-04-16 03:15:12 UTC
mfrom: (2239.1.250 development-branch)
Revision ID: christopher.halse.rogers@canonical.com-20150416031512-5e8riyn0gq3asg42

Merge trunk

files added:
doc/kernel_requirements.md

examples/server_example_adorning_compositor.cpp

examples/server_example_adorning_compositor.h

examples/server_example_custom_compositor.cpp

examples/server_example_custom_compositor.h

examples/target.c

include/server/mir/shell/surface_specification.h

src/common/thread/signal_blocker.cpp

src/include/common/mir/events

src/include/common/mir/signal_blocker.h

src/server/graphics/nested/host_surface.h

tests/acceptance-tests/test_render_override.cpp

tests/acceptance-tests/test_surface_modifications.cpp

tools/abi-check-mirclient-skip-symbols

tools/generate-abi-base-dump.sh

tools/run_abi_compliance_checker.sh

files removed:
src/include/server/mir/scene/surface_configurator.h

src/platforms/common/server

src/platforms/common/server/symbols.map

tests/include/mir_test_doubles/mock_surface_configurator.h

tests/include/mir_test_doubles/null_surface_configurator.h

tools/abi_dumps

files renamed:
src/include/server/mir/compositor/scene_element.h => include/server/mir/compositor/scene_element.h

src/include/common/mir/event_type_to_string.h => src/include/client/mir/event_type_to_string.h

include/client/mir_toolkit/events/event_deprecated.h => src/include/common/mir/events/event_private.h

src/server/shell/default_window_manager.h => src/include/server/mir/shell/default_window_manager.h

src/server/graphics/nested/nested_display.cpp => src/server/graphics/nested/display.cpp

src/server/graphics/nested/nested_display.h => src/server/graphics/nested/display.h

src/server/graphics/nested/nested_output.cpp => src/server/graphics/nested/display_buffer.cpp

src/server/graphics/nested/nested_output.h => src/server/graphics/nested/display_buffer.h

files modified:
3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp

CMakeLists.txt

cmake/ABICheck.cmake

debian/control

doc/setup_kvm_for_mir.md

examples/CMakeLists.txt

examples/fingerpaint.c

examples/server_example.cpp

examples/server_example_basic_window_manager.h

examples/server_example_canonical_window_manager.cpp

examples/server_example_canonical_window_manager.h

examples/server_example_input_filter.cpp

examples/server_example_tiling_window_manager.cpp

examples/server_example_tiling_window_manager.h

examples/server_example_window_management.cpp

include/client/mir/events/event_builders.h

include/client/mir_toolkit/events/event.h

include/client/mir_toolkit/mir_surface.h

include/common/mir/geometry/dimensions.h

include/common/mir/geometry/point.h

include/common/mir/optional_value.h

include/platform/mir/graphics/platform.h

include/server/mir/frontend/surface.h

include/server/mir/scene/surface.h

include/server/mir/scene/surface_creation_parameters.h

include/server/mir/shell/abstract_shell.h

include/server/mir/shell/shell.h

include/server/mir/shell/shell_wrapper.h

include/server/mir/shell/window_manager.h

playground/demo-shell/demo_compositor.cpp

playground/demo-shell/demo_renderer.cpp

playground/demo-shell/demo_renderer.h

playground/demo-shell/demo_shell.cpp

playground/demo-shell/window_manager.cpp

src/client/event.cpp

src/client/events/event_builders.cpp

src/client/input/android/android_input_lexicon.cpp

src/client/input/android/android_input_receiver.cpp

src/client/input/input_event.cpp

src/client/input/xkb_mapper.cpp

src/client/mir_connection.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/symbols.map

src/common/dispatch/threaded_dispatcher.cpp

src/common/geometry/ostream.cpp

src/common/logging/input_timestamp.cpp

src/common/logging/logger.cpp

src/common/symbols.map

src/common/thread/CMakeLists.txt

src/include/client/mir/client_platform_factory.h

src/include/common/mir/input/xkb_mapper.h

src/include/server/mir/compositor/gl_renderer.h

src/include/server/mir/default_server_configuration.h

src/include/server/mir/frontend/shell.h

src/platform/graphics/platform_probe.cpp

src/platform/udev/udev_wrapper.cpp

src/platforms/android/client/client_platform_factory.cpp

src/platforms/android/client/gralloc_registrar.cpp

src/platforms/android/server/android_buffer_allocator.cpp

src/platforms/android/server/android_graphic_buffer_allocator.h

src/platforms/android/server/buffer.cpp

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/platform.cpp

src/platforms/mesa/client/client_platform_factory.cpp

src/platforms/mesa/server/buffer_allocator.cpp

src/platforms/mesa/server/buffer_allocator.h

src/platforms/mesa/server/kms_page_flipper.cpp

src/platforms/mesa/server/platform.cpp

src/platforms/mesa/server/real_kms_output.cpp

src/protobuf/mir_protobuf.proto

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/multi_threaded_compositor.h

src/server/compositor/recently_used_cache.cpp

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/event_sender.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/shell_wrapper.cpp

src/server/frontend/shell_wrapper.h

src/server/glib_main_loop_sources.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/surfaceless_egl_context.cpp

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/android_input_manager.cpp

src/server/input/android/event_filter_dispatcher_policy.cpp

src/server/input/android/event_filter_dispatcher_policy.h

src/server/input/android/input_sender.cpp

src/server/input/android/input_translator.cpp

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/null_input_dispatcher.cpp

src/server/input/vt_filter.cpp

src/server/report/lttng/message_processor_report.cpp

src/server/scene/application_session.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/default_session_container.cpp

src/server/scene/prompt_session_container.cpp

src/server/scene/surface_allocator.h

src/server/scene/surface_stack.cpp

src/server/shell/abstract_shell.cpp

src/server/shell/basic_window_manager.h

src/server/shell/canonical_window_manager.cpp

src/server/shell/canonical_window_manager.h

src/server/shell/default_window_manager.cpp

src/server/shell/frontend_shell.cpp

src/server/shell/frontend_shell.h

src/server/shell/shell_wrapper.cpp

src/server/symbols.map

src/utils/screencast.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_errors.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/acceptance-tests/throwback/test_client_input.cpp

tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp

tests/include/mir_test/signal.h

tests/include/mir_test_doubles/mock_event_filter.h

tests/include/mir_test_doubles/mock_frontend_surface.h

tests/include/mir_test_doubles/mock_gbm.h

tests/include/mir_test_doubles/mock_shell.h

tests/include/mir_test_doubles/mock_window_manager.h

tests/include/mir_test_doubles/stub_scene_element.h

tests/include/mir_test_doubles/stub_scene_surface.h

tests/include/mir_test_framework/connected_client_with_a_surface.h

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

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/test_nested_input.cpp

tests/integration-tests/test_default_window_manager.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test/signal.cpp

tests/mir_test_doubles/mock_gbm.cpp

tests/mir_test_doubles/platform_factory.cpp

tests/mir_test_doubles/test_protobuf_client.cpp

tests/mir_test_framework/connected_client_with_a_surface.cpp

tests/mir_test_framework/fake_event_hub_server_configuration.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

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

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

tests/unit-tests/client/test_event_distributor.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/dispatch/test_threaded_dispatcher.cpp

tests/unit-tests/examples/test_demo_compositor.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

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

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

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

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

tests/unit-tests/graphics/nested/test_nested_display.cpp

tests/unit-tests/graphics/nested/test_nested_display_buffer.cpp

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

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

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

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

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

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

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

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/input/test_event_filter_chain.cpp

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/shell/test_default_window_manager.cpp

tools/setup-partial-armhf-chroot.sh

Show diffs side-by-side

added added

removed removed

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp

cmake/ABICheck.cmake

doc/kernel_requirements.md

doc/setup_kvm_for_mir.md

examples/CMakeLists.txt

examples/fingerpaint.c

examples/server_example.cpp

examples/server_example_adorning_compositor.cpp

examples/server_example_adorning_compositor.h

examples/server_example_basic_window_manager.h

examples/server_example_canonical_window_manager.cpp

examples/server_example_canonical_window_manager.h

examples/server_example_custom_compositor.cpp

examples/server_example_custom_compositor.h

examples/server_example_input_filter.cpp

examples/server_example_tiling_window_manager.cpp

examples/server_example_tiling_window_manager.h

examples/server_example_window_management.cpp

examples/target.c

include/client/mir/events/event_builders.h

include/client/mir_toolkit/events/event.h

include/client/mir_toolkit/mir_surface.h

include/common/mir/geometry/dimensions.h

include/common/mir/geometry/point.h

include/common/mir/optional_value.h

include/platform/mir/graphics/platform.h

include/server/mir/compositor/scene_element.h

include/server/mir/frontend/surface.h

include/server/mir/scene/surface.h

include/server/mir/scene/surface_creation_parameters.h

include/server/mir/shell/abstract_shell.h

include/server/mir/shell/shell.h

include/server/mir/shell/shell_wrapper.h

include/server/mir/shell/surface_specification.h

include/server/mir/shell/window_manager.h

playground/demo-shell/demo_compositor.cpp

playground/demo-shell/demo_renderer.cpp

playground/demo-shell/demo_renderer.h

playground/demo-shell/demo_shell.cpp

playground/demo-shell/window_manager.cpp

src/client/event.cpp

src/client/events/event_builders.cpp

src/client/input/android/android_input_lexicon.cpp

src/client/input/android/android_input_receiver.cpp

src/client/input/input_event.cpp

src/client/input/xkb_mapper.cpp

src/client/mir_connection.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/symbols.map

src/common/dispatch/threaded_dispatcher.cpp

src/common/geometry/ostream.cpp

src/common/logging/input_timestamp.cpp

src/common/logging/logger.cpp

src/common/symbols.map

src/common/thread/CMakeLists.txt

src/common/thread/signal_blocker.cpp

src/include/client/mir/client_platform_factory.h

src/include/common/mir/events/

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

src/include/common/mir/input/xkb_mapper.h

src/include/common/mir/signal_blocker.h

src/include/server/mir/compositor/gl_renderer.h

src/include/server/mir/default_server_configuration.h

src/include/server/mir/frontend/shell.h

src/include/server/mir/scene/surface_configurator.h

src/include/server/mir/shell/default_window_manager.h

src/platform/graphics/platform_probe.cpp

src/platform/udev/udev_wrapper.cpp

src/platforms/android/client/client_platform_factory.cpp

src/platforms/android/client/gralloc_registrar.cpp

src/platforms/android/server/android_buffer_allocator.cpp

src/platforms/android/server/android_graphic_buffer_allocator.h

src/platforms/android/server/buffer.cpp

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/platform.cpp

src/platforms/common/server/

src/platforms/common/server/symbols.map

src/platforms/mesa/client/client_platform_factory.cpp

src/platforms/mesa/server/buffer_allocator.cpp

src/platforms/mesa/server/buffer_allocator.h

src/platforms/mesa/server/kms_page_flipper.cpp

src/platforms/mesa/server/platform.cpp

src/platforms/mesa/server/real_kms_output.cpp

src/protobuf/mir_protobuf.proto

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/multi_threaded_compositor.h

src/server/compositor/recently_used_cache.cpp

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/event_sender.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/shell_wrapper.cpp

src/server/frontend/shell_wrapper.h

src/server/glib_main_loop_sources.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/display.cpp

src/server/graphics/nested/display.h

src/server/graphics/nested/display_buffer.cpp

src/server/graphics/nested/display_buffer.h

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/host_surface.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/surfaceless_egl_context.cpp

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/android_input_manager.cpp

src/server/input/android/event_filter_dispatcher_policy.cpp

src/server/input/android/event_filter_dispatcher_policy.h

src/server/input/android/input_sender.cpp

src/server/input/android/input_translator.cpp

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/null_input_dispatcher.cpp

src/server/input/vt_filter.cpp

src/server/report/lttng/message_processor_report.cpp

src/server/scene/application_session.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/default_session_container.cpp

src/server/scene/prompt_session_container.cpp

src/server/scene/surface_allocator.h

src/server/scene/surface_stack.cpp

src/server/shell/abstract_shell.cpp

src/server/shell/basic_window_manager.h

src/server/shell/canonical_window_manager.cpp

src/server/shell/canonical_window_manager.h

src/server/shell/default_window_manager.cpp

src/server/shell/frontend_shell.cpp

src/server/shell/frontend_shell.h

src/server/shell/shell_wrapper.cpp

src/server/symbols.map

src/utils/screencast.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_errors.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/acceptance-tests/test_render_override.cpp

tests/acceptance-tests/test_surface_modifications.cpp

tests/acceptance-tests/throwback/test_client_input.cpp

tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp

tests/include/mir_test/signal.h

tests/include/mir_test_doubles/mock_event_filter.h

tests/include/mir_test_doubles/mock_frontend_surface.h

tests/include/mir_test_doubles/mock_gbm.h

tests/include/mir_test_doubles/mock_shell.h

tests/include/mir_test_doubles/mock_surface_configurator.h

tests/include/mir_test_doubles/mock_window_manager.h

tests/include/mir_test_doubles/null_surface_configurator.h

tests/include/mir_test_doubles/stub_scene_element.h

tests/include/mir_test_doubles/stub_scene_surface.h

tests/include/mir_test_framework/connected_client_with_a_surface.h

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

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/test_nested_input.cpp

tests/integration-tests/test_default_window_manager.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test/signal.cpp

tests/mir_test_doubles/mock_gbm.cpp

tests/mir_test_doubles/platform_factory.cpp

tests/mir_test_doubles/test_protobuf_client.cpp

tests/mir_test_framework/connected_client_with_a_surface.cpp

tests/mir_test_framework/fake_event_hub_server_configuration.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

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

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

tests/unit-tests/client/test_event_distributor.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/dispatch/test_threaded_dispatcher.cpp

tests/unit-tests/examples/test_demo_compositor.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

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

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

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

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

tests/unit-tests/graphics/nested/test_nested_display.cpp

tests/unit-tests/graphics/nested/test_nested_display_buffer.cpp

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

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

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

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

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

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

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

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/input/test_event_filter_chain.cpp

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/shell/test_default_window_manager.cpp

tools/abi-check-mirclient-skip-symbols

tools/abi_dumps/

tools/generate-abi-base-dump.sh

tools/run_abi_compliance_checker.sh

tools/setup-partial-armhf-chroot.sh

Older »