yet another cleanup

some cleanup changes
uncommented dual layout in preparation of dwm 4.9
2008-04-03 14:39:19 +01:00 · 2008-04-03 14:38:58 +01:00 · 2008-04-02 22:18:09 +01:00 · 2008-04-02 22:10:55 +01:00 · 2008-04-01 15:46:00 +01:00 · 2008-03-31 10:09:48 +01:00
18 changed files with 2241 additions and 2175 deletions
--- a/.hgtags
+++ b/.hgtags
@ -5,3 +5,50 @@ eb3165734f00fe7f7da8aeebaed00e60a57caac9 0.4
 22213b9a2114167ee8ba019a012e27da0422a61a 0.5
 c11f86db4550cac5d0a648a3fe4d6d3b9a4fcf7e 0.6
 3fb41412e2492f66476d92ce8f007a8b48fb1d2a 0.7
 cd15de32e173f8ce97bfe1c9b6607937b59056b4 0.8
 fae61afa861755636c4a1070694209ace8efbb6c 0.9
 bbc98e77ae89a7c9232a5be0835f60ea00d8036e 1.0
 44a55e6e46bf6c231780b09d919977d6f01083de 1.1
 e3179ce2b90451d2807cd53b589d768412b8666b 1.2
 f5f5cbf016a94b48a8fe9c47f0736e96d166d5d4 1.3
 3cff9403766bf83a9fc2a0aef230115d68de2a8e 1.4
 728c9089b079721b43c3347124639a29baa22a97 1.5
 ad3fa2d185426c51fd5deceae809770363f8d33c 1.6
 4dbdb61c8b8ce21dee5c7050a6b103855964ed20 1.7
 d5ad819f2a66a40fa75dd2e44429f3bfc884d07b 1.7.1
 c71952fa3c7ca848ec38a6923b5c6d0e18fff431 1.8
 a5567a0d30112822db2627a04a2e7aa3b6c38148 1.9
 12deea36603da407e3f32640048846a3bd74a9ec 2.0
 a2c465098a3b972bbed00feda9804b6aae1e9531 2.1
 7e92f58754ae6edb3225f26d754bd89c1ff458cf 2.2
 719b37b37b0df829d7cf017ac70e353088fe5849 2.3
 32b246925086910d63147483160281a91a47479f 2.4
 dcbbfabc8ecc5f33a6cc950584de87da1a368045 2.5
 c7f84f23ec5aef29988dcdc4ec22a7352ee8f58e 2.5.1
 5308dd22b6ee8e3218c81d9e7e4125f235bb5778 2.6
 21951c0dfbae5af68ed77821a4d87253ee91803f 2.7
 107719a9ce3bd0c79f9f1f626596eb338a276561 2.8
 3a5910fac3ccb522a98aeeba7af7008530b25092 2.9
 76b58d21ea98257c05565a3b9c850b9b26a32968 3.0
 e1c8bef05e6e48df4f26471ea0712aa43ab9d949 3.1
 4ce65f61f01b055fa6c2901c6d2527ef741aa4bf 3.2
 f2cabc83a18f9b5b548159329ddd4dee904fa31f 3.2.1
 d3876aa792923f9a95f7ad0c7f0134533404df35 3.2.2
 0f91934037b04221ff5d1ba3a6c39c1ff26e3661 3.3
 9ede7b2d2450537e750d5505789fbe63960e97e6 3.4
 63ad05e7f9e1f4f1881fb02f529cb6c6ae81e693 3.5
 75b1b25fe0d7e29400baf30568153f668324928b 3.6
 20ec6976cee1fcfee0c2f354ae382ee3f9f68efa 3.6.1
 baee494346e520f8dee2cee9491b8350064770d2 3.7
 2ea201354cf016407ea93e1e390d1422940d29b0 3.8
 55478328b2422c700c5404a774c85e77322f41a3 3.9
 018c3846842291cb6c009dc087e7fe2f0ef53bea 4.0
 00f4180df72b49aadb2933804fde4bfb33e5666d 4.1
 c13cb8c6b7a56af74cc88346e71d2490470b546f 4.2
 e0ec0d5d8b1ef3ee04a83c7c0fee5853aa2ac6a6 4.3
 408014d2126153d2b0fce26a13ba707db222b7b9 4.4
 7c117df5d202530e85066d8b1ab02cef605c79ad 4.4.1
 2acc60d6dfe28c101a8cd44a8aa710a38ae3607c 4.5
 bcd7e18e196a00cc2e97ff3a4a58f3cdaba13856 4.6
 d6d3085307d8d98b8b012b669e858fd787befeb1 4.7
 607015ddb091d49cbd3457af41713691aa69f4d6 4.8
--- a/8
+++ b/8
@ -1,6 +1,12 @@
 MIT/X Consortium License
-(C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+© 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
 © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
 © 2006-2007 Jukka Salmi <jukka at salmi dot ch>
 © 2007 Premysl Hruby <dfenze at gmail dot com>
 © 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
 © 2007 Christof Musik <christof at sendfax dot de>
 © 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
--- a/20
+++ b/20
@ -1,13 +1,12 @@
 # dwm - dynamic window manager
-#   (C)opyright MMVI Anselm R. Garbe
+# © 2006-2007 Anselm R. Garbe, Sander van Dijk
 include config.mk
-SRC = client.c draw.c event.c main.c tag.c util.c
+SRC = dwm.c
 OBJ = ${SRC:.c=.o}
 all: options dwm
 	@echo finished
 options:
 	@echo dwm build options:
@ -19,16 +18,15 @@ options:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
-${OBJ}: dwm.h config.h config.mk
+${OBJ}: config.h config.mk
 config.h:
-	@echo creating $@ from config.default.h
+	@echo creating $@ from config.def.h
-	@cp config.default.h $@
+	@cp config.def.h $@
 dwm: ${OBJ}
-	@echo LD $@
+	@echo CC -o $@
 	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 	@strip $@
 clean:
 	@echo cleaning
@ -37,8 +35,8 @@ clean:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dwm-${VERSION}
-	@cp -R LICENSE Makefile README config.*.h config.mk \
+	@cp -R LICENSE Makefile README config.def.h config.mk \
-		dwm.1 dwm.h ${SRC} dwm-${VERSION}
+		dwm.1 ${SRC} dwm-${VERSION}
 	@tar -cf dwm-${VERSION}.tar dwm-${VERSION}
 	@gzip dwm-${VERSION}.tar
 	@rm -rf dwm-${VERSION}
@ -50,7 +48,7 @@ install: all
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@sed 's/VERSION/${VERSION}/g' < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
+	@sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
 uninstall:
--- a/9
+++ b/9
@ -1,6 +1,6 @@
 dwm - dynamic window manager
----------------------------
+============================
-dwm is an extremely fast, small, and dynamic X11 window manager.
+dwm is an extremely fast, small, and dynamic window manager for X.
 Requirements
@ -18,6 +18,9 @@ necessary as root):
    make clean install
 If you are going to use the default bluegray color scheme it is highly
 recommended to also install the bluegray files shipped in the dextra package.
 Running dwm
 -----------
@ -37,7 +40,7 @@ like this in your .xinitrc:
    while true
    do
-        echo `date` `uptime | sed 's/.*://; s/,//g'`
+        echo `date` `uptime | sed 's/.*,//'`
        sleep 1
    done | dwm
