app/xray_trigger: API transition

Ref #1987

repos/os/src/app/xray_trigger/main.cc

@@ -12,32 +12,39 @@
  */
 
 /* Genode includes */
-#include <os/attached_rom_dataspace.h>
+#include <base/component.h>
+#include <base/attached_rom_dataspace.h>
 #include <nitpicker_session/connection.h>
-#include <os/server.h>
-#include <os/config.h>
 #include <os/reporter.h>
 #include <input/event.h>
 #include <input/keycodes.h>
 #include <timer_session/connection.h>
 
 
-namespace Xray_trigger { struct Main; }
+namespace Xray_trigger {
+	struct Main;
+	using namespace Genode;
+}
 
 
 struct Xray_trigger::Main
 {
-	Server::Entrypoint &_ep;
+	Env &_env;
+
+	/**
+	 * Configuration buffer
+	 */
+	Attached_rom_dataspace _config { _env, "config" };
 
 	/**
 	 * Nitpicker connection to obtain user input
 	 */
-	Nitpicker::Connection _nitpicker;
+	Nitpicker::Connection _nitpicker { _env, "input" };
 
 	/**
 	 * Input-event buffer
 	 */
-	Genode::Attached_dataspace _ev_ds { _nitpicker.input()->dataspace() };
+	Attached_dataspace _ev_ds { _env.rm(), _nitpicker.input()->dataspace() };
 
 	/**
 	 * Number of pressed keys, used to distinguish primary keys from key
@@ -48,17 +55,17 @@ struct Xray_trigger::Main
 	/**
 	 * Hover model as reported by nitpicker
 	 */
-	Genode::Constructible<Genode::Attached_rom_dataspace> _hover_ds;
+	Constructible<Attached_rom_dataspace> _hover_ds;
 
 	/**
 	 * Reporter for posting the result of our policy decision
 	 */
-	Genode::Reporter _xray_reporter { "xray" };
+	Reporter _xray_reporter { _env, "xray" };
 
 	/**
 	 * Timer to delay the xray report
 	 */
-	Timer::Connection _timer;
+	Timer::Connection _timer { _env };
 
 	/**
 	 * X-Ray criterion depending on key events
@@ -73,20 +80,20 @@ struct Xray_trigger::Main
 	bool _xray() const { return _key_xray || _hover_xray; }
 
 	bool _evaluate_input(bool, unsigned, Input::Event const [], unsigned &) const;
-	bool _evaluate_hover(Genode::Xml_node) const;
+	bool _evaluate_hover(Xml_node) const;
 
 	/**
 	 * Handler that is called on config changes, on hover-model changes, or on
 	 * the arrival of user input
 	 */
-	void _handle_update(unsigned);
+	void _handle_update();
 
-	Genode::Signal_rpc_member<Main> _update_dispatcher =
-		{ _ep, *this, &Main::_handle_update };
+	Signal_handler<Main> _update_handler =
+		{ _env.ep(), *this, &Main::_handle_update };
 
 	void _report_xray()
 	{
-		Genode::Reporter::Xml_generator xml(_xray_reporter, [&] () {
+		Reporter::Xml_generator xml(_xray_reporter, [&] () {
 			xml.attribute("enabled", _xray() ? "yes" : "no");
 		});
 	}
@@ -94,26 +101,21 @@ struct Xray_trigger::Main
 	/**
 	 * Handler that is called after the xray report delay
 	 */
-	void _handle_timeout(unsigned)
+	Signal_handler<Main> _timeout_handler =
+		{ _env.ep(), *this, &Main::_report_xray };
+
+	Main(Env &env) : _env(env)
 	{
-		_report_xray();
-	}
+		_config.sigh(_update_handler);
 
-	Genode::Signal_rpc_member<Main> _timeout_dispatcher =
-		{ _ep, *this, &Main::_handle_timeout };
-
-	Main(Server::Entrypoint &ep) : _ep(ep)
-	{
-		Genode::config()->sigh(_update_dispatcher);
-
-		_timer.sigh(_timeout_dispatcher);
+		_timer.sigh(_timeout_handler);
 
 		/* enable xray reporter and produce initial xray report */
 		_xray_reporter.enabled(true);
 		_report_xray();
 
-		_nitpicker.input()->sigh(_update_dispatcher);
-		_handle_update(0);
+		_nitpicker.input()->sigh(_update_handler);
+		_handle_update();
 	}
 };
 
@@ -137,10 +139,10 @@ bool Xray_trigger::Main::_evaluate_input(bool key_xray, unsigned num_ev,
 		/* ignore key combinations */
 		if (key_cnt > 1) continue;
 
-		typedef Genode::String<32> Key_name;
+		typedef String<32> Key_name;
 		Key_name const ev_key_name(Input::key_name(ev.keycode()));
 
-		typedef Genode::Xml_node Xml_node;
+		typedef Xml_node Xml_node;
 
 		auto lambda = [&] (Xml_node node) {
 
@@ -178,19 +180,19 @@ bool Xray_trigger::Main::_evaluate_input(bool key_xray, unsigned num_ev,
 				key_xray = !_key_xray;
 		};
 
-		Genode::config()->xml_node().for_each_sub_node(lambda);
+		_config.xml().for_each_sub_node(lambda);
 	}
 	return key_xray;
 }
 
 
-bool Xray_trigger::Main::_evaluate_hover(Genode::Xml_node nitpicker_hover) const
+bool Xray_trigger::Main::_evaluate_hover(Xml_node nitpicker_hover) const
 {
 	bool hover_xray = false;
 
 	using namespace Genode;
 
-	config()->xml_node().for_each_sub_node("hover", [&] (Xml_node node) {
+	_config.xml().for_each_sub_node("hover", [&] (Xml_node node) {
 
 		typedef String<160> Domain;
 		Domain nitpicker_domain = nitpicker_hover.attribute_value("domain", Domain());
@@ -203,9 +205,9 @@ bool Xray_trigger::Main::_evaluate_hover(Genode::Xml_node nitpicker_hover) const
 }
 
 
-void Xray_trigger::Main::_handle_update(unsigned)
+void Xray_trigger::Main::_handle_update()
 {
-	Genode::config()->reload();
+	_config.update();
 
 	/* remember X-Ray mode prior applying the changes */
 	bool const orig_xray = _xray();
@@ -216,19 +218,19 @@ void Xray_trigger::Main::_handle_update(unsigned)
 		                            _key_cnt);
 
 	/* obtain / update hover model if needed */
-	if (Genode::config()->xml_node().has_sub_node("hover")) {
+	if (_config.xml().has_sub_node("hover")) {
 
 		if (!_hover_ds.constructed()) {
-			_hover_ds.construct("hover");
-			_hover_ds->sigh(_update_dispatcher);
+			_hover_ds.construct(_env, "hover");
+			_hover_ds->sigh(_update_handler);
 		}
 
 		_hover_ds->update();
 	}
 
 	try {
-		_hover_xray = _evaluate_hover(Genode::Xml_node(_hover_ds->local_addr<char>(),
-		                                               _hover_ds->size()));
+		_hover_xray = _evaluate_hover(Xml_node(_hover_ds->local_addr<char>(),
+		                                       _hover_ds->size()));
 	} catch (...) { }
 
 	/* generate new X-Ray report if the X-Ray mode changed */
@@ -237,11 +239,9 @@ void Xray_trigger::Main::_handle_update(unsigned)
 }
 
 
-namespace Server {
+/***************
+ ** Component **
+ ***************/
 
-	char const *name() { return "ep"; }
-
-	size_t stack_size() { return 16*1024*sizeof(long); }
-
-	void construct(Entrypoint &ep) { static Xray_trigger::Main main(ep); }
-}
+void Component::construct(Genode::Env &env) {
+	static Xray_trigger::Main main(env); }

repos/os/src/app/xray_trigger/target.mk

@@ -1,3 +1,3 @@
 TARGET = xray_trigger
 SRC_CC = main.cc
-LIBS  += base server config
+LIBS  += base