Import show_input from world

runtimes/show_input/Tupfile

@@ -1,9 +0,0 @@
-TARGET_NAME = show_input
-
-PKG_DEPENDS += \
-	@(PUBLIC_SRC_SHOW_INPUT) \
-
-include_rules
-
-: runtime |> !collect_pkg_runtime |>
-: |> !pkg |>

src/app/show_input/Tupfile

@@ -0,0 +1,21 @@
+TARGET_NAME = show_input
+include_rules
+
+PKG_CONFIGS = vfs genode-gems genode-os genode-prg
+CXXFLAGS += -std=gnu++11
+CXXFLAGS += `$(PKG_CONFIG) -cflags $(PKG_CONFIGS)`
+LDFLAGS += `$(PKG_CONFIG) -libs $(PKG_CONFIGS)`
+
+: foreach *.cc |> !cxx |> %B.o {objs}
+
+: {objs} |> !ld |> %d {binary}
+
+: {binary} |> !collect_bin |>
+include $(BIN_RULES)
+
+PKG_DEPENDS += \
+	@(PUBLIC_SRC_VFS) \
+	_/src/$(BIN_NAME) \
+
+: runtime |> !collect_pkg_runtime |>
+include $(PKG_RULES)

src/app/show_input/main.cc

@@ -0,0 +1,140 @@
+/*
+ * \brief  Tool for checking input events
+ * \author Emery Hemingway
+ * \date   2018-10-09
+ */
+
+/*
+ * Copyright (C) 2018 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU Affero General Public License version 3.
+ */
+
+/* Genode includes */
+#include <nitpicker_session/connection.h>
+#include <framebuffer_session/connection.h>
+#include <base/component.h>
+#include <base/attached_rom_dataspace.h>
+#include <base/log.h>
+#include <base/heap.h>
+#include <os/pixel_rgb565.h>
+#include <os/surface.h>
+#include <nitpicker_gfx/tff_font.h>
+#include <nitpicker_gfx/box_painter.h>
+
+/* gems includes */
+#include <gems/vfs.h>
+#include <gems/vfs_font.h>
+
+
+namespace Show_input {
+	using namespace Genode;
+	typedef Surface_base::Point Point;
+	typedef Surface_base::Area  Area;
+	typedef Surface_base::Rect  Rect;
+
+	struct Main;
+};
+
+
+struct Show_input::Main
+{
+	Genode::Env &_env;
+
+	Heap _heap { _env.ram(), _env.rm() };
+
+	Attached_rom_dataspace _config { _env, "config" };
+
+	Root_directory _root { _env, _heap, _config.xml().sub_node("vfs") };
+
+	Vfs_font _font { _heap, _root, "fonts/text/regular" };
+
+	Nitpicker::Connection  _nitpicker { _env };
+
+	Input::Session_client &_input = *_nitpicker.input();
+	Framebuffer::Session  &_fb    = *_nitpicker.framebuffer();
+
+	Dataspace_capability _fb_ds_cap()
+	{
+		_nitpicker.buffer(_nitpicker.mode(), false);
+		return _fb.dataspace();
+	}
+
+	Attached_dataspace _fb_ds { _env.rm(), _fb_ds_cap() };
+
+	Nitpicker::Session::View_handle _view = _nitpicker.create_view();
+
+	typedef Pixel_rgb565 PT;
+
+	Surface_base::Area _size { (unsigned)_fb.mode().width(),
+	                           (unsigned)_font.height() };
+
+	Surface<PT> _surface { _fb_ds.local_addr<PT>(), _size };
+
+	void _refresh() { _fb.refresh(0, 0, _size.w(), _size.h()); }
+
+	Signal_handler<Main> _input_sigh {
+		_env.ep(), *this, &Main::_handle_input };
+
+	void _handle_input()
+	{
+		using namespace Input;
+		bool refresh = false;
+
+		_input.for_each_event([&] (Input::Event const &ev) {
+			ev.handle_press([&] (Keycode key, Codepoint codepoint) {
+				String<128> info(
+					key_name(key), " ",
+					codepoint, " "
+					"(", codepoint.value, ")");
+
+				Box_painter::paint(
+					_surface,
+					Rect(Point(), _size),
+					Color(0, 0, 0));
+
+
+				Text_painter::paint(
+					_surface,
+					Text_painter::Position(0, 0),
+					_font,
+					Color(255, 255, 255),
+					info.string());
+				refresh = true;
+
+				auto w = _font.string_width(info.string()).decimal();
+				auto h = _font.height();
+
+				_nitpicker.enqueue<Nitpicker::Session::Command::Geometry>(
+					_view, Rect(Point(0, 0), Area(w*2, h*2)));
+			});
+		});
+
+		if (refresh) {
+			_nitpicker.execute();
+			_refresh();
+		}
+	}
+
+	Main(Env &env) : _env(env)
+	{
+		_input.sigh(_input_sigh);
+
+		_nitpicker.enqueue<Nitpicker::Session::Command::Geometry>(
+			_view, Rect(Point(0, 0), _size));
+
+		_nitpicker.enqueue<Nitpicker::Session::Command::To_front>(
+			_view, Nitpicker::Session::View_handle());
+		_nitpicker.execute();
+
+		_surface.clip(Rect(Point(0, 0), _size));
+	}
+};
+
+
+void Component::construct(Genode::Env &env)
+{
+	env.exec_static_constructors();
+	static Show_input::Main inst(env);
+}

src/app/show_input/runtime

@@ -6,8 +6,6 @@
 	</requires>
 
 	<content>
-		<rom label="libc.lib.so"/>
-		<rom label="libm.lib.so"/>
 		<rom label="show_input"/>
 		<rom label="vfs.lib.so"/>
 	</content>