--- a/client.c
+++ b/client.c
@ -1,486 +0,0 @@
 /*
 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */
 #include "dwm.h"
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 /* static functions */
 static void
 resizetitle(Client *c)
 {
 	int i;
 	c->tw = 0;
 	for(i = 0; i < ntags; i++)
 		if(c->tags[i])
 			c->tw += textw(tags[i]);
 	c->tw += textw(c->name);
 	if(c->tw > c->w)
 		c->tw = c->w + 2;
 	c->tx = c->x + c->w - c->tw + 2;
 	c->ty = c->y;
 	if(c->tags[tsel])
 		XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
 	else
 		XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
 }
 static int
 xerrordummy(Display *dsply, XErrorEvent *ee)
 {
 	return 0;
 }
 /* extern functions */
 void
 ban(Client *c)
 {
 	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
 }
 void
 focus(Client *c)
 {
 	if (!issel)
 		return;
 	Client *old = sel;
 	XEvent ev;
 	sel = c;
 	if(old && old != c)
 		drawtitle(old);
 	drawtitle(c);
 	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 void
 focusnext(Arg *arg)
 {
 	Client *c;
 	if(!sel)
 		return;
 	if(sel->ismax)
 		togglemax(NULL);
 	if(!(c = getnext(sel->next)))
 		c = getnext(clients);
 	if(c) {
 		higher(c);
 		focus(c);
 	}
 }
 void
 focusprev(Arg *arg)
 {
 	Client *c;
 	if(!sel)
 		return;
 	if(sel->ismax)
 		togglemax(NULL);
 	if(!(c = getprev(sel->prev))) {
 		for(c = clients; c && c->next; c = c->next);
 		c = getprev(c);
 	}
 	if(c) {
 		higher(c);
 		focus(c);
 	}
 }
 Client *
 getclient(Window w)
 {
 	Client *c;
 	for(c = clients; c; c = c->next)
 		if(c->win == w)
 			return c;
 	return NULL;
 }
 Client *
 getctitle(Window w)
 {
 	Client *c;
 	for(c = clients; c; c = c->next)
 		if(c->title == w)
 			return c;
 	return NULL;
 }
 void
 gravitate(Client *c, Bool invert)
 {
 	int dx = 0, dy = 0;
 	switch(c->grav) {
 	default:
 		break;
 	case StaticGravity:
 	case NorthWestGravity:
 	case NorthGravity:
 	case NorthEastGravity:
 		dy = c->border;
 		break;
 	case EastGravity:
 	case CenterGravity:
 	case WestGravity:
 		dy = -(c->h / 2) + c->border;
 		break;
 	case SouthEastGravity:
 	case SouthGravity:
 	case SouthWestGravity:
 		dy = -(c->h);
 		break;
 	}
 	switch (c->grav) {
 	default:
 		break;
 	case StaticGravity:
 	case NorthWestGravity:
 	case WestGravity:
 	case SouthWestGravity:
 		dx = c->border;
 		break;
 	case NorthGravity:
 	case CenterGravity:
 	case SouthGravity:
 		dx = -(c->w / 2) + c->border;
 		break;
 	case NorthEastGravity:
 	case EastGravity:
 	case SouthEastGravity:
 		dx = -(c->w + c->border);
 		break;
 	}
 	if(invert) {
 		dx = -dx;
 		dy = -dy;
 	}
 	c->x += dx;
 	c->y += dy;
 }
 void
 higher(Client *c)
 {
 	XRaiseWindow(dpy, c->win);
 	XRaiseWindow(dpy, c->title);
 }
 void
 killclient(Arg *arg)
 {
 	if(!sel)
 		return;
 	if(sel->proto & PROTODELWIN)
 		sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
 	else
 		XKillClient(dpy, sel->win);
 }
 void
 manage(Window w, XWindowAttributes *wa)
 {
 	Client *c;
 	Window trans;
 	XSetWindowAttributes twa;
 	c = emallocz(sizeof(Client));
 	c->tags = emallocz(ntags * sizeof(Bool));
 	c->win = w;
 	c->x = c->tx = wa->x;
 	c->y = c->ty = wa->y;
 	c->w = c->tw = wa->width;
 	c->h = wa->height;
 	c->th = bh;
 	c->border = 0;
 	setsize(c);
 	if(c->h != sh && c->y < bh)
 		c->y = c->ty = bh;
 	c->proto = getproto(c->win);
 	XSelectInput(dpy, c->win,
 		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
 	XGetTransientForHint(dpy, c->win, &trans);
 	twa.override_redirect = 1;
 	twa.background_pixmap = ParentRelative;
 	twa.event_mask = ExposureMask | EnterWindowMask;
 	c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
 			0, DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 	if(clients)
 		clients->prev = c;
 	c->next = clients;
 	clients = c;
 	XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button1, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button1, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button2, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button2, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button3, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button3, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	settags(c);
 	if(!c->isfloat)
 		c->isfloat = trans
 			|| (c->maxw && c->minw &&
 				c->maxw == c->minw && c->maxh == c->minh);
 	settitle(c);
 	arrange(NULL);
 	/* mapping the window now prevents flicker */
 	XMapRaised(dpy, c->win);
 	XMapRaised(dpy, c->title);
 	if(c->tags[tsel])
 		focus(c);
 }
 void
 resize(Client *c, Bool sizehints, Corner sticky)
 {
 	int bottom = c->y + c->h;
 	int right = c->x + c->w;
 	/*XConfigureEvent e;*/
 	XWindowChanges wc;
 	if(sizehints) {
 		if(c->incw)
 			c->w -= (c->w - c->basew) % c->incw;
 		if(c->inch)
 			c->h -= (c->h - c->baseh) % c->inch;
 		if(c->minw && c->w < c->minw)
 			c->w = c->minw;
 		if(c->minh && c->h < c->minh)
 			c->h = c->minh;
 		if(c->maxw && c->w > c->maxw)
 			c->w = c->maxw;
 		if(c->maxh && c->h > c->maxh)
 			c->h = c->maxh;
 	}
 	if(c->x > right) /* might happen on restart */
 		c->x = right - c->w;
 	if(c->y > bottom)
 		c->y = bottom - c->h;
 	if(sticky == TopRight || sticky == BotRight)
 		c->x = right - c->w;
 	if(sticky == BotLeft || sticky == BotRight)
 		c->y = bottom - c->h;
 	resizetitle(c);
 	wc.x = c->x;
 	wc.y = c->y;
 	wc.width = c->w;
 	wc.height = c->h;
 	if(c->w == sw && c->h == sh)
 		wc.border_width = 0;
 	else
 		wc.border_width = 1;
 	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
 	XSync(dpy, False);
 }
 void
 setsize(Client *c)
 {
 	long msize;
 	XSizeHints size;
 	if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
 		size.flags = PSize;
 	c->flags = size.flags;
 	if(c->flags & PBaseSize) {
 		c->basew = size.base_width;
 		c->baseh = size.base_height;
 	}
 	else
 		c->basew = c->baseh = 0;
 	if(c->flags & PResizeInc) {
 		c->incw = size.width_inc;
 		c->inch = size.height_inc;
 	}
 	else
 		c->incw = c->inch = 0;
 	if(c->flags & PMaxSize) {
 		c->maxw = size.max_width;
 		c->maxh = size.max_height;
 	}
 	else
 		c->maxw = c->maxh = 0;
 	if(c->flags & PMinSize) {
 		c->minw = size.min_width;
 		c->minh = size.min_height;
 	}
 	else
 		c->minw = c->minh = 0;
 	if(c->flags & PWinGravity)
 		c->grav = size.win_gravity;
 	else
 		c->grav = NorthWestGravity;
 }
 void
 settitle(Client *c)
 {
 	char **list = NULL;
 	int n;
 	XTextProperty name;
 	name.nitems = 0;
 	c->name[0] = 0;
 	XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]);
 	if(!name.nitems)
 		XGetWMName(dpy, c->win, &name);
 	if(!name.nitems)
 		return;
 	if(name.encoding == XA_STRING)
 		strncpy(c->name, (char *)name.value, sizeof(c->name));
 	else {
 		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
 				&& n > 0 && *list)
 		{
 			strncpy(c->name, *list, sizeof(c->name));
 			XFreeStringList(list);
 		}
 	}
 	XFree(name.value);
 	resizetitle(c);
 }
 void
 togglemax(Arg *arg)
 {
 	int ox, oy, ow, oh;
 	XEvent ev;
 	if(!sel)
 		return;
 	if((sel->ismax = !sel->ismax)) {
 		ox = sel->x;
 		oy = sel->y;
 		ow = sel->w;
 		oh = sel->h;
 		sel->x = sx;
 		sel->y = sy + bh;
 		sel->w = sw - 2;
 		sel->h = sh - 2 - bh;
 		higher(sel);
 		resize(sel, False, TopLeft);
 		sel->x = ox;
 		sel->y = oy;
 		sel->w = ow;
 		sel->h = oh;
 	}
 	else
 		resize(sel, False, TopLeft);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 void
 unmanage(Client *c)
 {
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	XDestroyWindow(dpy, c->title);
 	if(c->prev)
 		c->prev->next = c->next;
 	if(c->next)
 		c->next->prev = c->prev;
 	if(c == clients)
 		clients = c->next;
 	if(sel == c) {
 		sel = getnext(c->next);
 		if(!sel)
 			sel = getprev(c->prev);
 		if(!sel)
 			sel = clients;
 	}
 	free(c->tags);
 	free(c);
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
 	arrange(NULL);
 	if(sel)
 		focus(sel);
 }
 void
 zoom(Arg *arg)
 {
 	Client *c;
 	if(!sel || (arrange != dotile) || sel->isfloat)
 		return;
 	if(sel == getnext(clients))  {
 		if((c = getnext(sel->next)))
 			sel = c;
 		else
 			return;
 	}
 	/* pop */
 	if(sel->prev)
 		sel->prev->next = sel->next;
 	if(sel->next)
 		sel->next->prev = sel->prev;
 	sel->prev = NULL;
 	if(clients)
 		clients->prev = sel;
 	sel->next = clients;
 	clients = sel;
 	arrange(NULL);
 	focus(sel);
 }
--- a/config.arg.h
+++ b/config.arg.h
@ -1,55 +0,0 @@
 /*
 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */
 #define TAGS \
 const char *tags[] = { "work", "net", "fnord", NULL };
 #define DEFMODE			dotile /* dofloat */
 #define DEFTAG			0 /* index */
 #define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
 #define BGCOLOR			"#eeeeee"
 #define FGCOLOR			"#666699"
 #define BORDERCOLOR		"#9999CC"
 #define MODKEY			Mod1Mask
 #define NUMLOCKMASK		Mod2Mask
 #define MASTERW			60 /* percent */
 #define KEYS \
 static Key key[] = { \
 	/* modifier		key		function	arguments */ \
 	{ MODKEY,		XK_1,		view,		{ .i = 0 } }, \
 	{ MODKEY,		XK_2,		view,		{ .i = 1 } }, \
 	{ MODKEY,		XK_3,		view,		{ .i = 2 } }, \
 	{ MODKEY,		XK_h,		viewprev,	{ 0 } }, \
 	{ MODKEY,		XK_j,		focusnext,	{ 0 } }, \
 	{ MODKEY,		XK_k,		focusprev,	{ 0 } }, \
 	{ MODKEY,		XK_l,		viewnext,	{ 0 } }, \
 	{ MODKEY,		XK_m,		togglemax,	{ 0 } }, \
 	{ MODKEY,		XK_p,		spawn, \
 		{ .cmd = "exec `ls -lL /usr/bin /usr/local/bin 2>/dev/null | " \
 			"awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort | uniq | dmenu`" } }, \
 	{ MODKEY,		XK_space,	togglemode,	{ 0 } }, \
 	{ MODKEY,		XK_Return,	zoom,		{ 0 } }, \
 	{ MODKEY|ControlMask,	XK_1,		appendtag,	{ .i = 0 } }, \
 	{ MODKEY|ControlMask,	XK_2,		appendtag,	{ .i = 1 } }, \
 	{ MODKEY|ControlMask,	XK_3,		appendtag,	{ .i = 2 } }, \
 	{ MODKEY|ShiftMask,	XK_1,		replacetag,	{ .i = 0 } }, \
 	{ MODKEY|ShiftMask,	XK_2,		replacetag,	{ .i = 1 } }, \
 	{ MODKEY|ShiftMask,	XK_3,		replacetag,	{ .i = 2 } }, \
 	{ MODKEY|ShiftMask,	XK_c,		killclient,	{ 0 } }, \
 	{ MODKEY|ShiftMask,	XK_q,		quit,		{ 0 } }, \
 	{ MODKEY|ShiftMask,	XK_Return,	spawn, \
 		{ .cmd = "exec uxterm -bg '#dddddd' -fg '#000000' -cr '#000000' +sb " \
 			"-fn '-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*'" } }, \
 };
 #define RULES \
 static Rule rule[] = { \
 	/* class:instance regex		tags regex	isfloat */ \
 	{ "Firefox.*",			"net",		False }, \
 	{ "Gimp.*",			NULL,		True}, \
 	{ "MPlayer.*",			NULL,		True}, \
 	{ "Acroread.*",			NULL,		True}, \
 };
--- a/config.def.h
+++ b/config.def.h
@ -0,0 +1,100 @@
 /* See LICENSE file for copyright and license details. */
 /* appearance */
 #define BORDERPX		1
 #define FONT			"-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR		"#cccccc"
 #define NORMBGCOLOR		"#cccccc"
 #define NORMFGCOLOR		"#000000"
 #define SELBORDERCOLOR		"#0066ff"
 #define SELBGCOLOR		"#0066ff"
 #define SELFGCOLOR		"#ffffff"
 /* tagging */
 const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 Rule rules[] = {
 	/* class	instance	title		tags ref	isfloating */
 	{ "Gimp",	NULL,		NULL,		NULL,		True },
 };
 /* geometries, s{x,y,w,h} and bh are already initualized here */
 /*   func name  bx  by  bw  wx  wy  ww     wh  mx  my       mw  mh     tx  ty     tw  th  mox moy mow moh */
 #define MFACT			0.55	/* master width factor [0.1 .. 0.9] */
 DEFGEOM(single,  0,  0, sw,  0, bh, sw, sh-bh, wx, wy, mfact*sw, wh, mx+mw, wy, ww-mw, wh,  wx, wy, ww, wh)
 Geom geoms[] = {
 	/* symbol	function */
 	{ "[]",		single },	/* first entry is default */
 };
 /* layout(s) */
 #define RESIZEHINTS		True	/* False - respect size hints in tiled resizals */
 #define SNAP			32	/* snap pixel */
 Layout layouts[] = {
 	/* symbol		function	isfloating */
 	{ "[]=",		tilev,		False }, /* first entry is default */
 	{ "[]|",		tileh,		False },
 	{ "><>",		floating,	True },
 	{ "[M]",		monocle,	True },
 };
 /* key definitions */
 #define MODKEY			Mod1Mask
 Key keys[] = {
 	/* modifier			key		function	argument */
 	{ MODKEY,			XK_p,		spawn,
 		"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
 	{ MODKEY|ShiftMask,		XK_Return,	spawn,		"exec uxterm" },
 	{ MODKEY,			XK_j,		focusnext,	NULL },
 	{ MODKEY,			XK_k,		focusprev,	NULL },
 	{ MODKEY,			XK_r,		reapply,	NULL },
 	{ MODKEY,			XK_h,		setmfact,	"-0.05" },
 	{ MODKEY,			XK_l,		setmfact,	"+0.05" },
 	{ MODKEY,			XK_Return,	zoom,		NULL },
 	{ MODKEY,			XK_Tab,		viewprevtag,	NULL },
 	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL },
 	{ MODKEY,			XK_space,	setlayout,	NULL },
 	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL },
 	{ MODKEY|ControlMask,		XK_space,	setgeom,	NULL },
 	{ MODKEY,			XK_0,		view,		NULL },
 	{ MODKEY,			XK_1,		view,		tags[0] },
 	{ MODKEY,			XK_2,		view,		tags[1] },
 	{ MODKEY,			XK_3,		view,		tags[2] },
 	{ MODKEY,			XK_4,		view,		tags[3] },
 	{ MODKEY,			XK_5,		view,		tags[4] },
 	{ MODKEY,			XK_6,		view,		tags[5] },
 	{ MODKEY,			XK_7,		view,		tags[6] },
 	{ MODKEY,			XK_8,		view,		tags[7] },
 	{ MODKEY,			XK_9,		view,		tags[8] },
 	{ MODKEY|ControlMask,		XK_1,		toggleview,	tags[0] },
 	{ MODKEY|ControlMask,		XK_2,		toggleview,	tags[1] },
 	{ MODKEY|ControlMask,		XK_3,		toggleview,	tags[2] },
 	{ MODKEY|ControlMask,		XK_4,		toggleview,	tags[3] },
 	{ MODKEY|ControlMask,		XK_5,		toggleview,	tags[4] },
 	{ MODKEY|ControlMask,		XK_6,		toggleview,	tags[5] },
 	{ MODKEY|ControlMask,		XK_7,		toggleview,	tags[6] },
 	{ MODKEY|ControlMask,		XK_8,		toggleview,	tags[7] },
 	{ MODKEY|ControlMask,		XK_9,		toggleview,	tags[8] },
 	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL },
 	{ MODKEY|ShiftMask,		XK_1,		tag,		tags[0] },
 	{ MODKEY|ShiftMask,		XK_2,		tag,		tags[1] },
 	{ MODKEY|ShiftMask,		XK_3,		tag,		tags[2] },
 	{ MODKEY|ShiftMask,		XK_4,		tag,		tags[3] },
 	{ MODKEY|ShiftMask,		XK_5,		tag,		tags[4] },
 	{ MODKEY|ShiftMask,		XK_6,		tag,		tags[5] },
 	{ MODKEY|ShiftMask,		XK_7,		tag,		tags[6] },
 	{ MODKEY|ShiftMask,		XK_8,		tag,		tags[7] },
 	{ MODKEY|ShiftMask,		XK_9,		tag,		tags[8] },
 	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	tags[0] },
 	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	tags[1] },
 	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	tags[2] },
 	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	tags[3] },
 	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	tags[4] },
 	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	tags[5] },
 	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	tags[6] },
 	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	tags[7] },
 	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	tags[8] },
 	{ MODKEY|ShiftMask,		XK_q,		quit,		NULL },
 };
