- by Przemyslaw Iskra

Changed files:
    vfmg-enlightenment_fix.patch -> 1.1
    vfmg-metisse.patch -> 1.1

diff --git a/vfmg-enlightenment_fix.patch b/vfmg-enlightenment_fix.patch
new file mode 100644 (file)
index 0000000..8b1d155
--- /dev/null
+++ b/vfmg-enlightenment_fix.patch
@@ -0,0 +1,27 @@
+--- vfmg-0.9.18/vfmg.orig      2004-12-07 19:12:25.793620512 +0100
++++ vfmg-0.9.18/vfmg   2004-12-07 19:13:33.724293480 +0100
+@@ -74,7 +74,7 @@
+ @tmp=split(/:+/,$ENV{'XDG_DATA_DIRS'}) if $ENV{'XDG_DATA_DIRS'};
+ my @xdg_data_dirs=grep -d, $tmp,@tmp;
+ 
+-$tmp="$ENV{'HOME'}/.config";
++#$tmp="$ENV{'HOME'}/.config";
+ $tmp="$ENV{'XDG_CONFIG_HOME'}" if $ENV{'XDG_CONFIG_HOME'};
+ @tmp=("/etc/xdg");
+ @tmp=split(/:+/,$ENV{'XDG_CONFIG_DIRS'}) if $ENV{'XDG_CONFIG_DIRS'};
+@@ -908,13 +908,13 @@
+               $icon=$menu[$no]{$entry}[1] if $o_icons;
+               $icon=scale_icon($icon,"png","-geometry 18x18") if $icon;
+               if($menu[$no]{$entry}[0]<0) {
+-                      $name=~s/\"/\\\"/g;
++                      $name=~s/\"/\'/g;
+                       print $F_OUT "\"$name\" \"$icon\" exec \"$menu[$no]{$entry}[2]\"\n";
+               } else {
+                       $name=substr($name,1);
+                       $name=~s|/||g;
+                       my $name2=$name;
+-                      $name2=~s/\"/\\\"/g;
++                      $name2=~s/\"/\'/g;
+                       print $F_OUT "\"$name2\" \"$icon\" menu \"$dir/$name2.menu\"\n";
+                       enlightenment($menu[$no]{$entry}[0],"$name","$name");
+               }

