← Back to branch summary

~cemil-azizoglu/mir/improve-raii-take2

~cemil-azizoglu/mir/improve-raii-take2

« back to all changes in this revision

Viewing changes to src/server/server.cpp

Committer: Cemil Azizoglu
Date: 2015-02-26 23:37:35 UTC
mfrom: (2323.1.24 development-branch)
Revision ID: cemil.azizoglu@canonical.com-20150226233735-zm2j3eunf26b2hgb

Merge trunk.

files added:
include/common/mir/module_deleter.h

include/common/mir_toolkit/events/keymap_event.h

include/server/mir/lockable_callback.h

src/common/sharedlibrary/module_deleter.cpp

src/include/server/mir/basic_callback.h

src/include/server/mir/lockable_callback_wrapper.h

src/server/basic_callback.cpp

src/server/lockable_callback_wrapper.cpp

tests/include/mir_test_doubles/mock_lockable_callback.h

tests/include/mir_test_doubles/null_display_sync_group.h

tests/unit-tests/library_example.cpp

tests/unit-tests/library_example.h

tests/unit-tests/test_data/libinvalid.so.3

tests/unit-tests/test_lockable_callback.cpp

tests/unit-tests/test_module_deleter.cpp

files renamed:
debian/libmirserver29.install => debian/libmirserver31.install

debian/mir-client-platform-android.install => debian/mir-client-platform-android2.install

debian/mir-client-platform-mesa.install => debian/mir-client-platform-mesa2.install

debian/mir-platform-graphics-android.install => debian/mir-platform-graphics-android2.install

debian/mir-platform-graphics-mesa.install => debian/mir-platform-graphics-mesa2.install

include/server/mir/time/timer.h => include/server/mir/time/alarm_factory.h

tests/include/mir_test_doubles/stub_timer.h => tests/include/mir_test_doubles/stub_alarm.h

files modified:
CMakeLists.txt

benchmarks/frame-uniformity/main.cpp

benchmarks/frame-uniformity/touch_producing_server.cpp

benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp

debian/changelog

debian/control

examples/render_overlays.cpp

examples/render_surfaces.cpp

examples/render_to_fb.cpp

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_generic_shell.cpp

examples/server_example_generic_shell.h

examples/server_example_shell.cpp

examples/server_example_test_client.cpp

examples/server_example_tiling_window_manager.cpp

examples/server_example_tiling_window_manager.h

include/common/mir/events/event_builders.h

include/common/mir/geometry/dimensions.h

include/common/mir/geometry/displacement.h

include/common/mir/geometry/point.h

include/common/mir/input/input_platform.h

include/common/mir_toolkit/events/event.h

include/common/mir_toolkit/events/event_deprecated.h

include/platform/mir/graphics/cursor.h

include/platform/mir/graphics/display.h

include/platform/mir/graphics/display_buffer.h

include/server/mir/main_loop.h

include/server/mir/scene/null_surface_observer.h

include/server/mir/scene/surface.h

include/server/mir/scene/surface_coordinator.h

include/server/mir/scene/surface_observer.h

include/server/mir/server.h

include/server/mir/shell/abstract_shell.h

playground/demo-shell/demo_compositor.cpp

src/CMakeLists.txt

src/client/CMakeLists.txt

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/common/event.cpp

src/common/events/event_builders.cpp

src/common/geometry/rectangle.cpp

src/common/geometry/rectangles.cpp

src/common/input/CMakeLists.txt

src/common/input/android/android_input_platform.cpp

src/common/input/android/android_input_platform.h

src/common/input/android/android_input_receiver.cpp

src/common/input/android/android_input_receiver.h

src/common/input/xkb_mapper.cpp

src/common/sharedlibrary/CMakeLists.txt

src/common/sharedlibrary/shared_library_prober.cpp

src/common/symbols.map

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

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

src/include/server/mir/glib_main_loop.h

src/include/server/mir/glib_main_loop_sources.h

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

src/platform/graphics/platform_probe.cpp

src/platforms/CMakeLists.txt

src/platforms/android/client/CMakeLists.txt

src/platforms/android/server/CMakeLists.txt

src/platforms/android/server/configurable_display_buffer.h

src/platforms/android/server/display.cpp

src/platforms/android/server/display.h

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/display_buffer.h

src/platforms/mesa/client/CMakeLists.txt

src/platforms/mesa/server/CMakeLists.txt

