Broader selection of windowmanagers, headers added.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2745 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 51 insertions, 11 deletions

diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh
index b9992c12..c0cad9d7 100644
--- a/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -225,14 +225,22 @@ filecheck
 # Get all virtual machine specific stuff from the respective include file
 if [ -e /etc/opt/openslx/run-${virt_mach}.include ] ; then
   . /etc/opt/openslx/run-${virt_mach}.include
-  # start fvwm for player 2+
-  # problems with windows opening in background
+  # start a windowmanager for player 2+
+  # otherwise expect problems with windows opening in background
   if [ "${virt_mach}" = "vmware" ]; then
     case "$vmversion" in
       2.0|6.0|2.5|6.5)
-        which fvwm2 >/dev/null 2>&1 && \
-        ( echo "EdgeScroll 0 0" > ${redodir}/fvwm
-        fvwm2 -f ${redodir}/fvwm >/dev/null 2>&1 & )
+        for dm in metacity kwin fvwm2 ; do
+          if which $dm >/dev/null 2>&1 ; then
+            if [ "$dm" = "fvwm2" ] ; then
+              echo "EdgeScroll 0 0" > ${redodir}/fvwm
+              fvwm2 -f ${redodir}/fvwm >/dev/null 2>&1 &
+            else
+              $dm &
+            fi
+            break
+          fi
+        done
       ;;
     esac
   fi
diff --git a/os-plugins/plugins/vmchooser/files/vmchooser.sh b/os-plugins/plugins/vmchooser/files/vmchooser.sh
index ad4f387e..8a47f9e2 100644
--- a/os-plugins/plugins/vmchooser/files/vmchooser.sh
+++ b/os-plugins/plugins/vmchooser/files/vmchooser.sh
@@ -1,9 +1,25 @@
 #!/bin/sh
+# -----------------------------------------------------------------------------
+# Copyright (c) 2007..2009 - RZ Uni FR
+# Copyright (c) 2007..2009 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# vmchooser.sh
+#    - This is a generic wrapper script for the vmchooser tool. If you would 
+#      like to apply any filters for the sessions to be shown to the logged in
+#      user, you could use a different path to the sessions *.xml's ...
+# -----------------------------------------------------------------------------
 
 if [ -e "/etc/opt/openslx/vmchooser-stage3.conf" ]; then
   . /etc/opt/openslx/vmchooser-stage3.conf
 fi
 
-
 /opt/openslx/plugin-repo/vmchooser/vmchooser -p${vmchooser_xmlpath}
 
diff --git a/os-plugins/plugins/vmchooser/files/xmlfilter.sh b/os-plugins/plugins/vmchooser/files/xmlfilter.sh
index 92c5807e..1b724ddd 100755
--- a/os-plugins/plugins/vmchooser/files/xmlfilter.sh
+++ b/os-plugins/plugins/vmchooser/files/xmlfilter.sh
@@ -1,10 +1,26 @@
 #!/bin/bash
-# Copyright (c) 2008 - Rechenzentrum Uni Freiburg, OpenSLX GmbH
+# -----------------------------------------------------------------------------
+# Copyright (c) 2007..2009 - RZ Uni FR
+# Copyright (c) 2007..2009 - OpenSLX GmbH
 #
-# This script simply filters xml-files (taking the path to these files in $1). # You might modify it in any way to match your needs, e.g. ask some database
-# instead. You can re-implement it in any other programming language too. You
-# simply have to return a list of proper xml files to be interpreted by the
-# vmchooser binary).
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# xmlfilter.sh
+#    - This script is invoked by the vmchooser tool. It simply filters xml-
+#      files (taking the path to these files in $1). You might modify it in any
+#      way to match your needs, e.g. ask some database instead. You can re-
+#      implement it in any other programming language too. You simply have to
+#      return a list of proper xml files to be interpreted by the vmchooser
+#      binary). Please check for vmchooser.sh too ...
+# -----------------------------------------------------------------------------
+
+# This script .
 #
 # currently:
 #     - filter for slxgrp (which comes from /etc/machine-setup)