lp:~robertcarr/mir/client-focus-notifications

Branch merges

Merged into lp:~mir-team/mir/trunk at revision 1003

PS Jenkins bot: Approve (continuous-integration) on 2013-08-23

kevin gunn (community): Approve on 2013-08-23

Daniel van Vugt: Needs Fixing on 2013-08-22

Alan Griffiths: Abstain on 2013-08-21

Robert Ancell: Approve on 2013-08-21

Chris Halse Rogers: Approve on 2013-08-20

Alexandros Frantzis: Pending requested 2013-08-19

Diff: 1138 lines (+481/-104)

31 files modified

include/server/mir/frontend/message_processor_report.h (+4/-0)
include/server/mir/frontend/null_message_processor_report.h (+2/-0)
include/server/mir/frontend/shell.h (+2/-0)
include/server/mir/logging/message_processor_report.h (+2/-0)
include/server/mir/lttng/message_processor_report.h (+1/-0)
include/server/mir/shell/default_focus_mechanism.h (+7/-1)
include/server/mir/shell/session_manager.h (+2/-0)
include/shared/mir_toolkit/common.h (+12/-3)
include/test/mir_test/event_matchers.h (+14/-0)
include/test/mir_test_doubles/mock_shell.h (+1/-0)
include/test/mir_test_doubles/stub_shell.h (+4/-1)
include/test/mir_test_framework/input_testing_server_configuration.h (+2/-3)
src/client/mir_connection.cpp (+4/-1)
src/client/mir_surface.cpp (+3/-4)
src/client/mir_surface.h (+1/-1)
src/server/frontend/null_message_processor_report.cpp (+4/-0)
src/server/frontend/session_mediator.cpp (+35/-29)
src/server/frontend/socket_messenger.cpp (+2/-0)
src/server/logging/message_processor_report.cpp (+6/-3)
src/server/lttng/message_processor_report.cpp (+6/-0)
src/server/shell/default_focus_mechanism.cpp (+7/-0)
src/server/shell/session_manager.cpp (+13/-2)
src/server/shell/surface.cpp (+5/-2)
tests/acceptance-tests/CMakeLists.txt (+1/-0)
tests/acceptance-tests/test_client_focus_notification.cpp (+232/-0)
tests/acceptance-tests/test_client_input.cpp (+3/-1)
tests/acceptance-tests/test_focus_selection.cpp (+1/-0)
tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp (+7/-0)
tests/mir_test_framework/input_testing_server_options.cpp (+38/-53)
tests/unit-tests/shell/test_default_focus_mechanism.cpp (+26/-0)
tests/unit-tests/shell/test_surface.cpp (+34/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1102757: System compositor children receive all input events	High	Fix Released
Bug #1201435: Intermittent hangs in TestClientInput.clients_receive_key_input and TestClientInput.clients_receive_us_english_mapped_keys tests	High	Fix Committed

Link a bug report

Related blueprints

782. By Robert Carr on 2013-08-22

Merge trunk

781. By Robert Carr on 2013-08-20

Cleanup

780. By Robert Carr on 2013-08-20

Merge trunk

779. By Robert Carr on 2013-08-19

Fix some indentation

778. By Robert Carr on 2013-08-19

Comment in stub lttng impl

777. By Robert Carr on 2013-08-19

Fix DefaultFocusMechanism locking

776. By Robert Carr on 2013-08-19

Backout accidental rever mserge

775. By Robert Carr on 2013-08-19

Merge trunk

774. By Robert Carr on 2013-08-15

Merge trunk

773. By Robert Carr on 2013-08-13

Merge trunk