summaryrefslogtreecommitdiffstats
path: root/core/modules/run-virt
diff options
context:
space:
mode:
authorSimon Rettberg2020-08-21 12:53:01 +0200
committerSimon Rettberg2020-08-21 12:53:01 +0200
commit3e1c221afeed6c121595eba37d5f3d001976a82c (patch)
tree51cf6cad45c6ca5c7a71b6fbc96b5783adf04a74 /core/modules/run-virt
parent[metacity] Add module (diff)
downloadmltk-3e1c221afeed6c121595eba37d5f3d001976a82c.tar.gz
mltk-3e1c221afeed6c121595eba37d5f3d001976a82c.tar.xz
mltk-3e1c221afeed6c121595eba37d5f3d001976a82c.zip
[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.
Diffstat (limited to 'core/modules/run-virt')
-rw-r--r--core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc13
1 files changed, 11 insertions, 2 deletions
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}