From dc1a08074ab4597670325336367bcd72c0b7a106 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Tue, 20 May 2014 22:52:57 +0200
Subject: [PATCH] qt5: use window manager

---
 repos/libports/run/qt5.run                |  2 +-
 repos/libports/run/qt5_avplay.run         |  2 +-
 repos/libports/run/qt5_calculatorform.run |  2 +-
 repos/libports/run/qt5_common.inc         | 25 +++++++++++++++++++++++
 repos/libports/run/qt5_openglwindow.run   |  2 +-
 repos/libports/run/qt5_previewer.run      |  2 +-
 repos/libports/run/qt5_qpluginwidget.run  |  2 +-
 repos/libports/run/qt5_quicktest.run      |  2 +-
 repos/libports/run/qt5_samegame.run       |  2 +-
 repos/libports/run/qt5_tetrix.run         |  2 +-
 repos/libports/run/qt5_textedit.run       |  2 +-
 repos/ports/run/arora.run                 |  2 +-
 12 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run
index 30070f173..4b77f37f9 100644
--- a/repos/libports/run/qt5.run
+++ b/repos/libports/run/qt5.run
@@ -27,7 +27,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]
diff --git a/repos/libports/run/qt5_avplay.run b/repos/libports/run/qt5_avplay.run
index 7b64a4376..803f71b6c 100644
--- a/repos/libports/run/qt5_avplay.run
+++ b/repos/libports/run/qt5_avplay.run
@@ -38,7 +38,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]
diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run
index dcef822b1..75128564e 100644
--- a/repos/libports/run/qt5_calculatorform.run
+++ b/repos/libports/run/qt5_calculatorform.run
@@ -25,7 +25,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]
diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc
index c034b2db7..d4821755b 100644
--- a/repos/libports/run/qt5_common.inc
+++ b/repos/libports/run/qt5_common.inc
@@ -21,6 +21,10 @@ proc qt5_build_components { feature_arg } {
 
 	append build_components {
 		server/nitpicker
+		server/report_rom
+		app/floating_window_layouter
+		app/decorator
+		server/wm
 	}
 
 	return $build_components
@@ -50,6 +54,23 @@ proc qt5_start_nodes { feature_arg } {
 		<start name="nitpicker">
 			<resource name="RAM" quantum="1M"/>
 			<provides><service name="Nitpicker"/></provides>
+			<config>
+				<domain name="default" color="#ffffff"/>
+				<policy label="" domain="default"/>
+				<global-key name="KEY_SCROLLLOCK" operation="xray" />
+				<global-key name="KEY_SYSRQ"      operation="kill" />
+				<global-key name="KEY_PRINT"      operation="kill" />
+				<global-key name="KEY_F11"        operation="kill" />
+				<global-key name="KEY_F12"        operation="xray" />
+			</config>
+		</start>
+		<start name="wm">
+			<resource name="RAM" quantum="16M"/>
+			<provides><service name="Nitpicker"/></provides>
+			<route>
+				<service name="Nitpicker"> <child name="nitpicker"/> </service>
+				<any-service> <parent/> <any-child/> </any-service>
+			</route>
 		</start>
 	}
 
@@ -73,6 +94,10 @@ proc qt5_boot_modules { feature_arg } {
 
 	append boot_modules {
 		nitpicker
+		report_rom
+		floating_window_layouter
+		decorator
+		wm
 	}
 
 	return $boot_modules
diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run
index 246e52274..d345affb0 100644
--- a/repos/libports/run/qt5_openglwindow.run
+++ b/repos/libports/run/qt5_openglwindow.run
@@ -25,7 +25,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]
diff --git a/repos/libports/run/qt5_previewer.run b/repos/libports/run/qt5_previewer.run
index 7dcc33e52..03bcce5eb 100644
--- a/repos/libports/run/qt5_previewer.run
+++ b/repos/libports/run/qt5_previewer.run
@@ -25,7 +25,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]
diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run
index 37e43398b..b6eef227f 100644
--- a/repos/libports/run/qt5_qpluginwidget.run
+++ b/repos/libports/run/qt5_qpluginwidget.run
@@ -28,7 +28,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]
diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run
index 889d92aba..8b461bfe1 100644
--- a/repos/libports/run/qt5_quicktest.run
+++ b/repos/libports/run/qt5_quicktest.run
@@ -32,7 +32,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]
diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run
index d95b5d1c7..4faf3f7ec 100644
--- a/repos/libports/run/qt5_samegame.run
+++ b/repos/libports/run/qt5_samegame.run
@@ -32,7 +32,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]
diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run
index 917f1af38..c0453d9fb 100644
--- a/repos/libports/run/qt5_tetrix.run
+++ b/repos/libports/run/qt5_tetrix.run
@@ -25,7 +25,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]
diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run
index 742985317..06ab51abd 100644
--- a/repos/libports/run/qt5_textedit.run
+++ b/repos/libports/run/qt5_textedit.run
@@ -33,7 +33,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]
diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run
index e1a3cbdf1..d851cc182 100644
--- a/repos/ports/run/arora.run
+++ b/repos/ports/run/arora.run
@@ -33,7 +33,7 @@ append config [qt5_parent_provides feature]
 append config {
 	</parent-provides>
 	<default-route>
-		<any-service> <parent/> <any-child/> </any-service>
+		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
 	</default-route>}
 
 append config [qt5_start_nodes feature]