Author: sparky Date: Tue Nov 1 02:55:22 2005 GMT
Module: vfmg Tag: DEVEL
---- Log message:
- use constants instead of numbers
---- Files affected:
vfmg:
vfmg (1.73.2.18 -> 1.73.2.19)
---- Diffs:
================================================================
Index: vfmg/vfmg
diff -u vfmg/vfmg:1.73.2.18 vfmg/vfmg:1.73.2.19
--- vfmg/vfmg:1.73.2.18 Tue Nov 1 03:13:53 2005
+++ vfmg/vfmg Tue Nov 1 03:55:16 2005
@@ -765,6 +765,11 @@
}
# WM functions {{{
+use constant FILENAME => 0;
+use constant LOCALENAME => 1;
+use constant ICON => 2;
+use constant EXEC => 3;
+
$level="";
sub cmpdname {
return $desktop{$a}[1] cmp $desktop{$b}[1];
@@ -774,12 +779,12 @@
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- $name = $$d[1];
+ $name = $$d[LOCALENAME];
$name =~ s/\"/\\\"/g;
my $icon = "";
- $icon = scale_icon($$d[2]) if $opt{icons};
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
if($menu[$no]{$entry} < 0) {
- $apps .= qq(${level}prog "$name" "$icon" $$d[3]\n);
+ $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);
@@ -798,9 +803,9 @@
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
if($menu[$no]{$entry} < 0) {
- $apps .= "$level"."[exec] ($$d[1]) {$$d[3]}\n";
+ $apps .= "$level"."[exec] ($$d[LOCALENAME])
{$$d[EXEC]}\n";
} else {
- print "$level"."[submenu] ($$d[1])\n";
+ print "$level"."[submenu] ($$d[LOCALENAME])\n";
$level.=" ";
blackbox($menu[$no]{$entry});
$level=substr($level,1);
@@ -815,10 +820,10 @@
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- my $name = $$d[1];
+ my $name = $$d[LOCALENAME];
$name =~ s/\"/\\\"/g;
if($menu[$no]{$entry} < 0) {
- $apps .= qq($level"$name" EXEC $$d[3]\n);
+ $apps .= qq($level"$name" EXEC $$d[EXEC]\n);
} else {
print qq($level"$name" MENU\n);
$level.=" ";
@@ -835,10 +840,10 @@
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- $name = $$d[1];
+ $name = $$d[LOCALENAME];
$name =~ s/\"/\\\"/g;
if($menu[$no]{$entry} < 0) {
- (my $exec = $$d[3]) =~ s/\"/\\\"/g;
+ (my $exec = $$d[EXEC]) =~ s/\"/\\\"/g;
$apps .= "$coma\n".
qq{$level("$name", EXEC, "$exec")};
} else {
@@ -867,12 +872,13 @@
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- $name = ($$d[1] =~ /["&<>]/) ? xmlname($$d[1]) : $$d[1];
+ $name = ($$d[LOCALENAME] =~ /["&<>]/) ?
+ xmlname($$d[LOCALENAME]) : $$d[LOCALENAME];
my $icon = "";
- $icon = scale_icon($$d[2]) if $opt{icons};
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
if($menu[$no]{$entry} < 0) {
$apps .= qq($level<app name="$name" cmd=");
- $apps .= ($$d[3] =~ /["&<>]/) ? xmlname($$d[3]) :
$$d[3];
+ $apps .= ($$d[EXEC] =~ /["&<>]/) ? xmlname($$d[EXEC]) :
$$d[EXEC];
$apps .= qq(" icon="$icon"/>\n);
} else {
print qq($level<menu name="$name" icon="$icon"
visible="yes">\n);
@@ -890,14 +896,14 @@
foreach my $entry(keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- $name = encode($opt{encoding},$$d[1]);
+ $name = encode($opt{encoding},$$d[LOCALENAME]);
if($menu[$no]{$entry} < 0) {
$name=~s/\"/\\\"/g;
my $icon = "";
- $icon = scale_icon($$d[2]) if $opt{icons};
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
my $F_OUT;
- open $F_OUT, ">> $dir/$$d[0]" or warn "$dir/$$d[0]:
$!\n";
- print $F_OUT qq(Exec "$name" exec $$d[3]\n);
+ 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 {
@@ -918,14 +924,14 @@
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
if($menu[$no]{$entry} < 0) {
- $name = $$d[1];
+ $name = $$d[LOCALENAME];
$name =~ s/\"/\\\"/g;
- $apps .= qq(\tExec "$name"\texec $$d[3]\n);
+ $apps .= qq(\tExec "$name"\texec $$d[EXEC]\n);
} else {
- $name = $$d[0];
+ $name = $$d[FILENAME];
$name =~ s/\s+/_/g;
- $this_menu .= qq(\tPopup "$$d[1]"\t$file.$name\n);
- fvwm($menu[$no]{$entry},"$file.$name",$$d[1]);
+ $this_menu .= qq(\tPopup
"$$d[LOCALENAME]"\t$file.$name\n);
+ fvwm($menu[$no]{$entry},"$file.$name",$$d[LOCALENAME]);
}
}
print $this_menu . $apps . "EndPopup\n\n" if length $file;
@@ -936,14 +942,14 @@
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- ( my $name = $$d[1] ) =~ s/\"/\\\"/g;
+ ( my $name = $$d[LOCALENAME] ) =~ s/\"/\\\"/g;
if($menu[$no]{$entry}<0) {
my $icon = "";
- $icon = scale_icon($$d[2]) if $opt{icons};
- $apps .= qq(AddToMenu $level "$name" Exec $$d[3]
&\n);
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
+ $apps .= qq(AddToMenu $level "$name" Exec $$d[EXEC]
&\n);
$apps .= qq(Style "$name" Icon $icon\n) if length
$icon;
} else {
- my $file = $$d[0];
+ my $file = $$d[FILENAME];
$file =~ s/\s+/_/g;
$level .= ".$file";
print qq(AddToMenu $level "$name" Popup $level\n);
@@ -966,16 +972,16 @@
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
my $icon = "";
- $icon = scale_icon($$d[2]) if $opt{icons};
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
$icon = "\%$icon\%" if length $icon;
if($menu[$no]{$entry} < 0) {
- ( my $name = $$d[1] ) =~ s/\"/\\\"/g;
- $apps .= qq(+ "$icon$name"\tExec exec $$d[3]\n);
+ ( my $name = $$d[LOCALENAME] ) =~ s/\"/\\\"/g;
+ $apps .= qq(+ "$icon$name"\tExec exec $$d[EXEC]\n);
} else {
- ( my $name = $$d[0] ) =~ s/\s+/_/g;
- $this_menu .= qq(+ "$icon$$d[1]"\tPopup\t$file.$name\n);
- metisse($menu[$no]{$entry},"$file.$name",$$d[1]);
+ ( my $name = $$d[FILENAME] ) =~ s/\s+/_/g;
+ $this_menu .= qq(+
"$icon$$d[LOCALENAME]"\tPopup\t$file.$name\n);
+
metisse($menu[$no]{$entry},"$file.$name",$$d[LOCALENAME]);
}
}
print $this_menu . $apps . "\n" if length $file;
@@ -986,9 +992,9 @@
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- ( my $name = $$d[1] ) =~ s/\"/\\\"/g;
+ ( my $name = $$d[LOCALENAME] ) =~ s/\"/\\\"/g;
if($menu[$no]{$entry}<0) {
- $apps .= qq($level"$name" exec $$d[3]\n);
+ $apps .= qq($level"$name" exec $$d[EXEC]\n);
} else {
print qq($level"$name" MENU\n);
$level.=" ";
@@ -1005,11 +1011,11 @@
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- ( my $name = $$d[1] ) =~ s/\"/\\\"/g;
+ ( my $name = $$d[LOCALENAME] ) =~ s/\"/\\\"/g;
my $icon = "";
- $icon = scale_icon($$d[2]) if $opt{icons};
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
if($menu[$no]{$entry} < 0) {
- ( my $exec = $$d[3] ) =~ s/\"/\\\"/g;
+ ( my $exec = $$d[EXEC] ) =~ s/\"/\\\"/g;
$apps .= qq($level"$name" "$icon" "$exec"\n);
} else {
print qq($level"$name" "$icon"\n),
@@ -1029,9 +1035,9 @@
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- ( my $name = $$d[1] ) =~ s/\"/\\\"/g;
+ ( my $name = $$d[LOCALENAME] ) =~ s/\"/\\\"/g;
if($menu[$no]{$entry} < 0) {
- ( my $exec = $$d[3] ) =~ s/\"/\\\"/g;
+ ( my $exec = $$d[EXEC] ) =~ s/\"/\\\"/g;
$apps .= qq(${level}cmd "$name" "$exec"\n);
} else {
print qq(${level}menu "$name"\n);
@@ -1052,15 +1058,15 @@
my $apps="";
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- $name=encode($opt{encoding},$$d[1]);
+ $name=encode($opt{encoding},$$d[LOCALENAME]);
$name=~s/\"/\'/g;
my $icon="";
- $icon = scale_icon($$d[2]) if $opt{icons};
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
if($menu[$no]{$entry}<0) {
- $apps .= qq("$name" "$icon" exec "$$d[3]"\n);
+ $apps .= qq("$name" "$icon" exec "$$d[EXEC]"\n);
} else {
- print $F_OUT qq("$name" "$icon" menu
"$dir/$$d[0].menu"\n);
- enlightenment($menu[$no]{$entry},$$d[0],$name);
+ print $F_OUT qq("$name" "$icon" menu
"$dir/$$d[FILENAME].menu"\n);
+ enlightenment($menu[$no]{$entry},$$d[FILENAME],$name);
}
}
print $F_OUT $apps;
@@ -1071,15 +1077,15 @@
my ($no, $dir)[EMAIL PROTECTED];
foreach my $entry (keys %{$menu[$no]}) {
my $d = $desktop{$entry};
- $name = encode($opt{encoding},$$d[1]);
+ $name = encode($opt{encoding},$$d[LOCALENAME]);
if($menu[$no]{$entry} < 0) {
$name =~ s/\"/\\\"/g;
my $icon = "";
- $icon = scale_icon($$d[2]) if $opt{icons};
- open F_OUT, ">> $dir/$$d[0].lnk" or warn
"$dir/$$d[0].lnk: $!\n";
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
+ open F_OUT, ">> $dir/$$d[FILENAME].lnk" or warn
"$dir/$$d[FILENAME].lnk: $!\n";
print F_OUT "[Shortcut]\n",
"Caption=$name\n",
- "Command=$$d[3]\n";
+ "Command=$$d[EXEC]\n";
print F_OUT "Icon=$icon\n" if length $icon;
close F_OUT;
} else {
@@ -1096,17 +1102,17 @@
foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
my $d = $desktop{$entry};
my $icon = "";
- $icon = scale_icon($$d[2]) if $opt{icons};
+ $icon = scale_icon($$d[ICON]) if $opt{icons};
if($menu[$no]{$entry}<0) {
$apps .=
"${level}item {\n".
- "${level} name = $$d[1]\n".
- "${level} action = $$d[3]\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[1]\n";
+ print "${level} name = $$d[LOCALENAME]\n";
print "${level} image = $icon\n";
$level.=" ";
fbpanel($menu[$no]{$entry});
@@ -1124,13 +1130,13 @@
my $d = $desktop{$entry};
if($menu[$no]{$entry}<0) {
$apps .=
- qq($level<item label="$$d[1]">\n).
+ qq($level<item label="$$d[LOCALENAME]">\n).
qq($level <action name="Execute">\n).
- qq($level <execute>$$d[3]</execute>\n).
+ qq($level
<execute>$$d[EXEC]</execute>\n).
qq($level </action>\n).
qq($level</item>\n);
} else {
- print qq($level<menu id="$$d[1]" label="$$d[1]">\n);
+ print qq($level<menu id="$$d[LOCALENAME]"
label="$$d[LOCALENAME]">\n);
$level.=" ";
openbox($menu[$no]{$entry});
$level=substr($level,1);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/vfmg/vfmg?r1=1.73.2.18&r2=1.73.2.19&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
