summaryrefslogtreecommitdiffstats
path: root/core/modules/vmware-common
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/vmware-common
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/vmware-common')
-rw-r--r--core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/create_vmhome_preferences_file.inc4
-rw-r--r--core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include4
2 files changed, 5 insertions, 3 deletions
diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/create_vmhome_preferences_file.inc b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/create_vmhome_preferences_file.inc
index b4197051..82997e6b 100644
--- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/create_vmhome_preferences_file.inc
+++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/create_vmhome_preferences_file.inc
@@ -4,6 +4,8 @@
###########################################
## Functions ##
create_vmhome_preferences_file() {
+ local nobar=1
+ [ "$DISPLAY_COUNT" -gt 1 ] && nobar=0
cat > "${VM_HOME}/preferences" <<-HEREEND
.encoding = "UTF-8"
# This configuration file was generated on $(date)
@@ -45,7 +47,7 @@ create_vmhome_preferences_file() {
# fullscreen/mouse/keyboard
pref.fullscreen.toolbarPixels = "0"
pref.vmplayer.fullscreen.autohide = "TRUE"
- pref.vmplayer.fullscreen.nobar = 1
+ pref.vmplayer.fullscreen.nobar = $nobar
pref.grabOnMouseClick = "TRUE"
pref.grabOnKeyPress = "TRUE"
pref.motionGrab = "TRUE"
diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include
index 548dc97d..a59ea434 100644
--- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include
+++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include
@@ -47,8 +47,8 @@ run_plugin() {
# If we have multi-screen, try to switch to blackbox, seems the only
# lean WM to handle this properly.
- if [ "$DISPLAY_COUNT" -gt 1 ] && command -v blackbox > /dev/null; then
- start_wm "blackbox"
+ if [ "$DISPLAY_COUNT" -gt 1 ] && command -v xfwm4 > /dev/null; then
+ start_wm "xfwm4"
fi
# HACK: make the mouse disappear