--- a/config.default.h
+++ b/config.default.h
@ -1,54 +0,0 @@
 /*
 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */
 #define TAGS \
 const char *tags[] = { "0", "1", "2", "3", "4", NULL };
 #define DEFMODE			dotile /* dofloat */
 #define DEFTAG			1 /* index */
 #define FONT			"fixed"
 #define BGCOLOR			"#666699"
 #define FGCOLOR			"#eeeeee"
 #define BORDERCOLOR		"#9999CC"
 #define MODKEY			Mod1Mask
 #define NUMLOCKMASK		Mod2Mask
 #define MASTERW			60 /* percent */
 #define KEYS \
 static Key key[] = { \
 	/* modifier		key		function	arguments */ \
 	{ MODKEY,		XK_0,		view,		{ .i = 0 } }, \
 	{ MODKEY,		XK_1,		view,		{ .i = 1 } }, \
 	{ MODKEY,		XK_2,		view,		{ .i = 2 } }, \
 	{ MODKEY,		XK_3,		view,		{ .i = 3 } }, \
 	{ MODKEY,		XK_4,		view,		{ .i = 4 } }, \
 	{ MODKEY,		XK_h,		viewprev,	{ 0 } }, \
 	{ MODKEY,		XK_j,		focusnext,	{ 0 } }, \
 	{ MODKEY,		XK_k,		focusprev,	{ 0 } }, \
 	{ MODKEY,		XK_l,		viewnext,	{ 0 } }, \
 	{ MODKEY,		XK_m,		togglemax,	{ 0 } }, \
 	{ MODKEY,		XK_space,	togglemode,	{ 0 } }, \
 	{ MODKEY,		XK_Return,	zoom,		{ 0 } }, \
 	{ MODKEY|ControlMask,	XK_0,		appendtag,	{ .i = 0 } }, \
 	{ MODKEY|ControlMask,	XK_1,		appendtag,	{ .i = 1 } }, \
 	{ MODKEY|ControlMask,	XK_2,		appendtag,	{ .i = 2 } }, \
 	{ MODKEY|ControlMask,	XK_3,		appendtag,	{ .i = 3 } }, \
 	{ MODKEY|ControlMask,	XK_4,		appendtag,	{ .i = 4 } }, \
 	{ MODKEY|ShiftMask,	XK_0,		replacetag,	{ .i = 0 } }, \
 	{ MODKEY|ShiftMask,	XK_1,		replacetag,	{ .i = 1 } }, \
 	{ MODKEY|ShiftMask,	XK_2,		replacetag,	{ .i = 2 } }, \
 	{ MODKEY|ShiftMask,	XK_3,		replacetag,	{ .i = 3 } }, \
 	{ MODKEY|ShiftMask,	XK_4,		replacetag,	{ .i = 4 } }, \
 	{ MODKEY|ShiftMask,	XK_c,		killclient,	{ 0 } }, \
 	{ MODKEY|ShiftMask,	XK_q,		quit,		{ 0 } }, \
 	{ MODKEY|ShiftMask,	XK_Return,	spawn,		{ .cmd = "exec xterm" } }, \
 };
 #define RULES \
 static Rule rule[] = { \
 	/* class:instance regex		tags regex	isfloat */ \
 	{ "Firefox.*",			"2",		False }, \
 	{ "Gimp.*",			NULL,		True}, \
 };
