vfmg (DEVEL): vfmg, vfmgrc - wmii support, a little tricky but works

[sparky]

Author: sparky                       Date: Sat Jan 28 00:13:32 2006 GMT
Module: vfmg                          Tag: DEVEL
---- Log message:
- wmii support, a little tricky but works

---- Files affected:
vfmg:
   vfmg (1.73.2.54 -> 1.73.2.55) , vfmgrc (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: vfmg/vfmg
diff -u vfmg/vfmg:1.73.2.54 vfmg/vfmg:1.73.2.55
--- vfmg/vfmg:1.73.2.54	Thu Jan  5 18:46:31 2006
+++ vfmg/vfmg	Sat Jan 28 01:13:26 2006
@@ -42,7 +42,8 @@
 $defopt{xterm}="$ENV{'VFMG_TERM'}" if $ENV{'VFMG_TERM'};
 
 my @wms = qw(ASCII DR17 aewm afterstep blackbox enlightenment fbpanel fluxbox
-	fvwm fvwm2 icewm metisse olvwm openbox qvwm wmaker wmaker-old xfce4 xpde);
+	fvwm fvwm2 icewm metisse olvwm openbox qvwm wmaker wmaker-old wmii xfce4
+	xpde);
 
 # %destdir and %iconsdir should only contain directories propsed by WM
 my %destdir = (
@@ -1284,6 +1285,28 @@
 	print $apps;
 } # }}}
 
+sub wmii { # {{{
+	my ($no, $level)=@_;
+	my @apps;
+	foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
+		my $d = $desktop[$entry];
+		if($menu[$no]{$entry} < 0) {
+			push @apps, [encode($opt{encoding}, $$d{Name}), $$d{Exec}];
+		} else {
+			system("wmiir", "create", "/menu/items/menu" . $level . "/items/" .
+				encode($opt{encoding}, $$d{Name}),
+				"wmiir write /menu/lookup /items/menu" . $level ."/". $$d{file}. "/items; wmiir write /menu/ctl 'display 1'");
+				
+			wmii($menu[$no]{$entry}, $level ."/". $$d{file} );
+		}
+	}
+	foreach my $app (@apps) {
+		system("wmiir", "create",
+			"/menu/items/menu" . $level . "/items/" . $$app[0],
+			$$app[1]);
+	}
+} # }}}
+
 # sub xfce4 { {{{
 sub xmlname($) {
 	$_ = $_[0];
@@ -1514,6 +1537,10 @@
 }
 elsif($o_output eq "wmaker-old") {
 	wmakerold($opt{strip},"");
+}
+elsif($o_output eq "wmii") {
+	system(qw(wmiir remove /menu/items/menu));
+	wmii($opt{strip}, "");
 }
 elsif($o_output eq "xfce4") {
 	print "<xfdesktop-menu>\n";

================================================================
Index: vfmg/vfmgrc
diff -u vfmg/vfmgrc:1.10 vfmg/vfmgrc:1.11
--- vfmg/vfmgrc:1.10	Sun Dec 11 03:38:24 2005
+++ vfmg/vfmgrc	Sat Jan 28 01:13:26 2006
@@ -191,6 +191,14 @@
 #should be unstripped
 strip	= 0
 
+[wmii]
+# no icons support
+icons	= 0
+icons_full	= 0
+icons_scale	= 0
+
+# should be stripped
+strip	= 1
 
 ### TERMINAL information ###
 [terminals] # will be skipped, so no comment required
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/vfmg/vfmg?r1=1.73.2.54&r2=1.73.2.55&f=u
    http://cvs.pld-linux.org/vfmg/vfmgrc?r1=1.10&r2=1.11&f=u