src/platforms/mesa/server/cursor.cpp

src/platforms/mesa/server/cursor.h

src/platforms/mesa/server/display.cpp

src/platforms/mesa/server/display.h

src/platforms/mesa/server/display_buffer.cpp

src/platforms/mesa/server/display_buffer.h

src/server/CMakeLists.txt

src/server/compositor/buffer_queue.cpp

src/server/compositor/buffer_queue.h

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/screencast_display_buffer.cpp

src/server/compositor/screencast_display_buffer.h

src/server/compositor/timeout_frame_dropping_policy_factory.cpp

src/server/compositor/timeout_frame_dropping_policy_factory.h

src/server/glib_main_loop.cpp

src/server/glib_main_loop_sources.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_output.cpp

src/server/graphics/nested/nested_output.h

src/server/graphics/offscreen/display.cpp

src/server/graphics/offscreen/display.h

src/server/graphics/offscreen/display_buffer.cpp

src/server/graphics/offscreen/display_buffer.h

src/server/graphics/software_cursor.cpp

src/server/graphics/software_cursor.h

src/server/input/android/input_sender.cpp

src/server/input/cursor_controller.cpp

src/server/input/display_input_region.cpp

src/server/input/touchspot_controller.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/default_coordinate_translator.cpp

src/server/scene/legacy_surface_change_notification.cpp

src/server/scene/legacy_surface_change_notification.h

src/server/scene/null_surface_observer.cpp

src/server/scene/surface_controller.cpp

src/server/scene/surface_controller.h

src/server/scene/surface_event_source.cpp

src/server/scene/surface_stack.cpp

src/server/scene/surface_stack.h

src/server/scene/surface_stack_model.h

src/server/server.cpp

src/server/shell/abstract_shell.cpp

src/server/shell/graphics_display_layout.cpp

src/server/symbols.map

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_symbols_required_by_mesa.cpp

tests/acceptance-tests/throwback/test_client_cursor_api.cpp

tests/acceptance-tests/throwback/test_client_input.cpp

tests/include/mir_test/event_matchers.h

tests/include/mir_test_doubles/mock_display.h

tests/include/mir_test_doubles/mock_display_buffer.h

tests/include/mir_test_doubles/mock_frame_dropping_policy_factory.h

tests/include/mir_test_doubles/mock_main_loop.h

tests/include/mir_test_doubles/mock_surface_coordinator.h

tests/include/mir_test_doubles/mock_timer.h

tests/include/mir_test_doubles/null_display.h

tests/include/mir_test_doubles/null_display_buffer.h

tests/include/mir_test_doubles/stub_display.h

tests/include/mir_test_doubles/stub_frame_dropping_policy_factory.h

tests/include/mir_test_doubles/stub_scene_surface.h

tests/include/mir_test_doubles/triggered_main_loop.h

tests/include/mir_test_framework/client_platform_factory.h

tests/integration-tests/compositor/test_buffer_stream.cpp

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

tests/integration-tests/test_default_shell.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_test_framework.cpp

tests/mir_test_doubles/mock_frame_dropping_policy_factory.cpp

tests/mir_test_doubles/mock_timer.cpp

tests/mir_test_doubles/triggered_main_loop.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/executable_path.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/CMakeLists.txt

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

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

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

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_client_platform.cpp

tests/unit-tests/client/test_probing_client_platform_factory.cpp

tests/unit-tests/compositor/test_buffer_queue.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_timeout_frame_dropping_policy.cpp

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

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

tests/unit-tests/graphics/android/test_platform.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_multi_monitor.cpp

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

tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/graphics/test_platform_prober.cpp

tests/unit-tests/graphics/test_software_cursor.cpp

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

tests/unit-tests/input/test_cursor_controller.cpp

tests/unit-tests/input/test_display_input_region.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_surface_controller.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/shared_library_test.cpp

tests/unit-tests/test_glib_main_loop.cpp

tests/unit-tests/test_raii.cpp

tests/unit-tests/test_shared_library_prober.cpp

Show diffs side-by-side

added added

removed removed

src/server/server.cpp

67

67

MACRO(the_compositor)\

68

68

MACRO(the_composite_event_filter)\

69

69

MACRO(the_cursor_listener)\

70

MACRO(the_cursor)\

70

71

MACRO(the_display)\

71

72

MACRO(the_focus_controller)\

72

73

MACRO(the_gl_config)\

Older »