--- a/config.mk
+++ b/config.mk
@ -1,5 +1,5 @@
 # dwm version
-VERSION = 0.8
+VERSION = 4.9
 # Customize below to fit your system
@ -11,14 +11,18 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 # includes and libs
-INCS = -I/usr/lib -I${X11INC}
+INCS = -I. -I/usr/include -I${X11INC}
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
 # flags
 CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
-LDFLAGS = ${LIBS}
+LDFLAGS = -s ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
+#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = -g ${LIBS}
-# compiler
+# Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = ${LIBS}
 # compiler and linker
 CC = cc
--- a/draw.c
+++ b/draw.c
@ -1,233 +0,0 @@
 /*
 * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */
 #include "dwm.h"
 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlocale.h>
 /* static */
 static void
 drawborder(void)
 {
 	XPoint points[5];
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 	XSetForeground(dpy, dc.gc, dc.border);
 	points[0].x = dc.x;
 	points[0].y = dc.y;
 	points[1].x = dc.w - 1;
 	points[1].y = 0;
 	points[2].x = 0;
 	points[2].y = dc.h - 1;
 	points[3].x = -(dc.w - 1);
 	points[3].y = 0;
 	points[4].x = 0;
 	points[4].y = -(dc.h - 1);
 	XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 }
 static unsigned int
 textnw(const char *text, unsigned int len)
 {
 	XRectangle r;
 	if(dc.font.set) {
 		XmbTextExtents(dc.font.set, text, len, NULL, &r);
 		return r.width;
 	}
 	return XTextWidth(dc.font.xfont, text, len);
 }
 static void
 drawtext(const char *text, Bool invert)
 {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	drawborder();
 	if(!text)
 		return;
 	w = 0;
 	len = strlen(text);
 	if(len >= sizeof(buf))
 		len = sizeof(buf) - 1;
 	memcpy(buf, text, len);
 	buf[len] = 0;
 	h = dc.font.ascent + dc.font.descent;
 	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
 	x = dc.x + (h / 2);
 	/* shorten text if necessary */
 	while(len && (w = textnw(buf, len)) > dc.w - h)
 		buf[--len] = 0;
 	if(w > dc.w)
 		return; /* too long */
 	gcv.foreground = invert ? dc.bg : dc.fg;
 	gcv.background = invert ? dc.fg : dc.bg;
 	if(dc.font.set) {
 		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
 		XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
 				x, y, buf, len);
 	}
 	else {
 		gcv.font = dc.font.xfont->fid;
 		XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
 		XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
 }
 /* extern */
 void
 drawall()
 {
 	Client *c;
 	for(c = clients; c; c = getnext(c->next))
 		drawtitle(c);
 	drawstatus();
 }
 void
 drawstatus()
 {
 	int i, x;
 	Bool istile = arrange == dotile;
 	dc.x = dc.y = 0;
 	dc.w = bw;
 	drawtext(NULL, !istile);
 	dc.w = 0;
 	for(i = 0; i < ntags; i++) {
 		dc.x += dc.w;
 		dc.w = textw(tags[i]);
 		if(istile)
 			drawtext(tags[i], (i == tsel));
 		else
 			drawtext(tags[i], (i != tsel));
 	}
 	x = dc.x + dc.w;
 	dc.w = textw(stext);
 	dc.x = bx + bw - dc.w;
 	drawtext(stext, !istile);
 	if(sel && ((dc.w = dc.x - x) >= bh)) {
 		dc.x = x;
 		drawtext(sel->name, istile);
 	}
 	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
 	XSync(dpy, False);
 }
 void
 drawtitle(Client *c)
 {
 	int i;
 	Bool istile = arrange == dotile;
 	if(c == sel && issel) {
 		drawstatus();
 		XUnmapWindow(dpy, c->title);
 		XSetWindowBorder(dpy, c->win, dc.fg);
 		return;
 	}
 	XSetWindowBorder(dpy, c->win, dc.bg);
 	XMapWindow(dpy, c->title);
 	dc.x = dc.y = 0;
 	dc.w = 0;
 	for(i = 0; i < ntags; i++) {
 		if(c->tags[i]) {
 			dc.x += dc.w;
 			dc.w = textw(tags[i]);
 			drawtext(tags[i], !istile);
 		}
 	}
 	dc.x += dc.w;
 	dc.w = textw(c->name);
 	drawtext(c->name, !istile);
 	XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
 	XSync(dpy, False);
 }
 unsigned long
 getcolor(const char *colstr)
 {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
 	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
 	return color.pixel;
 }
 void
 setfont(const char *fontstr)
 {
 	char **missing, *def;
 	int i, n;
 	missing = NULL;
 	setlocale(LC_ALL, "");
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
 	if(missing) {
 		while(n--)
 			fprintf(stderr, "missing fontset: %s\n", missing[n]);
 		XFreeStringList(missing);
 		if(dc.font.set) {
 			XFreeFontSet(dpy, dc.font.set);
 			dc.font.set = NULL;
 		}
 	}
 	if(dc.font.set) {
 		XFontSetExtents *font_extents;
 		XFontStruct **xfonts;
 		char **font_names;
 		dc.font.ascent = dc.font.descent = 0;
 		font_extents = XExtentsOfFontSet(dc.font.set);
 		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
 		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
 			if(dc.font.ascent < (*xfonts)->ascent)
 				dc.font.ascent = (*xfonts)->ascent;
 			if(dc.font.descent < (*xfonts)->descent)
 				dc.font.descent = (*xfonts)->descent;
 			xfonts++;
 		}
 	}
 	else {
 		if(dc.font.xfont)
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
 		dc.font.xfont = XLoadQueryFont(dpy, fontstr);
 		if (!dc.font.xfont)
 			dc.font.xfont = XLoadQueryFont(dpy, "fixed");
 		if (!dc.font.xfont)
 			eprint("error, cannot init 'fixed' font\n");
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
 	}
 	dc.font.height = dc.font.ascent + dc.font.descent;
 }
 unsigned int
 textw(const char *text)
 {
 	return textnw(text, strlen(text)) + dc.font.height;
 }
--- a/dwm.1
+++ b/dwm.1
@ -1,115 +1,157 @@
-.TH DWM 1 dwm-VERSION
+.TH DWM 1 dwm\-VERSION
 .SH NAME
 dwm \- dynamic window manager
 .SH SYNOPSIS
 .B dwm
 .RB [ \-v ]
 .SH DESCRIPTION
-.B dwm
+dwm is a dynamic window manager for X. It manages windows in tiled, monocle
-is a dynamic window manager for X11. It manages windows in tiling and floating
+and floating layouts. Either layout can be applied dynamically, optimising the
-modes. Either mode can be applied dynamically, optimizing the environment for
+environment for the application in use and the task performed.
 the application in use and the task performed.
 .P
