lp:~mir-team/mir/connect-display-request-merge-trunk
Created by
Robert Carr
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
Rejected
for merging
into
lp:~mir-team/mir/trunk
- PS Jenkins bot (community): Approve (continuous-integration)
- Mir development team: Pending requested
-
Diff: 2111 lines (+872/-419)37 files modifiedexamples/demo-inprocess-surface-client/inprocess_egl_client.cpp (+5/-4)
examples/demo-inprocess-surface-client/inprocess_egl_client.h (+5/-0)
examples/demo-shell/demo_shell.cpp (+1/-1)
examples/demo-shell/window_manager.cpp (+3/-3)
examples/demo-shell/window_manager.h (+3/-3)
include/server/mir/default_server_configuration.h (+0/-2)
include/server/mir/frontend/session.h (+1/-0)
include/server/mir/frontend/shell.h (+6/-2)
include/server/mir/shell/default_focus_mechanism.h (+22/-3)
include/server/mir/shell/display_changer.h (+4/-1)
include/server/mir/shell/focus_controller.h (+0/-44)
include/server/mir/shell/focus_setter.h (+9/-3)
include/server/mir/shell/mediating_display_changer.h (+22/-2)
include/server/mir/shell/session_manager.h (+9/-16)
include/server/mir/shell/unauthorized_display_changer.h (+4/-1)
include/test/mir_test_doubles/mock_display_changer.h (+3/-1)
include/test/mir_test_doubles/mock_focus_setter.h (+5/-1)
include/test/mir_test_doubles/mock_shell.h (+3/-0)
include/test/mir_test_doubles/null_display_changer.h (+7/-3)
include/test/mir_test_doubles/stub_session.h (+1/-5)
include/test/mir_test_doubles/stub_shell.h (+13/-2)
src/server/default_server_configuration.cpp (+9/-10)
src/server/frontend/session_mediator.cpp (+8/-2)
src/server/shell/default_focus_mechanism.cpp (+69/-14)
src/server/shell/mediating_display_changer.cpp (+55/-9)
src/server/shell/session_manager.cpp (+31/-61)
src/server/shell/unauthorized_display_changer.cpp (+10/-1)
tests/acceptance-tests/test_client_input.cpp (+5/-1)
tests/acceptance-tests/test_focus_selection.cpp (+19/-21)
tests/integration-tests/shell/CMakeLists.txt (+1/-1)
tests/integration-tests/test_display_info.cpp (+106/-12)
tests/unit-tests/frontend/test_session_mediator.cpp (+56/-2)
tests/unit-tests/shell/CMakeLists.txt (+1/-0)
tests/unit-tests/shell/test_default_focus_mechanism.cpp (+116/-46)
tests/unit-tests/shell/test_mediating_display_changer.cpp (+179/-0)
tests/unit-tests/shell/test_session_manager.cpp (+75/-120)
tests/unit-tests/shell/test_unauthorized_display_changer.cpp (+6/-22)
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:~mir-team/mir/trunk