aboutsummaryrefslogtreecommitdiff
path: root/nls
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-06-08 13:15:30 (GMT)
committerrathnor <rathnor>2004-06-08 13:15:30 (GMT)
commitb1b3a6b8d241388eef6d31029e2791a8e9cfaeba (patch)
tree0203940d67dee1025c11dd997ecb825d18db0f03 /nls
parentb659c2583c5a8825da34b94977fab213ab7946d4 (diff)
downloadfluxbox_paul-b1b3a6b8d241388eef6d31029e2791a8e9cfaeba.zip
fluxbox_paul-b1b3a6b8d241388eef6d31029e2791a8e9cfaeba.tar.bz2
more nls updates
Diffstat (limited to 'nls')
-rw-r--r--nls/Makefile.am2
-rw-r--r--nls/fluxbox-nls.hh17
-rw-r--r--nls/nlsinfo38
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:
18 18
19fluxbox-nls.hh: 19fluxbox-nls.hh:
20 chmod +x nlsinfo 20 chmod +x nlsinfo
21 ./nlsinfo -H -N FBNLS $(top_srcdir)/src > fluxbox-nls.hh 21 ./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 @@
1// This file generated by nlsinfo -H -N FBNLS ../src, on Mon Jun 7 21:30:58 2004 1// This file generated by nlsinfo -H -N FBNLS ../src ../util, on Tue Jun 8 23:00:01 2004
2 2
3#ifndef FLUXBOX_NLS_HH 3#ifndef FLUXBOX_NLS_HH
4#define FLUXBOX_NLS_HH 4#define FLUXBOX_NLS_HH
@@ -165,8 +165,7 @@ enum {
165 ToolbarOnHead = 0x9, 165 ToolbarOnHead = 0x9,
166 ToolbarPlacement = 0xa, 166 ToolbarPlacement = 0xa,
167 ToolbarToolbar = 0xb, 167 ToolbarToolbar = 0xb,
168 ToolbarToolbarTitle = 0xc, 168 ToolbarWidthPercent = 0xc,
169 ToolbarWidthPercent = 0xd,
170 169
171 WindowSet = 0xf, 170 WindowSet = 0xf,
172 WindowUnnamed = 0x1, 171 WindowUnnamed = 0x1,
@@ -178,8 +177,9 @@ enum {
178 WindowmenuLower = 0x4, 177 WindowmenuLower = 0x4,
179 WindowmenuMaximize = 0x5, 178 WindowmenuMaximize = 0x5,
180 WindowmenuRaise = 0x6, 179 WindowmenuRaise = 0x6,
181 WindowmenuShade = 0x7, 180 WindowmenuSendTo = 0x7,
182 WindowmenuStick = 0x8, 181 WindowmenuShade = 0x8,
182 WindowmenuStick = 0x9,
183 183
184 WorkspaceSet = 0x11, 184 WorkspaceSet = 0x11,
185 WorkspaceDefaultNameFormat = 0x1, 185 WorkspaceDefaultNameFormat = 0x1,
@@ -187,7 +187,12 @@ enum {
187 WorkspaceNewWorkspace = 0x3, 187 WorkspaceNewWorkspace = 0x3,
188 WorkspaceRemoveLast = 0x4, 188 WorkspaceRemoveLast = 0x4,
189 189
190 mainSet = 0x12, 190 bsetrootSet = 0x12,
191 bsetrootMustSpecify = 0x1,
192 bsetrootNoPixmapAtoms = 0x2,
193 bsetrootUsage = 0x3,
194
195 mainSet = 0x13,
191 mainDISPLAYRequiresArg = 0x1, 196 mainDISPLAYRequiresArg = 0x1,
192 mainErrorBadAlloc = 0x2, 197 mainErrorBadAlloc = 0x2,
193 mainErrorBadCast = 0x3, 198 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"})) {
120 120
121 121
122if (scalar(@ARGV) == 0) { 122if (scalar(@ARGV) == 0) {
123 print STDERR "Must give one more argument - the directory to scan\n"; 123 print STDERR "Must give at least one more argument - the directory to scan\n";
124 exit(1);
125} elsif (scalar(@ARGV) > 1) {
126 print STDERR "Too many arguments, none expected after directory to scan\n";
127 exit(1); 124 exit(1);
128} 125}
129 126
130 127
131my $dir = $ARGV[0]; 128my @args = @ARGV;
132my $file; 129if (!defined($opts{"f"})) {
133if (!defined($opts{"f"}) && ! -d $dir ) { 130 foreach my $dir (@args) {
134 print STDERR "$dir is not a directory, aborting\n"; 131 if (! -d $dir) {
135 exit(2); 132 print STDERR "$dir is not a directory, aborting\n";
133 exit(2);
134 }
135 }
136} elsif (defined($opts{"f"})) { 136} elsif (defined($opts{"f"})) {
137 $file = $dir;
138 undef $dir;
139 $recurse = 0; 137 $recurse = 0;
140 138
141 if (! -r $file) { 139 foreach my $file (@args) {
142 print STDERR "$file is not a readable file, aborting\n"; 140 if (! -r $file) {
143 exit(2); 141 print STDERR "$file is not a readable file, aborting\n";
142 exit(2);
143 }
144 } 144 }
145} 145}
146 146
@@ -150,10 +150,14 @@ if (!defined($opts{"f"}) && ! -d $dir ) {
150 150
151my %sets; 151my %sets;
152 152
153if (defined($dir)) { 153if (defined($opts{"f"})) {
154 process_dir($dir); 154 foreach my $file (@args) {
155 process_file($file);
156 }
155} else { 157} else {
156 process_file($file); 158 foreach my $dir (@args) {
159 process_dir($dir);
160 }
157} 161}
158 162
159# Now we have the data, we need to print it out 163# Now we have the data, we need to print it out