From c6c79acf8e58f79ee923fcf05d699cca50f90fe5 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Mon, 13 Feb 2017 17:07:41 +0100 Subject: [PATCH] gems/wm: API transition (deprecated warnings) Issue #1987 --- repos/gems/include/gems/local_reporter.h | 5 +++-- repos/gems/src/server/wm/decorator_nitpicker.h | 8 +++++--- repos/gems/src/server/wm/direct_nitpicker.h | 7 ++++--- repos/gems/src/server/wm/layouter_nitpicker.h | 4 ++-- repos/gems/src/server/wm/main.cc | 2 +- repos/gems/src/server/wm/nitpicker.h | 17 ++++++++--------- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/repos/gems/include/gems/local_reporter.h b/repos/gems/include/gems/local_reporter.h index 2a25d51db3..07a6d627e1 100644 --- a/repos/gems/include/gems/local_reporter.h +++ b/repos/gems/include/gems/local_reporter.h @@ -27,9 +27,10 @@ struct Local_reporter char const *_name; - Local_reporter(char const *name, Genode::Capability session_cap) + Local_reporter(Genode::Region_map &rm, char const *name, + Genode::Capability session_cap) : - _session(session_cap), _ds(_session.dataspace()), _name(name) + _session(session_cap), _ds(rm, _session.dataspace()), _name(name) { } struct Xml_generator : public Genode::Xml_generator diff --git a/repos/gems/src/server/wm/decorator_nitpicker.h b/repos/gems/src/server/wm/decorator_nitpicker.h index ec2cc27b9a..e65550046c 100644 --- a/repos/gems/src/server/wm/decorator_nitpicker.h +++ b/repos/gems/src/server/wm/decorator_nitpicker.h @@ -159,6 +159,8 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, Genode::Env &_env; + Genode::Heap _heap { _env.ram(), _env.rm() }; + Ram_session_client _ram; Nitpicker::Connection _nitpicker_session { _env, "decorator" }; @@ -180,12 +182,12 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, Decorator_content_callback &_content_callback; /* XXX don't allocate content-registry entries from heap */ - Decorator_content_registry _content_registry { *Genode::env()->heap() }; + Decorator_content_registry _content_registry { _heap }; Allocator &_md_alloc; /* Nitpicker::Connection requires a valid input session */ - Input::Session_component _dummy_input_component; + Input::Session_component _dummy_input_component { _env, _env.ram() }; Input::Session_capability _dummy_input_component_cap = _env.ep().manage(_dummy_input_component); @@ -448,7 +450,7 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, /* * See comment in 'Wm::Nitpicker::Session_component::buffer'. */ - Nitpicker::Session_client(_nitpicker_session.cap()).buffer(mode, use_alpha); + Nitpicker::Session_client(_env.rm(), _nitpicker_session.cap()).buffer(mode, use_alpha); } void focus(Genode::Capability) { } diff --git a/repos/gems/src/server/wm/direct_nitpicker.h b/repos/gems/src/server/wm/direct_nitpicker.h index d03f5afcf8..7ff56a1b2d 100644 --- a/repos/gems/src/server/wm/direct_nitpicker.h +++ b/repos/gems/src/server/wm/direct_nitpicker.h @@ -26,16 +26,17 @@ class Wm::Direct_nitpicker_session : public Genode::Rpc_object Attached_ram_dataspace _command_ds; - Layouter_nitpicker_session(Genode::Ram_session &ram, + Layouter_nitpicker_session(Genode::Env &env, Input::Session_capability input_session_cap) : _input_session_cap(input_session_cap), - _command_ds(&ram, 4096) + _mode_sigh_nitpicker(env), _command_ds(env.ram(), env.rm(), 4096) { } diff --git a/repos/gems/src/server/wm/main.cc b/repos/gems/src/server/wm/main.cc index a0bbf51948..6a35e72e56 100644 --- a/repos/gems/src/server/wm/main.cc +++ b/repos/gems/src/server/wm/main.cc @@ -59,7 +59,7 @@ struct Wm::Main Window_registry window_registry { heap, window_list_reporter }; - Nitpicker::Connection focus_nitpicker_session; + Nitpicker::Connection focus_nitpicker_session { env }; Nitpicker::Root nitpicker_root { env, window_registry, heap, env.ram_session_cap(), diff --git a/repos/gems/src/server/wm/nitpicker.h b/repos/gems/src/server/wm/nitpicker.h index dafa066f77..bb43494c74 100644 --- a/repos/gems/src/server/wm/nitpicker.h +++ b/repos/gems/src/server/wm/nitpicker.h @@ -444,7 +444,7 @@ class Wm::Nitpicker::Session_component : public Rpc_object, Tslab _child_view_alloc; List _top_level_views; List _child_views; - Input::Session_component _input_session; + Input::Session_component _input_session { _env, _ram }; Input::Session_capability _input_session_cap; Click_handler &_click_handler; Signal_context_capability _mode_sigh; @@ -457,7 +457,7 @@ class Wm::Nitpicker::Session_component : public Rpc_object, */ typedef Nitpicker::Session::Command_buffer Command_buffer; - Attached_ram_dataspace _command_ds { &_ram, sizeof(Command_buffer) }; + Attached_ram_dataspace _command_ds { _ram, _env.rm(), sizeof(Command_buffer) }; Command_buffer &_command_buffer = *_command_ds.local_addr(); @@ -472,8 +472,8 @@ class Wm::Nitpicker::Session_component : public Rpc_object, /* * Input */ - Input::Session_client _nitpicker_input { _session.input_session() }; - Attached_dataspace _nitpicker_input_ds { _nitpicker_input.dataspace() }; + Input::Session_client _nitpicker_input { _env.rm(), _session.input_session() }; + Attached_dataspace _nitpicker_input_ds { _env.rm(), _nitpicker_input.dataspace() }; Signal_handler _input_handler { _env.ep(), *this, &Session_component::_handle_input }; @@ -964,7 +964,7 @@ class Wm::Nitpicker::Session_component : public Rpc_object, * session upgrades initiated by the wm client's buffer * operation twice. */ - Nitpicker::Session_client(_session.cap()).buffer(mode, has_alpha); + Nitpicker::Session_client(_env.rm(), _session.cap()).buffer(mode, has_alpha); _has_alpha = has_alpha; } @@ -1005,7 +1005,7 @@ class Wm::Nitpicker::Root : public Genode::Rpc_objectram_session(), - _window_layouter_input_cap); + Layouter_nitpicker_session(_env, _window_layouter_input_cap); return _env.ep().manage(*_layouter_session); } @@ -1174,7 +1173,7 @@ class Wm::Nitpicker::Root : public Genode::Rpc_object