~robertcarr/mir/add-log-all-option

« back to all changes in this revision

Viewing changes to examples/demo-shell/demo_shell.cpp

Committer: Tarmac
Author(s): Alan Griffiths
Date: 2013-11-01 10:09:33 UTC
mfrom: (1182.1.9 mir2)
Revision ID: tarmac-20131101100933-oxdyp7o5o02pgon0

shell: avoid publishing some internal headers.

Approved by PS Jenkins bot, Alexandros Frantzis.

files added:
src/server/shell/default_configuration.cpp

files renamed:
src/server/shell/unauthorized_display_changer.cpp => src/server/frontend/unauthorized_display_changer.cpp

include/server/mir/shell/unauthorized_display_changer.h => src/server/frontend/unauthorized_display_changer.h

include/server/mir/shell/broadcasting_session_event_sink.h => src/server/shell/broadcasting_session_event_sink.h

include/server/mir/shell/consuming_placement_strategy.h => src/server/shell/consuming_placement_strategy.h

include/server/mir/shell/default_focus_mechanism.h => src/server/shell/default_focus_mechanism.h

include/server/mir/shell/default_session_container.h => src/server/shell/default_session_container.h

include/server/mir/shell/gl_pixel_buffer.h => src/server/shell/gl_pixel_buffer.h

include/server/mir/shell/graphics_display_layout.h => src/server/shell/graphics_display_layout.h

include/server/mir/shell/mediating_display_changer.h => src/server/shell/mediating_display_changer.h

include/server/mir/shell/organising_surface_factory.h => src/server/shell/organising_surface_factory.h

include/server/mir/shell/registration_order_focus_sequence.h => src/server/shell/registration_order_focus_sequence.h

include/server/mir/shell/surface_source.h => src/server/shell/surface_source.h

include/server/mir/shell/threaded_snapshot_strategy.h => src/server/shell/threaded_snapshot_strategy.h

tests/unit-tests/shell/test_unauthorized_display_changer.cpp => tests/unit-tests/frontend/test_unauthorized_display_changer.cpp

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

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/server/mir/shell/application_session.h

include/server/mir/shell/session_manager.h

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/shell/CMakeLists.txt

src/server/shell/broadcasting_session_event_sink.cpp

src/server/shell/consuming_placement_strategy.cpp

src/server/shell/default_focus_mechanism.cpp

src/server/shell/default_session_container.cpp

src/server/shell/gl_pixel_buffer.cpp

src/server/shell/graphics_display_layout.cpp

src/server/shell/mediating_display_changer.cpp

src/server/shell/organising_surface_factory.cpp

src/server/shell/registration_order_focus_sequence.cpp

src/server/shell/surface_source.cpp

src/server/shell/threaded_snapshot_strategy.cpp

tests/acceptance-tests/test_focus_selection.cpp

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

tests/integration-tests/shell/test_session_manager.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/shell/test_broadcasting_session_event_sink.cpp

tests/unit-tests/shell/test_consuming_placement_strategy.cpp

tests/unit-tests/shell/test_default_focus_mechanism.cpp

tests/unit-tests/shell/test_gl_pixel_buffer.cpp

tests/unit-tests/shell/test_graphics_display_layout.cpp

tests/unit-tests/shell/test_mediating_display_changer.cpp

tests/unit-tests/shell/test_organising_surface_factory.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp

Show diffs side-by-side

added added

removed removed

examples/demo-shell/demo_shell.cpp

#include "mir/run_mir.h"

#include "mir/report_exception.h"

#include "mir/shell/session_manager.h"

#include "mir/shell/registration_order_focus_sequence.h"

#include "mir/shell/default_focus_mechanism.h"

#include "mir/shell/session_container.h"

#include "mir/shell/organising_surface_factory.h"

#include "mir/graphics/display.h"

#include "mir/input/composite_event_filter.h"

// We use this strange two stage initialization to avoid a circular dependency between the EventFilters

// and the SessionStore

wm->set_focus_controller(config.the_focus_controller());

100

wm->set_session_manager(config.the_session_manager());

101

wm->set_display(config.the_display());

102

wm->set_compositor(config.the_compositor());

103

});

Older »