~kgunn72/mir/mir-mwc-ppa-disable-tests

Viewing changes to src/server/scene/application_session.cpp

Committer: Tarmac
Author(s): Alan Griffiths
Date: 2015-01-28 20:21:34 UTC
mfrom: (2257.1.31 mir3)
Revision ID: tarmac-20150128202134-dn97lf8gwk0xcqbc

shell, frontend: Provide a mir::shell::Shell customization point.

Approved by PS Jenkins bot, Kevin DuBois, Alexandros Frantzis.

files added:
include/server/mir/shell/shell.h

include/server/mir/shell/shell_wrapper.h

src/server/shell/frontend_shell.cpp

src/server/shell/frontend_shell.h

src/server/shell/shell_wrapper.cpp

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

include/server/mir/shell/surface_coordinator_wrapper.h

src/server/shell/session_coordinator_wrapper.cpp

src/server/shell/surface_coordinator_wrapper.cpp

files renamed:
include/server/mir/frontend/shell.h => src/include/server/mir/frontend/shell.h

files modified:
include/server/mir/scene/session.h

include/server/mir/server.h

playground/demo-shell/demo_shell.cpp

server-ABI-sha1sums

src/include/server/mir/default_server_configuration.h

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/default_configuration.cpp

src/server/server.cpp

src/server/shell/CMakeLists.txt

src/server/shell/default_configuration.cpp

src/server/shell/default_shell.cpp

src/server/shell/default_shell.h

src/server/symbols.map

tests/acceptance-tests/server_configuration_wrapping.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/acceptance-tests/throwback/test_client_input.cpp

tests/acceptance-tests/throwback/test_focus_selection.cpp

tests/include/mir_test_doubles/mock_scene_session.h

tests/include/mir_test_doubles/stub_scene_session.h

tests/integration-tests/client/test_mirsurface.cpp

tests/mir_test_framework/input_testing_server_options.cpp

Show diffs side-by-side

added added

removed removed

src/server/scene/application_session.cpp

* Authored by: Robert Carr <racarr@canonical.com>

#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER

#include "application_session.h"

#include "snapshot_strategy.h"

#include "default_session_container.h"

117

119

118

120

std::shared_ptr<mf::Surface> ms::ApplicationSession::get_surface(mf::SurfaceId id) const

119

121

{

122

return surface(id);

123

}

124

125

std::shared_ptr<ms::Surface> ms::ApplicationSession::surface(mf::SurfaceId id) const

126

{

120

127

std::unique_lock<std::mutex> lock(surfaces_mutex);

121

128

122

129

return checked_find(id)->second;

Older »