about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R. Garbe <garbeam@gmail.com>2007-10-06 19:43:15 +0200
committerAnselm R. Garbe <garbeam@gmail.com>2007-10-06 19:43:15 +0200
commiteeea4ef583a2ca3746e987bd2ecd570fd1869c2d (patch)
tree8cd07dd4c195c9330bc35d3319ce9117a43851ab
parent883e09b2eb8b6a42289bc5a64294df4122d90e38 (diff)
downloaddwm-eeea4ef583a2ca3746e987bd2ecd570fd1869c2d.tar.gz
applied Brandon MacDone's static initialization patch for seltags and Client->tags
-rw-r--r--dwm.c44
1 files changed, 21 insertions, 23 deletions
diff --git a/dwm.c b/dwm.c
index c9495ec..9e9e748 100644
--- a/dwm.c
+++ b/dwm.c
@@ -57,21 +57,6 @@ enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* typedefs */
 typedef struct Client Client;
-struct Client {
-	char name[256];
-	int x, y, w, h;
-	int rx, ry, rw, rh; /* revert geometry */
-	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
-	int minax, maxax, minay, maxay;
-	long flags;
-	unsigned int border, oldborder;
-	Bool isbanned, isfixed, ismax, isfloating, wasfloating;
-	Bool *tags;
-	Client *next;
-	Client *prev;
-	Client *snext;
-	Window win;
-};
 
 typedef struct {
 	int x, y, w, h;
@@ -195,7 +180,7 @@ char stext[256];
 double mwfact;
 int screen, sx, sy, sw, sh, wax, way, waw, wah;
 int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos, ntags;
+unsigned int bh, bpos;
 unsigned int blw = 0;
 unsigned int ltidx = 0; /* default */
 unsigned int nlayouts = 0;
@@ -218,7 +203,6 @@ void (*handler[LASTEvent]) (XEvent *) = {
 Atom wmatom[WMLast], netatom[NetLast];
 Bool otherwm, readin;
 Bool running = True;
-Bool *seltags;
 Bool selscreen = True;
 Client *clients = NULL;
 Client *sel = NULL;
@@ -232,6 +216,26 @@ Regs *regs = NULL;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
+/* Statically define the number of tags. */
+unsigned int ntags = sizeof tags / sizeof tags[0];
+Bool seltags[sizeof tags / sizeof tags[0]] = {[0] = True};
+
+struct Client {
+	char name[256];
+	int x, y, w, h;
+	int rx, ry, rw, rh; /* revert geometry */
+	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+	int minax, maxax, minay, maxay;
+	long flags;
+	unsigned int border, oldborder;
+	Bool isbanned, isfixed, ismax, isfloating, wasfloating;
+	Bool tags[sizeof tags / sizeof tags[0]];
+	Client *next;
+	Client *prev;
+	Client *snext;
+	Window win;
+};
+
 /* functions*/
 void
 applyrules(Client *c) {
@@ -393,7 +397,6 @@ cleanup(void) {
 	XFreeCursor(dpy, cursor[CurMove]);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 	XSync(dpy, False);
-	free(seltags);
 }
 
 void
@@ -1006,7 +1009,6 @@ manage(Window w, XWindowAttributes *wa) {
 	XWindowChanges wc;
 
 	c = emallocz(sizeof(Client));
-	c->tags = emallocz(ntags * sizeof(Bool));
 	c->win = w;
 	c->x = wa->x;
 	c->y = wa->y;
@@ -1467,9 +1469,6 @@ setup(void) {
 
 	/* init tags */
 	compileregs();
-	ntags = sizeof tags / sizeof tags[0];
-	seltags = emallocz(sizeof(Bool) * ntags);
-	seltags[0] = True;
 
 	/* init appearance */
 	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
@@ -1703,7 +1702,6 @@ unmanage(Client *c) {
 		focus(NULL);
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	setclientstate(c, WithdrawnState);
-	free(c->tags);
 	free(c);
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
ng/suckless/dwm/commit/event.c?h=5.7.2&id=dba23062bad40afb1a90f60b6897cf9e1ca5035b'>dba2306 ^
29355bd ^







6458d72 ^
dba2306 ^
29355bd ^
c0705ee ^
b9da4b0 ^



dba2306 ^
b9da4b0 ^

dfd84f9 ^
b9da4b0 ^

dba2306 ^
b9da4b0 ^





439e15d ^

439e15d ^

439e15d ^

439e15d ^
b9da4b0 ^
2e836ec ^
439e15d ^
a05beb6 ^
439e15d ^
a05beb6 ^
439e15d ^
a05beb6 ^
439e15d ^
a05beb6 ^
2e836ec ^
72655f0 ^
2e836ec ^
66da153 ^
439e15d ^





7696c89 ^
439e15d ^




439e15d ^
439e15d ^




439e15d ^


26e134b ^

439e15d ^




439e15d ^





3399650 ^

dfd84f9 ^
da2bbd3 ^
439e15d ^


439e15d ^


83d2390 ^
439e15d ^

59b4a5e ^
c0705ee ^
dba2306 ^
c0705ee ^
439e15d ^



adaa28a ^

























439e15d ^

439e15d ^











0053620 ^

439e15d ^


adaa28a ^

































439e15d ^

439e15d ^
66da153 ^
439e15d ^




3399650 ^
b1701ad ^
dba2306 ^
b1701ad ^

3399650 ^


66da153 ^
dba2306 ^
66da153 ^
3399650 ^

c0705ee ^
3399650 ^


c0705ee ^

3399650 ^

439e15d ^


adaa28a ^

































439e15d ^

439e15d ^


0053620 ^

439e15d ^
adaa28a ^





























1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355