-In tiling mode windows are managed in a master and stacking column. The master
+In tiled layouts windows are managed in a master and stacking area. The master
-column contains the window which currently needs most attention, whereas the
+area contains the window which currently needs most attention, whereas the
-stacking column contains all other windows. In floating mode windows can be
+stacking area contains all other windows. In monocle layout all windows are
-resized and moved freely. Dialog windows are always managed floating,
+maximised to the screen size. In floating layout windows can be resized and
-regardless of the mode selected.
+moved freely. Dialog windows are always managed floating, regardless of the
 layout applied.
 .P
 Windows are grouped by tags. Each window can be tagged with one or multiple
-tags. Selecting a certain tag for viewing will display all windows with that
+tags. Selecting certain tags displays all windows with these tags.
 tag.
 .P
-.B dwm
+dwm contains a small status bar which displays all available tags, the layout,
-has a small status bar which displays the text read from standard
+the title of the focused window, and the text read from standard input. A
-input, if written. Besides that, it displays all available tags, and the title
+floating window is indicated with an empty square and a maximised
-of the focused window. It draws a 1-pixel border around windows to
+floating window is indicated with a filled square before the windows
-indicate the focus state. Unfocused windows contain a small bar in front of
+title.  The selected tags are indicated with a different color. The tags of
-them displaying their tags and title.
+the focused window are indicated with a filled square in the top left
 corner.  The tags which are applied to one or more windows are indicated
 with an empty square in the top left corner.
 .P
 dwm draws a small border around windows to indicate the focus state.
 .SH OPTIONS
 .TP
 .B \-v
 prints version information to standard output, then exits.
 .SH USAGE
 .SS Status bar
 .TP
-.B Mod1-Return
+.B Standard input
-Zoom current
+is read and displayed in the status text area.
 .B window
 to the 
 .B master
 column.
 .TP
-.B Mod1-h
+.B Button1
-Focus previous
+click on a tag label to display all windows with that tag, click on the layout
-.B tag.
+label toggles between tiled and floating layout.
 .TP
-.B Mod1-j
+.B Button3
-Focus next
+click on a tag label adds/removes all windows with that tag to/from the view.
 .B window.
 .TP
-.B Mod1-k
+.B Mod1\-Button1
-Focus previous
+click on a tag label applies that tag to the focused window.
 .B window.
 .TP
-.B Mod1-l
+.B Mod1\-Button3
-Focus next
+click on a tag label adds/removes that tag to/from the focused window.
-.B tag.
+.SS Keyboard commands
 .TP
-.B Mod1-m
+.B Mod1\-Shift\-Return
 Maximize current
 .B window.
 .TP
 .B Mod1-[0..n]
 Focus
 .B nth tag.
 .TP
 .B Mod1-space
 Toggle between
 .B tiled
 and
 .B floating
 mode (affects
 .BR "all windows" ).
 .TP
 .B Mod1-Shift-[0..n]
 Apply
 .B nth tag
 to current
 .B window.
 .TP
 .B Mod1-Shift-q
 Quit
 .B dwm.
 .TP
 .B Mod1-Shift-Return
 Start
-.B terminal.
+.BR xterm.
 .TP
-.B Mod1-Control-[0..n]
+.B Mod1\-space
-Append
+Toggles between layouts.
 .B nth tag
 to current
 .B window.
 .TP
-.B Mod1-Button1
+.B Mod1\-Control\-space
-Move current
+Toggles between geometries.
 .B window
 while dragging.
 .TP
-.B Mod1-Button2
+.B Mod1\-j
-Zoom current
+Focus next window.
 .B window
 to the 
 .B master
 column.
 .TP
-.B Mod1-Button3
+.B Mod1\-k
-Resize current
+Focus previous window.
-.B window
+.TP
-while dragging.
+.B Mod1\-h
 Decrease master area size.
 .TP
 .B Mod1\-l
 Increase master area size.
 .TP
 .B Mod1\-Return
 Zooms/cycles focused window to/from master area (tiled layouts only).
 .TP
 .B Mod1\-Shift\-c
 Close focused window.
 .TP
 .B Mod1\-Shift\-space
 Toggle focused window between tiled and floating state.
 .TP
 .B Mod1\-Tab
 Toggles to the previously selected tags.
 .TP
 .B Mod1\-r
 Re-applies tagging rules to all windows.
 .TP
 .B Mod1\-Shift\-[1..n]
 Apply
 .RB nth
 tag to focused window.
 .TP
 .B Mod1\-Shift\-0
 Apply all tags to focused window.
 .TP
 .B Mod1\-Control\-Shift\-[1..n]
 Add/remove
 .B nth
 tag to/from focused window.
 .TP
 .B Mod1\-[1..n]
 View all windows with
 .BR nth
 tag.
 .TP
 .B Mod1\-0
 View all windows with any tag.
 .TP
 .B Mod1\-Control\-[1..n]
 Add/remove all windows with
 .BR nth
 tag to/from the view.
 .TP
 .B Mod1\-Shift\-q
 Quit dwm.
 .SS Mouse commands
 .TP
 .B Mod1\-Button1
 Move focused window while dragging. Tiled windows will be toggled to the floating state.
 .TP
 .B Mod1\-Button2
 Zooms/cycles focused window to/from master area. If it is floating (but not fixed) it will be toggled to the tiled state instead.
 .TP
 .B Mod1\-Button3
 Resize focused window while dragging. Tiled windows will be toggled to the floating state.
 .SH CUSTOMIZATION
-.B dwm
+dwm is customized by creating a custom config.h and (re)compiling the source
 is customized by creating a custom config.h and (re)compiling the source
 code. This keeps it fast, secure and simple.
 .SH SEE ALSO
 .BR dmenu (1)
 .SH BUGS
 The status bar may display
 .BR "EOF"
 when dwm has been started by an X session manager like
 .BR xdm (1),
 because those close standard output before executing dwm.
 .P
 Java applications which use the XToolkit/XAWT backend may draw grey windows
 only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
 JDK 1.6 versions, because it assumes a reparenting window manager. As a workaround
 you can use JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or you
 can set the following environment variable (to use the older Motif
 backend instead):
 .BR AWT_TOOLKIT=MToolkit .
 .P
 GTK 2.10.9+ versions contain a broken
 .BR Save\-As
 file dialog implementation,
 which requests to reconfigure its window size in an endless loop. However, its
 window is still respondable during this state, so you can simply ignore the flicker
 until a new GTK version appears, which will fix this bug, approximately
 GTK 2.10.12+ versions.
--- a/dwm.c
+++ b/dwm.c
--- a/dwm.h
+++ b/dwm.h
@ -1,136 +0,0 @@
 /*
 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */
 #include "config.h"
 #include <X11/Xlib.h>
 /* mask shorthands, used in event.c and client.c */
 #define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
 #define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 #define PROTODELWIN		1
 typedef union Arg Arg;
 typedef struct Client Client;
 typedef struct DC DC;
 typedef struct Fnt Fnt;
 union Arg {
 	const char *cmd;
 	int i;
 };
 /* atoms */
 enum { NetSupported, NetWMName, NetLast };
 enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 /* windowcorners */
 typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
 struct Fnt {
 	int ascent;
 	int descent;
 	int height;
 	XFontSet set;
 	XFontStruct *xfont;
 };
 struct DC { /* draw context */
 	int x, y, w, h;
 	unsigned long bg;
 	unsigned long fg;
 	unsigned long border;
 	Drawable drawable;
 	Fnt font;
 	GC gc;
 };
 struct Client {
 	char name[256];
 	int proto;
 	int x, y, w, h;
 	int tx, ty, tw, th; /* title */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int grav;
 	long flags; 
 	unsigned int border;
 	Bool isfloat;
 	Bool ismax;
 	Bool *tags;
 	Client *next;
 	Client *prev;
 	Window win;
 	Window title;
 };
 extern const char *tags[];
 extern char stext[1024];
 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern unsigned int ntags;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 extern Atom wmatom[WMLast], netatom[NetLast];
 extern Bool running, issel;
 extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;
 extern Display *dpy;
 extern Window root, barwin;
 /* client.c */
 extern void ban(Client *c);
 extern void focus(Client *c);
 extern void focusnext(Arg *arg);
 extern void focusprev(Arg *arg);
 extern Client *getclient(Window w);
 extern Client *getctitle(Window w);
 extern void gravitate(Client *c, Bool invert);
 extern void higher(Client *c);
 extern void killclient(Arg *arg);
 extern void manage(Window w, XWindowAttributes *wa);
 extern void resize(Client *c, Bool sizehints, Corner sticky);
 extern void setsize(Client *c);
 extern void settitle(Client *c);
 extern void togglemax(Arg *arg);
 extern void unmanage(Client *c);
 extern void zoom(Arg *arg);
 /* draw.c */
 extern void drawall();
 extern void drawstatus();
 extern void drawtitle(Client *c);
 extern unsigned long getcolor(const char *colstr);
 extern void setfont(const char *fontstr);
 extern unsigned int textw(const char *text);
 /* event.c */
 extern void grabkeys();
 /* main.c */
 extern int getproto(Window w);
 extern void quit(Arg *arg);
 extern void sendevent(Window w, Atom a, long value);
 extern int xerror(Display *dsply, XErrorEvent *ee);
 /* tag.c */
 extern void appendtag(Arg *arg);
 extern void dofloat(Arg *arg);
 extern void dotile(Arg *arg);
 extern void initrregs();
 extern Client *getnext(Client *c);
 extern Client *getprev(Client *c);
 extern void replacetag(Arg *arg);
 extern void settags(Client *c);
 extern void togglemode(Arg *arg);
 extern void view(Arg *arg);
 extern void viewnext(Arg *arg);
 extern void viewprev(Arg *arg);
 /* util.c */
 extern void *emallocz(unsigned int size);
 extern void eprint(const char *errstr, ...);
 extern void spawn(Arg *arg);
