From 7fff1770e0e878e7be3a68f631c6ec43908746bf Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Thu, 17 Sep 2015 12:50:42 +0200
Subject: [PATCH] qt5: update run scripts

Fixes #1695
---
 repos/libports/run/qt5.run                |   6 +-
 repos/libports/run/qt5_avplay.run         |   6 +-
 repos/libports/run/qt5_calculatorform.run |   8 +-
 repos/libports/run/qt5_common.inc         |  53 ++++++++-
 repos/libports/run/qt5_drivers.inc        | 127 +++++++---------------
 repos/libports/run/qt5_openglwindow.run   |   6 +-
 repos/libports/run/qt5_previewer.run      |   6 +-
 repos/libports/run/qt5_qpluginwidget.run  |   8 +-
 repos/libports/run/qt5_quicktest.run      |   6 +-
 repos/libports/run/qt5_samegame.run       |   6 +-
 repos/libports/run/qt5_tetrix.run         |   8 +-
 repos/libports/run/qt5_textedit.run       |   7 +-
 repos/ports/run/arora.run                 |   6 +-
 13 files changed, 123 insertions(+), 130 deletions(-)

diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run
index f5242fb82..3ab1904c4 100644
--- a/repos/libports/run/qt5.run
+++ b/repos/libports/run/qt5.run
@@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 # Build
 #
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	app/qt5/qt_launchpad
@@ -28,7 +28,7 @@ create_qt5_fs_tar_archive "tetrix" "gui"
 # Generate config
 #
 
