~alan-griffiths/mir/0.21-hacks

« back to all changes in this revision

Viewing changes to include/server/mir/shell/application_session.h

Committer: Daniel van Vugt
Date: 2013-04-24 05:22:20 UTC
mfrom: (628 trunk)
mto: This revision was merged to the branch mainline in revision 629.
Revision ID: daniel.van.vugt@canonical.com-20130424052220-qhpyhw2resxzr7bq

Merge latest lp:mir

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

include/shared/mir/event_sink.h

src/server/event_queue.cpp

tests/unit-tests/event

tests/unit-tests/event/CMakeLists.txt

tests/unit-tests/event/test_event_queue.cpp

files modified:
include/client/mir_toolkit/mir_client_library.h

include/server/mir/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/session.h

include/server/mir/frontend/session_mediator.h

include/server/mir/shell/application_session.h

include/server/mir/shell/surface.h

include/shared/mir_toolkit/common.h

include/shared/mir_toolkit/event.h

include/test/mir_test_doubles/mock_session.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_session.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_socket_rpc_channel.cpp

src/client/mir_socket_rpc_channel.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/server/CMakeLists.txt

src/server/default_server_configuration.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_socket_communicator.cpp

src/server/frontend/session_mediator.cpp

src/server/shell/application_session.cpp

src/server/shell/surface.cpp

src/shared/protobuf/mir_protobuf.proto

src/shared/protobuf/mir_protobuf_wire.proto

tests/acceptance-tests/test_client_library.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/shell/application_session.h

namespace mir

{

class EventSink;

namespace shell

{

int configure_surface(frontend::SurfaceId id, MirSurfaceAttrib attrib, int value);

void set_event_sink(std::shared_ptr<mir::EventSink> const& sink);

protected:

ApplicationSession(ApplicationSession const&) = delete;

ApplicationSession& operator=(ApplicationSession const&) = delete;

Surfaces::const_iterator checked_find(frontend::SurfaceId id) const;

std::mutex mutable surfaces_mutex;

Surfaces surfaces;

std::shared_ptr<EventSink> event_sink;

};

}

Older »