From 13be339d81c3e2af8df5fd6bab8ef5d73889e887 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Tue, 20 Nov 2018 17:27:06 +0100
Subject: [PATCH] sculpt: let window layouter recall its prior state

Issue #3024
Issue #3031
---
 .../gems/recipes/pkg/window_layouter/archives |  4 +
 .../gems/recipes/pkg/window_layouter/runtime  | 75 ++++++++++++++++++-
 .../gems/run/sculpt/launcher/window_layouter  |  3 +-
 3 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/repos/gems/recipes/pkg/window_layouter/archives b/repos/gems/recipes/pkg/window_layouter/archives
index 3f25d3083c..9cd19eac9d 100644
--- a/repos/gems/recipes/pkg/window_layouter/archives
+++ b/repos/gems/recipes/pkg/window_layouter/archives
@@ -1,2 +1,6 @@
 _/raw/window_layouter
 _/src/window_layouter
+_/src/init
+_/src/fs_report
+_/src/fs_rom
+_/src/vfs
diff --git a/repos/gems/recipes/pkg/window_layouter/runtime b/repos/gems/recipes/pkg/window_layouter/runtime
index 2c9a1132f4..9b34051723 100644
--- a/repos/gems/recipes/pkg/window_layouter/runtime
+++ b/repos/gems/recipes/pkg/window_layouter/runtime
@@ -1,9 +1,80 @@
-<runtime ram="4M" caps="200" binary="window_layouter" config="window_layouter.config">
+<runtime ram="7M" caps="400" binary="init">
 
-	<requires> <nitpicker/> <timer/> </requires>
+	<requires> <nitpicker/> <file_system/> <timer/> </requires>
+
+	<config>
+		<parent-provides>
+			<service name="CPU"/>
+			<service name="LOG"/>
+			<service name="PD"/>
+			<service name="ROM"/>
+			<service name="Report"/>
+			<service name="Timer"/>
+			<service name="Nitpicker"/>
+			<service name="File_system"/>
+		</parent-provides>
+
+		<default-route>
+			<any-service> <parent/> <any-child/> </any-service>
+		</default-route>
+
+		<default caps="100"/>
+
+		<start name="fs_report">
+			<resource name="RAM" quantum="1M"/>
+			<provides> <service name="Report"/> </provides>
+			<config> <vfs> <fs/> </vfs> </config>
+			<route>
+				<service name="File_system"> <parent label="recall"/> </service>
+				<any-service> <parent/> </any-service>
+			</route>
+		</start>
+
+		<start name="fs_rom">
+			<resource name="RAM" quantum="1M"/>
+			<provides> <service name="ROM"/> </provides>
+			<config/>
+			<route>
+				<service name="File_system"> <parent label="recall"/> </service>
+				<any-service> <parent/> </any-service>
+			</route>
+		</start>
+
+		<start name="window_layouter">
+			<resource name="RAM" quantum="6M"/>
+			<route>
+				<service name="ROM" label="config">
+					<parent label="window_layouter.config"/> </service>
+				<service name="ROM" label="rules">
+					<child name="fs_rom" label="rules"/> </service>
+				<service name="ROM" label="window_list">
+					<parent label="window_list"/> </service>
+				<service name="ROM" label="focus_request">
+					<parent label="focus_request"/> </service>
+				<service name="ROM" label="hover">
+					<parent label="hover"/> </service>
+				<service name="ROM" label="decorator_margins">
+					<parent label="decorator_margins"/> </service>
+				<service name="Report" label="rules">
+					<child name="fs_report" label="rules"/> </service>
+				<service name="Report" label="window_layout">
+					<parent label="window_layout"/> </service>
+				<service name="Report" label="resize_request">
+					<parent label="resize_request"/> </service>
+				<service name="Report" label="focus">
+					<parent label="focus"/> </service>
+				<any-service> <parent/> </any-service>
+			</route>
+		</start>
+
+	</config>
 
 	<content>
 		<rom label="ld.lib.so"/>
+		<rom label="vfs.lib.so"/>
+		<rom label="init"/>
+		<rom label="fs_report"/>
+		<rom label="fs_rom"/>
 		<rom label="window_layouter"/>
 		<rom label="window_layouter.config"/>
 	</content>
diff --git a/repos/gems/run/sculpt/launcher/window_layouter b/repos/gems/run/sculpt/launcher/window_layouter
index ebfda90815..5e75ec3151 100644
--- a/repos/gems/run/sculpt/launcher/window_layouter
+++ b/repos/gems/run/sculpt/launcher/window_layouter
@@ -4,8 +4,9 @@
 		<service name="ROM" label="focus_request">     <child name="wm"/> </service>
 		<service name="ROM" label="hover">             <child name="wm"/> </service>
 		<service name="ROM" label="decorator_margins"> <child name="wm"/> </service>
-		<service name="ROM" label="rules">             <child name="wm"/> </service>
 		<service name="Report">                        <child name="wm"/> </service>
 		<service name="Nitpicker">                     <child name="wm"/> </service>
+		<service name="File_system">
+			<child name="recall_fs" label="window_layouter"/> </service>
 	</route>
 </launcher>