-set config {
+append config {
 <config>
 	<parent-provides>}
 append config [qt5_parent_provides feature]
@@ -81,7 +81,7 @@ install_config $config
 # Boot modules
 #
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	qt_launchpad
diff --git a/repos/libports/run/qt5_avplay.run b/repos/libports/run/qt5_avplay.run
index 8d5a7654e..14d48c92d 100644
--- a/repos/libports/run/qt5_avplay.run
+++ b/repos/libports/run/qt5_avplay.run
@@ -6,7 +6,7 @@ set feature(Audio_out) 1
 # Build
 #
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	app/avplay
@@ -37,7 +37,7 @@ create_qt5_fs_tar_archive "qt_avplay" "gui"
 # Generate config
 #
 
-set config {
+append config {
 <config>
 	<parent-provides>}
 append config [qt5_parent_provides feature]
@@ -71,7 +71,7 @@ install_config $config
 # Boot modules
 #
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	qt_avplay
diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run
index c7775eea6..5efe6e6c2 100644
--- a/repos/libports/run/qt5_calculatorform.run
+++ b/repos/libports/run/qt5_calculatorform.run
@@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 # Build
 #
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	app/qt5/examples/calculatorform
@@ -25,7 +25,7 @@ create_qt5_fs_tar_archive "calculatorform" "gui"
 # Generate config
 #
 
-set config {
+append config {
 <config>
 	<parent-provides>}
 append config [qt5_parent_provides feature]
@@ -58,7 +58,7 @@ install_config $config
 # Boot modules
 #
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	calculatorform
@@ -83,7 +83,7 @@ append boot_modules {
 
 build_boot_image $boot_modules
 
-append qemu_args " -m 128"
+append qemu_args " -m 256"
 
 run_genode_until forever
 
diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc
index 63a796d69..53b53fe8d 100644
--- a/repos/libports/run/qt5_common.inc
+++ b/repos/libports/run/qt5_common.inc
@@ -94,12 +94,57 @@ proc qt5_start_nodes { feature_arg } {
 			</route>
 		</start>
 
+		<start name="report_rom">
+			<resource name="RAM" quantum="4M"/>
+			<provides>
+				<service name="Report"/>
+				<service name="ROM"/>
+			</provides>
+			<config>
+				<rom>
+					<policy label="layouter -> window_list"     report="wm -> window_list"/>
+					<policy label="decorator -> window_layout"  report="layouter -> window_layout"/>
+					<policy label="wm -> resize_request"        report="layouter -> resize_request"/>
+					<policy label="decorator -> pointer"        report="wm -> pointer"/>
+					<policy label="layouter -> hover"           report="decorator -> hover"/>
+					<policy label="wm -> focus"                 report="layouter -> focus"/>
+				</rom>
+			</config>
+		</start>
+
 		<start name="wm">
-			<resource name="RAM" quantum="16M"/>
-			<provides><service name="Nitpicker"/></provides>
+			<resource name="RAM" quantum="8M"/>
+			<provides>
+				<service name="Nitpicker"/>
+			</provides>
+			<config>
+				<policy label="decorator" role="decorator"/>
+				<policy label="layouter"  role="layouter"/>
+			</config>
 			<route>
-				<service name="Nitpicker"> <child name="nitpicker"/> </service>
-				<any-service> <parent/> <any-child/> </any-service>
+				<any-service>
+					<child name="nitpicker"/> <child name="report_rom"/> <parent/> <any-child/>
+				</any-service>
+			</route>
+		</start>
+
+		<start name="layouter">
+			<binary name="floating_window_layouter"/>
+			<resource name="RAM" quantum="4M"/>
+			<route>
+				<any-service>
+					<child name="wm"/> <child name="report_rom"/> <parent/> <any-child/>
+				</any-service>
+			</route>
+		</start>
+
+		<start name="decorator">
+			<binary name="decorator"/>
+			<resource name="RAM" quantum="8M"/>
+			<route>
+				<any-service>
+					<child name="wm"/> <child name="report_rom"/> <parent/> <any-child/>
+				</any-service>
 			</route>
 		</start>
 	}
diff --git a/repos/libports/run/qt5_drivers.inc b/repos/libports/run/qt5_drivers.inc
index 77efc70aa..5ac258cff 100644
--- a/repos/libports/run/qt5_drivers.inc
+++ b/repos/libports/run/qt5_drivers.inc
@@ -1,14 +1,18 @@
+#
+# Global variables required by platform_drv-related functions
+#
+
+set build_components { }
+set config { }
+set boot_modules { }
+
+source ${genode_dir}/repos/base/run/platform_drv.inc
 
 #
 # Helper functions
 #
 
-proc use_acpi_drv { feature_arg } {
-	upvar $feature_arg feature
-	return [have_spec acpi]
-}
-
-proc use_audio_out_drv { feature_arg } {
+proc use_audio_drv { feature_arg } {
 	upvar $feature_arg feature
 	return [info exists feature(Audio_out)]
 }
@@ -35,16 +39,6 @@ proc use_nic_drv { feature_arg } {
 	              ![use_usb_drv feature]}]
 }
 
-proc use_pci_device_pd { feature_arg } {
-	upvar $feature_arg feature
-	return [expr [use_pci_drv feature] && [have_spec nova]]
-}
-
-proc use_pci_drv { feature_arg } {
-	upvar $feature_arg feature
-	return [have_spec pci]
-}
-
 proc use_ps2_drv { feature_arg } {
 	upvar $feature_arg feature
 	return [have_spec ps2]
@@ -72,16 +66,18 @@ proc drivers_build_components { feature_arg } {
 
 	set build_components { }
 
-	lappend_if [use_acpi_drv feature]      build_components drivers/acpi
-	lappend_if [use_audio_out_drv feature] build_components drivers/audio_out
-	lappend_if [use_fb_drv feature]        build_components drivers/framebuffer
-	lappend_if [use_fb_sdl feature]        build_components drivers/framebuffer
-	lappend_if [use_gpio_drv feature]      build_components drivers/gpio
-	lappend_if [use_nic_drv feature]       build_components drivers/nic
-	lappend_if [use_pci_drv feature]       build_components drivers/pci
-	lappend_if [use_ps2_drv feature]       build_components drivers/input/spec/ps2
-	lappend_if [use_timer feature]         build_components drivers/timer
-	lappend_if [use_usb_drv feature]       build_components drivers/usb
+	# This function appends to the global 'build_components' variable, not to
+	# the local version defined above.
+	append_platform_drv_build_components
+
+	lappend_if [use_audio_drv feature] build_components drivers/audio
+	lappend_if [use_fb_drv feature]    build_components drivers/framebuffer
+	lappend_if [use_fb_sdl feature]    build_components drivers/framebuffer
+	lappend_if [use_gpio_drv feature]  build_components drivers/gpio
+	lappend_if [use_nic_drv feature]   build_components drivers/nic
+	lappend_if [use_ps2_drv feature]   build_components drivers/input/spec/ps2
+	lappend_if [use_timer feature]     build_components drivers/timer
+	lappend_if [use_usb_drv feature]   build_components drivers/usb
 
 	return $build_components
 }
@@ -121,41 +117,11 @@ proc drivers_start_nodes { feature_arg } {
 
 	set start_nodes { }
 
-	append_if [use_acpi_drv feature] start_nodes {
-		<start name="acpi">
-			<resource name="RAM" quantum="10M" constrain_phys="yes"/>
-			<binary name="acpi_drv"/>
-			<provides>
-				<service name="PCI"/>
-				<service name="IRQ" />
-			</provides>
-			<binary name="acpi_drv"/>
-			<provides>
-				<service name="PCI"/>
-				<service name="IRQ" />
-			</provides>
-			<config>
-				<policy label="acpi_drv">
-					<pci class="ALL"/>
-				</policy>
-				<policy label="ahci">
-					<pci class="AHCI"/>
-				</policy>
-				<policy label="ps2_drv">
-					<device name="PS2" />
-				</policy>
-				<policy label="fb_drv">
-					<pci class="VGA" />
-				</policy>
-			</config>
-			<route>
-				<service name="PCI"> <any-child /> </service>
-				<any-service> <parent/> <any-child /> </any-service>
-			</route>
-		</start>
-	}
+	# This function appends to the global 'config' variable, not to the
+	# 'start_nodes' variable defined above.
+	append_platform_drv_config
 
-	append_if [use_audio_out_drv feature] start_nodes {
+	append_if [use_audio_drv feature] start_nodes {
 		<start name="audio_drv">
 			<resource name="RAM" quantum="4M"/>
 			<provides><service name="Audio_out"/></provides>
@@ -194,24 +160,6 @@ proc drivers_start_nodes { feature_arg } {
 		</start>
 	}
 
-	append_if [expr [use_pci_drv feature] && ![use_acpi_drv feature]] start_nodes {
-		<start name="pci_drv">
-			<resource name="RAM" quantum="2M" constrain_phys="yes"/>
-			<provides><service name="PCI"/></provides>
-			<config>
-				<policy label="ahci">
-					<pci class="AHCI"/>
-				</policy>
-				<policy label="ps2_drv">
-					<device name="PS2" />
-				</policy>
-				<policy label="fb_drv">
-					<pci class="VGA" />
-				</policy>
-			</config>
-		</start>
-	}
-
 	append_if [use_ps2_drv feature] start_nodes {
 		<start name="ps2_drv">
 			<resource name="RAM" quantum="1M"/>
@@ -261,17 +209,18 @@ proc drivers_boot_modules { feature_arg } {
 
 	set boot_modules { }
 
-	lappend_if [use_acpi_drv feature]      boot_modules acpi_drv
-	lappend_if [use_audio_out_drv feature] boot_modules audio_out_drv
-	lappend_if [use_fb_drv feature]        boot_modules fb_drv
-	lappend_if [use_fb_sdl feature]        boot_modules fb_sdl
-	lappend_if [use_gpio_drv feature]      boot_modules gpio_drv
-	lappend_if [use_nic_drv feature]       boot_modules nic_drv
-	lappend_if [use_pci_drv feature]       boot_modules pci_drv
-	lappend_if [use_pci_device_pd feature] boot_modules pci_device_pd
-	lappend_if [use_ps2_drv feature]       boot_modules ps2_drv
-	lappend_if [use_timer feature]         boot_modules timer
-	lappend_if [use_usb_drv feature]       boot_modules usb_drv
+	# This function appends to the global 'boot_modules' variable, not to the
+	# local version defined above.
+	append_platform_drv_boot_modules
+
+	lappend_if [use_audio_drv feature] boot_modules audio_drv
+	lappend_if [use_fb_drv feature]    boot_modules fb_drv
+	lappend_if [use_fb_sdl feature]    boot_modules fb_sdl
+	lappend_if [use_gpio_drv feature]  boot_modules gpio_drv
+	lappend_if [use_nic_drv feature]   boot_modules nic_drv
+	lappend_if [use_ps2_drv feature]   boot_modules ps2_drv
+	lappend_if [use_timer feature]     boot_modules timer
+	lappend_if [use_usb_drv feature]   boot_modules usb_drv
 
 	return $boot_modules
 }
diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run
index 501c3af7e..28353a76c 100644
--- a/repos/libports/run/qt5_openglwindow.run
+++ b/repos/libports/run/qt5_openglwindow.run
@@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 # Build
 #
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	app/qt5/examples/openglwindow
@@ -24,7 +24,7 @@ create_qt5_fs_tar_archive "openglwindow" "gui"
 # Generate config
 #
 
-set config {
+append config {
 <config>
 	<parent-provides>}
 append config [qt5_parent_provides feature]
@@ -57,7 +57,7 @@ install_config $config
 # Boot modules
 #
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	openglwindow
diff --git a/repos/libports/run/qt5_previewer.run b/repos/libports/run/qt5_previewer.run
index 65b014848..27eb3084c 100644
--- a/repos/libports/run/qt5_previewer.run
+++ b/repos/libports/run/qt5_previewer.run
@@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 # Build
 #
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	app/qt5/examples/previewer
@@ -24,7 +24,7 @@ create_qt5_fs_tar_archive "previewer" "gui"
 # Generate config
 #
 
-set config {
+append config {
 <config>
 	<parent-provides>}
 append config [qt5_parent_provides feature]
@@ -57,7 +57,7 @@ install_config $config
 # Boot modules
 #
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	previewer
diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run
index bd23f0e1a..417b061f5 100644
--- a/repos/libports/run/qt5_qpluginwidget.run
+++ b/repos/libports/run/qt5_qpluginwidget.run
@@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 # Build
 #
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	server/loader
@@ -27,7 +27,7 @@ create_qt5_fs_tar_archive "test-qpluginwidget" "gui"
 # Generate config
 #
 
-set config {
+append config {
 <config>
 	<parent-provides>}
 append config [qt5_parent_provides feature]
@@ -66,7 +66,7 @@ install_config $config
 
 exec sh -c "ln -sf ../test/qt5/qpluginwidget/test-plugin.tar bin/"
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	loader
@@ -100,7 +100,7 @@ append boot_modules {
 
 build_boot_image $boot_modules
 
-append qemu_args " -m 128"
+append qemu_args " -m 256"
 
 run_genode_until forever
 
diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run
index 58a072ccf..6c52bc5e7 100644
--- a/repos/libports/run/qt5_quicktest.run
+++ b/repos/libports/run/qt5_quicktest.run
@@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 # Build
 #
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	app/qt5/qt_quicktest
@@ -25,7 +25,7 @@ create_qt5_fs_tar_archive "qt_quicktest" "gui quick"
 # Generate config
 #
 
-set config {
+append config {
 <config>
 	<parent-provides>}
 append config [qt5_parent_provides feature]
@@ -61,7 +61,7 @@ install_config $config
 # The QtQuick plugin currently needs to be provided both in the file system
 # (for Qt) and as ROM module (for 'dlopen()').
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	qt_quicktest
diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run
index 99cafd651..596d75809 100644
--- a/repos/libports/run/qt5_samegame.run
+++ b/repos/libports/run/qt5_samegame.run
@@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 # Build
 #
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	app/qt5/examples/samegame
@@ -25,7 +25,7 @@ create_qt5_fs_tar_archive "samegame" "gui quick"
 # Generate config
 #
 
-set config {
+append config {
 <config>
 	<parent-provides>}
 append config [qt5_parent_provides feature]
@@ -61,7 +61,7 @@ install_config $config
 # The QtQuick plugin currently needs to be provided both in the file system
 # (for Qt) and as ROM module (for 'dlopen()').
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	samegame
diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run
index 9e9337693..f5af1e3f7 100644
--- a/repos/libports/run/qt5_tetrix.run
+++ b/repos/libports/run/qt5_tetrix.run
@@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 # Build
 #
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	app/qt5/examples/tetrix
@@ -24,7 +24,7 @@ create_qt5_fs_tar_archive "tetrix" "gui"
 # Generate config
 #
 
-set config {
+append config {
 <config>
 	<parent-provides>}
 append config [qt5_parent_provides feature]
@@ -57,7 +57,7 @@ install_config $config
 # Boot modules
 #
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	tetrix
@@ -84,7 +84,7 @@ append boot_modules {
 
 build_boot_image $boot_modules
 
-append qemu_args " -m 128"
+append qemu_args " -m 256"
 
 run_genode_until forever
 
diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run
index 7c2327776..faa58c8a9 100644
--- a/repos/libports/run/qt5_textedit.run
+++ b/repos/libports/run/qt5_textedit.run
@@ -9,7 +9,7 @@ if {[have_spec hw_odroid_xu]} {
 	exit 0
 }
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	app/qt5/examples/textedit
@@ -50,8 +50,7 @@ append config {
 append config [qt5_start_nodes feature]
 
 append_if $use_ahci_driver config {
-	<start name="ahci">
-		<binary name="ahci_drv" />
+	<start name="ahci_drv">
 		<resource name="RAM" quantum="5M"/>
 		<provides> <service name="Block"/> </provides>
 		<config>
@@ -121,7 +120,7 @@ install_config $config
 # Boot modules
 #
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	textedit
diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run
index a286283c1..2bb797a4c 100644
--- a/repos/ports/run/arora.run
+++ b/repos/ports/run/arora.run
@@ -6,7 +6,7 @@ set feature(Nic) 1
 # Build
 #
 
-set build_components [qt5_build_components feature]
+append build_components [qt5_build_components feature]
 
 append build_components {
 	server/loader server/tar_rom server/nit_fb app/launchpad test/nitpicker
@@ -32,7 +32,7 @@ exec tar cf bin/nitpicker_plugin.tar -C [genode_dir]/repos/ports/src/app/arora/d
 # Generate config
 #
 
-set config {
+append config {
 <config>
 	<parent-provides>}
 append config [qt5_parent_provides feature]
@@ -68,7 +68,7 @@ install_config $config
 # Boot modules
 #
 
-set boot_modules [qt5_boot_modules feature]
+append boot_modules [qt5_boot_modules feature]
 
 append boot_modules {
 	loader