about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--client.c70
-rw-r--r--cmd.c52
-rw-r--r--config.mk2
-rw-r--r--kb.c12
-rw-r--r--wm.c12
-rw-r--r--wm.h13
7 files changed, 97 insertions, 66 deletions
diff --git a/Makefile b/Makefile
index 223f6f7..ccb9af7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-WMSRC = bar.c client.c cmd.c draw.c event.c kb.c mouse.c util.c wm.c
+WMSRC = bar.c client.c draw.c event.c kb.c mouse.c util.c wm.c
 WMOBJ = ${WMSRC:.c=.o}
 MENSRC = menu.c draw.c util.c
 MENOBJ = ${MENSRC:.c=.o}
diff --git a/client.c b/client.c
index 84fbce5..b961d86 100644
--- a/client.c
+++ b/client.c
@@ -3,6 +3,7 @@
  * See LICENSE file for license details.
  */
 
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
@@ -10,6 +11,73 @@
 #include "util.h"
 #include "wm.h"
 
+void
+arrange(void *aux)
+{
+	Client *c;
+	int n, cols, rows, gw, gh, i, j;
+    float rt, fd;
+
+	if(!clients)
+		return;
+	for(n = 0, c = clients; c; c = c->next, n++);
+	rt = sqrt(n);
+	if(modff(rt, &fd) < 0.5)
+		rows = floor(rt);
+	else
+		rows = ceil(rt);
+	if(rows * rows < n)
+		cols = rows + 1;
+	else
+		cols = rows;
+
+	gw = (sw - 1)  / cols;
+	gh = (sh - bh - 1) / rows;
+
+	for(i = j = 0, c = clients; c; c = c->next) {
+		c->x = i * gw;
+		c->y = j * gh + bh;
+		c->w = gw;
+		c->h = gh;
+		resize(c);
+		if(++i == cols) {
+			j++;
+			i = 0;
+		}
+	}
+}
+
+void
+sel(void *aux)
+{
+	const char *arg = aux;
+	Client *c = NULL;
+
+	if(!arg || !stack)
+		return;
+	if(!strncmp(arg, "next", 5))
+		c = stack->snext ? stack->snext : stack;
+	else if(!strncmp(arg, "prev", 5))
+		for(c = stack; c && c->snext; c = c->snext);
+	if(!c)
+		c = stack;
+	raise(c);
+	focus(c);
+}
+
+void
+kill(void *aux)
+{
+	Client *c = stack;
+
+	if(!c)
+		return;
+	if(c->proto & WM_PROTOCOL_DELWIN)
+		send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+	else
+		XKillClient(dpy, c->win);
+}
+
 static void
 resize_title(Client *c)
 {
@@ -113,7 +181,7 @@ focus(Client *c)
 		draw_client(old);
 	}
 	XUnmapWindow(dpy, c->title);
-	draw_client(old);
+	draw_client(c);
 	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	XFlush(dpy);
 }
diff --git a/cmd.c b/cmd.c
deleted file mode 100644
index baa3ae9..0000000
--- a/cmd.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
-#include "wm.h"
-#include <stdio.h>
-#include <string.h>
-
-void
-run(void *aux)
-{
-	spawn(dpy, aux);
-}
-
-void
-quit(void *aux)
-{
-	running = False;
-}
-
-void
-sel(void *aux)
-{
-	const char *arg = aux;
-	Client *c = NULL;
-
-	if(!arg || !stack)
-		return;
-	if(!strncmp(arg, "next", 5))
-		c = stack->snext ? stack->snext : stack;
-	else if(!strncmp(arg, "prev", 5))
-		for(c = stack; c && c->snext; c = c->snext);
-	if(!c)
-		c = stack;
-	raise(c);
-	focus(c);
-}
-
-void
-kill(void *aux)
-{
-	Client *c = stack;
-
-	if(!c)
-		return;
-	if(c->proto & WM_PROTOCOL_DELWIN)
-		send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
-	else
-		XKillClient(dpy, c->win);
-}
-
diff --git a/config.mk b/config.mk
index 4fa9e86..0e5d372 100644
--- a/config.mk
+++ b/config.mk
@@ -11,7 +11,7 @@ X11LIB = /usr/X11R6/lib
 VERSION = 0.0
 
 # includes and libs
-LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
+LIBS = -L${PREFIX}/lib -L/usr/lib -lc -lm -L${X11LIB} -lX11
 
 # Linux/BSD
 CFLAGS = -g -Wall -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
diff --git a/kb.c b/kb.c
index 7eb788a..76dc29e 100644
--- a/kb.c
+++ b/kb.c
@@ -13,16 +13,18 @@ static const char *term[] = {
 };
 
 static const char *proglist[] = {
-		"sh", "-c", "exec `ls -lL /bin /sbin /usr/bin /usr/local/bin 2>/dev/null | awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort | uniq | gridmenu`", 0
+		"sh", "-c", "exec `ls -lL /bin /sbin /usr/bin /usr/local/bin 2>/dev/null "
+		"| awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort | uniq | gridmenu`", 0
 };
 
 static Key key[] = {
 	{ Mod1Mask, XK_Return, run, term },
 	{ Mod1Mask, XK_p, run, proglist }, 
-	{ Mod1Mask, XK_k, sel, "prev"}, 
-	{ Mod1Mask, XK_j, sel, "next"}, 
-	{ Mod1Mask | ShiftMask, XK_c, kill, NULL}, 
-	{ Mod1Mask | ShiftMask, XK_q, quit, NULL},
+	{ Mod1Mask, XK_k, sel, "prev" }, 
+	{ Mod1Mask, XK_j, sel, "next" }, 
+	{ Mod1Mask, XK_g, arrange, NULL }, 
+	{ Mod1Mask | ShiftMask, XK_c, kill, NULL }, 
+	{ Mod1Mask | ShiftMask, XK_q, quit, NULL },
 };
 
 void
diff --git a/wm.c b/wm.c
index f0069d2..02b9a68 100644
--- a/wm.c
+++ b/wm.c
@@ -175,6 +175,18 @@ cleanup()
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 
+void
+run(void *aux)
+{
+	spawn(dpy, aux);
+}
+
+void
+quit(void *aux)
+{
+	running = False;
+}
+
 int
 main(int argc, char *argv[])
 {
diff --git a/wm.h b/wm.h
index b5b07b5..1e6f214 100644
--- a/wm.h
+++ b/wm.h
@@ -58,12 +58,6 @@ extern Client *clients, *stack;
 /* bar.c */
 extern void draw_bar();
 
-/* cmd.c */
-extern void run(void *aux);
-extern void quit(void *aux);
-extern void kill(void *aux);
-extern void sel(void *aux);
-
 /* client.c */
 extern void manage(Window w, XWindowAttributes *wa);
 extern void unmanage(Client *c);
@@ -76,10 +70,15 @@ extern void update_size(Client *c);
 extern Client *gettitle(Window w);
 extern void raise(Client *c);
 extern void lower(Client *c);
+extern void kill(void *aux);
+extern void sel(void *aux);
 
 /* event.c */
 extern void discard_events(long even_mask);
 
+/* grid.c */
+extern void arrange();
+
 /* key.c */
 extern void update_keys();
 extern void keypress(XEvent *e);
@@ -92,3 +91,5 @@ extern void mmove(Client *c);
 extern int error_handler(Display *dpy, XErrorEvent *error);
 extern void send_message(Window w, Atom a, long value);
 extern int win_proto(Window w);
+extern void run(void *aux);
+extern void quit(void *aux);
previous revision' href='/ahoang/Nim/blame/lib/nimbase.h?h=devel&id=916c25f9a70b68eb7a5e2c45d7cc2e10c6e3a525'>^
405b86068


405b86068












07d5a8085 ^
405b86068

07d5a8085 ^
405b86068

07d5a8085 ^
405b86068


8b2a9401a ^

405b86068




8b2a9401a ^
405b86068
8b2a9401a ^
405b86068






8b2a9401a ^
405b86068







8b2a9401a ^






405b86068















07d5a8085 ^
405b86068









07d5a8085 ^
405b86068
07d5a8085 ^
405b86068

07d5a8085 ^

405b86068




07d5a8085 ^
405b86068






405b86068
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
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425