← Back to branch summary

~robertcarr/mir/input-conglomeration

~robertcarr/mir/input-conglomeration

Viewing all changes in revision 638.

Committer: Robert Carr
Date: 2013-04-30 18:41:05 UTC
mfrom: (603.1.40 trunk)
Revision ID: robert.carr@canonical.com-20130430184105-bzs74a9j42tuc5hq

Merge trunk

files added:
include/server/mir/report_exception.h

include/shared/mir/events

src/server/report_exception.cpp

files removed:
tests/unit-tests/event

tests/unit-tests/event/CMakeLists.txt

files renamed:
include/shared/mir/event_sink.h => include/shared/mir/events/event_sink.h

src/server/event_queue.cpp => src/server/frontend/event_pipe.cpp

include/server/mir/event_queue.h => src/server/frontend/event_pipe.h

tests/unit-tests/event/test_event_queue.cpp => tests/unit-tests/frontend/test_event_pipe.cpp

files modified:
HACKING.md

cmake/Doxygen.cmake

debian/control

doc/mainpage.md

examples/demo-inprocess-egl/demo_inprocess_egl.cpp

examples/demo-inprocess-egl/inprocess_egl_client.cpp

examples/demo-shell/demo_shell.cpp

examples/render_surfaces.cpp

guides/CMakeLists.txt

include/server/mir/compositor/rendering_operator.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/session.h

include/server/mir/frontend/session_mediator.h

include/server/mir/frontend/shell.h

include/server/mir/graphics/display_report.h

include/server/mir/graphics/gl_renderer.h

include/server/mir/graphics/null_display_report.h

include/server/mir/graphics/renderer.h

include/server/mir/logging/display_report.h

include/server/mir/run_mir.h

include/server/mir/shell/application_session.h

include/server/mir/shell/organising_surface_factory.h

include/server/mir/shell/session_manager.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_factory.h

include/server/mir/shell/surface_source.h

include/shared/mir_toolkit/event.h

include/test/mir_test/event_factory.h

include/test/mir_test/event_matchers.h

include/test/mir_test/gl_mock.h

include/test/mir_test_doubles/mock_display_report.h

include/test/mir_test_doubles/mock_event_filter.h

include/test/mir_test_doubles/mock_session.h

include/test/mir_test_doubles/mock_shell.h

include/test/mir_test_doubles/mock_surface_factory.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_session.h

include/test/mir_test_doubles/stub_shell.h

src/client/make_rpc_channel.h

src/client/make_socket_rpc_channel.cpp

src/client/mir_basic_rpc_channel.cpp

src/client/mir_basic_rpc_channel.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_socket_rpc_channel.cpp

src/client/mir_socket_rpc_channel.h

src/server/CMakeLists.txt

src/server/compositor/rendering_operator.cpp

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_socket_communicator.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/android_display_allocator.cpp

src/server/graphics/android/android_display_allocator.h

src/server/graphics/android/android_display_factory.cpp

src/server/graphics/android/android_display_factory.h

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/android_platform.h

src/server/graphics/android/display_allocator.h

src/server/graphics/android/hwc_display.cpp

src/server/graphics/android/hwc_display.h

src/server/graphics/gbm/gbm_buffer_allocator.cpp

src/server/graphics/gl_renderer.cpp

src/server/graphics/null_display_report.cpp

src/server/logging/display_report.cpp

src/server/main.cpp

src/server/shell/application_session.cpp

src/server/shell/organising_surface_factory.cpp

src/server/shell/session_manager.cpp

src/server/shell/surface.cpp

src/server/shell/surface_source.cpp

src/shared/input/android_input_lexicon.cpp

src/shared/protobuf/mir_protobuf_wire.proto

tests/acceptance-tests/test_focus_management_api.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/behavior-tests/session_management_context.cpp

tests/integration-tests/cucumber/test_session_management_context.cpp

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

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

