From b1229f4efdf0517b853d5b63cda6c5aa69528f2e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 18 Aug 2020 12:13:15 +0200
Subject: [run-virt] Use special blackboxrc

Prevent blackbox from changing our background
Don't set blackbox' toolbar always on top
---
 .../run-virt/data/opt/openslx/vmchooser/config/blackbox.rc       | 2 ++
 .../openslx/vmchooser/run-virt-includes/start_windowmanager.inc  | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 core/modules/run-virt/data/opt/openslx/vmchooser/config/blackbox.rc

(limited to 'core/modules/run-virt')

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/config/blackbox.rc b/core/modules/run-virt/data/opt/openslx/vmchooser/config/blackbox.rc
new file mode 100644
index 00000000..8cac244b
--- /dev/null
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/config/blackbox.rc
@@ -0,0 +1,2 @@
+rootCommand: true
+toolbar.onTop: false
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/start_windowmanager.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/start_windowmanager.inc
index 089182b2..59d5d3bc 100644
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/start_windowmanager.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/start_windowmanager.inc
@@ -8,7 +8,9 @@
 start_wm() {
 	# Sanity checks
 	unset RUNVIRT_DM
-	for DM in "$@" openbox kwin blackbox; do
+	# xfwm4 and metacity make the VM appear frozen after openslx.exe
+	# tries to change the resolution
+	for DM in "$@" openbox blackbox kwin; do
 		if type "${DM}" >/dev/null 2>&1 ; then
 			declare -g RUNVIRT_DM="${DM}"
 			break
@@ -28,8 +30,11 @@ start_wm() {
 	openbox|kwin|xfwm4|metacity)
 		OPTS+=( "--replace" )
 		;;
+	blackbox)
+		# Don't replace background, toolbar not always on top
+		OPTS+=( "-rc" "/opt/openslx/vmchooser/config/blackbox.rc" )
+		;;
 	fvwm2)
-		# fvwm2 is not even in the minilinux, so this might be obsolete...
 		echo "EdgeScroll 0 0" > "${TMPDIR}/fvwm"
 		OPTS+=( "-replace" "-f" "${TMPDIR}/fvwm" )
 		;;
-- 
cgit v1.2.3-55-g7522