← Back to branch summary

~robertcarr/mir/client-focus-notifications

~robertcarr/mir/client-focus-notifications

Viewing all changes in revision 757.

Committer: Robert Carr
Date: 2013-07-22 17:54:06 UTC
mfrom: (706.2.171 trunk)
Revision ID: robert.carr@canonical.com-20130722175406-kpheyf06xm7ibc3s

Merge trunk

files added:
include/server/mir/input/display_input_region.h

include/server/mir/input/input_region.h

include/server/mir/shell/display_layout.h

include/server/mir/shell/graphics_display_layout.h

include/test/mir_test_doubles/mock_display_layout.h

include/test/mir_test_doubles/mock_input_region.h

include/test/mir_test_doubles/stub_display_buffer.h

src/server/input/display_input_region.cpp

src/server/shell/graphics_display_layout.cpp

src/shared/geometry/rectangle.cpp

tests/unit-tests/input/test_display_input_region.cpp

tests/unit-tests/shell/test_graphics_display_layout.cpp

files removed:
include/server/mir/graphics/framebuffer_backend.h

include/server/mir/graphics/viewable_area.h

include/test/mir_test_doubles/mock_viewable_area.h

files renamed:
include/server/mir/graphics/compositing_criteria.h => include/server/mir/compositor/compositing_criteria.h

include/server/mir/graphics/gl_renderer.h => include/server/mir/compositor/gl_renderer.h

include/server/mir/graphics/renderer.h => include/server/mir/compositor/renderer.h

include/server/mir/compositor/buffer_basic.h => include/server/mir/graphics/buffer_basic.h

src/server/graphics/gl_renderer.cpp => src/server/compositor/gl_renderer.cpp

src/server/compositor/buffer_basic.cpp => src/server/graphics/buffer_basic.cpp

tests/unit-tests/graphics/test_gl_renderer.cpp => tests/unit-tests/compositor/test_gl_renderer.cpp

files modified:
CMakeLists.txt

debian/changelog

debian/libmirclient1.install

debian/libmirprotobuf0.install

debian/libmirserver0.install

debian/rules

examples/demo-shell/demo_shell.cpp

examples/demo-shell/fullscreen_placement_strategy.cpp

examples/demo-shell/fullscreen_placement_strategy.h

examples/render_surfaces.cpp

include/server/mir/compositor/default_compositing_strategy.h

include/server/mir/compositor/rendering_operator.h

include/server/mir/compositor/scene.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/session_mediator.h

include/server/mir/graphics/display.h

include/server/mir/graphics/gl_pixel_buffer.h

include/server/mir/input/input_manager.h

include/server/mir/shell/consuming_placement_strategy.h

include/server/mir/shell/pixel_buffer.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_creation_parameters.h

include/server/mir/surfaces/surface.h

include/server/mir/surfaces/surface_stack.h

include/server/mir/surfaces/surface_stack_model.h

include/server/mir/surfaces/surface_state.h

include/shared/mir/geometry/displacement.h

include/shared/mir/geometry/rectangle.h

include/shared/mir/geometry/rectangles.h

include/test/mir_test/fake_event_hub_input_configuration.h

include/test/mir_test_doubles/mock_buffer.h

include/test/mir_test_doubles/mock_compositing_criteria.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/null_display.h

include/test/mir_test_doubles/null_display_buffer.h

include/test/mir_test_doubles/stub_buffer.h

include/test/mir_test_framework/display_server_test_fixture.h

include/test/mir_test_framework/input_testing_server_configuration.h

include/test/mir_test_framework/testing_server_configuration.h

src/client/CMakeLists.txt

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

src/server/compositor/default_compositing_strategy.cpp

src/server/compositor/rendering_operator.cpp

src/server/default_server_configuration.cpp

src/server/frontend/make_protobuf_socket_communicator.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/CMakeLists.txt

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/buffer.cpp

src/server/graphics/android/buffer.h

src/server/graphics/gbm/gbm_buffer.cpp

src/server/graphics/gbm/gbm_buffer.h

src/server/graphics/gbm/internal_native_display.cpp

src/server/graphics/gl_pixel_buffer.cpp

src/server/input/CMakeLists.txt

src/server/input/android/android_input_manager.cpp

src/server/input/android/android_input_reader_policy.cpp

src/server/input/android/android_input_reader_policy.h

src/server/input/android/android_pointer_controller.cpp

src/server/input/android/android_pointer_controller.h

src/server/input/android/default_android_input_configuration.cpp

src/server/input/android/default_android_input_configuration.h

src/server/shell/CMakeLists.txt

src/server/shell/consuming_placement_strategy.cpp

src/server/shell/surface_creation_parameters.cpp

src/server/surfaces/surface.cpp

src/server/surfaces/surface_controller.cpp

src/server/surfaces/surface_stack.cpp

src/shared/geometry/CMakeLists.txt

src/shared/geometry/rectangles.cpp

src/shared/protobuf/CMakeLists.txt

tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/graphics/gbm/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/shell/test_session.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_drm_auth_magic.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_doubles/fake_event_hub_input_configuration.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_default_compositing_strategy.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/compositor/test_swapper_factory.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/geometry/test-rectangles.cpp