diff --git a/vfmg-metisse.patch b/vfmg-metisse.patch
new file mode 100644 (file)
index 0000000..c924d2b
--- /dev/null
+++ b/vfmg-metisse.patch
@@ -0,0 +1,113 @@
+diff -Nura vfmg-0.9.18.orig/vfmg vfmg-0.9.18/vfmg
+--- vfmg-0.9.18.orig/vfmg      2004-12-07 22:20:51.329071000 +0100
++++ vfmg-0.9.18/vfmg   2004-12-07 22:41:14.452128376 +0100
+@@ -41,7 +41,7 @@
+       );
+ 
+ if($o_help) {
+-      print "Usage:   $0 [options] {aewm, afterstep, blackbox, enlightenment, fbpanel, fluxbox, fvwm, fvwm2, icewm, openbox, olvwm, qvwm, wmaker, wmaker-old, xfce4, xpde}
++      print "Usage:   $0 [options] {aewm, afterstep, blackbox, enlightenment, fbpanel, fluxbox, fvwm, fvwm2, icewm, metisse, openbox, olvwm, qvwm, wmaker, wmaker-old, xfce4, xpde}
+       -h, --help      - print this help
+       -t, --tags      - echo omitted tags to stderr
+       -e, --end       - echo omitted XDG file ending to stderr
+@@ -60,11 +60,11 @@
+       exit;
+ }
+ 
+-die "Missing argument {aewm, afterstep, blackbox, enlightenment, fbpanel, fluxbox, fvwm, fvwm2, icewm, openbox, olvwm, qvwm, wmaker, wmaker-old, xfce4, xpde}\n"
++die "Missing argument {aewm, afterstep, blackbox, enlightenment, fbpanel, fluxbox, fvwm, fvwm2, icewm, metisse, openbox, olvwm, qvwm, wmaker, wmaker-old, xfce4, xpde}\n"
+       unless exists $ARGV[0];
+ $o_output=$ARGV[0];
+ die "Unrecognized argument: $o_output\n"
+-      unless $o_output=~/^(aewm|afterstep|blackbox|enlightenment|fbpanel|fluxbox|fvwm|fvwm2|icewm|openbox|olvwm|qvwm|wmaker|wmaker-old|xfce4|xpde)$/;
++      unless $o_output=~/^(aewm|afterstep|blackbox|enlightenment|fbpanel|fluxbox|fvwm|fvwm2|icewm|metisse|openbox|olvwm|qvwm|wmaker|wmaker-old|xfce4|xpde)$/;
+ 
+ $o_full=1 if $o_icons and $o_output=~/^(enlightenment)$/;
+       
+@@ -839,6 +839,41 @@
+       print "\n";
+ }
+ 
++sub metisse {
++      my $no=$_[0];
++      my $file=$_[1];
++      $file=~s|^\.||;
++      my $basename=$_[2];
++      foreach my $entry(keys %{$menu[$no]}) {
++              if($menu[$no]{$entry}[0]>=0) {
++                      $name=substr($entry,1);
++                      $name=~s|/||g;
++                      my $menutitle=$name;
++                      $name=~s/\s+/_/g;
++                    metisse($menu[$no]{$entry}[0],"$file.$name","$menutitle");
++              }
++      }
++      if (!$file) {
++              return;
++      }
++      print "DestroyMenu $file\n";
++      print "AddToMenu $file \"$basename\" Title\n";
++      foreach my $entry(sort keys %{$menu[$no]}) {
++              if($menu[$no]{$entry}[0]<0) {
++                      $name=$entry;
++                      $name=~s/\"/\\\"/g;
++                      print "+ \"$name\"\tExec exec $menu[$no]{$entry}[2]\n";
++              } else {
++                      $name=substr($entry,1);
++                      $name=~s|/||g;
++                      my $menutitle=$name;
++                      $name=~s/\s+/_/g;
++                      print "+ \"$menutitle\"\tPopup\t$file.$name\n";
++              }
++      }
++      print "\n";
++}
++
+ sub olvwm {
+       my $no=$_[0];
+       foreach my $entry(sort keys %{$menu[$no]}) {
+@@ -1062,6 +1097,12 @@
+       fvwm2($o_strip);
+       exit;
+ }
++
++if($o_output eq "metisse") {
++      metisse($o_strip,"", "metisse");
++      exit;
++}
++              
+ if($o_output eq "olvwm") {
+       olvwm($o_strip);
+       exit;
+diff -Nura vfmg-0.9.18.orig/vfmg.html vfmg-0.9.18/vfmg.html
+--- vfmg-0.9.18.orig/vfmg.html 2004-12-07 22:20:51.325071000 +0100
++++ vfmg-0.9.18/vfmg.html      2004-12-07 22:24:29.116962552 +0100
+@@ -4,7 +4,7 @@
+       <title>VFolders Menu Generator home page</title>
+       <meta name="author" content="gotar">
+       <meta name="description" content="VFolders Menu Generator home page">
+-      <meta name="keywords" content="vfmg, menu, window manager, vfolders, aewm, afterstep, blackbox, enlightenment, fluxbox, fvwm, fvwm2, icewm, olvwm, qvwm, wmaker, xfce4, xpde, fbpanel, openbox">
++      <meta name="keywords" content="vfmg, menu, window manager, vfolders, aewm, afterstep, blackbox, enlightenment, fluxbox, fvwm, fvwm2, icewm, metisse, olvwm, qvwm, wmaker, xfce4, xpde, fbpanel, openbox">
+       <meta http-equiv="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+ </head>
+ <body bgcolor=lightblue>
+@@ -41,6 +41,7 @@
+ <a TARGET="_blank" href="http://www.fvwm.org/">fvwm</a>,
+ <a TARGET="_blank" href="http://www.fvwm.org/">fvwm2</a>,
+ <a TARGET="_blank" href="http://www.icewm.org/">icewm</a>,
++<a TARGET="_blank" href="http://insitu.lri.fr/~chapuis/metisse/">metisse</a>,
+ <a TARGET="_blank" href="http://www.phys.columbia.edu/~flame/olvwm.html">olvwm</a>,
+ <a TARGET="_blank" href="http://www.icculus.org/openbox/">openbox</a>,
+ <a TARGET="_blank" href="http://www.qvwm.org/">qvwm</a>,
+diff -Nura vfmg-0.9.18.orig/vfmg-zsh vfmg-0.9.18/vfmg-zsh
+--- vfmg-0.9.18.orig/vfmg-zsh  2004-08-01 08:11:55.000000000 +0200
++++ vfmg-0.9.18/vfmg-zsh       2004-12-07 22:25:55.922766064 +0100
+@@ -1,7 +1,7 @@
+ #compdef vfmg
+ 
+ _arguments \
+-      ':Output:(aewm afterstep blackbox enlightenment fbpanel fluxbox fvwm2 icewm openbox olvwm qvwm wmaker wmaker-old xfce4 xpde)' \
++      ':Output:(aewm afterstep blackbox enlightenment fbpanel fluxbox fvwm2 icewm metisse openbox olvwm qvwm wmaker wmaker-old xfce4 xpde)' \
+       '(-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]' \