From 9bceec4394394401766fe689d617951ff4f784d2 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Fri, 24 Mar 2017 17:41:30 +0100
Subject: [PATCH] Fix backdrop handing in wm.run and nano3d.run

This patch adjusts the run script in two ways:

It removes the reliance on init's formerly built-in resource-request
handling by increasing the RAM quota for the backdrop instances. Since
commit "init: explicit response to resource requests", init no longer
hands out slack memory automatically.

Second, it makes sure that the backdrop appears under the precise label
"backdrop" at nitpicker by facilitating init's label-rewriting feature.
Without explicitly setting the label to "backdrop", nitpicker observes
the label "backdrop -> backdrop" (the first part comes from init, the
second part comes from the nitpicker-session argument specified by
backdrop itself). However, the client is only considered as default
background if labeled as "backdrop" (see nitpicker's '_create_session')
implementation.

Issue #2352
---
 repos/gems/run/nano3d.run | 17 ++++++++++-------
 repos/gems/run/wm.run     | 26 ++++++++++++--------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/repos/gems/run/nano3d.run b/repos/gems/run/nano3d.run
index 17203572c5..1b341eac5e 100644
--- a/repos/gems/run/nano3d.run
+++ b/repos/gems/run/nano3d.run
@@ -65,18 +65,21 @@ append config {
 	</start>
 
 	<start name="backdrop">
-		<resource name="RAM" quantum="4M"/>
+		<resource name="RAM" quantum="20M"/>
 		<config>
-			<libc>
-				<vfs>
-					<rom name="genode_logo.png"/>
-					<rom name="grid.png"/>
-				</vfs>
-			</libc>
+			<libc/>
+			<vfs>
+				<rom name="genode_logo.png"/>
+				<rom name="grid.png"/>
+			</vfs>
 			<fill color="#122334" />
 			<image png="grid.png"        tiled="yes" alpha="200" />
 			<image png="genode_logo.png" anchor="bottom_right" alpha="150"/>
 		</config>
+		<route>
+			<service name="Nitpicker"> <child name="nitpicker" label="backdrop" /> </service>
+			<any-service> <parent/> <any-child/> </any-service>
+		</route>
 	</start>
 
 	<start name="dynamic_rom">
diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run
index c7a596c2b8..d93377bfaf 100644
--- a/repos/gems/run/wm.run
+++ b/repos/gems/run/wm.run
@@ -206,33 +206,31 @@ append config {
 		</route>
 	</start>
 	<start name="backdrop" priority="-1">
-		<resource name="RAM" quantum="4M"/>
+		<resource name="RAM" quantum="24M"/>
 		<config>
-			<libc>
-				<vfs>
-					<rom name="genode_logo.png"/>
-					<rom name="grid.png"/>
-				</vfs>
-			</libc>
+			<libc/>
+			<vfs>
+				<rom name="genode_logo.png"/>
+				<rom name="grid.png"/>
+			</vfs>
 			<fill color="#224433" />
 			<image png="grid.png"        tiled="yes" alpha="200" />
 			<image png="genode_logo.png" anchor="bottom_right" alpha="150"
 			                             xpos="-20" ypos="-20" />
 		</config>
 		<route>
-			<any-service> <child name="nitpicker"/> <parent/> <any-child/>
+			<any-service> <child name="nitpicker" label="backdrop"/> <parent/> <any-child/>
 			</any-service>
 		</route>
 	</start>
 	<start name="wm_backdrop" priority="-1">
 		<binary name="backdrop" />
-		<resource name="RAM" quantum="4M"/>
+		<resource name="RAM" quantum="24M"/>
 		<config>
-			<libc>
-				<vfs>
-					<rom name="genode_logo.png"/>
-				</vfs>
-			</libc>
+			<libc/>
+			<vfs>
+				<rom name="genode_logo.png"/>
+			</vfs>
 			<fill color="#664455" />
 			<image png="genode_logo.png" scale="zoom" alpha="150" />
 			<image png="genode_logo.png" scale="fit" alpha="150" tiled="yes" />