← Back to branch summary

~robertcarr/mir/client-focus-notifications

~robertcarr/mir/client-focus-notifications

Viewing all changes in revision 758.

Committer: Robert Carr
Date: 2013-07-24 20:24:58 UTC
mfrom: (706.2.177 trunk)
Revision ID: robert.carr@canonical.com-20130724202458-exuoaovciq5ro0u4

Merge trunk

files added:
include/server/mir/compositor/display_buffer_compositor_factory.h

include/server/mir/compositor/gl_renderer_factory.h

include/server/mir/compositor/renderer_factory.h

include/test/mir_test_doubles/mock_buffer_allocator.h

include/test/mir_test_doubles/mock_session_listener.h

src/client/display_configuration.cpp

src/client/display_configuration.h

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/gl_renderer.cpp

src/server/compositor/gl_renderer.h

src/server/compositor/gl_renderer_factory.cpp

files removed:
include/server/mir/compositor/gl_renderer.h

src/server/compositor/default_compositing_strategy.cpp

src/server/compositor/gl_renderer.cpp

files renamed:
include/server/mir/compositor/basic_compositing_strategy.h => include/server/mir/compositor/basic_display_buffer_compositor.h

include/server/mir/compositor/default_compositing_strategy.h => include/server/mir/compositor/default_display_buffer_compositor_factory.h

include/server/mir/compositor/compositing_strategy.h => include/server/mir/compositor/display_buffer_compositor.h

include/server/mir/graphics/gl_pixel_buffer.h => include/server/mir/shell/gl_pixel_buffer.h

src/server/compositor/basic_compositing_strategy.cpp => src/server/compositor/basic_display_buffer_compositor.cpp

src/server/graphics/gl_pixel_buffer.cpp => src/server/shell/gl_pixel_buffer.cpp

tests/unit-tests/compositor/test_default_compositing_strategy.cpp => tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/graphics/test_gl_pixel_buffer.cpp => tests/unit-tests/shell/test_gl_pixel_buffer.cpp

files modified:
examples/demo_client.c

examples/demo_client_accelerated.cpp

examples/demo_client_unaccelerated.c

examples/eglapp.c

examples/fingerpaint.c

examples/multiwin.c

examples/render_surfaces.cpp

include/client/mir_toolkit/mir_client_library.h

include/server/mir/compositor/multi_threaded_compositor.h

include/server/mir/default_server_configuration.h

include/server/mir/shell/application_session.h

include/server/mir/shell/null_session_listener.h

include/server/mir/shell/session_listener.h

include/shared/mir_toolkit/client_types.h

include/test/mir_test_framework/display_server_test_fixture.h

include/test/mir_test_framework/testing_server_configuration.h

src/client/CMakeLists.txt

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/server/compositor/CMakeLists.txt

src/server/compositor/multi_threaded_compositor.cpp

src/server/default_server_configuration.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/CMakeLists.txt

src/server/graphics/gbm/linux_virtual_terminal.cpp

src/server/shell/CMakeLists.txt

src/server/shell/application_session.cpp

src/server/shell/session_manager.cpp

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/compositor/test_swapping_swappers.cpp

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir-stress/src/client.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

Show diffs side-by-side

added added

removed removed

examples/demo_client.c

examples/demo_client_accelerated.cpp

examples/demo_client_unaccelerated.c

examples/eglapp.c

examples/fingerpaint.c

examples/multiwin.c

examples/render_surfaces.cpp

include/client/mir_toolkit/mir_client_library.h

include/server/mir/compositor/basic_display_buffer_compositor.h

include/server/mir/compositor/default_display_buffer_compositor_factory.h

include/server/mir/compositor/display_buffer_compositor.h

include/server/mir/compositor/display_buffer_compositor_factory.h

include/server/mir/compositor/gl_renderer.h

include/server/mir/compositor/gl_renderer_factory.h

include/server/mir/compositor/multi_threaded_compositor.h

include/server/mir/compositor/renderer_factory.h

include/server/mir/default_server_configuration.h

include/server/mir/shell/application_session.h

include/server/mir/shell/gl_pixel_buffer.h

include/server/mir/shell/null_session_listener.h

include/server/mir/shell/session_listener.h

include/shared/mir_toolkit/client_types.h

include/test/mir_test_doubles/mock_buffer_allocator.h

include/test/mir_test_doubles/mock_session_listener.h

include/test/mir_test_framework/display_server_test_fixture.h

include/test/mir_test_framework/testing_server_configuration.h

src/client/CMakeLists.txt

src/client/display_configuration.cpp

src/client/display_configuration.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/server/compositor/CMakeLists.txt

src/server/compositor/basic_display_buffer_compositor.cpp

src/server/compositor/default_compositing_strategy.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/gl_renderer.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer.h

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/multi_threaded_compositor.cpp

src/server/default_server_configuration.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/CMakeLists.txt

src/server/graphics/gbm/linux_virtual_terminal.cpp

src/server/shell/CMakeLists.txt

src/server/shell/application_session.cpp

src/server/shell/gl_pixel_buffer.cpp

src/server/shell/session_manager.cpp

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/compositor/test_swapping_swappers.cpp

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir-stress/src/client.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/CMakeLists.txt

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/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_gl_pixel_buffer.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

Older »