From e679d55f67bf26c72a46fddf2df8d95f86ddbe96 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Mon, 25 Feb 2019 18:52:09 +0100 Subject: [PATCH] Update info in pkg runtimes This information is now used by Sculpt's '+' menu for the interactive routing. --- repos/gems/recipes/pkg/fonts_fs/runtime | 2 ++ repos/gems/recipes/pkg/motif_decorator/runtime | 8 +++++++- repos/gems/recipes/pkg/sculpt-installation/archives | 1 + repos/gems/recipes/pkg/themed_decorator/runtime | 8 +++++++- repos/gems/recipes/pkg/themed_wm/runtime | 9 +++++++-- repos/gems/recipes/pkg/window_layouter/runtime | 11 ++++++++++- repos/gems/recipes/pkg/wm/runtime | 7 ++++++- repos/gems/recipes/raw/motif_wm/wm.config | 1 + repos/gems/recipes/raw/wm/wm.config | 1 + repos/gems/run/sculpt/nitpicker.config | 5 +++-- repos/libports/recipes/pkg/qt5_textedit/runtime | 2 ++ repos/ports/recipes/pkg/arora/runtime | 3 +++ repos/ports/recipes/pkg/report_dump/runtime | 2 +- repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime | 9 +++++++++ 14 files changed, 60 insertions(+), 9 deletions(-) diff --git a/repos/gems/recipes/pkg/fonts_fs/runtime b/repos/gems/recipes/pkg/fonts_fs/runtime index 56bf009ca..90c211492 100644 --- a/repos/gems/recipes/pkg/fonts_fs/runtime +++ b/repos/gems/recipes/pkg/fonts_fs/runtime @@ -1,5 +1,7 @@ + + diff --git a/repos/gems/recipes/pkg/motif_decorator/runtime b/repos/gems/recipes/pkg/motif_decorator/runtime index b45d0ed39..d58c4f587 100644 --- a/repos/gems/recipes/pkg/motif_decorator/runtime +++ b/repos/gems/recipes/pkg/motif_decorator/runtime @@ -1,6 +1,12 @@ - + + + + + + + <closer/> </controls> diff --git a/repos/gems/recipes/pkg/sculpt-installation/archives b/repos/gems/recipes/pkg/sculpt-installation/archives index 5b99b5764..d7df5d735 100644 --- a/repos/gems/recipes/pkg/sculpt-installation/archives +++ b/repos/gems/recipes/pkg/sculpt-installation/archives @@ -8,6 +8,7 @@ _/pkg/rom_reporter _/pkg/nic_router-nat _/pkg/vbox5-nova-sculpt _/pkg/wm +_/pkg/themed_wm _/pkg/themed_decorator _/pkg/motif_decorator _/pkg/window_layouter diff --git a/repos/gems/recipes/pkg/themed_decorator/runtime b/repos/gems/recipes/pkg/themed_decorator/runtime index 5b0ca840c..1aad38571 100644 --- a/repos/gems/recipes/pkg/themed_decorator/runtime +++ b/repos/gems/recipes/pkg/themed_decorator/runtime @@ -1,6 +1,12 @@ <runtime ram="8M" caps="400" binary="themed_decorator"> - <requires> <nitpicker/> <timer/> </requires> + <requires> + <rom label="window_layout"/> + <rom label="pointer"/> + <report/> + <nitpicker/> + <timer/> + </requires> <config> <libc/> diff --git a/repos/gems/recipes/pkg/themed_wm/runtime b/repos/gems/recipes/pkg/themed_wm/runtime index fdee664b8..8bff9dca6 100644 --- a/repos/gems/recipes/pkg/themed_wm/runtime +++ b/repos/gems/recipes/pkg/themed_wm/runtime @@ -1,8 +1,13 @@ <runtime ram="28M" caps="1000" binary="init" config="wm.config"> - <requires> <nitpicker/> <timer/> </requires> + <requires> + <nitpicker label="focus"/> + <nitpicker/> + <report/> + <timer/> + </requires> - <provides> <nitpicker/> </provides> + <provides> <nitpicker/> <report/> </provides> <content> <rom label="ld.lib.so"/> diff --git a/repos/gems/recipes/pkg/window_layouter/runtime b/repos/gems/recipes/pkg/window_layouter/runtime index 9b3405172..503e2a69b 100644 --- a/repos/gems/recipes/pkg/window_layouter/runtime +++ b/repos/gems/recipes/pkg/window_layouter/runtime @@ -1,6 +1,15 @@ <runtime ram="7M" caps="400" binary="init"> - <requires> <nitpicker/> <file_system/> <timer/> </requires> + <requires> + <nitpicker/> + <rom label="window_list"/> + <rom label="focus_request"/> + <rom label="hover"/> + <rom label="decorator_margins"/> + <report/> + <file_system label="recall"/> + <timer/> + </requires> <config> <parent-provides> diff --git a/repos/gems/recipes/pkg/wm/runtime b/repos/gems/recipes/pkg/wm/runtime index 1eb01af52..76bfe5f31 100644 --- a/repos/gems/recipes/pkg/wm/runtime +++ b/repos/gems/recipes/pkg/wm/runtime @@ -1,6 +1,11 @@ <runtime ram="16M" caps="500" binary="init" config="wm.config"> - <requires> <nitpicker/> <timer/> </requires> + <requires> + <nitpicker label="focus"/> + <nitpicker/> + <report/> + <timer/> + </requires> <provides> <nitpicker/> <rom/> <report/> </provides> diff --git a/repos/gems/recipes/raw/motif_wm/wm.config b/repos/gems/recipes/raw/motif_wm/wm.config index deca1999d..0296db990 100644 --- a/repos/gems/recipes/raw/motif_wm/wm.config +++ b/repos/gems/recipes/raw/motif_wm/wm.config @@ -57,6 +57,7 @@ <service name="ROM" label="focus"> <child name="report_rom"/> </service> <service name="Report" label_last="shape"> <parent/> </service> <service name="Report"> <child name="report_rom"/> </service> + <service name="Nitpicker" label=""> <parent label="focus"/> </service> <any-service> <child name="nitpicker"/> <parent/> <any-child/> </any-service> diff --git a/repos/gems/recipes/raw/wm/wm.config b/repos/gems/recipes/raw/wm/wm.config index 01641e340..862bf4f98 100644 --- a/repos/gems/recipes/raw/wm/wm.config +++ b/repos/gems/recipes/raw/wm/wm.config @@ -86,6 +86,7 @@ <service name="ROM" label="focus"> <child name="report_rom"/> </service> <service name="Report" label_last="shape"> <parent/> </service> <service name="Report"> <child name="report_rom"/> </service> + <service name="Nitpicker" label=""> <parent label="focus"/> </service> <any-service> <parent/> </any-service> </route> </start> diff --git a/repos/gems/run/sculpt/nitpicker.config b/repos/gems/run/sculpt/nitpicker.config index 05a99b732..3f3f1c654 100644 --- a/repos/gems/run/sculpt/nitpicker.config +++ b/repos/gems/run/sculpt/nitpicker.config @@ -9,8 +9,9 @@ <domain name="desktop" layer="4" content="client" label="no" hover="always" focus="click" /> <domain name="background" layer="5" content="client" label="no" hover="always" focus="transient" /> - <policy label_prefix="runtime -> wm -> wm -> decorator" domain="decorator"/> - <policy label_prefix="runtime -> wm" domain="desktop"/> + <policy label_suffix="-> decorator" domain="decorator"/> + <policy label_prefix="runtime -> wm" domain="desktop"/> + <policy label_prefix="runtime -> themed_wm" domain="desktop"/> <policy label_prefix="pointer" domain="pointer"/> <policy label_prefix="leitzentrale -> " domain="leitzentrale"/> diff --git a/repos/libports/recipes/pkg/qt5_textedit/runtime b/repos/libports/recipes/pkg/qt5_textedit/runtime index 3000dac5c..a8fda6b8d 100644 --- a/repos/libports/recipes/pkg/qt5_textedit/runtime +++ b/repos/libports/recipes/pkg/qt5_textedit/runtime @@ -1,7 +1,9 @@ <runtime ram="64M" caps="500" binary="textedit" config="textedit.config"> <requires> + <file_system/> <nitpicker/> + <report label="shape"/> <timer/> </requires> diff --git a/repos/ports/recipes/pkg/arora/runtime b/repos/ports/recipes/pkg/arora/runtime index 575258d8e..afd14c565 100644 --- a/repos/ports/recipes/pkg/arora/runtime +++ b/repos/ports/recipes/pkg/arora/runtime @@ -3,6 +3,9 @@ <requires> <nic/> <nitpicker/> + <report label="shape"/> + <rm/> + <rtc/> <timer/> </requires> diff --git a/repos/ports/recipes/pkg/report_dump/runtime b/repos/ports/recipes/pkg/report_dump/runtime index b2a361478..c2e5ff4b2 100644 --- a/repos/ports/recipes/pkg/report_dump/runtime +++ b/repos/ports/recipes/pkg/report_dump/runtime @@ -1,9 +1,9 @@ <runtime ram="50M" caps="1000" binary="noux"> <requires> - <timer/> <file_system label="report" writeable="no"/> <file_system label="target" writeable="yes"/> + <timer/> </requires> <config stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"> diff --git a/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime b/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime index 8378b5df2..087bf04e4 100755 --- a/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime +++ b/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime @@ -3,7 +3,16 @@ <requires> <file_system label="vm"/> <file_system label="shared"/> + <nitpicker/> <nic/> + <rom label="capslock"/> + <rom label="platform_info"/> + <rom label="usb_devices"/> + <report label="shape"/> + <report/> + <rm/> + <rtc/> + <usb/> </requires> <content>