more nls updates

3 files changed, 33 insertions, 24 deletions

diff --git a/nls/Makefile.am b/nls/Makefile.am
index 7dbdc15..7b47ac5 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -18,4 +18,4 @@ distclean-local:
 
 fluxbox-nls.hh:
         chmod +x nlsinfo
-        ./nlsinfo -H -N FBNLS $(top_srcdir)/src > fluxbox-nls.hh
+        ./nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh
diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh
index 40e3001..9cac48f 100644
--- a/nls/fluxbox-nls.hh
+++ b/nls/fluxbox-nls.hh
@@ -1,4 +1,4 @@
-// This file generated by nlsinfo -H -N FBNLS ../src, on Mon Jun  7 21:30:58 2004
+// This file generated by nlsinfo -H -N FBNLS ../src ../util, on Tue Jun  8 23:00:01 2004
 
 #ifndef FLUXBOX_NLS_HH
 #define FLUXBOX_NLS_HH
@@ -165,8 +165,7 @@ enum {
         ToolbarOnHead = 0x9,
         ToolbarPlacement = 0xa,
         ToolbarToolbar = 0xb,
-        ToolbarToolbarTitle = 0xc,
-        ToolbarWidthPercent = 0xd,
+        ToolbarWidthPercent = 0xc,
 
         WindowSet = 0xf,
         WindowUnnamed = 0x1,
@@ -178,8 +177,9 @@ enum {
         WindowmenuLower = 0x4,
         WindowmenuMaximize = 0x5,
         WindowmenuRaise = 0x6,
-        WindowmenuShade = 0x7,
-        WindowmenuStick = 0x8,
+        WindowmenuSendTo = 0x7,
+        WindowmenuShade = 0x8,
+        WindowmenuStick = 0x9,
 
         WorkspaceSet = 0x11,
         WorkspaceDefaultNameFormat = 0x1,
@@ -187,7 +187,12 @@ enum {
         WorkspaceNewWorkspace = 0x3,
         WorkspaceRemoveLast = 0x4,
 
-        mainSet = 0x12,
+        bsetrootSet = 0x12,
+        bsetrootMustSpecify = 0x1,
+        bsetrootNoPixmapAtoms = 0x2,
+        bsetrootUsage = 0x3,
+
+        mainSet = 0x13,
         mainDISPLAYRequiresArg = 0x1,
         mainErrorBadAlloc = 0x2,
         mainErrorBadCast = 0x3,
diff --git a/nls/nlsinfo b/nls/nlsinfo
index c7e5772..2a3eec7 100644
--- a/nls/nlsinfo
+++ b/nls/nlsinfo
@@ -120,27 +120,27 @@ if (defined($opts{"r"})) {
 
 
 if (scalar(@ARGV) == 0) {
-    print STDERR "Must give one more argument - the directory to scan\n";
-    exit(1);
-} elsif (scalar(@ARGV) > 1) {
-    print STDERR "Too many arguments, none expected after directory to scan\n";
+    print STDERR "Must give at least one more argument - the directory to scan\n";
     exit(1);
 }
 
 
-my $dir = $ARGV[0];
-my $file;
-if (!defined($opts{"f"}) && ! -d $dir ) {
-    print STDERR "$dir is not a directory, aborting\n";
-    exit(2);
+my @args = @ARGV;
+if (!defined($opts{"f"})) {
+    foreach my $dir (@args) {
+        if (! -d $dir) {
+            print STDERR "$dir is not a directory, aborting\n";
+            exit(2);
+        }
+    }
 } elsif (defined($opts{"f"})) {
-    $file = $dir;
-    undef $dir;
     $recurse = 0;
 
-    if (! -r $file) {
-        print STDERR "$file is not a readable file, aborting\n";
-        exit(2);
+    foreach my $file (@args) {
+        if (! -r $file) {
+            print STDERR "$file is not a readable file, aborting\n";
+            exit(2);
+        }
     }
 }
 
@@ -150,10 +150,14 @@ if (!defined($opts{"f"}) && ! -d $dir ) {
 
 my %sets;
 
-if (defined($dir)) {
-    process_dir($dir);
+if (defined($opts{"f"})) {
+    foreach my $file (@args) {
+        process_file($file);
+    }
 } else {
-    process_file($file);
+    foreach my $dir (@args) {
+        process_dir($dir);
+    }
 }
 
 # Now we have the data, we need to print it out