tests/unit-tests/graphics/CMakeLists.txt

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

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

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

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

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

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

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

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

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

tests/unit-tests/graphics/test_gl_pixel_buffer.cpp

tests/unit-tests/input/CMakeLists.txt

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

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

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

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/shell/test_consuming_placement_strategy.cpp

tests/unit-tests/surfaces/test_surface.cpp

tests/unit-tests/surfaces/test_surface_controller.cpp

tests/unit-tests/surfaces/test_surface_data.cpp

tests/unit-tests/surfaces/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/libmirclient1.install

debian/libmirprotobuf0.install

debian/libmirserver0.install

examples/demo-shell/demo_shell.cpp

examples/demo-shell/fullscreen_placement_strategy.cpp

examples/demo-shell/fullscreen_placement_strategy.h

examples/render_surfaces.cpp

include/server/mir/compositor/compositing_criteria.h

include/server/mir/compositor/default_compositing_strategy.h

include/server/mir/compositor/gl_renderer.h

include/server/mir/compositor/renderer.h

include/server/mir/compositor/rendering_operator.h

include/server/mir/compositor/scene.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/session_mediator.h

include/server/mir/graphics/buffer_basic.h

include/server/mir/graphics/display.h

include/server/mir/graphics/framebuffer_backend.h

include/server/mir/graphics/gl_pixel_buffer.h

include/server/mir/graphics/viewable_area.h

include/server/mir/input/display_input_region.h

include/server/mir/input/input_manager.h

include/server/mir/input/input_region.h

include/server/mir/shell/consuming_placement_strategy.h

include/server/mir/shell/display_layout.h

include/server/mir/shell/graphics_display_layout.h

include/server/mir/shell/pixel_buffer.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_creation_parameters.h

include/server/mir/surfaces/surface.h

include/server/mir/surfaces/surface_stack.h

include/server/mir/surfaces/surface_stack_model.h

include/server/mir/surfaces/surface_state.h

include/shared/mir/geometry/displacement.h

include/shared/mir/geometry/rectangle.h

include/shared/mir/geometry/rectangles.h

include/test/mir_test/fake_event_hub_input_configuration.h

include/test/mir_test_doubles/mock_buffer.h

include/test/mir_test_doubles/mock_compositing_criteria.h

include/test/mir_test_doubles/mock_display_layout.h

include/test/mir_test_doubles/mock_input_region.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/mock_viewable_area.h

include/test/mir_test_doubles/null_display.h

include/test/mir_test_doubles/null_display_buffer.h

include/test/mir_test_doubles/stub_buffer.h

include/test/mir_test_doubles/stub_display_buffer.h

include/test/mir_test_framework/display_server_test_fixture.h

include/test/mir_test_framework/input_testing_server_configuration.h

include/test/mir_test_framework/testing_server_configuration.h

src/client/CMakeLists.txt

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

src/server/compositor/default_compositing_strategy.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/rendering_operator.cpp

src/server/default_server_configuration.cpp

src/server/frontend/make_protobuf_socket_communicator.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/CMakeLists.txt

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/buffer.cpp

src/server/graphics/android/buffer.h

src/server/graphics/buffer_basic.cpp

src/server/graphics/gbm/gbm_buffer.cpp

src/server/graphics/gbm/gbm_buffer.h

src/server/graphics/gbm/internal_native_display.cpp

src/server/graphics/gl_pixel_buffer.cpp

src/server/input/CMakeLists.txt

src/server/input/android/android_input_manager.cpp

src/server/input/android/android_input_reader_policy.cpp

src/server/input/android/android_input_reader_policy.h

src/server/input/android/android_pointer_controller.cpp

src/server/input/android/android_pointer_controller.h

src/server/input/android/default_android_input_configuration.cpp

src/server/input/android/default_android_input_configuration.h

src/server/input/display_input_region.cpp

src/server/shell/CMakeLists.txt

src/server/shell/consuming_placement_strategy.cpp

src/server/shell/graphics_display_layout.cpp

src/server/shell/surface_creation_parameters.cpp

src/server/surfaces/surface.cpp

src/server/surfaces/surface_controller.cpp

src/server/surfaces/surface_stack.cpp

src/shared/geometry/CMakeLists.txt

src/shared/geometry/rectangle.cpp

src/shared/geometry/rectangles.cpp

src/shared/protobuf/CMakeLists.txt

tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/graphics/gbm/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/shell/test_session.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_drm_auth_magic.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_doubles/fake_event_hub_input_configuration.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_default_compositing_strategy.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/compositor/test_swapper_factory.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/geometry/test-rectangles.cpp

tests/unit-tests/graphics/CMakeLists.txt

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

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

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

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

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

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

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

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

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

tests/unit-tests/graphics/test_gl_pixel_buffer.cpp

tests/unit-tests/input/CMakeLists.txt

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

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

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

tests/unit-tests/input/test_display_input_region.cpp

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/shell/test_consuming_placement_strategy.cpp

tests/unit-tests/shell/test_graphics_display_layout.cpp

tests/unit-tests/surfaces/test_surface.cpp

tests/unit-tests/surfaces/test_surface_controller.cpp

tests/unit-tests/surfaces/test_surface_data.cpp

tests/unit-tests/surfaces/test_surface_stack.cpp

Older »