Author: sparky Date: Wed Nov 2 00:40:20 2005 GMT
Module: vfmg Tag: DEVEL
---- Log message:
- sorted WM names, functions, final 'case'; nothing else done
---- Files affected:
vfmg:
vfmg (1.73.2.25 -> 1.73.2.26)
---- Diffs:
================================================================
Index: vfmg/vfmg
diff -u vfmg/vfmg:1.73.2.25 vfmg/vfmg:1.73.2.26
--- vfmg/vfmg:1.73.2.25 Wed Nov 2 00:32:11 2005
+++ vfmg/vfmg Wed Nov 2 01:40:14 2005
@@ -39,7 +39,7 @@
$defopt{xterm}="$ENV{'VFMG_TERM'}" if $ENV{'VFMG_TERM'};
my @wms = qw(DR17 aewm afterstep blackbox enlightenment fbpanel fluxbox fvwm
- fvwm2 icewm metisse openbox olvwm qvwm wmaker wmaker-old xfce4 xpde);
+ fvwm2 icewm metisse olvwm openbox qvwm wmaker wmaker-old xfce4 xpde);
# %destdir and %iconsdir should only contain directories propsed by WM
my %destdir = (
@@ -863,136 +863,111 @@
close F_OUT;
} # }}}
-sub icewm { # {{{
+sub aewm { # {{{
my ($no, $level)[EMAIL PROTECTED];
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- $name = $$d[LOCALENAME];
- $name =~ s/\"/\\\"/g;
- my $icon = "";
- $icon = scale_icon($$d[ICON]) if $opt{icons};
+ ( my $name = $$d[LOCALENAME] ) =~ s/\"/\\\"/g;
if($menu[$no]{$entry} < 0) {
- $apps .= qq(${level}prog "$name" "$icon" $$d[EXEC]\n);
+ ( my $exec = $$d[EXEC] ) =~ s/\"/\\\"/g;
+ $apps .= qq(${level}cmd "$name" "$exec"\n);
} else {
- $icon = "folder" if not length $icon and $opt{icons};
- print qq(${level}menu "$name" "$icon" {\n);
- icewm($menu[$no]{$entry}, $level.step);
- print "$level}\n";
+ print qq(${level}menu "$name"\n);
+ aewm($menu[$no]{$entry},$level.step);
+ print "${level}end\n";
}
}
print $apps;
} # }}}
-sub blackbox { # {{{
- my ($no, $level)[EMAIL PROTECTED];
- my $apps="";
- foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
+sub afterstep { # {{{
+ my ($no, $dir)[EMAIL PROTECTED];
+
+ foreach my $entry(keys %{$menu[$no]}) {
my $d = $desktop{$entry};
+ $name = encode($opt{encoding},$$d[LOCALENAME]);
if($menu[$no]{$entry} < 0) {
- $apps .= "$level"."[exec] ($$d[LOCALENAME])
{$$d[EXEC]}\n";
+ $name=~s/\"/\\\"/g;
+ my $icon = "";
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
+ my $F_OUT;
+ open $F_OUT, ">> $dir/$$d[FILENAME]" or warn
"$dir/$$d[FILENAME]: $!\n";
+ print $F_OUT qq(Exec "$name" exec $$d[EXEC]\n);
+ print $F_OUT qq(MiniPixmap "$icon"\n) if length $icon;
+ close $F_OUT;
} else {
- print "$level"."[submenu] ($$d[LOCALENAME])\n";
- blackbox($menu[$no]{$entry}, $level.step);
- print "$level\[end]\n";
+ $name =~ s|/||g;
+ mkpath("$dir/$name",0,0700);
+ afterstep($menu[$no]{$entry},"$dir/$name");
}
}
- print $apps;
} # }}}
-sub wmakerold { # {{{
+sub blackbox { # {{{
my ($no, $level)[EMAIL PROTECTED];
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- my $name = $$d[LOCALENAME];
- $name =~ s/\"/\\\"/g;
if($menu[$no]{$entry} < 0) {
- $apps .= qq($level"$name" EXEC $$d[EXEC]\n);
+ $apps .= "$level"."[exec] ($$d[LOCALENAME])
{$$d[EXEC]}\n";
} else {
- print qq($level"$name" MENU\n);
- wmakerold($menu[$no]{$entry}, $level.step);
- print qq($level"$name" END\n);
+ print "$level"."[submenu] ($$d[LOCALENAME])\n";
+ blackbox($menu[$no]{$entry}, $level.step);
+ print "$level\[end]\n";
}
}
print $apps;
} # }}}
-sub wmaker { # {{{
- my ($no, $coma, $level)[EMAIL PROTECTED];
+sub enlightenment { # {{{
+ my ($no, $mfile, $title)[EMAIL PROTECTED];
+ my $F_OUT;
+ open $F_OUT, ">> $opt{destdir}/$mfile.menu" or warn
"$opt{destdir}/$mfile.menu: $!\n";
+ print $F_OUT qq("$title"\n);
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- $name = $$d[LOCALENAME];
- $name =~ s/\"/\\\"/g;
- if($menu[$no]{$entry} < 0) {
- (my $exec = $$d[EXEC]) =~ s/\"/\\\"/g;
- $apps .= "$coma\n".
- qq{$level("$name", EXEC, "$exec")};
+ $name=encode($opt{encoding},$$d[LOCALENAME]);
+ $name=~s/\"/\'/g;
+ my $icon="";
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
+ if($menu[$no]{$entry}<0) {
+ $apps .= qq("$name" "$icon" exec "$$d[EXEC]"\n);
} else {
- print "$coma\n",
- qq{$level("$name"};
- wmaker($menu[$no]{$entry},",",$level.step);
- print "\n$level)";
+ print $F_OUT qq("$name" "$icon" menu
"$opt{destdir}/$$d[FILENAME].menu"\n);
+ enlightenment($menu[$no]{$entry},$$d[FILENAME],$name);
}
}
- print $apps;
+ print $F_OUT $apps;
+ close $F_OUT;
} # }}}
-# sub xfce4 { {{{
-sub xmlname($) {
- $_ = $_[0];
- s/&/&/g;
- s/\"/"/g;
- s/</</g;
- s/>/>/g;
- return $_;
-}
-sub xfce4 {
+sub fbpanel { # {{{
my ($no, $level)[EMAIL PROTECTED];
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- $name = ($$d[LOCALENAME] =~ /["&<>]/) ?
- xmlname($$d[LOCALENAME]) : $$d[LOCALENAME];
my $icon = "";
$icon = scale_icon($$d[ICON]) if $opt{icons};
- if($menu[$no]{$entry} < 0) {
- $apps .= qq($level<app name="$name" cmd=");
- $apps .= ($$d[EXEC] =~ /["&<>]/) ? xmlname($$d[EXEC]) :
$$d[EXEC];
- $apps .= qq(" icon="$icon"/>\n);
+ if($menu[$no]{$entry}<0) {
+ $apps .=
+ "${level}item {\n".
+ "${level} name = $$d[LOCALENAME]\n".
+ "${level} action = $$d[EXEC]\n".
+ "${level} image = $icon\n".
+ "${level}}\n";
} else {
- print qq($level<menu name="$name" icon="$icon"
visible="yes">\n);
- xfce4($menu[$no]{$entry},$level.step);
- print "$level</menu>\n";
+ print "${level}menu {\n";
+ print "${level} name = $$d[LOCALENAME]\n";
+ print "${level} image = $icon\n";
+ fbpanel($menu[$no]{$entry},$level.step);
+ print "${level}}\n";
}
}
print $apps;
} # }}}
-sub afterstep { # {{{
- my ($no, $dir)[EMAIL PROTECTED];
-
- foreach my $entry(keys %{$menu[$no]}) {
- my $d = $desktop{$entry};
- $name = encode($opt{encoding},$$d[LOCALENAME]);
- if($menu[$no]{$entry} < 0) {
- $name=~s/\"/\\\"/g;
- my $icon = "";
- $icon = scale_icon($$d[ICON]) if $opt{icons};
- my $F_OUT;
- open $F_OUT, ">> $dir/$$d[FILENAME]" or warn
"$dir/$$d[FILENAME]: $!\n";
- print $F_OUT qq(Exec "$name" exec $$d[EXEC]\n);
- print $F_OUT qq(MiniPixmap "$icon"\n) if length $icon;
- close $F_OUT;
- } else {
- $name =~ s|/||g;
- mkpath("$dir/$name",0,0700);
- afterstep($menu[$no]{$entry},"$dir/$name");
- }
- }
-} # }}}
-
sub fvwm { # {{{
my ($no, $file, $basename)[EMAIL PROTECTED];
$file=~s|^\.||;
@@ -1039,6 +1014,27 @@
print $apps."\n";
} # }}}
+sub icewm { # {{{
+ my ($no, $level)[EMAIL PROTECTED];
+ my $apps="";
+ foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
+ my $d = $desktop{$entry};
+ $name = $$d[LOCALENAME];
+ $name =~ s/\"/\\\"/g;
+ my $icon = "";
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
+ if($menu[$no]{$entry} < 0) {
+ $apps .= qq(${level}prog "$name" "$icon" $$d[EXEC]\n);
+ } else {
+ $icon = "folder" if not length $icon and $opt{icons};
+ print qq(${level}menu "$name" "$icon" {\n);
+ icewm($menu[$no]{$entry}, $level.step);
+ print "$level}\n";
+ }
+ }
+ print $apps;
+} # }}}
+
sub metisse { # {{{
my ($no, $file, $basename) = @_;
$file =~ s|^\.||;
@@ -1081,6 +1077,27 @@
print $apps;
} # }}}
+sub openbox { # {{{
+ my ($no, $level)[EMAIL PROTECTED];
+ my $apps="";
+ foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
+ my $d = $desktop{$entry};
+ if($menu[$no]{$entry}<0) {
+ $apps .=
+ qq($level<item label="$$d[LOCALENAME]">\n).
+ qq($level <action name="Execute">\n).
+ qq($level
<execute>$$d[EXEC]</execute>\n).
+ qq($level </action>\n).
+ qq($level</item>\n);
+ } else {
+ print qq($level<menu id="$$d[LOCALENAME]"
label="$$d[LOCALENAME]">\n);
+ openbox($menu[$no]{$entry},$level.step);
+ print "$level</menu>\n";
+ }
+ }
+ print $apps;
+} # }}}
+
sub qvwm { # {{{
my ($no, $level)[EMAIL PROTECTED];
my $apps="";
@@ -1102,45 +1119,74 @@
print $apps;
} # }}}
-sub aewm { # {{{
+sub wmaker { # {{{
+ my ($no, $coma, $level)[EMAIL PROTECTED];
+ my $apps="";
+ foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
+ my $d = $desktop{$entry};
+ $name = $$d[LOCALENAME];
+ $name =~ s/\"/\\\"/g;
+ if($menu[$no]{$entry} < 0) {
+ (my $exec = $$d[EXEC]) =~ s/\"/\\\"/g;
+ $apps .= "$coma\n".
+ qq{$level("$name", EXEC, "$exec")};
+ } else {
+ print "$coma\n",
+ qq{$level("$name"};
+ wmaker($menu[$no]{$entry},",",$level.step);
+ print "\n$level)";
+ }
+ }
+ print $apps;
+} # }}}
+
+sub wmakerold { # {{{
my ($no, $level)[EMAIL PROTECTED];
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- ( my $name = $$d[LOCALENAME] ) =~ s/\"/\\\"/g;
+ my $name = $$d[LOCALENAME];
+ $name =~ s/\"/\\\"/g;
if($menu[$no]{$entry} < 0) {
- ( my $exec = $$d[EXEC] ) =~ s/\"/\\\"/g;
- $apps .= qq(${level}cmd "$name" "$exec"\n);
+ $apps .= qq($level"$name" EXEC $$d[EXEC]\n);
} else {
- print qq(${level}menu "$name"\n);
- aewm($menu[$no]{$entry},$level.step);
- print "${level}end\n";
+ print qq($level"$name" MENU\n);
+ wmakerold($menu[$no]{$entry}, $level.step);
+ print qq($level"$name" END\n);
}
}
print $apps;
} # }}}
-sub enlightenment { # {{{
- my ($no, $mfile, $title)[EMAIL PROTECTED];
- my $F_OUT;
- open $F_OUT, ">> $opt{destdir}/$mfile.menu" or warn
"$opt{destdir}/$mfile.menu: $!\n";
- print $F_OUT qq("$title"\n);
+# sub xfce4 { {{{
+sub xmlname($) {
+ $_ = $_[0];
+ s/&/&/g;
+ s/\"/"/g;
+ s/</</g;
+ s/>/>/g;
+ return $_;
+}
+sub xfce4 {
+ my ($no, $level)[EMAIL PROTECTED];
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- $name=encode($opt{encoding},$$d[LOCALENAME]);
- $name=~s/\"/\'/g;
- my $icon="";
+ $name = ($$d[LOCALENAME] =~ /["&<>]/) ?
+ xmlname($$d[LOCALENAME]) : $$d[LOCALENAME];
+ my $icon = "";
$icon = scale_icon($$d[ICON]) if $opt{icons};
- if($menu[$no]{$entry}<0) {
- $apps .= qq("$name" "$icon" exec "$$d[EXEC]"\n);
+ if($menu[$no]{$entry} < 0) {
+ $apps .= qq($level<app name="$name" cmd=");
+ $apps .= ($$d[EXEC] =~ /["&<>]/) ? xmlname($$d[EXEC]) :
$$d[EXEC];
+ $apps .= qq(" icon="$icon"/>\n);
} else {
- print $F_OUT qq("$name" "$icon" menu
"$opt{destdir}/$$d[FILENAME].menu"\n);
- enlightenment($menu[$no]{$entry},$$d[FILENAME],$name);
+ print qq($level<menu name="$name" icon="$icon"
visible="yes">\n);
+ xfce4($menu[$no]{$entry},$level.step);
+ print "$level</menu>\n";
}
}
- print $F_OUT $apps;
- close $F_OUT;
+ print $apps;
} # }}}
sub xpde { # {{{
@@ -1165,52 +1211,6 @@
}
}
} # }}}
-
-sub fbpanel { # {{{
- my ($no, $level)[EMAIL PROTECTED];
- my $apps="";
- foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
- my $d = $desktop{$entry};
- my $icon = "";
- $icon = scale_icon($$d[ICON]) if $opt{icons};
- if($menu[$no]{$entry}<0) {
- $apps .=
- "${level}item {\n".
- "${level} name = $$d[LOCALENAME]\n".
- "${level} action = $$d[EXEC]\n".
- "${level} image = $icon\n".
- "${level}}\n";
- } else {
- print "${level}menu {\n";
- print "${level} name = $$d[LOCALENAME]\n";
- print "${level} image = $icon\n";
- fbpanel($menu[$no]{$entry},$level.step);
- print "${level}}\n";
- }
- }
- print $apps;
-} # }}}
-
-sub openbox { # {{{
- my ($no, $level)[EMAIL PROTECTED];
- my $apps="";
- foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
- my $d = $desktop{$entry};
- if($menu[$no]{$entry}<0) {
- $apps .=
- qq($level<item label="$$d[LOCALENAME]">\n).
- qq($level <action name="Execute">\n).
- qq($level
<execute>$$d[EXEC]</execute>\n).
- qq($level </action>\n).
- qq($level</item>\n);
- } else {
- print qq($level<menu id="$$d[LOCALENAME]"
label="$$d[LOCALENAME]">\n);
- openbox($menu[$no]{$entry},$level.step);
- print "$level</menu>\n";
- }
- }
- print $apps;
-} # }}}
# WM functions }}}
unless (length $opt{encoding}) {
@@ -1286,8 +1286,12 @@
unlink $DR{icon};
exit;
} # }}}
-if($o_output eq "icewm") {
- icewm($opt{strip},"");
+if($o_output eq "aewm") {
+ aewm($opt{strip},"");
+ exit;
+}
+if($o_output eq "afterstep") {
+ afterstep($opt{strip},$opt{destdir});
exit;
}
if($o_output eq "blackbox") {
@@ -1296,32 +1300,12 @@
print "[end]\n" unless $opt{nomenu};
exit;
}
-if($o_output eq "wmaker-old") {
- wmakerold($opt{strip},"");
- exit;
-}
-if($o_output eq "wmaker") {
- if($opt{strip}) {
- wmaker(1,",","");
- } else {
- wmaker(0,"","");
- }
- print "\n";
- exit;
-}
-if($o_output eq "xfce4") {
- print "<xfdesktop-menu>\n";
- print qq(<title name="Desktop Menu" visible="yes"/>\n) unless
$opt{nomenu};
- xfce4($opt{strip},step);
- print "</xfdesktop-menu>\n";
- exit;
-}
-if($o_output eq "afterstep") {
- afterstep($opt{strip},$opt{destdir});
+if($o_output eq "enlightenment") {
+ enlightenment($opt{strip},"index","Enlightenment");
exit;
}
-if($o_output eq "fvwm") {
- fvwm($opt{strip},"", "fvwm");
+if($o_output eq "fbpanel") {
+ fbpanel($opt{strip},"");
exit;
}
if($o_output eq "fluxbox") { # This is the same as blackbox (I hope so)
@@ -1330,10 +1314,18 @@
print "[end]\n" unless $opt{nomenu};
exit;
}
+if($o_output eq "fvwm") {
+ fvwm($opt{strip},"", "fvwm");
+ exit;
+}
if($o_output eq "fvwm2") {
fvwm2($opt{strip},"fvwm2");
exit;
}
+if($o_output eq "icewm") {
+ icewm($opt{strip},"");
+ exit;
+}
if($o_output eq "metisse") {
metisse($opt{strip},"", "metisse");
exit;
@@ -1342,33 +1334,41 @@
olvwm($opt{strip},"");
exit;
}
+if($o_output eq "openbox") {
+ print "<openbox_menu>\n" unless $opt{nomenu};
+ print qq(<menu id="root-menu" label="PLD Linux">\n) unless $opt{nomenu};
+ openbox($opt{strip},"");
+ print "</menu>\n" unless $opt{nomenu};
+ print "</openbox_menu>\n" unless $opt{nomenu};
+ exit;
+}
if($o_output eq "qvwm") {
print "[StartMenu]\n";
qvwm($opt{strip},"");
exit;
}
-if($o_output eq "aewm") {
- aewm($opt{strip},"");
- exit;
-}
-if($o_output eq "enlightenment") {
- enlightenment($opt{strip},"index","Enlightenment");
+if($o_output eq "wmaker") {
+ if($opt{strip}) {
+ wmaker(1,",","");
+ } else {
+ wmaker(0,"","");
+ }
+ print "\n";
exit;
}
-if($o_output eq "xpde") {
- xpde($opt{strip},$opt{destdir});
+if($o_output eq "wmaker-old") {
+ wmakerold($opt{strip},"");
exit;
}
-if($o_output eq "fbpanel") {
- fbpanel($opt{strip},"");
+if($o_output eq "xfce4") {
+ print "<xfdesktop-menu>\n";
+ print qq(<title name="Desktop Menu" visible="yes"/>\n) unless
$opt{nomenu};
+ xfce4($opt{strip},step);
+ print "</xfdesktop-menu>\n";
exit;
}
-if($o_output eq "openbox") {
- print "<openbox_menu>\n" unless $opt{nomenu};
- print qq(<menu id="root-menu" label="PLD Linux">\n) unless $opt{nomenu};
- openbox($opt{strip},"");
- print "</menu>\n" unless $opt{nomenu};
- print "</openbox_menu>\n" unless $opt{nomenu};
+if($o_output eq "xpde") {
+ xpde($opt{strip},$opt{destdir});
exit;
}
# WM case }}}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/vfmg/vfmg?r1=1.73.2.25&r2=1.73.2.26&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
