← Back to branch summary

~mir-team/mir/support-multiple-protocols-in-the-server

~mir-team/mir/support-multiple-protocols-in-the-server

Viewing all changes in revision 1463.

Committer: Christopher James Halse Rogers
Date: 2015-03-25 02:25:52 UTC
mfrom: (1414.949.52 development-branch)
Revision ID: christopher.halse.rogers@canonical.com-20150325022552-l1zxidug9nitnob1

Merge trunk

files added:
doc/snappy_appliances.md

examples/eglsquare.cpp

include/client/mir

include/common/mir/dispatch/action_queue.h

include/server/mir/shell/null_window_manager.h

snappy

snappy/CMakeLists.txt

snappy/copy-external-libs.sh

snappy/mir-demos.package.yaml.in

snappy/mir-run

snappy/mir.framework.in

snappy/mir.package.yaml.in

snappy/readme.md

src/client/lttng/perf_report.cpp

src/client/lttng/perf_report.h

src/client/lttng/perf_report_tp.h

src/common/dispatch/action_queue.cpp

src/include/client/mir/input

src/platform/udev

src/platform/udev/CMakeLists.txt

src/server/shell/default_window_manager.cpp

src/server/shell/default_window_manager.h

src/server/shell/null_window_manager.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/include/mir_test_doubles/mock_window_manager.h

tests/unit-tests/dispatch/test_action_queue.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tools/tsan-suppressions

tools/update_package_abis.sh

tools/valgrind_suppressions_glibc_2.21

files removed:
examples/server_example_generic_shell.cpp

examples/server_example_generic_shell.h

include/common/mir/input

src/server/shell/default_shell.cpp

src/server/shell/default_shell.h

files renamed:
cmake/FindGtest.cmake => cmake/FindGtestGmock.cmake

debian/libmircommon3.install => debian/libmircommon4.install

include/common/mir_toolkit/client_types.h => include/client/mir_toolkit/client_types.h

include/common/mir_toolkit/cursors.h => include/client/mir_toolkit/cursors.h

include/common/mir_toolkit/event.h => include/client/mir_toolkit/event.h

include/common/mir_toolkit/events/ => include/client/mir_toolkit/events/

examples/server_example_window_manager.h => include/server/mir/shell/window_manager.h

src/common/event.cpp => src/client/event.cpp

src/common/events/ => src/client/events/

src/common/input/ => src/client/input/

include/common/mir/events/ => src/include/client/mir/events/

include/common/mir/input/input_platform.h => src/include/client/mir/input/input_platform.h

src/include/common/mir/udev/ => src/include/platform/mir/udev/

src/common/input/udev_wrapper.cpp => src/platform/udev/udev_wrapper.cpp

tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp => tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/integration-tests/test_default_shell.cpp => tests/integration-tests/test_default_window_manager.cpp

tests/unit-tests/scene/test_default_shell.cpp => tests/unit-tests/shell/test_default_window_manager.cpp

files modified:
3rd_party/CMakeLists.txt

3rd_party/android-deps/std/Thread.h

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

CMakeLists.txt

cmake/MirCommon.cmake

cmake/src/mir/mir_discover_gtest_tests.cpp

debian/changelog

debian/control

debian/libmirclient-debug-extension1.install

debian/libmirclient-dev.install

debian/rules

doc/component_reports.md

doc/installing_prebuilt_on_android.md

doc/using_mir_on_android.md

examples/CMakeLists.txt

examples/eglapp.c

examples/progressbar.c

examples/server_example_basic_window_manager.h

examples/server_example_canonical_window_manager.cpp

examples/server_example_canonical_window_manager.h

examples/server_example_tiling_window_manager.cpp

examples/server_example_window_management.cpp

include/client/mir_toolkit/mir_client_library.h

include/common/mir_toolkit/common.h

include/platform/mir/graphics/buffer.h

include/platform/mir/graphics/display.h

include/server/mir/scene/surface.h

include/server/mir/shell/abstract_shell.h

include/server/mir/shell/shell.h

include/server/mir/shell/shell_wrapper.h

playground/demo-shell/window_manager.cpp

src/CMakeLists.txt

src/client/CMakeLists.txt

src/client/default_client_buffer_stream_factory.cpp

src/client/events/CMakeLists.txt

src/client/input/CMakeLists.txt

src/client/input/android/android_input_receiver.cpp

src/client/input/android/android_input_receiver.h

src/client/input/input_event.cpp

src/client/lttng/CMakeLists.txt

src/client/lttng/tracepoints.c

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_cursor_api.cpp

src/client/perf_report.h

src/client/symbols-debug.map

src/client/symbols.map

src/common/CMakeLists.txt

src/common/dispatch/CMakeLists.txt

src/common/sharedlibrary/CMakeLists.txt

src/common/symbols.map

src/include/common/mir/logging/input_timestamp.h

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

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

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

src/platform/CMakeLists.txt

