X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_sbin%2Fgrml-quickconfig;h=a7c2a9bdc991caa24b9642f9a5c3cac2c538b233;hb=84add129af8995a6ccdc9db457f89832146c16e8;hp=ea1395cafbf85f5b2e5b02ddb024a3bd647b7f0a;hpb=10dd4d041f14e5cd0f7bd87d9b9b307d20bc3548;p=grml-scripts.git

diff --git a/usr_sbin/grml-quickconfig b/usr_sbin/grml-quickconfig
index ea1395c..a7c2a9b 100755
--- a/usr_sbin/grml-quickconfig
+++ b/usr_sbin/grml-quickconfig
@@ -4,12 +4,13 @@
 # Authors:       Michael Schierl <schierlm-public@gmx.de>, Alexander Wirt <formorer@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Apr 12 13:47:04 CEST 2007 [mika]
+# Latest change: Fre Jun 22 23:05:01 CEST 2007 [mika]
 ################################################################################
 
 # menu with quick config options
 
 use Term::ReadKey;
+use Time::HiRes;
 
 # enable alternate charset support (needed for screen)
 print "\e(B\e)0";
@@ -56,8 +57,8 @@ $HLINE=$B."x".$N;      # A single horizontal line drawing character
     v => 'fvwm',
     2 => 'fvwm2',
     c => 'fvwm-crystal',
-    i => 'ion3',
     j => 'jwm',
+    o => 'openbox',
     p => 'pekwm',
     3 => 'pwm3',
     r => 'ratpoison',
@@ -101,30 +102,33 @@ EOF
   ReadMode 4; # Turn off controls keys
   while (not defined ($x = ReadKey(-1))) {
       # No key yet
+      Time::HiRes::sleep(0.5); 
   }
   ReadMode 0; # Reset tty mode before exiting
 
   print $N.$/.$/;
   if (defined($menu_commands{$x})) {
       $command = $menu_commands{$x};
-  } elsif ($x eq "\n") {
+  } elsif ($x eq "\n" || $x eq ' ') {
       $command= 'exit';
   } elsif ($x eq "x") {
       print <<"EOF";
 
-   ${B}lqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqk${N}
-   $HLINE Select a window manager (unsorted list):               $HLINE
-   $HLINE Press any other key to return to the main menu.        $HLINE
-   ${B}tqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqu${N}
-   $HLINE ${W}d${N}wm ${W}e${N}vilwm ${W}f${N}luxbox f${W}v${N}wm fvwm${W}2${N} fvwm-${W}c${N}rystal             $HLINE
-   $HLINE w${W}9${N}wm ${W}w${N}indowlab wm${W}i${N}i wmi-${W}n${N}g                             $HLINE
-   ${B}mqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqj${N}
+   ${B}lqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqk${N}
+   $HLINE Select a window manager (unsorted list):                $HLINE
+   $HLINE Press any other key to return to the main menu.         $HLINE
+   ${B}tqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqu${N}
+   $HLINE ${W}d${N}wm ${W}e${N}vilwm ${W}f${N}luxbox f${W}v${N}wm fvwm${W}2${N} fvwm-${W}c${N}rystal ${W}d${N}wm          ${N}$HLINE
+   $HLINE ${W}o${N}penbox pe${W}k${N}wm ${W}p${N}wm3 ${W}t${N}wm ${W}r${N}atpoison  w${W}9${N}wm ${W}w${N}indowlab        ${N}$HLINE
+   $HLINE wm${W}i${N}i wmi-${W}n${N}g                                             ${N}$HLINE
+   ${B}mqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqj${N}
 
 EOF
       print "Press a key: ".$M;
       ReadMode 4; # Turn off controls keys
       while (not defined ($x = ReadKey(-1))) {
     # No key yet
+        Time::HiRes::sleep(0.5); 
       }
       ReadMode 0; # Reset tty mode before exiting
 
@@ -132,7 +136,8 @@ EOF
       if (defined($windowmanagers{$x})) {
     $command = "su - grml -c 'grml-x ".$windowmanagers{$x}."'";
       } else {
-    print "Unknown key.\n";
+    print "Unknown key, not bound to a windowmanager.\n";
+    print "Returning to main menu.\n";
       }
   } else {
       print "Unknown key.\n";