- olvwm support

Changed files:
    vfmg -> 1.30
    vfmg-zsh -> 1.5

diff --git a/vfmg b/vfmg
index 73587ae9188c2877f390046f7a2ef6fa18a7e3a8..19921f3b6232694fefe8f5e65dcf6b86cb882bce 100755 (executable)
--- a/vfmg
+++ b/vfmg
@@ -30,7 +30,7 @@ GetOptions('help'=>\$o_help,
        );
 
 if($o_help) {
-       print "Usage:   $0 [options] afterstep|blackbox|fluxbox|fvwm2|icewm|wmaker|wmaker-old|xfce4
+       print "Usage:   $0 [options] afterstep|blackbox|fluxbox|fvwm2|icewm|olvwm|wmaker|wmaker-old|xfce4
        -h, --help      - print this help
        -t, --tags      - echo omitted tags to stderr
        -e, --end       - echo omitted XDG file ending to stderr
@@ -45,11 +45,11 @@ if($o_help) {
        exit;
 }
 
-die "Missing argument (afterstep|blackbox|fluxbox|fvwm2|icewm|wmaker|wmaker-old|xfce4)\n"
+die "Missing argument (afterstep|blackbox|fluxbox|fvwm2|icewm|olvwm|wmaker|wmaker-old|xfce4)\n"
        unless exists $ARGV[0];
 $o_output=$ARGV[0];
 die "Unrecognized argument: $o_output\n"
-       unless $o_output=~/^(afterstep|blackbox|fluxbox|fvwm2|icewm|wmaker|wmaker-old|xfce4)$/;
+       unless $o_output=~/^(afterstep|blackbox|fluxbox|fvwm2|icewm|olvwm|wmaker|wmaker-old|xfce4)$/;
 
 
 if($o_exec) {
@@ -671,6 +671,25 @@ sub fvwm2 {
        }
        print "\n";
 }
+sub olvwm {
+       my $no=$_[0];
+       my $name;
+       foreach my $entry(sort keys %{$menu[$no]}) {
+               print "$level";
+               if($menu[$no]{$entry}[0]<0) {
+                       print "\"$entry\"       exec $menu[$no]{$entry}[2]\n";
+               } else {
+                       $name=$entry;
+                       $name=~s/^\0//;
+                       print "\"$name\" MENU\n";
+                       $level.="       ";
+                       olvwm($menu[$no]{$entry}[0]);
+                       $level=~s/      //;
+                       print "$level\"$name\" END PIN\n";
+               }
+       }
+}
+
 
 if($o_output eq "icewm") {
        icewm($o_strip);
@@ -729,3 +748,7 @@ if($o_output eq "fvwm2") {
        fvwm2($o_strip);
        exit;
 }
+if($o_output eq "olvwm") {
+       olvwm($o_strip);
+       exit;
+}

diff --git a/vfmg-zsh b/vfmg-zsh
index a44de123b868d2048f54090b77d65452e2f86589..0ff2875042e7470b20e6520507071155cf44d41a 100644 (file)
--- a/vfmg-zsh
+++ b/vfmg-zsh
@@ -1,7 +1,7 @@
 #compdef vfmg
 
 _arguments \
-       ':Output:(afterstep blackbox fluxbox fvwm2 icewm wmaker wmaker-old xfce4)' \
+       ':Output:(afterstep blackbox fluxbox fvwm2 icewm olvwm wmaker wmaker-old xfce4)' \
        '(-h --help)'{-h,--help}'[print help]' \
        '(-t --tags)'{-t,--tags}'[echo omitted tags to stderr]' \
        '(-e --end)'{-e,--end}'[echo omitted XDG file ending to stderr]' \