← Back to branch summary

~robertcarr/mir/client-focus-notifications

~robertcarr/mir/client-focus-notifications

« back to all changes in this revision

Viewing changes to include/server/mir/frontend/session.h

Committer: Robert Carr
Date: 2013-08-12 18:47:49 UTC
mfrom: (706.257.38 connect-display-request)
Revision ID: robert.carr@canonical.com-20130812184749-3mlmw8xw01927mua

Merge lp:~kdub/mir/connect-display-request

files added:
tests/integration-tests/test_server_client_types.cpp

tests/unit-tests/shell/test_mediating_display_changer.cpp

files removed:
include/server/mir/shell/focus_controller.h

files modified:
examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

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

examples/demo-shell/demo_shell.cpp

examples/demo-shell/window_manager.cpp

examples/demo-shell/window_manager.h

include/platform/mir/graphics/display_configuration.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/session.h

include/server/mir/frontend/shell.h

include/server/mir/shell/default_focus_mechanism.h

include/server/mir/shell/display_changer.h

include/server/mir/shell/focus_setter.h

include/server/mir/shell/mediating_display_changer.h

include/server/mir/shell/session_manager.h

include/server/mir/shell/unauthorized_display_changer.h

include/shared/mir_toolkit/client_types.h

include/test/mir_test_doubles/mock_display_changer.h

include/test/mir_test_doubles/mock_drm.h

include/test/mir_test_doubles/mock_focus_setter.h

include/test/mir_test_doubles/mock_shell.h

include/test/mir_test_doubles/null_display_changer.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_session.h

include/test/mir_test_doubles/stub_shell.h

src/client/display_configuration.cpp

src/client/display_configuration.h

src/platform/graphics/default_display_configuration_policy.cpp

src/platform/graphics/display_configuration.cpp

src/server/default_server_configuration.cpp

src/server/frontend/protobuf_buffer_packer.cpp

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/default_focus_mechanism.cpp

src/server/shell/mediating_display_changer.cpp

src/server/shell/session_manager.cpp

src/server/shell/unauthorized_display_changer.cpp

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/shell/CMakeLists.txt

tests/integration-tests/test_display_info.cpp

tests/mir_test/display_config_matchers.cpp

tests/mir_test_doubles/mock_drm.cpp

tests/mir_test_framework/input_testing_server_options.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/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/CMakeLists.txt

tests/unit-tests/shell/test_default_focus_mechanism.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_unauthorized_display_changer.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/frontend/session.h

21

21

22

22

#include "mir_toolkit/common.h"

23

23

#include "mir/frontend/surface_id.h"

24

#include "mir/shell/surface_creation_parameters.h"

24

25

25

26

#include <mutex>

26

27

#include <atomic>

Older »