--- a/dwm.html
+++ b/dwm.html
@ -1,126 +0,0 @@
 <html>
 	<head>
 		<title>dwm - dynamic window manager</title>
 		<meta name="author" content="Anselm R. Garbe">
 		<meta name="generator" content="ed">
 		<meta name="copyright" content="(C)opyright 2006 by Anselm R. Garbe">
 		<style type="text/css">
 			body {
 				color: #000000;
 				font-family: sans-serif;
 				margin: 20px 20px 20px 20px;
 			}
 		</style>
 	</head>
 	<body>
 		<center>
 			<img src="dwm.png"/><br />
 			<h3>dynamic window manager</h3>
 		</center>
 		<h3>Description</h3>
 		<p>
 		dwm is a dynamic window manager for X11.
 		</p>
 		<h4>Background</h4>
 		<p>
 		As founder and main developer of wmii I came to the conclusion that
 		wmii is too clunky for my needs. I don't need so many funky features
 		and all this hype about remote control through a 9P service, I only
 		want to manage my windows in a simple, but dynamic way. wmii never got
 		finished because I listened to users, who proposed arbitrary ideas I
 		considered useful. This resulted in an extreme <a
 		href="http://www.jwz.org/doc/cadt.html">CADT</a> development model,
 		which was a mistake. Thus the philosophy of dwm is simply <i>to fit my
 		needs</i> (maybe yours as well). That's it.
 		</p>
 		<h4>Differences to ion, larswm, and wmii</h4>
 		<p>
 		In contrast to ion, larswm, and wmii, dwm is much smaller, faster and simpler.
 		</p>
 		<ul>
 			<li>
 			dwm has no Lua integration, no 9P support, no editable
 			tagbars, no shell-based configuration, no remote control, and comes
 			without any additional tools like printing the selection or warping
 			the mouse.
 			</li>
 			<li>
 			dwm is only a single binary, it's source code is intended to never
 			exceed 2000 SLOC.
 			</li>
 			<li>
 			dwm is based on tagging and dynamic window management (however
 			simpler than ion, wmii or larswm). It manages windows in
 			tiling and floating modes. Either mode can be applied dynamically,
 			depending on the application in use and the task performed.
 			</li>
 			<li>
 			dwm don't distinguishes between layers, there is no floating or
 			tiled layer. Wether the clients of currently selected tag are in
 			tiled mode or not, you can re-arrange all clients on the fly.
 			Popup- and fixed-size windows are treated floating, however. 
 			</li>
 			<li>
 			dwm is customized through editing its source code, that makes it
 			extremely fast and secure - it does not process any input data
 			which hasn't been known at compile time, except window title names
 			and status text read from standard input. You don't have to learn
 			Lua/sh/ruby or some weird configuration file format (like X
 			resource files), beside C to customize it for your needs,
 			you <b>only</b> have to learn C (at least editing header files).
 			</li>
 			<li>
 			Because dwm is customized through editing its source code, it's
 			pointless to make binary packages of it. This keeps its userbase
 			small and elitist. No novices asking stupid questions.
 			</li>
 			<li>
 			dwm uses 1-pixel borders to provide the maximum of screen real
 			estate to clients. Small titlebars are only drawn in front of
 			unfocused clients.
 			</li>
 			<li>
 			dwm reads from standard input to print arbitrary status text (like
 			the date, load, battery charge). That's much simpler than
 			larsremote, wmiir and what not...
 			</li>
 			<li>
 			It can be downloaded and distributed under the conditions
 			of the <a href="http://10kloc.org/cgi-bin/hgwebdir.cgi/dwm?f=f10eb1139362;file=LICENSE;style=raw">MIT/X Consortium license</a>.
 			</li>
 			<li>
 			Optionally you can install <b>dmenu</b> to extend dwm with a wmii-alike menu.
 			</li>
 		</ul>
 		<h4>Links</h4>
 		<ul>
 			<li><a href="http://10kloc.org/cgi-bin/man/man2html?query=dwm">Man page</a></li>
 			<li><a href="http://10kloc.org/shots/dwm-20060810a.png">Screenshot of tiled mode</a> (20060810)</li>
 			<li><a href="http://10kloc.org/shots/dwm-20060810b.png">Screenshotof floating mode</a> (20060810)</li>
 			<li><a href="http://10kloc.org/download/poster.ps">A4 poster (PostScript)</a></li>
 			<li>Mailing List: <a href="http://10kloc.org/cgi-bin/mailman/listinfo/dwm">dwm at wmii dot de</a> <a href="http://10kloc.org/pipermail/dwm/">(Archives)</a></li>
 			<li>IRC channel: <code>#dwm</code> at <code>irc.oftc.net</code></li>
 		</ul>
 		<h3>Download</h3>
 		<ul>
 			<li><a href="http://10kloc.org/download/dwm-0.8.tar.gz">dwm 0.8</a> (14kb) (20060810)</li>
 			<li><a href="http://10kloc.org/download/dmenu-0.3.tar.gz">dmenu 0.3</a> (7kb) (20060810)</li>
 		</ul>
 		<h3>Development</h3>
 		<p>
 		dwm is actively developed in parallel to wmii. You can <a href="http://10kloc.org/cgi-bin/hgwebdir.cgi/dwm">browse</a> its source code repository or get a copy using <a href="http://www.selenic.com/mercurial/">Mercurial</a> with following command:
 		</p>
 		<p>
 		<code>hg clone http://10kloc.org/cgi-bin/hgwebdir.cgi/dwm</code>
 		</p>
 		<p>
 		<code>hg clone http://10kloc.org/cgi-bin/hgwebdir.cgi/dmenu</code>
 		</p>
 		<h3>Miscellaneous</h3>
 		<p>
 		You can purchase this <a href="https://www.spreadshirt.net/shop.php?op=article&article_id=3298632&view=403">tricot</a>
 		if you like dwm and the dwm logo, which has been designed by Anselm.
 		</p>
 		<p><small>--Anselm</small></p>
 	</body>
 </html>
