ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wm: support multiple decorator sessions

This commit is contained in:
Norman Feske 2015-11-12 19:47:17 +01:00 committed by Christian Helmuth
parent ed774253b6
commit 461776a29c
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
repos/gems/src/server/wm/decorator_nitpicker.h
View File

@ -153,7 +153,8 @@ class Wm::Decorator_content_registry
}; };
struct Wm::Decorator_nitpicker_session : Genode::Rpc_object<Nitpicker::Session> struct Wm::Decorator_nitpicker_session : Genode::Rpc_object<Nitpicker::Session>,
List<Decorator_nitpicker_session>::Element
{ {
typedef Nitpicker::View_capability View_capability; typedef Nitpicker::View_capability View_capability;
typedef Nitpicker::Session::View_handle View_handle; typedef Nitpicker::Session::View_handle View_handle;

25
repos/gems/src/server/wm/nitpicker.h
View File

@ -1058,7 +1058,7 @@ class Wm::Nitpicker::Root : public Genode::Rpc_object<Genode::Typed_root<Session
Layouter_nitpicker_session *_layouter_session = nullptr; Layouter_nitpicker_session *_layouter_session = nullptr;
Decorator_nitpicker_session *_decorator_session = nullptr; List<Decorator_nitpicker_session> _decorator_sessions;
/** /**
* Nitpicker session used to perform session-control operations * Nitpicker session used to perform session-control operations
@ -1136,13 +1136,14 @@ class Wm::Nitpicker::Root : public Genode::Rpc_object<Genode::Typed_root<Session
case ROLE_DECORATOR: case ROLE_DECORATOR:
{ {
_decorator_session = new (_md_alloc) auto session = new (_md_alloc)
Decorator_nitpicker_session(_ram, _ep, _md_alloc, Decorator_nitpicker_session(_ram, _ep, _md_alloc,
_pointer_reporter, _pointer_reporter,
_last_motion, _last_motion,
_window_layouter_input, _window_layouter_input,
*this); *this);
return _ep.manage(*_decorator_session); _decorator_sessions.insert(session);
return _ep.manage(*session);
} }
case ROLE_LAYOUTER: case ROLE_LAYOUTER:
@ -1227,14 +1228,16 @@ class Wm::Nitpicker::Root : public Genode::Rpc_object<Genode::Typed_root<Session
return; return;
} }
auto decorator_lambda = [this] (Decorator_nitpicker_session *session) { Decorator_nitpicker_session *decorator_session =
_ep.dissolve(*_decorator_session); ep.apply(session_cap, [this] (Decorator_nitpicker_session *session) {
_decorator_session = nullptr; if (session) {
return session; _decorator_sessions.remove(session);
}; _ep.dissolve(*session);
}
if (ep.apply(session_cap, decorator_lambda) == _decorator_session) { return session;
Genode::destroy(_md_alloc, _decorator_session); });
if (decorator_session) {
Genode::destroy(_md_alloc, decorator_session);
return; return;
} }