From 72f5f9d13315dfd4e0a67298eba5d8f5a37bc860 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Tue, 14 Jan 2020 15:10:14 +0100 Subject: [PATCH] sculpt_manager: apply affinity-space to runtime Issue #3599 --- repos/gems/run/leitzentrale.run | 11 ++++++----- repos/gems/src/app/sculpt_manager/main.cc | 8 ++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/repos/gems/run/leitzentrale.run b/repos/gems/run/leitzentrale.run index 48b91991b..02b727f80 100644 --- a/repos/gems/run/leitzentrale.run +++ b/repos/gems/run/leitzentrale.run @@ -311,11 +311,12 @@ exec parted -a none -s [ahci_1_img] -- mklabel gpt \ mkpart GRUB fat32 1024s 1279s \ mkpart GENODE ext2 1280s 3700s -install_rom_module focus {} -install_rom_module leitzentrale {} -install_rom_module reset {} -install_rom_module README {nothing to read here} -install_rom_module VERSION {unknown version} +install_rom_module focus {} +install_rom_module leitzentrale {} +install_rom_module reset {} +install_rom_module README {nothing to read here} +install_rom_module VERSION {unknown version} +install_rom_module platform_info {} install_rom_module block_devices { diff --git a/repos/gems/src/app/sculpt_manager/main.cc b/repos/gems/src/app/sculpt_manager/main.cc index e67a77f29..67fbfe0b2 100644 --- a/repos/gems/src/app/sculpt_manager/main.cc +++ b/repos/gems/src/app/sculpt_manager/main.cc @@ -463,6 +463,7 @@ struct Sculpt::Main : Input_event_handler, void _handle_runtime_state(); + Attached_rom_dataspace const _platform { _env, "platform_info" }; /**************************************** ** Cached model of the runtime config ** @@ -1302,6 +1303,13 @@ void Sculpt::Main::_generate_runtime_config(Xml_generator &xml) const gen_parent_service(xml); }); + _platform.xml().with_sub_node("affinity-space", [&] (Xml_node const &node) { + xml.node("affinity-space", [&] () { + xml.attribute("width", node.attribute_value("width", 1U)); + xml.attribute("height", node.attribute_value("height", 1U)); + }); + }); + xml.node("start", [&] () { gen_runtime_view_start_content(xml, _runtime_view_state, _gui.font_size()); });