--- a/event.c
+++ b/event.c
@ -1,374 +0,0 @@
 /*
 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */
 #include "dwm.h"
 #include <stdlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 /* static */
 typedef struct {
 	unsigned long mod;
 	KeySym keysym;
 	void (*func)(Arg *arg);
 	Arg arg;
 } Key;
 KEYS
 #define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
 static void
 movemouse(Client *c)
 {
 	int x1, y1, ocx, ocy, di;
 	unsigned int dui;
 	Window dummy;
 	XEvent ev;
 	ocx = c->x;
 	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 			None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
 		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
 		switch (ev.type) {
 		default: break;
 		case Expose:
 			handler[Expose](&ev);
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
 			c->x = ocx + (ev.xmotion.x - x1);
 			c->y = ocy + (ev.xmotion.y - y1);
 			resize(c, False, TopLeft);
 			break;
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
 			return;
 		}
 	}
 }
 static void
 resizemouse(Client *c)
 {
 	int ocx, ocy;
 	Corner sticky;
 	XEvent ev;
 	ocx = c->x;
 	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 				None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
 	for(;;) {
 		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
 		switch(ev.type) {
 		default: break;
 		case Expose:
 			handler[Expose](&ev);
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
 			c->w = abs(ocx - ev.xmotion.x);
 			c->h = abs(ocy - ev.xmotion.y);
 			c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
 			c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
 			if(ocx <= ev.xmotion.x)
 				sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
 			else
 				sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
 			resize(c, True, sticky);
 			break;
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
 			return;
 		}
 	}
 }
 static void
 buttonpress(XEvent *e)
 {
 	int x;
 	Arg a;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 	if(barwin == ev->window) {
 		switch(ev->button) {
 		default:
 			x = 0;
 			for(a.i = 0; a.i < ntags; a.i++) {
 				x += textw(tags[a.i]);
 				if(ev->x < x) {
 					view(&a);
 					break;
 				}
 			}
 			break;
 		case Button4:
 			viewprev(&a);
 			break;
 		case Button5:
 			viewnext(&a);
 			break;
 		}
 	}
 	else if((c = getclient(ev->window))) {
 		higher(c);
 		focus(c);
 		switch(ev->button) {
 		default:
 			break;
 		case Button1:
 			if(!c->ismax && (arrange == dofloat || c->isfloat))
 				movemouse(c);
 			break;
 		case Button2:
 			if(!c->ismax && arrange != dofloat && !c->isfloat)
 				zoom(NULL);
 			break;
 		case Button3:
 			if(!c->ismax && (arrange == dofloat || c->isfloat))
 				resizemouse(c);
 			break;
 		}
 	}
 }
 static void
 configurerequest(XEvent *e)
 {
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XEvent synev;
 	XWindowChanges wc;
 	unsigned long newmask;
 	if((c = getclient(ev->window))) {
 		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
 		if(ev->value_mask & CWY)
 			c->y = ev->y;
 		if(ev->value_mask & CWWidth)
 			c->w = ev->width;
 		if(ev->value_mask & CWHeight)
 			c->h = ev->height;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
 		gravitate(c, False);
 		wc.x = c->x;
 		wc.y = c->y;
 		wc.width = c->w;
 		wc.height = c->h;
 		newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
 		if(newmask)
 			XConfigureWindow(dpy, c->win, newmask, &wc);
 		else {
 			synev.type = ConfigureNotify;
 			synev.xconfigure.display = dpy;
 			synev.xconfigure.event = c->win;
 			synev.xconfigure.window = c->win;
 			synev.xconfigure.x = c->x;
 			synev.xconfigure.y = c->y;
 			synev.xconfigure.width = c->w;
 			synev.xconfigure.height = c->h;
 			synev.xconfigure.border_width = c->border;
 			synev.xconfigure.above = None;
 			/* Send synthetic ConfigureNotify */
 			XSendEvent(dpy, c->win, True, NoEventMask, &synev);
 		}
 		XSync(dpy, False);
 		if(c->isfloat)
 			resize(c, False, TopLeft);
 		else
 			arrange(NULL);
 	}
 	else {
 		wc.x = ev->x;
 		wc.y = ev->y;
 		wc.width = ev->width;
 		wc.height = ev->height;
 		wc.border_width = ev->border_width;
 		wc.sibling = ev->above;
 		wc.stack_mode = ev->detail;
 		XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
 		XSync(dpy, False);
 	}
 }
 static void
 destroynotify(XEvent *e)
 {
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
 	if((c = getclient(ev->window)))
 		unmanage(c);
 }
 static void
 enternotify(XEvent *e)
 {
 	Client *c;
 	XCrossingEvent *ev = &e->xcrossing;
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
 	if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
 		focus(c);
 	else if(ev->window == root) {
 		issel = True;
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 		drawall();
 	}
 }
 static void
 expose(XEvent *e)
 {
 	Client *c;
 	XExposeEvent *ev = &e->xexpose;
 	if(ev->count == 0) {
 		if(barwin == ev->window)
 			drawstatus();
 		else if((c = getctitle(ev->window)))
 			drawtitle(c);
 	}
 }
 static void
 keypress(XEvent *e)
 {
 	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeySym keysym;
 	XKeyEvent *ev = &e->xkey;
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
 	for(i = 0; i < len; i++)
 		if(keysym == key[i].keysym &&
 				CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) {
 			if(key[i].func)
 				key[i].func(&key[i].arg);
 			return;
 		}
 }
 static void
 leavenotify(XEvent *e)
 {
 	XCrossingEvent *ev = &e->xcrossing;
 	if((ev->window == root) && !ev->same_screen) {
 		issel = False;
 		drawall();
 	}
 }
 static void
 maprequest(XEvent *e)
 {
 	static XWindowAttributes wa;
 	XMapRequestEvent *ev = &e->xmaprequest;
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
 	if(wa.override_redirect) {
 		XSelectInput(dpy, ev->window,
 				(StructureNotifyMask | PropertyChangeMask));
 		return;
 	}
 	if(!getclient(ev->window))
 		manage(ev->window, &wa);
 }
 static void
 propertynotify(XEvent *e)
 {
 	Client *c;
 	Window trans;
 	XPropertyEvent *ev = &e->xproperty;
 	if(ev->state == PropertyDelete)
 		return; /* ignore */
 	if((c = getclient(ev->window))) {
 		if(ev->atom == wmatom[WMProtocols]) {
 			c->proto = getproto(c->win);
 			return;
 		}
 		switch (ev->atom) {
 			default: break;
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
 				if(!c->isfloat && (c->isfloat = (trans != 0)))
 					arrange(NULL);
 				break;
 			case XA_WM_NORMAL_HINTS:
 				setsize(c);
 				break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 			settitle(c);
 			drawtitle(c);
 		}
 	}
 }
 static void
 unmapnotify(XEvent *e)
 {
 	Client *c;
 	XUnmapEvent *ev = &e->xunmap;
 	if((c = getclient(ev->window)))
 		unmanage(c);
 }
 /* extern */
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
 	[DestroyNotify] = destroynotify,
 	[EnterNotify] = enternotify,
 	[LeaveNotify] = leavenotify,
 	[Expose] = expose,
 	[KeyPress] = keypress,
 	[MapRequest] = maprequest,
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
 };
 void
 grabkeys()
 {
 	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeyCode code;
 	for(i = 0; i < len; i++) {
 		code = XKeysymToKeycode(dpy, key[i].keysym);
 		XGrabKey(dpy, code, key[i].mod, root, True,
 				GrabModeAsync, GrabModeAsync);
 		XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
 		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
 				GrabModeAsync, GrabModeAsync);
 		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
 	}
 }
--- a/main.c
+++ b/main.c
@ -1,291 +0,0 @@
 /*
 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */
 #include "dwm.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 /* static */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static Bool otherwm;
 static void
 cleanup()
 {
 	while(sel) {
 		resize(sel, True, TopLeft);
 		unmanage(sel);
 	}
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 static void
 scan()
 {
 	unsigned int i, num;
 	Window *wins, d1, d2;
 	XWindowAttributes wa;
 	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
 		for(i = 0; i < num; i++) {
 			if(!XGetWindowAttributes(dpy, wins[i], &wa))
 				continue;
 			if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
 				continue;
 			if(wa.map_state == IsViewable)
 				manage(wins[i], &wa);
 		}
 	}
 	if(wins)
 		XFree(wins);
 }
 static int
 win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {
 	int status, format;
 	unsigned long res, extra;
 	Atom real;
 	status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
 			&res, &extra, prop);
 	if(status != Success || *prop == 0) {
 		return 0;
 	}
 	if(res == 0) {
 		free((void *) *prop);
 	}
 	return res;
 }
 /*
 * Startup Error handler to check if another window manager
 * is already running.
 */
 static int
 xerrorstart(Display *dsply, XErrorEvent *ee)
 {
 	otherwm = True;
 	return -1;
 }
 /* extern */
 char stext[1024];
 int tsel = DEFTAG;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 unsigned int ntags;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
 Client *clients = NULL;
 Client *sel = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
 Window root, barwin;
 int
 getproto(Window w)
 {
 	int protos = 0;
 	int i;
 	long res;
 	Atom *protocols;
 	res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
 			((unsigned char **)&protocols));
 	if(res <= 0) {
 		return protos;
 	}
 	for(i = 0; i < res; i++) {
 		if(protocols[i] == wmatom[WMDelete])
 			protos |= PROTODELWIN;
 	}
 	free((char *) protocols);
 	return protos;
 }
 void
 sendevent(Window w, Atom a, long value)
 {
 	XEvent e;
 	e.type = ClientMessage;
 	e.xclient.window = w;
 	e.xclient.message_type = a;
 	e.xclient.format = 32;
 	e.xclient.data.l[0] = value;
 	e.xclient.data.l[1] = CurrentTime;
 	XSendEvent(dpy, w, False, NoEventMask, &e);
 	XSync(dpy, False);
 }
 void
 quit(Arg *arg)
 {
 	running = False;
 }
 /*
 * There's no way to check accesses to destroyed windows, thus those cases are
 * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
 * default error handler, which calls exit().
 */
 int
 xerror(Display *dpy, XErrorEvent *ee)
 {
 	if(ee->error_code == BadWindow
 	|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
 	|| (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
 	|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
 	|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
 	|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
 	|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess))
 		return 0;
 	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
 		ee->request_code, ee->error_code);
 	return xerrorxlib(dpy, ee); /* may call exit() */
 }
 int
 main(int argc, char *argv[])
 {
 	int i;
 	unsigned int mask;
 	fd_set rd;
 	Bool readin = True;
 	Window w;
 	XEvent ev;
 	XSetWindowAttributes wa;
 	if(argc == 2 && !strncmp("-v", argv[1], 3)) {
 		fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
 		exit(EXIT_SUCCESS);
 	}
 	else if(argc != 1)
 		eprint("usage: dwm [-v]\n");
 	dpy = XOpenDisplay(0);
 	if(!dpy)
 		eprint("dwm: cannot open display\n");
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
 	otherwm = False;
 	XSetErrorHandler(xerrorstart);
 	/* this causes an error if some other window manager is running */
 	XSelectInput(dpy, root, SubstructureRedirectMask);
 	XSync(dpy, False);
 	if(otherwm)
 		eprint("dwm: another window manager is already running\n");
 	XSetErrorHandler(NULL);
 	xerrorxlib = XSetErrorHandler(xerror);
 	/* init atoms */
 	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
 	wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
 	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
 	netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
 	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
 			PropModeReplace, (unsigned char *) netatom, NetLast);
 	/* init cursors */
 	cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 	grabkeys();
 	initrregs();
 	for(ntags = 0; tags[ntags]; ntags++);
 	/* style */
 	dc.bg = getcolor(BGCOLOR);
 	dc.fg = getcolor(FGCOLOR);
 	dc.border = getcolor(BORDERCOLOR);
 	setfont(FONT);
 	sx = sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	mw = (sw * MASTERW) / 100;
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ButtonPressMask | ExposureMask;
 	bx = by = 0;
 	bw = sw;
 	dc.h = bh = dc.font.height + 4;
 	barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
 			CopyFromParent, DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
 	XMapRaised(dpy, barwin);
 	dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
 	strcpy(stext, "dwm-"VERSION);
 	drawstatus();
 	issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 	wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
 	wa.cursor = cursor[CurNormal];
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 	scan();
 	/* main event loop, also reads status text from stdin */
 	XSync(dpy, False);
 	while(running) {
 		FD_ZERO(&rd);
 		if(readin)
 			FD_SET(STDIN_FILENO, &rd);
 		FD_SET(ConnectionNumber(dpy), &rd);
 		i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
 		if(i == -1 && errno == EINTR)
 			continue;
 		if(i < 0)
 			eprint("select failed\n");
 		else if(i > 0) {
 			if(FD_ISSET(ConnectionNumber(dpy), &rd)) {
 				while(XPending(dpy)) {
 					XNextEvent(dpy, &ev);
 					if(handler[ev.type])
 						(handler[ev.type])(&ev); /* call handler */
 				}
 			}
 			if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
 				readin = NULL != fgets(stext, sizeof(stext), stdin);
 				if(readin)
 					stext[strlen(stext) - 1] = 0;
 				else 
 					strcpy(stext, "broken pipe");
 				drawstatus();
 			}
 		}
 	}
 	cleanup();
 	XCloseDisplay(dpy);
 	return 0;
 }
