← Back to branch summary

~robertcarr/mir/client-focus-notifications

~robertcarr/mir/client-focus-notifications

Viewing all changes in revision 706.257.38.

Committer: Robert Carr
Date: 2013-08-12 18:23:41 UTC
mfrom: (706.2.262 trunk)
mto: This revision was merged to the branch mainline in revision 763.
Revision ID: robert.carr@canonical.com-20130812182341-ounyh7lgxn2lkn2l

Merge trunk

files added:
debian/libmirplatform.install

include/server/mir/frontend/global_event_sender.h

include/test/mir_test_doubles/mock_shell_session.h

src/server/frontend/global_event_sender.cpp

src/server/frontend/surface.cpp

tests/integration-tests/test_server_client_types.cpp

tests/mir_test/display_config_matchers.cpp

tests/unit-tests/frontend/test_global_event_sender.cpp

files removed:
debian/source_mir.py

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/libmirserver1.install

debian/rules

doc/installing_prebuilt_on_pc.md

doc/using_mir_on_pc.md

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/eglapp.c

examples/render_surfaces.cpp

include/platform/mir/graphics/display_configuration.h

include/server/mir/compositor/multi_threaded_compositor.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/session.h

include/server/mir/frontend/surface.h

include/server/mir/shell/application_session.h

include/server/mir/shell/organising_surface_factory.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_builder.h

include/server/mir/shell/surface_factory.h

include/server/mir/shell/surface_source.h

include/server/mir/surfaces/surface_controller.h

include/shared/mir_toolkit/client_types.h

include/test/mir_test/display_config_matchers.h

include/test/mir_test_doubles/mock_drm.h

include/test/mir_test_doubles/mock_session.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_surface_factory.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_session.h

include/test/mir_test_doubles/stub_surface_builder.h

src/client/display_configuration.cpp

src/client/display_configuration.h

src/client/mir_connection.cpp

src/platform/graphics/CMakeLists.txt

src/platform/graphics/default_display_configuration_policy.cpp

src/platform/graphics/display_configuration.cpp

src/server/compositor/multi_threaded_compositor.cpp

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/event_sender.cpp

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/protobuf_buffer_packer.h

src/server/frontend/session_mediator.cpp

src/server/graphics/android/android_display.cpp

src/server/graphics/gbm/drm_mode_resources.cpp

src/server/graphics/gbm/drm_mode_resources.h

src/server/graphics/gbm/real_kms_display_configuration.cpp

src/server/graphics/gbm/real_kms_display_configuration.h

src/server/shell/application_session.cpp

src/server/shell/organising_surface_factory.cpp

src/server/shell/surface.cpp

src/server/shell/surface_source.cpp

src/server/surfaces/surface_controller.cpp

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_input.cpp

tests/integration-tests/CMakeLists.txt

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

tests/integration-tests/test_display_info.cpp

tests/mir_test/CMakeLists.txt

tests/mir_test_doubles/mock_drm.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_client_display_conf.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_event_sender.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

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

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

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

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

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

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_default_focus_mechanism.cpp

tests/unit-tests/shell/test_mediating_display_changer.cpp

tests/unit-tests/shell/test_organising_surface_factory.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/surfaces/test_surface_controller.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/libmirplatform.install

debian/libmirserver1.install

debian/source_mir.py

doc/installing_prebuilt_on_pc.md

doc/using_mir_on_pc.md

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/eglapp.c

examples/render_surfaces.cpp

include/platform/mir/graphics/display_configuration.h

include/server/mir/compositor/multi_threaded_compositor.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/global_event_sender.h

include/server/mir/frontend/session.h

include/server/mir/frontend/surface.h

include/server/mir/shell/application_session.h

include/server/mir/shell/organising_surface_factory.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_builder.h

include/server/mir/shell/surface_factory.h

include/server/mir/shell/surface_source.h

include/server/mir/surfaces/surface_controller.h

include/shared/mir_toolkit/client_types.h

include/test/mir_test/display_config_matchers.h

include/test/mir_test_doubles/mock_drm.h

include/test/mir_test_doubles/mock_session.h

include/test/mir_test_doubles/mock_shell_session.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_surface_factory.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_session.h

include/test/mir_test_doubles/stub_surface_builder.h

src/client/display_configuration.cpp

src/client/display_configuration.h

src/client/mir_connection.cpp

src/platform/graphics/CMakeLists.txt

src/platform/graphics/default_display_configuration_policy.cpp

src/platform/graphics/display_configuration.cpp

src/server/compositor/multi_threaded_compositor.cpp

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/event_sender.cpp

src/server/frontend/global_event_sender.cpp

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/protobuf_buffer_packer.h

src/server/frontend/session_mediator.cpp

src/server/frontend/surface.cpp

src/server/graphics/android/android_display.cpp

src/server/graphics/gbm/drm_mode_resources.cpp

src/server/graphics/gbm/drm_mode_resources.h

src/server/graphics/gbm/real_kms_display_configuration.cpp

src/server/graphics/gbm/real_kms_display_configuration.h

src/server/shell/application_session.cpp

src/server/shell/organising_surface_factory.cpp

src/server/shell/surface.cpp

src/server/shell/surface_source.cpp

src/server/surfaces/surface_controller.cpp

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_input.cpp

tests/integration-tests/CMakeLists.txt

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

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_server_client_types.cpp

tests/mir_test/CMakeLists.txt

tests/mir_test/display_config_matchers.cpp

tests/mir_test_doubles/mock_drm.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_client_display_conf.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_event_sender.cpp

tests/unit-tests/frontend/test_global_event_sender.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

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

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

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

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

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

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_default_focus_mechanism.cpp

tests/unit-tests/shell/test_mediating_display_changer.cpp

tests/unit-tests/shell/test_organising_surface_factory.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/surfaces/test_surface_controller.cpp

Older »