lp://staging/~alan-griffiths/mir/surface-states-simplification
Created by
Alan Griffiths
and last modified
Only
Alan Griffiths
can upload to this branch. If you are
Alan Griffiths
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- PS Jenkins bot (community): Approve (continuous-integration)
- Chris Halse Rogers: Approve
- Robert Ancell: Approve
- Kevin DuBois (community): Approve
- Daniel van Vugt: Pending requested
-
Diff: 1924 lines (+334/-253)62 files modifiedexamples/demo-inprocess-egl/inprocess_egl_client.cpp (+1/-1)
include/server/mir/frontend/protobuf_ipc_factory.h (+4/-2)
include/server/mir/frontend/session.h (+0/-3)
include/server/mir/frontend/session_mediator.h (+5/-3)
include/server/mir/frontend/shell.h (+5/-2)
include/server/mir/shell/application_session.h (+11/-5)
include/server/mir/shell/organising_surface_factory.h (+4/-1)
include/server/mir/shell/session_manager.h (+1/-1)
include/server/mir/shell/surface.h (+13/-7)
include/server/mir/shell/surface_factory.h (+9/-1)
include/server/mir/shell/surface_source.h (+4/-1)
include/shared/mir/events/event_sink.h (+6/-5)
include/test/mir_test_doubles/mock_session.h (+0/-2)
include/test/mir_test_doubles/mock_shell.h (+1/-1)
include/test/mir_test_doubles/mock_surface_factory.h (+4/-1)
include/test/mir_test_doubles/stub_ipc_factory.h (+1/-1)
include/test/mir_test_doubles/stub_session.h (+1/-1)
include/test/mir_test_doubles/stub_shell.h (+1/-1)
src/client/make_rpc_channel.h (+2/-2)
src/client/make_socket_rpc_channel.cpp (+1/-1)
src/client/mir_basic_rpc_channel.cpp (+1/-3)
src/client/mir_basic_rpc_channel.h (+6/-0)
src/client/mir_client_library.cpp (+9/-13)
src/client/mir_connection.cpp (+2/-1)
src/client/mir_connection.h (+5/-4)
src/client/mir_socket_rpc_channel.cpp (+32/-33)
src/client/mir_socket_rpc_channel.h (+4/-4)
src/server/CMakeLists.txt (+0/-1)
src/server/default_server_configuration.cpp (+2/-1)
src/server/frontend/CMakeLists.txt (+1/-0)
src/server/frontend/event_pipe.cpp (+6/-7)
src/server/frontend/event_pipe.h (+12/-10)
src/server/frontend/protobuf_message_processor.cpp (+3/-1)
src/server/frontend/protobuf_message_processor.h (+2/-2)
src/server/frontend/protobuf_socket_communicator.cpp (+4/-5)
src/server/frontend/session_mediator.cpp (+2/-3)
src/server/shell/application_session.cpp (+14/-12)
src/server/shell/organising_surface_factory.cpp (+5/-2)
src/server/shell/session_manager.cpp (+4/-2)
src/server/shell/surface.cpp (+19/-12)
src/server/shell/surface_source.cpp (+7/-2)
src/shared/protobuf/mir_protobuf_wire.proto (+3/-1)
tests/acceptance-tests/test_focus_management_api.cpp (+4/-4)
tests/behavior-tests/session_management_context.cpp (+8/-4)
tests/integration-tests/cucumber/test_session_management_context.cpp (+3/-3)
tests/integration-tests/shell/test_session_manager.cpp (+8/-7)
tests/unit-tests/CMakeLists.txt (+0/-1)
tests/unit-tests/client/test_client_mir_surface.cpp (+1/-1)
tests/unit-tests/client/test_mir_connection.cpp (+3/-1)
tests/unit-tests/event/CMakeLists.txt (+0/-5)
tests/unit-tests/frontend/CMakeLists.txt (+1/-0)
tests/unit-tests/frontend/test_event_pipe.cpp (+14/-11)
tests/unit-tests/frontend/test_session_mediator.cpp (+9/-5)
tests/unit-tests/frontend/test_session_mediator_android.cpp (+9/-3)
tests/unit-tests/frontend/test_session_mediator_gbm.cpp (+9/-3)
tests/unit-tests/shell/test_application_session.cpp (+10/-9)
tests/unit-tests/shell/test_organising_surface_factory.cpp (+6/-5)
tests/unit-tests/shell/test_registration_order_focus_sequence.cpp (+11/-10)
tests/unit-tests/shell/test_session_manager.cpp (+16/-15)
tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp (+0/-1)
tests/unit-tests/shell/test_surface.cpp (+2/-0)
tests/unit-tests/shell/test_the_session_container_implementation.cpp (+3/-4)
Superseded
for merging
into
lp://staging/~vanvugt/mir/surface-states
- Daniel van Vugt: Disapprove
-
Diff: 4891 lines (+1736/-576) (has conflicts)104 files modifiedCMakeLists.txt (+8/-0)
doc/building_source_for_android.md (+33/-19)
doc/footer.html (+1/-1)
doc/mainpage.md (+8/-0)
examples/demo-inprocess-egl/demo_inprocess_egl.cpp (+12/-0)
examples/demo-inprocess-egl/inprocess_egl_client.cpp (+10/-6)
examples/demo_client.c (+22/-32)
examples/demo_client_accelerated.cpp (+1/-1)
examples/demo_client_unaccelerated.c (+1/-1)
examples/eglapp.c (+3/-4)
examples/render_surfaces.cpp (+131/-25)
include/client/mir_toolkit/mir_client_library.h (+4/-2)
include/server/mir/default_server_configuration.h (+3/-3)
include/server/mir/frontend/protobuf_ipc_factory.h (+12/-0)
include/server/mir/frontend/session.h (+3/-0)
include/server/mir/frontend/session_mediator.h (+15/-0)
include/server/mir/frontend/shell.h (+5/-2)
include/server/mir/input/input_manager.h (+0/-1)
include/server/mir/input/null_input_manager.h (+0/-5)
include/server/mir/input/null_input_target_listener.h (+26/-11)
include/server/mir/shell/application_session.h (+15/-1)
include/server/mir/shell/input_focus_selector.h (+0/-52)
include/server/mir/shell/input_target_listener.h (+59/-0)
include/server/mir/shell/organising_surface_factory.h (+4/-1)
include/server/mir/shell/session.h (+1/-0)
include/server/mir/shell/session_manager.h (+6/-3)
include/server/mir/shell/single_visibility_focus_mechanism.h (+1/-4)
include/server/mir/shell/surface.h (+23/-4)
include/server/mir/shell/surface_factory.h (+9/-1)
include/server/mir/shell/surface_source.h (+4/-1)
include/shared/mir/default_configuration.h (+29/-0)
include/shared/mir/events/event_sink.h (+47/-0)
include/shared/mir/graphics/android/sync_object.h (+1/-1)
include/test/mir_test_doubles/mock_android_buffer.h (+2/-2)
include/test/mir_test_doubles/mock_display_support_provider.h (+2/-2)
include/test/mir_test_doubles/mock_fb_device.h (+2/-2)
include/test/mir_test_doubles/mock_input_configuration.h (+3/-3)
include/test/mir_test_doubles/mock_input_dispatcher.h (+3/-3)
include/test/mir_test_doubles/mock_input_focus_selector.h (+0/-40)
include/test/mir_test_doubles/mock_input_target_listener.h (+49/-0)
include/test/mir_test_doubles/mock_shell.h (+1/-1)
include/test/mir_test_doubles/mock_surface.h (+6/-1)
include/test/mir_test_doubles/mock_surface_factory.h (+4/-1)
include/test/mir_test_doubles/null_virtual_terminal.h (+2/-2)
include/test/mir_test_doubles/stub_input_target_listener.h (+59/-0)
include/test/mir_test_doubles/stub_ipc_factory.h (+5/-0)
include/test/mir_test_doubles/stub_session.h (+6/-0)
include/test/mir_test_doubles/stub_shell.h (+1/-1)
include/test/mir_test_framework/testing_server_configuration.h (+1/-1)
src/client/client_buffer_depository.h (+2/-2)
src/client/mir_client_library.cpp (+3/-0)
src/client/mir_connection.h (+8/-0)
src/client/mir_socket_rpc_channel.cpp (+13/-0)
src/client/mir_socket_rpc_channel.h (+14/-0)
src/server/default_server_configuration.cpp (+16/-9)
src/server/display_server.cpp (+1/-1)
src/server/frontend/CMakeLists.txt (+1/-0)
src/server/frontend/event_pipe.cpp (+39/-0)
src/server/frontend/event_pipe.h (+45/-0)
src/server/frontend/protobuf_message_processor.cpp (+0/-8)
src/server/frontend/protobuf_message_processor.h (+9/-4)
src/server/frontend/protobuf_socket_communicator.cpp (+17/-0)
src/server/frontend/session_mediator.cpp (+8/-0)
src/server/graphics/gbm/linux_virtual_terminal.cpp (+2/-2)
src/server/graphics/gbm/linux_virtual_terminal.h (+2/-2)
src/server/graphics/gbm/virtual_terminal.h (+2/-2)
src/server/input/android/android_dispatcher_controller.cpp (+76/-26)
src/server/input/android/android_dispatcher_controller.h (+22/-9)
src/server/input/android/default_android_input_configuration.cpp (+6/-1)
src/server/input/android/default_android_input_configuration.h (+2/-0)
src/server/input/android/event_filter_dispatcher_policy.cpp (+4/-3)
src/server/input/android/event_filter_dispatcher_policy.h (+2/-1)
src/server/shell/application_session.cpp (+10/-3)
src/server/shell/organising_surface_factory.cpp (+5/-2)
src/server/shell/session_manager.cpp (+30/-11)
src/server/shell/single_visibility_focus_mechanism.cpp (+2/-7)
src/server/shell/surface.cpp (+15/-1)
src/server/shell/surface_source.cpp (+7/-2)
tests/acceptance-tests/test_client_input.cpp (+5/-6)
tests/acceptance-tests/test_focus_management_api.cpp (+4/-4)
tests/acceptance-tests/test_focus_selection.cpp (+21/-21)
tests/behavior-tests/session_management_context.cpp (+8/-4)
tests/death-tests/test_application_manager_death.cpp (+4/-3)
tests/integration-tests/cucumber/test_session_management_context.cpp (+3/-3)
tests/integration-tests/input/android/test_android_input_manager.cpp (+70/-12)
tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp (+1/-1)
tests/integration-tests/shell/test_session_manager.cpp (+34/-26)
tests/mir_test_framework/testing_server_options.cpp (+3/-11)
tests/unit-tests/CMakeLists.txt (+4/-0)
tests/unit-tests/frontend/CMakeLists.txt (+1/-0)
tests/unit-tests/frontend/test_event_pipe.cpp (+119/-0)
tests/unit-tests/frontend/test_session_mediator.cpp (+17/-3)
tests/unit-tests/frontend/test_session_mediator_android.cpp (+18/-1)
tests/unit-tests/frontend/test_session_mediator_gbm.cpp (+17/-1)
tests/unit-tests/input/android/test_android_dispatcher_controller.cpp (+148/-21)
tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp (+1/-1)
tests/unit-tests/shell/test_application_session.cpp (+23/-16)
tests/unit-tests/shell/test_organising_surface_factory.cpp (+6/-5)
tests/unit-tests/shell/test_registration_order_focus_sequence.cpp (+17/-11)
tests/unit-tests/shell/test_session_manager.cpp (+94/-22)
tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp (+1/-24)
tests/unit-tests/shell/test_surface.cpp (+97/-16)
tests/unit-tests/shell/test_the_session_container_implementation.cpp (+9/-4)
tools/setup-partial-armhf-chroot.sh (+5/-24)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/~mir-team/mir/trunk