--- a/tag.c
+++ b/tag.c
@ -1,250 +0,0 @@
 /*
 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <X11/Xutil.h>
 typedef struct {
 	const char *clpattern;
 	const char *tpattern;
 	Bool isfloat;
 } Rule;
 typedef struct {
 	regex_t *clregex;
 	regex_t *tregex;
 } RReg;
 /* static */
 TAGS
 RULES
 static RReg *rreg = NULL;
 static unsigned int len = 0;
 void (*arrange)(Arg *) = DEFMODE;
 /* extern */
 void
 appendtag(Arg *arg)
 {
 	if(!sel)
 		return;
 	sel->tags[arg->i] = True;
 	arrange(NULL);
 }
 void
 dofloat(Arg *arg)
 {
 	Client *c;
 	for(c = clients; c; c = c->next) {
 		c->ismax = False;
 		if(c->tags[tsel]) {
 			resize(c, True, TopLeft);
 		}
 		else
 			ban(c);
 	}
 	if((sel = getnext(clients))) {
 		higher(sel);
 		focus(sel);
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	drawall();
 }
 void
 dotile(Arg *arg)
 {
 	int n, i, w, h;
 	Client *c;
 	w = sw - mw;
 	for(n = 0, c = clients; c; c = c->next)
 		if(c->tags[tsel] && !c->isfloat)
 			n++;
 	if(n > 1)
 		h = (sh - bh) / (n - 1);
 	else
 		h = sh - bh;
 	for(i = 0, c = clients; c; c = c->next) {
 		c->ismax = False;
 		if(c->tags[tsel]) {
 			if(c->isfloat) {
 				higher(c);
 				resize(c, True, TopLeft);
 				continue;
 			}
 			if(n == 1) {
 				c->x = sx;
 				c->y = sy + bh;
 				c->w = sw - 2;
 				c->h = sh - 2 - bh;
 			}
 			else if(i == 0) {
 				c->x = sx;
 				c->y = sy + bh;
 				c->w = mw - 2;
 				c->h = sh - 2 - bh;
 			}
 			else if(h > bh) {
 				c->x = sx + mw;
 				c->y = sy + (i - 1) * h + bh;
 				c->w = w - 2;
 				if(i + 1 == n)
 					c->h = sh - c->y - 2;
 				else
 					c->h = h - 2;
 			}
 			else { /* fallback if h < bh */
 				c->x = sx + mw;
 				c->y = sy + bh;
 				c->w = w - 2;
 				c->h = sh - 2 - bh;
 			}
 			resize(c, False, TopLeft);
 			i++;
 		}
 		else
 			ban(c);
 	}
 	if((sel = getnext(clients))) {
 		higher(sel);
 		focus(sel);
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	drawall();
 }
 Client *
 getnext(Client *c)
 {
 	for(; c && !c->tags[tsel]; c = c->next);
 	return c;
 }
 Client *
 getprev(Client *c)
 {
 	for(; c && !c->tags[tsel]; c = c->prev);
 	return c;
 }
 void
 initrregs()
 {
 	unsigned int i;
 	regex_t *reg;
 	if(rreg)
 		return;
 	len = sizeof(rule) / sizeof(rule[0]);
 	rreg = emallocz(len * sizeof(RReg));
 	for(i = 0; i < len; i++) {
 		if(rule[i].clpattern) {
 			reg = emallocz(sizeof(regex_t));
 			if(regcomp(reg, rule[i].clpattern, 0))
 				free(reg);
 			else
 				rreg[i].clregex = reg;
 		}
 		if(rule[i].tpattern) {
 			reg = emallocz(sizeof(regex_t));
 			if(regcomp(reg, rule[i].tpattern, 0))
 				free(reg);
 			else
 				rreg[i].tregex = reg;
 		}
 	}
 }
 void
 replacetag(Arg *arg)
 {
 	int i;
 	if(!sel)
 		return;
 	for(i = 0; i < ntags; i++)
 		sel->tags[i] = False;
 	appendtag(arg);
 }
 void
 settags(Client *c)
 {
 	char classinst[256];
 	unsigned int i, j;
 	regmatch_t tmp;
 	Bool matched = False;
 	XClassHint ch;
 	if(XGetClassHint(dpy, c->win, &ch)) {
 		snprintf(classinst, sizeof(classinst), "%s:%s",
 				ch.res_class ? ch.res_class : "",
 				ch.res_name ? ch.res_name : "");
 		for(i = 0; !matched && i < len; i++)
 			if(rreg[i].clregex && !regexec(rreg[i].clregex, classinst, 1, &tmp, 0)) {
 				c->isfloat = rule[i].isfloat;
 				for(j = 0; rreg[i].tregex && j < ntags; j++) {
 					if(!regexec(rreg[i].tregex, tags[j], 1, &tmp, 0)) {
 						matched = True;
 						c->tags[j] = True;
 					}
 				}
 			}
 		if(ch.res_class)
 			XFree(ch.res_class);
 		if(ch.res_name)
 			XFree(ch.res_name);
 	}
 	if(!matched)
 		c->tags[tsel] = True;
 }
 void
 togglemode(Arg *arg)
 {
 	arrange = arrange == dofloat ? dotile : dofloat;
 	arrange(NULL);
 }
 void
 view(Arg *arg)
 {
 	tsel = arg->i;
 	arrange(NULL);
 	drawall();
 }
 void
 viewnext(Arg *arg)
 {
 	arg->i = (tsel < ntags-1) ? tsel+1 : 0;
 	view(arg);
 }
 void
 viewprev(Arg *arg)
 {
 	arg->i = (tsel > 0) ? tsel-1 : ntags-1;
 	view(arg);
 }
--- a/util.c
+++ b/util.c
@ -1,65 +0,0 @@
 /*
 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */
 #include "dwm.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
 /* static */
 static void
 bad_malloc(unsigned int size)
 {
 	eprint("fatal: could not malloc() %u bytes\n", size);
 }
 /* extern */
 void *
 emallocz(unsigned int size)
 {
 	void *res = calloc(1, size);
 	if(!res)
 		bad_malloc(size);
 	return res;
 }
 void
 eprint(const char *errstr, ...)
 {
 	va_list ap;
 	va_start(ap, errstr);
 	vfprintf(stderr, errstr, ap);
 	va_end(ap);
 	exit(EXIT_FAILURE);
 }
 void
 spawn(Arg *arg)
 {
 	static char *shell = NULL;
 	if(!shell && !(shell = getenv("SHELL")))
 		shell = "/bin/sh";
 	if(!arg->cmd)
 		return;
 	if(fork() == 0) {
 		if(fork() == 0) {
 			if(dpy)
 				close(ConnectionNumber(dpy));
 			setsid();
 			execl(shell, shell, "-c", arg->cmd, NULL);
 			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
 			perror(" failed");
 		}
 		exit(0);
 	}
 	wait(0);
 }