src/platform/options/default_configuration.cpp

src/platform/symbols.map

src/platforms/android/server/display.cpp

src/platforms/android/server/framebuffer_bundle.h

src/platforms/android/server/framebuffers.cpp

src/platforms/android/server/framebuffers.h

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/hwc_blanking_control.cpp

src/platforms/android/server/server_render_window.cpp

src/platforms/android/server/server_render_window.h

src/platforms/mesa/server/display_buffer.cpp

src/platforms/mesa/server/display_buffer.h

src/protobuf/CMakeLists.txt

src/protobuf/mir_protobuf.proto

src/server/CMakeLists.txt

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.h

src/server/compositor/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor.h

src/server/compositor/default_display_buffer_compositor_factory.cpp

src/server/compositor/default_display_buffer_compositor_factory.h

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/multi_threaded_compositor.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_responder.cpp

src/server/frontend/protobuf_responder.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/frontend/shell_wrapper.cpp

src/server/frontend/shell_wrapper.h

src/server/frontend/surface_tracker.cpp

src/server/frontend/surface_tracker.h

src/server/graphics/nested/CMakeLists.txt

src/server/input/default_configuration.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/default_configuration.cpp

src/server/scene/legacy_scene_change_notification.cpp

src/server/scene/surface_allocator.cpp

src/server/scene/surface_allocator.h

src/server/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

src/server/shell/default_configuration.cpp

src/server/shell/frontend_shell.cpp

src/server/shell/frontend_shell.h

src/server/shell/shell_wrapper.cpp

src/server/symbols.map

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/server_configuration_wrapping.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_server_without_active_outputs.cpp

tests/acceptance-tests/test_unresponsive_client.cpp

tests/acceptance-tests/throwback/CMakeLists.txt

tests/acceptance-tests/throwback/clients.cpp

tests/acceptance-tests/throwback/test_focus_selection.cpp

tests/include/mir_test/auto_unblock_thread.h

tests/include/mir_test/signal.h

tests/include/mir_test_doubles/mock_framebuffer_bundle.h

tests/include/mir_test_doubles/mock_frontend_surface.h

tests/include/mir_test_doubles/mock_shell.h

tests/include/mir_test_doubles/stub_display_builder.h

tests/include/mir_test_doubles/stub_scene_surface.h

tests/include/mir_test_doubles/stub_shell.h

tests/include/mir_test_framework/async_server_runner.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/session_management.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/integration-tests/test_swapinterval.cpp

tests/integration-tests/test_test_framework.cpp

tests/mir_test/signal.cpp

tests/mir_test_framework/async_server_runner.cpp

tests/unit-tests/CMakeLists.txt

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

tests/unit-tests/client/mesa/test_client_platform.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/dispatch/CMakeLists.txt

tests/unit-tests/frontend/test_protobuf_message_processor.cpp

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

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

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

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

tests/unit-tests/input/test_cursor_controller.cpp

tests/unit-tests/input/test_xcursor_loader.cpp

tests/unit-tests/scene/CMakeLists.txt

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/test_fatal.cpp

tests/unit-tests/test_glib_main_loop.cpp

tools/process_doxygen_xml.py

tools/valgrind_suppressions_armhf

tools/valgrind_suppressions_generic

Show diffs side-by-side

added added

removed removed

3rd_party/CMakeLists.txt

3rd_party/android-deps/std/Thread.h

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

cmake/MirCommon.cmake

cmake/src/mir/mir_discover_gtest_tests.cpp

debian/changelog

debian/libmirclient-debug-extension1.install

debian/libmirclient-dev.install

debian/libmircommon4.install

doc/component_reports.md

doc/installing_prebuilt_on_android.md

doc/snappy_appliances.md

doc/using_mir_on_android.md

examples/CMakeLists.txt

examples/eglapp.c

examples/eglsquare.cpp

examples/progressbar.c

examples/server_example_basic_window_manager.h

examples/server_example_canonical_window_manager.cpp

examples/server_example_canonical_window_manager.h

examples/server_example_generic_shell.cpp

examples/server_example_generic_shell.h

examples/server_example_tiling_window_manager.cpp

examples/server_example_window_management.cpp

include/client/mir/

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/cursors.h

include/client/mir_toolkit/mir_client_library.h

include/common/mir/dispatch/action_queue.h

include/common/mir/input/

include/common/mir_toolkit/common.h

include/platform/mir/graphics/buffer.h

include/platform/mir/graphics/display.h

include/server/mir/scene/surface.h

include/server/mir/shell/abstract_shell.h

include/server/mir/shell/null_window_manager.h

include/server/mir/shell/shell.h

include/server/mir/shell/shell_wrapper.h

include/server/mir/shell/window_manager.h

playground/demo-shell/window_manager.cpp

snappy/CMakeLists.txt

snappy/copy-external-libs.sh

snappy/mir-demos.package.yaml.in

snappy/mir.framework.in

snappy/mir.package.yaml.in