tests/integration-tests/shell/test_session_manager.cpp

tests/mir_test_doubles/event_factory.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

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

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

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

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

tests/unit-tests/graphics/egl_mock/gl_mock.cpp

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp

tests/unit-tests/graphics/test_gl_renderer.cpp

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_organising_surface_factory.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

Show diffs side-by-side

added added

removed removed

cmake/Doxygen.cmake

doc/mainpage.md

examples/demo-inprocess-egl/demo_inprocess_egl.cpp

examples/demo-inprocess-egl/inprocess_egl_client.cpp

examples/demo-shell/demo_shell.cpp

examples/render_surfaces.cpp

guides/CMakeLists.txt

include/server/mir/compositor/rendering_operator.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/session.h

include/server/mir/frontend/session_mediator.h

include/server/mir/frontend/shell.h

include/server/mir/graphics/display_report.h

include/server/mir/graphics/gl_renderer.h

include/server/mir/graphics/null_display_report.h

include/server/mir/graphics/renderer.h

include/server/mir/logging/display_report.h

include/server/mir/report_exception.h

include/server/mir/run_mir.h

include/server/mir/shell/application_session.h

include/server/mir/shell/organising_surface_factory.h

include/server/mir/shell/session_manager.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_factory.h

include/server/mir/shell/surface_source.h

include/shared/mir/events/

include/shared/mir/events/event_sink.h

include/shared/mir_toolkit/event.h

include/test/mir_test/event_factory.h

include/test/mir_test/event_matchers.h

include/test/mir_test/gl_mock.h

include/test/mir_test_doubles/mock_display_report.h

include/test/mir_test_doubles/mock_event_filter.h

include/test/mir_test_doubles/mock_session.h

include/test/mir_test_doubles/mock_shell.h

include/test/mir_test_doubles/mock_surface_factory.h

include/test/mir_test_doubles/mock_surface_renderer.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_session.h

include/test/mir_test_doubles/stub_shell.h

src/client/make_rpc_channel.h

src/client/make_socket_rpc_channel.cpp

src/client/mir_basic_rpc_channel.cpp

src/client/mir_basic_rpc_channel.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_socket_rpc_channel.cpp

src/client/mir_socket_rpc_channel.h

src/server/CMakeLists.txt

src/server/compositor/rendering_operator.cpp

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/event_pipe.cpp

src/server/frontend/event_pipe.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_socket_communicator.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/android_display_allocator.cpp

src/server/graphics/android/android_display_allocator.h

src/server/graphics/android/android_display_factory.cpp

src/server/graphics/android/android_display_factory.h

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/android_platform.h

src/server/graphics/android/display_allocator.h

src/server/graphics/android/hwc_display.cpp

src/server/graphics/android/hwc_display.h

src/server/graphics/gbm/gbm_buffer_allocator.cpp

src/server/graphics/gl_renderer.cpp

src/server/graphics/null_display_report.cpp

src/server/logging/display_report.cpp

src/server/main.cpp

src/server/report_exception.cpp

src/server/shell/application_session.cpp

src/server/shell/organising_surface_factory.cpp

src/server/shell/session_manager.cpp

src/server/shell/surface.cpp

src/server/shell/surface_source.cpp

src/shared/input/android_input_lexicon.cpp

src/shared/protobuf/mir_protobuf_wire.proto

tests/acceptance-tests/test_focus_management_api.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/behavior-tests/session_management_context.cpp

tests/integration-tests/cucumber/test_session_management_context.cpp

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

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

tests/integration-tests/shell/test_session_manager.cpp

tests/mir_test_doubles/event_factory.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/event/

tests/unit-tests/event/CMakeLists.txt

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_event_pipe.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

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

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

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

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

tests/unit-tests/graphics/egl_mock/gl_mock.cpp

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp

tests/unit-tests/graphics/test_gl_renderer.cpp

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_organising_surface_factory.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

Older »