From 3e1c221afeed6c121595eba37d5f3d001976a82c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 21 Aug 2020 12:53:01 +0200
Subject: [run-virt/vmware-common] Switch to xfwm4 for dual-screen

Giving up on the blackbox/automatic approach; it appears that using
VMwareResolutionSet in a full-screen windows guest to enable more than
one screen can lead to a complete freeze of the guest.
---
 .../openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d')

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
index 54f60e16..d9e5a27f 100644
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
@@ -105,11 +105,20 @@ setup_virtual_floppy() {
 		SHARE_NO_HOME_WARN=0
 	fi
 
+	local resolution=
+	# Now that we fixed openslx.exe for VBox, we need the same hack for VMware
+	# since using VMwareResolutionSet can freeze the guest. Instead, we additionally
+	# show the full-screen toolbar again for > 1 display and let the user hammer
+	# the multi-screen button until it works.
+	if [ "$PLUGIN_ID" != "vmware" ] || [ "$DISPLAY_COUNT" -eq 1 ]; then
+		resolution="${RESOLUTIONS}"
+	fi
+
 	cat > "${FLOPPYDIR}/openslx.ini" <<-EOF
 	[openslx]
 	username=${UNAME}
-	resolution=${RESOLUTIONS%% *}
-	resolution2=${RESOLUTIONS}
+	resolution=${resolution%% *}
+	resolution2=${resolution}
 	createMissingRemap=${SHARE_CREATE_MISSING_REMAP}
 	remapMode=${SHARE_REMAP_MODE_INI}
 	homeDrive=${SHARE_HOME_DRIVE}
-- 
cgit v1.2.3-55-g7522