snappy/readme.md

src/CMakeLists.txt

src/client/CMakeLists.txt

src/client/default_client_buffer_stream_factory.cpp

src/client/events/CMakeLists.txt

src/client/input/CMakeLists.txt

src/client/input/android/android_input_receiver.cpp

src/client/input/android/android_input_receiver.h

src/client/input/input_event.cpp

src/client/lttng/CMakeLists.txt

src/client/lttng/perf_report.cpp

src/client/lttng/perf_report.h

src/client/lttng/perf_report_tp.h

src/client/lttng/tracepoints.c

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_cursor_api.cpp

src/client/perf_report.h

src/client/symbols-debug.map

src/client/symbols.map

src/common/CMakeLists.txt

src/common/dispatch/CMakeLists.txt

src/common/dispatch/action_queue.cpp

src/common/sharedlibrary/CMakeLists.txt

src/common/symbols.map

src/include/client/mir/input/

src/include/common/mir/logging/input_timestamp.h

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

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

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

src/platform/CMakeLists.txt

src/platform/options/default_configuration.cpp

src/platform/symbols.map

src/platform/udev/

src/platform/udev/CMakeLists.txt

src/platforms/android/server/display.cpp

src/platforms/android/server/framebuffer_bundle.h

src/platforms/android/server/framebuffers.cpp

src/platforms/android/server/framebuffers.h

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/hwc_blanking_control.cpp

src/platforms/android/server/server_render_window.cpp

src/platforms/android/server/server_render_window.h

src/platforms/mesa/server/display_buffer.cpp

src/platforms/mesa/server/display_buffer.h

src/protobuf/CMakeLists.txt

src/protobuf/mir_protobuf.proto

src/server/CMakeLists.txt

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.h

src/server/compositor/default_configuration.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor.h

src/server/compositor/default_display_buffer_compositor_factory.cpp

src/server/compositor/default_display_buffer_compositor_factory.h

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/multi_threaded_compositor.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_responder.cpp

src/server/frontend/protobuf_responder.h

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/frontend/shell_wrapper.cpp

src/server/frontend/shell_wrapper.h

src/server/frontend/surface_tracker.cpp

src/server/frontend/surface_tracker.h

src/server/graphics/nested/CMakeLists.txt

src/server/input/default_configuration.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/default_configuration.cpp

src/server/scene/legacy_scene_change_notification.cpp

src/server/scene/surface_allocator.cpp

src/server/scene/surface_allocator.h

src/server/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

src/server/shell/default_configuration.cpp

src/server/shell/default_shell.cpp

src/server/shell/default_shell.h

src/server/shell/default_window_manager.cpp

src/server/shell/default_window_manager.h

src/server/shell/frontend_shell.cpp

src/server/shell/frontend_shell.h

src/server/shell/null_window_manager.cpp

src/server/shell/shell_wrapper.cpp

src/server/symbols.map

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/server_configuration_wrapping.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_server_without_active_outputs.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/acceptance-tests/test_unresponsive_client.cpp

tests/acceptance-tests/throwback/CMakeLists.txt

tests/acceptance-tests/throwback/clients.cpp

tests/acceptance-tests/throwback/test_focus_selection.cpp

tests/include/mir_test/auto_unblock_thread.h

tests/include/mir_test/signal.h

tests/include/mir_test_doubles/mock_framebuffer_bundle.h

tests/include/mir_test_doubles/mock_frontend_surface.h

tests/include/mir_test_doubles/mock_shell.h

tests/include/mir_test_doubles/mock_window_manager.h

tests/include/mir_test_doubles/stub_display_builder.h

tests/include/mir_test_doubles/stub_scene_surface.h

tests/include/mir_test_doubles/stub_shell.h

tests/include/mir_test_framework/async_server_runner.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/session_management.cpp

tests/integration-tests/test_default_window_manager.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/integration-tests/test_swapinterval.cpp

tests/integration-tests/test_test_framework.cpp

tests/mir_test/signal.cpp

tests/mir_test_framework/async_server_runner.cpp

tests/unit-tests/CMakeLists.txt

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

tests/unit-tests/client/mesa/test_client_platform.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/dispatch/CMakeLists.txt

tests/unit-tests/dispatch/test_action_queue.cpp

tests/unit-tests/frontend/test_protobuf_message_processor.cpp

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

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

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

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

tests/unit-tests/input/test_cursor_controller.cpp

tests/unit-tests/input/test_xcursor_loader.cpp

tests/unit-tests/scene/CMakeLists.txt

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/shell/test_default_window_manager.cpp

tests/unit-tests/test_fatal.cpp

tests/unit-tests/test_glib_main_loop.cpp

tools/process_doxygen_xml.py

tools/tsan-suppressions

tools/update_package_abis.sh

tools/valgrind_suppressions_armhf

tools/valgrind_suppressions_generic

tools/valgrind_suppressions_glibc_2.21

Older »