added a comment to spawn

.hgtags

@@ -1,2 +1,10 @@
 d31b5ad96b0ba7b5b0a30928fcf000428339a577 0.1
 0a6472e2203994bc5738d40a340d26f7ec9d6062 0.2
+7e66082e5092fb0bccd18a3695a0bec52c80fdb2 0.3
+eb3165734f00fe7f7da8aeebaed00e60a57caac9 0.4
+22213b9a2114167ee8ba019a012e27da0422a61a 0.5
+c11f86db4550cac5d0a648a3fe4d6d3b9a4fcf7e 0.6
+3fb41412e2492f66476d92ce8f007a8b48fb1d2a 0.7
+cd15de32e173f8ce97bfe1c9b6607937b59056b4 0.8
+fae61afa861755636c4a1070694209ace8efbb6c 0.9
+bbc98e77ae89a7c9232a5be0835f60ea00d8036e 1.0

LICENSE

@@ -1,6 +1,7 @@
 MIT/X Consortium License
 
 (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+(C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

Makefile

@@ -3,53 +3,60 @@
 
 include config.mk
 
-SRC = client.c draw.c event.c main.c tag.c util.c
+SRC = client.c draw.c event.c main.c tag.c util.c view.c
 OBJ = ${SRC:.c=.o}
-MAN1 = dwm.1 
-BIN = dwm
 
 all: options dwm
-	@echo finished
 
 options:
 	@echo dwm build options:
-	@echo "LIBS     = ${LIBS}"
 	@echo "CFLAGS   = ${CFLAGS}"
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
+	@echo "LD       = ${LD}"
 
 .c.o:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: dwm.h
+${OBJ}: dwm.h config.h config.mk
+
+config.h:
+	@echo creating $@ from config.default.h
+	@cp config.default.h $@
 
 dwm: ${OBJ}
 	@echo LD $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@${LD} -o $@ ${OBJ} ${LDFLAGS}
+	@strip $@
 
 clean:
-	rm -f dwm *.o core dwm-${VERSION}.tar.gz
+	@echo cleaning
+	@rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
 
 dist: clean
-	mkdir -p dwm-${VERSION}
-	cp -R Makefile README LICENSE config.mk *.h *.c ${MAN1} dwm-${VERSION}
-	tar -cf dwm-${VERSION}.tar dwm-${VERSION}
-	gzip dwm-${VERSION}.tar
-	rm -rf dwm-${VERSION}
+	@echo creating dist tarball
+	@mkdir -p dwm-${VERSION}
+	@cp -R LICENSE Makefile README config.*.h config.mk \
+		dwm.1 dwm.h ${SRC} dwm-${VERSION}
+	@tar -cf dwm-${VERSION}.tar dwm-${VERSION}
+	@gzip dwm-${VERSION}.tar
+	@rm -rf dwm-${VERSION}
 
 install: all
+	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
-	@echo installed executable files to ${DESTDIR}${PREFIX}/bin
+	@cp -f dwm ${DESTDIR}${PREFIX}/bin
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
+	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
-	@echo installed manual pages to ${DESTDIR}${MANPREFIX}/man1
+	@sed 's/VERSION/${VERSION}/g' < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
+	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
 
 uninstall:
-	for i in ${BIN}; do \
-		rm -f ${DESTDIR}${PREFIX}/bin/`basename $$i`; \
-	done
-	for i in ${MAN1}; do \
-		rm -f ${DESTDIR}${MANPREFIX}/man1/`basename $$i`; \
-	done
+	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+	@rm -f ${DESTDIR}${PREFIX}/bin/dwm
+	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+	@rm -f ${DESTDIR}${MANPREFIX}/man1/dwm.1
+
+.PHONY: all options clean dist install uninstall

README

@@ -1,7 +1,6 @@
 dwm - dynamic window manager
 ----------------------------
-
-dwm is an extremly fast, small, and dynamic X11 window manager.
+dwm is an extremely fast, small, and dynamic window manager for X.
 
 
 Requirements
@@ -11,8 +10,8 @@ In order to build dwm you need the Xlib header files.
 
 Installation
 ------------
-Edit config.mk to match your local setup. dwm is installed into
-the /usr/local namespace by default.
+Edit config.mk to match your local setup (dwm is installed into
+the /usr/local namespace by default).
 
 Afterwards enter the following command to build and install dwm (if
 necessary as root):
@@ -31,10 +30,19 @@ the DISPLAY environment variable is set correctly, e.g.:
 
     DISPLAY=foo.bar:1 exec dwm
 
-This will start dwm on display :1 of the host foo.bar.
+(This will start dwm on display :1 of the host foo.bar.)
+
+In order to display status info in the bar, you can do something
+like this in your .xinitrc:
+
+    while true
+    do
+        echo `date` `uptime | sed 's/.*://; s/,//g'`
+        sleep 1
+    done | dwm
 
 
 Configuration
 -------------
-The configuration of dwm is done by customizing source code,
-grep for CUSTOMIZE keyword.
+The configuration of dwm is done by creating a custom config.h
+and (re)compiling the source code.

TODO

@@ -1 +0,0 @@
-- improve mouse based resizals with quadrant approach (then I think we have feature completeness already)

client.c

@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
@@ -11,24 +10,59 @@
 
 /* static functions */
 
+static void
+grabbuttons(Client *c, Bool focus)
+{
+	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+
+	if(focus) {
+		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);
+	}
+	else
+		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
+				GrabModeAsync, GrabModeSync, None, None);
+
+}
+
 static void
 resizetitle(Client *c)
 {
 	int i;
 
-	c->bw = 0;
-	for(i = 0; i < TLast; i++)
-		if(c->tags[i])
-			c->bw += textw(c->tags[i]);
-	c->bw += textw(c->name);
-	if(c->bw > *c->w)
-		c->bw = *c->w + 2;
-	c->bx = *c->x + *c->w - c->bw + 2;
-	c->by = *c->y;
-	if(c->tags[tsel])
-		XMoveResizeWindow(dpy, c->title, c->bx, c->by, c->bw, c->bh);
+	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(isvisible(c))
+		XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
 	else
-		XMoveResizeWindow(dpy, c->title, c->bx + 2 * sw, c->by, c->bw, c->bh);
+		XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
 
 }
 
@@ -43,60 +77,36 @@ xerrordummy(Display *dsply, XErrorEvent *ee)
 void
 ban(Client *c)
 {
-	XMoveWindow(dpy, c->win, *c->x + 2 * sw, *c->y);
-	XMoveWindow(dpy, c->title, c->bx + 2 * sw, c->by);
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void
 focus(Client *c)
 {
 	Client *old = sel;
-	XEvent ev;
 
-	sel = c;
-	if(old && old != c)
+	if(!issel)
+		return;
+	if(!sel)
+		sel = c;
+	else if(sel != c) {
+		if(sel->ismax)
+			togglemax(NULL);
+		sel = c;
+		grabbuttons(old, False);
 		drawtitle(old);
+	}
+	grabbuttons(c, True);
 	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(!(c = getnext(sel->next, tsel)))
-		c = getnext(clients, tsel);
-	if(c) {
-		higher(c);
-		c->revert = sel;
-		focus(c);
-	}
-}
-
-void
-focusprev(Arg *arg)
-{
-	Client *c;
-
-	if(!sel)
-		return;
-
-	if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
-		higher(c);
-		focus(c);
-	}
 }
 
 Client *
 getclient(Window w)
 {
 	Client *c;
+
 	for(c = clients; c; c = c->next)
 		if(c->win == w)
 			return c;
@@ -107,8 +117,9 @@ Client *
 getctitle(Window w)
 {
 	Client *c;
+
 	for(c = clients; c; c = c->next)
-		if(c->title == w)
+		if(c->twin == w)
 			return c;
 	return NULL;
 }
@@ -119,6 +130,8 @@ gravitate(Client *c, Bool invert)
 	int dx = 0, dy = 0;
 
 	switch(c->grav) {
+	default:
+		break;
 	case StaticGravity:
 	case NorthWestGravity:
 	case NorthGravity:
@@ -128,18 +141,18 @@ gravitate(Client *c, Bool invert)
 	case EastGravity:
 	case CenterGravity:
 	case WestGravity:
-		dy = -(*c->h / 2) + c->border;
+		dy = -(c->h / 2) + c->border;
 		break;
 	case SouthEastGravity:
 	case SouthGravity:
 	case SouthWestGravity:
-		dy = -(*c->h);
-		break;
-	default:
+		dy = -(c->h);
 		break;
 	}
 
 	switch (c->grav) {
+	default:
+		break;
 	case StaticGravity:
 	case NorthWestGravity:
 	case WestGravity:
@@ -149,14 +162,12 @@ gravitate(Client *c, Bool invert)
 	case NorthGravity:
 	case CenterGravity:
 	case SouthGravity:
-		dx = -(*c->w / 2) + c->border;
+		dx = -(c->w / 2) + c->border;
 		break;
 	case NorthEastGravity:
 	case EastGravity:
 	case SouthEastGravity:
-		dx = -(*c->w + c->border);
-		break;
-	default:
+		dx = -(c->w + c->border);
 		break;
 	}
 
@@ -164,15 +175,8 @@ gravitate(Client *c, Bool invert)
 		dx = -dx;
 		dy = -dy;
 	}
-	*c->x += dx;
-	*c->y += dy;
-}
-
-void
-higher(Client *c)
-{
-	XRaiseWindow(dpy, c->win);
-	XRaiseWindow(dpy, c->title);
+	c->x += dx;
+	c->y += dy;
 }
 
 void
@@ -180,188 +184,125 @@ killclient(Arg *arg)
 {
 	if(!sel)
 		return;
-	if(sel->proto & WM_PROTOCOL_DELWIN)
+	if(sel->proto & PROTODELWIN)
 		sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
 	else
 		XKillClient(dpy, sel->win);
 }
 
-void
-lower(Client *c)
-{
-	XLowerWindow(dpy, c->title);
-	XLowerWindow(dpy, c->win);
-}
-
 void
 manage(Window w, XWindowAttributes *wa)
 {
-	int diff;
-	Client *c;
-	XSetWindowAttributes twa;
+	unsigned int i;
+	Client *c, *tc;
 	Window trans;
+	XSetWindowAttributes twa;
 
 	c = emallocz(sizeof(Client));
+	c->tags = emallocz(ntags * sizeof(Bool));
 	c->win = w;
-	c->bx = c->fx = c->tx = wa->x;
-	c->by = c->fy = c->ty = wa->y;
-	c->bw = c->fw = c->tw = wa->width;
-	c->fh = c->th = wa->height;
-	c->bh = bh;
+	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;
 
-	diff = sw - c->fw;
-	c->fx = random() % (diff ? diff : 1);
-	diff = sh - c->fh - bh;
-	c->fy = random() % (diff ? diff : 1);
-
-	if(c->fy < bh)
-		c->by = c->fy = c->ty = bh;
-
-	c->border = 1;
-	c->proto = getproto(c->win);
+	c->border = 0;
 	setsize(c);
+
+	if(c->x + c->w + 2 > sw)
+		c->x = sw - c->w - 2;
+	if(c->x < 0)
+		c->x = 0;
+	if(c->y + c->h + 2 > sh)
+		c->y = sh - c->h - 2;
+	if(c->h != sh && c->y < bh)
+		c->y = bh;
+
+	c->proto = getproto(c->win);
 	XSelectInput(dpy, c->win,
-			StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
 	XGetTransientForHint(dpy, c->win, &trans);
 	twa.override_redirect = 1;
 	twa.background_pixmap = ParentRelative;
-	twa.event_mask = ExposureMask;
+	twa.event_mask = ExposureMask | EnterWindowMask;
 
-	c->title = XCreateWindow(dpy, root, c->bx, c->by, c->bw, c->bh,
+	c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
 			0, DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
-	settags(c);
-
+	if(clients)
+		clients->prev = c;
 	c->next = clients;
 	clients = c;
 
-	XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
-			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
-			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
-			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
-			GrabModeAsync, GrabModeSync, None, None);
+	grabbuttons(c, False);
 
+	if((tc = getclient(trans))) /* inherit tags */
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = tc->tags[i];
+	else
+		settags(c);
 	if(!c->isfloat)
 		c->isfloat = trans
-			|| ((c->maxw == c->minw) && (c->maxh == c->minh));
-
-	setgeom(c);
+			|| (c->maxw && c->minw &&
+				c->maxw == c->minw && c->maxh == c->minh);
 	settitle(c);
-
+	if(isvisible(c))
+		sel = c;
 	arrange(NULL);
-
-	/* mapping the window now prevents flicker */
-	if(c->tags[tsel]) {
-		XMapRaised(dpy, c->win);
-		XMapRaised(dpy, c->title);
+	XMapWindow(dpy, c->win);
+	XMapWindow(dpy, c->twin);
+	if(isvisible(c))
 		focus(c);
-	}
-	else {
-		XMapRaised(dpy, c->win);
-		XMapRaised(dpy, c->title);
-	}
 }
 
 void
-maximize(Arg *arg)
+resize(Client *c, Bool sizehints, Corner sticky)
 {
-	if(!sel)
-		return;
-	*sel->x = sx;
-	*sel->y = sy + bh;
-	*sel->w = sw - 2 * sel->border;
-	*sel->h = sh - 2 * sel->border - bh;
-	higher(sel);
-	resize(sel, False, TopLeft);
-}
+	int bottom = c->y + c->h;
+	int right = c->x + c->w;
+	XWindowChanges wc;
 
-void
-pop(Client *c)
-{
-	Client **l;
-	for(l = &clients; *l && *l != c; l = &(*l)->next);
-	*l = c->next;
-
-	c->next = clients; /* pop */
-	clients = c;
-	arrange(NULL);
-}
-
-void
-resize(Client *c, Bool inc, Corner sticky)
-{
-	XConfigureEvent e;
-	int right = *c->x + *c->w;
-	int bottom = *c->y + *c->h;
-
-	if(inc) {
+	if(sizehints) {
 		if(c->incw)
-			*c->w -= (*c->w - c->basew) % c->incw;
+			c->w -= (c->w - c->basew) % c->incw;
 		if(c->inch)
-			*c->h -= (*c->h - c->baseh) % 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 > sw) /* might happen on restart */
-		*c->x = sw - *c->w;
-	if(*c->y > sh)
-		*c->y = sh - *c->h;
-	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(sticky == TopRight || sticky == BotRight)
-		*c->x = right - *c->w;
+		c->x = right - c->w;
 	if(sticky == BotLeft || sticky == BotRight)
-		*c->y = bottom - *c->h;
+		c->y = bottom - c->h;
 
 	resizetitle(c);
-	XSetWindowBorderWidth(dpy, c->win, 1);
-	XMoveResizeWindow(dpy, c->win, *c->x, *c->y, *c->w, *c->h);
-
-	e.type = ConfigureNotify;
-	e.event = c->win;
-	e.window = c->win;
-	e.x = *c->x;
-	e.y = *c->y;
-	e.width = *c->w;
-	e.height = *c->h;
-	e.border_width = c->border;
-	e.above = None;
-	e.override_redirect = False;
-	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
+	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
-setgeom(Client *c)
-{
-	if((arrange == dotile) && !c->isfloat) {
-		c->x = &c->tx;
-		c->y = &c->ty;
-		c->w = &c->tw;
-		c->h = &c->th;
-	}
-	else {
-		c->x = &c->fx;
-		c->y = &c->fy;
-		c->w = &c->fw;
-		c->h = &c->fh;
-	}
-}
-
 void
 setsize(Client *c)
 {
-	XSizeHints size;
 	long msize;
+	XSizeHints size;
+
 	if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
 		size.flags = PSize;
 	c->flags = size.flags;
@@ -398,9 +339,9 @@ setsize(Client *c)
 void
 settitle(Client *c)
 {
-	XTextProperty name;
-	int n;
 	char **list = NULL;
+	int i, n;
+	XTextProperty name;
 
 	name.nitems = 0;
 	c->name[0] = 0;
@@ -423,48 +364,70 @@ settitle(Client *c)
 	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;
+
+		restack();
+		resize(sel, arrange == dofloat, 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)
 {
-	Client **l;
-
+	Client *tc;
+	Window trans;
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
 
+	XGetTransientForHint(dpy, c->win, &trans);
+
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	XDestroyWindow(dpy, c->title);
-
-	for(l = &clients; *l && *l != c; l = &(*l)->next);
-	*l = c->next;
-	for(l = &clients; *l; l = &(*l)->next)
-		if((*l)->revert == c)
-			(*l)->revert = NULL;
-	if(sel == c)
-		sel = sel->revert ? sel->revert : clients;
+	XDestroyWindow(dpy, c->twin);
 
+	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) {
+		if(trans && (tc = getclient(trans)) && isvisible(tc))
+			sel = tc;
+		else
+			sel = getnext(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)
-		return;
-
-	if(sel == getnext(clients, tsel) && sel->next)  {
-		if((c = getnext(sel->next, tsel)))
-			sel = c;
-	}
-
-	pop(sel);
-	focus(sel);
+	arrange(NULL);
 }

config.arg.h

@@ -0,0 +1,60 @@
+/*
+ * (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 FLOATSYMBOL		"><>"
+#define TILESYMBOL		"[]="
+
+#define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
+#define SELBGCOLOR		"#333366"
+#define SELFGCOLOR		"#eeeeee"
+#define NORMBGCOLOR		"#333333"
+#define NORMFGCOLOR		"#dddddd"
+#define STATUSBGCOLOR		"#222222"
+#define STATUSFGCOLOR		"#9999cc"
+
+#define MODKEY			Mod1Mask
+#define MASTERW			60 /* percent */
+
+#define KEYS \
+static Key key[] = { \
+	/* modifier			key		function	arguments */ \
+	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
+		{ .cmd = "exec uxterm -bg '#111111' -fg '#eeeeee' -cr '#eeeeee' +sb -fn '"FONT"'" } }, \
+	{ MODKEY,			XK_p,		spawn, \
+		{ .cmd = "exec `ls -lL /usr/bin /usr/X11R6/bin /usr/local/bin 2>/dev/null | " \
+			"awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort -u | dmenu`" } }, \
+	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
+	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
+	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
+	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
+	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
+	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
+	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 2 } }, \
+	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
+	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
+	{ MODKEY,			XK_1,		view,		{ .i = 0 } }, \
+	{ MODKEY,			XK_2,		view,		{ .i = 1 } }, \
+	{ MODKEY,			XK_3,		view,		{ .i = 2 } }, \
+	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 2 } }, \
+	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
+};
+
+#define RULES \
+static Rule rule[] = { \
+	/* class:instance:title regex	tags regex	isfloat */ \
+	{ "Firefox.*",			"net",		False }, \
+	{ "Gimp.*",			NULL,		True}, \
+	{ "MPlayer.*",			NULL,		True}, \
+	{ "Acroread.*",			NULL,		True}, \
+};

config.default.h

@@ -0,0 +1,64 @@
+/*
+ * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+ * See LICENSE file for license details.
+ */
+
+#define TAGS \
+const char *tags[] = { "1", "2", "3", "4", "5", NULL };
+
+#define DEFMODE			dotile /* dofloat */
+#define FLOATSYMBOL		"~"
+#define TILESYMBOL		"#"
+
+#define FONT			"fixed"
+#define SELBGCOLOR		"#666699"
+#define SELFGCOLOR		"#eeeeee"
+#define NORMBGCOLOR		"#333366"
+#define NORMFGCOLOR		"#cccccc"
+#define STATUSBGCOLOR		"#dddddd"
+#define STATUSFGCOLOR		"#222222"
+
+#define MODKEY			Mod1Mask
+#define MASTERW			60 /* percent */
+
+#define KEYS \
+static Key key[] = { \
+	/* modifier			key		function	arguments */ \
+	{ MODKEY|ShiftMask,		XK_Return,	spawn,		{ .cmd = "exec xterm" } }, \
+	{ MODKEY,			XK_Tab,		focusnext,	{ 0 } }, \
+	{ MODKEY|ShiftMask,		XK_Tab,		focusprev,	{ 0 } }, \
+	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
+	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
+	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
+	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
+	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
+	{ MODKEY|ShiftMask,		XK_4,		tag,		{ .i = 3 } }, \
+	{ MODKEY|ShiftMask,		XK_5,		tag,		{ .i = 4 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	{ .i = 3 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	{ .i = 4 } }, \
+	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
+	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
+	{ MODKEY,			XK_1,		view,		{ .i = 0 } }, \
+	{ MODKEY,			XK_2,		view,		{ .i = 1 } }, \
+	{ MODKEY,			XK_3,		view,		{ .i = 2 } }, \
+	{ MODKEY,			XK_4,		view,		{ .i = 3 } }, \
+	{ MODKEY,			XK_5,		view,		{ .i = 4 } }, \
+	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask,		XK_4,		toggleview,	{ .i = 3 } }, \
+	{ MODKEY|ControlMask,		XK_5,		toggleview,	{ .i = 4 } }, \
+	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
+};
+
+/* Query class:instance:title for regex matching info with following command:
+ * xprop | awk -F '"' '/^WM_CLASS/ { printf("%s:%s:",$4,$2) }; /^WM_NAME/ { printf("%s\n",$2) }' */
+#define RULES \
+static Rule rule[] = { \
+	/* class:instance:title regex	tags regex	isfloat */ \
+	{ "Firefox.*",			"2",		False }, \
+	{ "Gimp.*",			NULL,		True}, \
+};

config.mk

@@ -1,4 +1,7 @@
-# Customize to fit your system
+# dwm version
+VERSION = 1.1
+
+# Customize below to fit your system
 
 # paths
 PREFIX = /usr/local
@@ -7,24 +10,16 @@ MANPREFIX = ${PREFIX}/share/man
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
-VERSION = 0.3
-
 # includes and libs
-LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
+INCS = -I. -I/usr/include -I${X11INC}
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
 
-# Linux/BSD
-CFLAGS = -Os -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
-	-DVERSION=\"${VERSION}\"
+# flags
+CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
 LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
-#	-DVERSION=\"${VERSION}\"
+#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = -g ${LIBS}
 
-
-# Solaris
-#CFLAGS = -fast -xtarget=ultra ${INCLUDES} -DVERSION=\"${VERSION}\"
-#LIBS += -lnsl -lsocket
-
-AR = ar cr
+# compiler and linker
 CC = cc
-RANLIB = ranlib
+LD = ${CC}

draw.c

@@ -3,36 +3,17 @@
  * 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(char *text, unsigned int len)
+textnw(const char *text, unsigned int len)
 {
 	XRectangle r;
+
 	if(dc.font.set) {
 		XmbTextExtents(dc.font.set, text, len, NULL, &r);
 		return r.width;
@@ -41,25 +22,22 @@ textnw(char *text, unsigned int len)
 }
 
 static void
-drawtext(const char *text, Bool invert, Bool border)
+drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
 {
 	int x, y, w, h;
-	unsigned int len;
 	static char buf[256];
+	unsigned int len, olen;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
-	w = 0;
-	if(border)
-		drawborder();
-
 	if(!text)
 		return;
 
-	len = strlen(text);
+	w = 0;
+	olen = len = strlen(text);
 	if(len >= sizeof(buf))
 		len = sizeof(buf) - 1;
 	memcpy(buf, text, len);
@@ -72,21 +50,32 @@ drawtext(const char *text, Bool invert, Bool border)
 	/* shorten text if necessary */
 	while(len && (w = textnw(buf, len)) > dc.w - h)
 		buf[--len] = 0;
+	if(len < olen) {
+		if(len > 1)
+			buf[len - 1] = '.';
+		if(len > 2)
+			buf[len - 2] = '.';
+		if(len > 3)
+			buf[len - 3] = '.';
+	}
 
 	if(w > dc.w)
 		return; /* too long */
-
-	gcv.foreground = invert ? dc.bg : dc.fg;
-	gcv.background = invert ? dc.fg : dc.bg;
+	gcv.foreground = col[ColFG];
 	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-		XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
-				x, y, buf, len);
+		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+		XmbDrawString(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);
+		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+	}
+	if(highlight) {
+		r.x = dc.x + 2;
+		r.y = dc.y + 2;
+		r.width = r.height = 3;
+		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
 }
 
@@ -97,7 +86,7 @@ drawall()
 {
 	Client *c;
 
-	for(c = clients; c; c = getnext(c->next, tsel))
+	for(c = clients; c; c = getnext(c->next))
 		drawtitle(c);
 	drawstatus();
 }
@@ -105,31 +94,38 @@ drawall()
 void
 drawstatus()
 {
-	int i;
-	Bool istile = arrange == dotile;
+	int i, x;
 
 	dc.x = dc.y = 0;
-	dc.w = bw;
-	drawtext(NULL, !istile, False);
 
-	dc.w = 0;
-	for(i = 0; i < TLast; i++) {
-		dc.x += dc.w;
+	for(i = 0; i < ntags; i++) {
 		dc.w = textw(tags[i]);
-		if(istile)
-			drawtext(tags[i], (i == tsel), True);
+		if(seltag[i])
+			drawtext(tags[i], dc.sel, sel && sel->tags[i]);
 		else
-			drawtext(tags[i], (i != tsel), True);
-	}
-	if(sel) {
+			drawtext(tags[i], dc.norm, sel && sel->tags[i]);
 		dc.x += dc.w;
-		dc.w = textw(sel->name);
-		drawtext(sel->name, istile, True);
 	}
+
+	dc.w = bmw;
+	drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
+
+	x = dc.x + dc.w;
 	dc.w = textw(stext);
 	dc.x = bx + bw - dc.w;
-	drawtext(stext, !istile, False);
+	if(dc.x < x) {
+		dc.x = x;
+		dc.w = bw - x;
+	}
+	drawtext(stext, dc.status, False);
 
+	if((dc.w = dc.x - x) > bh) {
+		dc.x = x;
+		if(sel)
+			drawtext(sel->name, dc.sel, False);
+		else
+			drawtext(NULL, dc.norm, False);
+	}
 	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
 	XSync(dpy, False);
 }
@@ -138,40 +134,28 @@ void
 drawtitle(Client *c)
 {
 	int i;
-	Bool istile = arrange == dotile;
 
-	if(c == sel) {
+	if(c == sel && issel) {
 		drawstatus();
-		XUnmapWindow(dpy, c->title);
-		XSetWindowBorder(dpy, c->win, dc.fg);
+		XUnmapWindow(dpy, c->twin);
+		XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
 		return;
 	}
 
-	XSetWindowBorder(dpy, c->win, dc.bg);
-	XMapWindow(dpy, c->title);
-
+	XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
+	XMapWindow(dpy, c->twin);
 	dc.x = dc.y = 0;
-
-	dc.w = 0;
-	for(i = 0; i < TLast; i++) {
-		if(c->tags[i]) {
-			dc.x += dc.w;
-			dc.w = textw(c->tags[i]);
-			drawtext(c->tags[i], !istile, True);
-		}
-	}
-	dc.x += dc.w;
-	dc.w = textw(c->name);
-	drawtext(c->name, !istile, True);
-	XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+	dc.w = c->tw;
+	drawtext(c->name, dc.norm, False);
+	XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
 	XSync(dpy, False);
 }
 
 unsigned long
 getcolor(const char *colstr)
 {
-	XColor color;
 	Colormap cmap = DefaultColormap(dpy, screen);
+	XColor color;
 
 	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
 	return color.pixel;
@@ -229,7 +213,7 @@ setfont(const char *fontstr)
 }
 
 unsigned int
-textw(char *text)
+textw(const char *text)
 {
 	return textnw(text, strlen(text)) + dc.font.height;
 }

dwm.1

@@ -1,4 +1,4 @@
-.TH DWM 1 dwm-0.2
+.TH DWM 1 dwm-VERSION
 .SH NAME
 dwm \- dynamic window manager
 .SH SYNOPSIS
@@ -6,122 +6,150 @@ dwm \- dynamic window manager
 .RB [ \-v ]
 .SH DESCRIPTION
 .B dwm
-is a dynamic window manager for X11. It manages windows in tiling and floating
-modes. Either mode can be applied dynamically, depending on the application in
-use and the task performed.
+is a dynamic window manager for X. It manages windows in tiling and floating
+modes. Either mode can be applied dynamically, optimizing the environment for
+the application in use and the task performed.
 .P
 In tiling mode windows are managed in a master and stacking column. The master
-column contains the window which needs most attention at a time, whereas the
-stacking column contains all other windows in a stack.  Dialog windows are
-managed floating, however. In floating mode windows can be resized and moved
-freely.
+column contains the window which currently needs most attention, whereas the
+stacking column contains all other windows. In floating mode windows can be
+resized and moved freely. Dialog windows are always managed floating,
+regardless of the mode selected.
 .P
-Windows are grouped by tags. All windows with a specific tag can be viewed at a
-time. But each window may contain more than one tag, which makes it visible in
-several views.
+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
+tag.
 .P
 .B dwm
-consists of a small status bar which reads the text displayed from standard
-input, if written. It draws 1-pixel borders around windows to indicate the
-focus state. Unfocused windows contain a small bar in front of the window
-displaying the tags and the window title.
+contains a small status bar which displays all available tags, the mode, the
+title of the focused window, and the text read from standard input. The tags of
+the focused window are highlighted with a small point.
+.P
+.B dwm
+draws a 1-pixel border around windows to indicate the focus state.
+Unfocused windows contain a small bar in front of them displaying their title.
 .SH OPTIONS
 .TP
 .B \-v
 prints version information to standard output, then exits.
 .SH USAGE
+.SS Status bar
+.TP
+.B Standard input
+is read and displayed in the status text area.
+.TP
+.B Button1
+click on a tag label views all windows with that
+.BR tag ,
+click on the mode label toggles between
+.B tiled
+and
+.B floating
+mode.
+.TP
+.B Button3
+click on a tag label adds/removes all windows with that
+.B tag
+to/from the view.
+.SS Keyboard commands
+.TP
+.B Mod1-Shift-Return
+Start
+.BR xterm (1).
+.TP
+.B Mod1-Tab
+Focus next
+.BR window .
+.TP
+.B Mod1-Shift-Tab
+Focus previous
+.BR window .
 .TP
 .B Mod1-Return
-Zoom
+Zoom current
 .B window
 to the 
 .B master
 column
-.TP
-.B Mod1-k
-Focus previous
-.B window
-.TP
-.B Mod1-j
-Focus next
-.B window
+.RB ( tiling
+mode only).
 .TP
 .B Mod1-m
 Maximize current
-.B window
-.TP
-.B Mod1-[0..n]
-Focus
-.B nth
-tag
-.TP
-.B Mod1-space
-(Re-)arrange
-.B all
-windows tiled
-.TP
-.B Mod1-Shift-space
-(Re-)arrange
-.B all
-windows floating
+.BR window .
 .TP
 .B Mod1-Shift-[0..n]
 Apply
-.B nth
-tag to current
-.B window
+.B nth tag
+to current
+.BR window .
+.TP
+.B Mod1-Control-Shift-[0..n]
+Add/remove
+.B nth tag
+to/from current
+.BR window .
+.TP
+.B Mod1-Shift-c
+Close focused
+.B window.
+.TP
+.B Mod1-space
+Toggle between
+.B tiled
+and
+.B floating
+mode (affects
+.BR "all windows" ).
+.TP
+.B Mod1-[0..n]
+View all windows with
+.BR "tag n" .
+.TP
+.B Mod1-Control-[0..n]
+Add/remove all windows with
+.B tag n
+to/from the view.
 .TP
 .B Mod1-Shift-q
 Quit
-.B dwm
-.TP
-.B Mod1-Shift-Return
-Start
-.B terminal
-.TP
-.B Mod1-Shift-w
-Start
-.B web browser
-.TP
-.B Mod1-Shift-l
-Lock
-.B screen
-.TP
-.B Control-[0..n]
-Append
-.B nth
-tag to current
-.B window
-.TP
-.B Control-Shift-[0..n]
-Replace current
-.B window
-of
-.B nth
-tag with current tag.
-.B window
-.TP
-.B Control-Button1
-Zooms the clicked
-.B window
-to master column
+.B dwm.
+.SS Mouse commands
 .TP
 .B Mod1-Button1
-Moves current
+Move current
 .B window
 while dragging
+.RB ( floating
+mode only).
 .TP
 .B Mod1-Button2
-Lowers current
+Zoom current
 .B window
+to the 
+.B master
+column
+.RB ( tiling
+mode only).
 .TP
 .B Mod1-Button3
-Resizes current
+Resize current
 .B window
 while dragging
+.RB ( floating
+mode only).
 .SH CUSTOMIZATION
 .B dwm
-is customized through editing its source code.  This keeps it fast, secure and
-simple. The source code contains the
-.I CUSTOMIZE
-keyword to highlight relevant portions for customization.
+is customized by creating a custom config.h and (re)compiling the source
+code. This keeps it fast, secure and simple.
+.SH CAVEATS
+The status bar may display
+.B broken pipe
+when
+.B dwm
+has been started by
+.BR xdm (1),
+because it closes standard output before executing
+.BR dwm .
+.SH SEE ALSO
+.BR dmenu (1)

dwm.h

@@ -3,39 +3,18 @@
  * See LICENSE file for license details.
  */
 
+#include "config.h"
 #include <X11/Xlib.h>
 
-/********** CUSTOMIZE **********/
+/* mask shorthands, used in event.c and client.c */
+#define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
+#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
+#define PROTODELWIN		1
 
-#define FONT				"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
-#define BGCOLOR				"#0a2c2d"
-#define FGCOLOR				"#ddeeee"
-#define BORDERCOLOR			"#176164"
-/*
-#define BGCOLOR				"#666699"
-#define FGCOLOR				"#eeeeee"
-#define BORDERCOLOR			"#9999CC"
-*/
-#define MASTERW				52 /* percent */
-#define WM_PROTOCOL_DELWIN	1
-
-/* tags */
-enum { Tscratch, Tdev, Twww, Twork, TLast };
-
-/********** CUSTOMIZE **********/
-
-typedef union Arg Arg;
-typedef struct Client Client;
-typedef enum Corner Corner;
-typedef struct DC DC;
-typedef struct Fnt Fnt;
-typedef struct Key Key;
-typedef struct Rule Rule;
-
-union Arg {
-	const char **argv;
+typedef union {
+	const char *cmd;
 	int i;
-};
+} Arg;
 
 /* atoms */
 enum { NetSupported, NetWMName, NetLast };
@@ -44,92 +23,76 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
-enum Corner { TopLeft, TopRight, BotLeft, BotRight };
+/* color */
+enum { ColFG, ColBG, ColLast };
 
-struct Fnt {
+/* window corners */
+typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
+
+typedef struct {
 	int ascent;
 	int descent;
 	int height;
 	XFontSet set;
 	XFontStruct *xfont;
-};
+} Fnt;
 
-struct DC { /* draw context */
+typedef struct { /* draw context */
 	int x, y, w, h;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
+	unsigned long norm[ColLast];
+	unsigned long sel[ColLast];
+	unsigned long status[ColLast];
 	Drawable drawable;
 	Fnt font;
 	GC gc;
-};
+} DC;
 
+typedef struct Client Client;
 struct Client {
 	char name[256];
-	char *tags[TLast];
 	int proto;
-	int *x, *y, *w, *h; /* current geom */
-	int bx, by, bw, bh; /* title bar */
-	int fx, fy, fw, fh; /* floating geom */
-	int tx, ty, tw, th; /* tiled geom */
+	int x, y, w, h;
+	int tx, ty, tw, th; /* title */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int grav;
-	unsigned int border;
 	long flags; 
+	unsigned int border;
 	Bool isfloat;
+	Bool ismax;
+	Bool *tags;
 	Client *next;
-	Client *revert;
+	Client *prev;
 	Window win;
-	Window title;
+	Window twin;
 };
 
-struct Rule {
-	const char *class;
-	const char *instance;
-	char *tags[TLast];
-	Bool isfloat;
-};
-
-struct Key {
-	unsigned long mod;
-	KeySym keysym;
-	void (*func)(Arg *arg);
-	Arg arg;
-};
-
-extern char *tags[TLast], stext[1024];
-extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+extern const char *tags[];
+extern char stext[1024];
+extern int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
+extern unsigned int ntags, numlockmask;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 extern Atom wmatom[WMLast], netatom[NetLast];
-extern Bool running, issel;
+extern Bool running, issel, *seltag;
 extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;
 extern Display *dpy;
-extern Key key[];
 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 lower(Client *c);
 extern void manage(Window w, XWindowAttributes *wa);
-extern void maximize(Arg *arg);
-extern void pop(Client *c);
-extern void resize(Client *c, Bool inc, Corner sticky);
-extern void setgeom(Client *c);
+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();
@@ -137,10 +100,11 @@ 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(char *text);
+extern unsigned int textw(const char *text);
 
 /* event.c */
 extern void grabkeys();
+extern void procevent();
 
 /* main.c */
 extern int getproto(Window w);
@@ -149,16 +113,27 @@ 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 Client *getnext(Client *c, unsigned int t);
-extern void heretag(Arg *arg);
-extern void replacetag(Arg *arg);
+extern void initrregs();
+extern Client *getnext(Client *c);
+extern Client *getprev(Client *c);
 extern void settags(Client *c);
-extern void view(Arg *arg);
+extern void tag(Arg *arg);
+extern void toggletag(Arg *arg);
 
 /* util.c */
 extern void *emallocz(unsigned int size);
 extern void eprint(const char *errstr, ...);
+extern void *erealloc(void *ptr, unsigned int size);
 extern void spawn(Arg *arg);
+
+/* view.c */
+extern void dofloat(Arg *arg);
+extern void dotile(Arg *arg);
+extern void focusnext(Arg *arg);
+extern void focusprev(Arg *arg);
+extern Bool isvisible(Client *c);
+extern void restack();
+extern void togglemode(Arg *arg);
+extern void toggleview(Arg *arg);
+extern void view(Arg *arg);
+extern void zoom(Arg *arg);

dwm.html

@@ -4,6 +4,7 @@
 		<meta name="author" content="Anselm R. Garbe">
 		<meta name="generator" content="ed">
 		<meta name="copyright" content="(C)opyright 2006 by Anselm R. Garbe">
+		<link rel="dwm icon" href="favicon.ico" type="image/x-icon" />
 		<style type="text/css">
 			body {
 				color: #000000;
@@ -21,7 +22,7 @@
 		<p>
 		dwm is a dynamic window manager for X11.
 		</p>
-		<h4>Philosophy</h4>
+		<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
@@ -39,7 +40,7 @@
 		</p>
 		<ul>
 			<li>
-			dwm has no Lua integration, no 9P support, no menu, no editable
+			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.
@@ -55,7 +56,7 @@
 			depending on the application in use and the task performed.
 			</li>
 			<li>
-			dwm don't distinguishes between layers, there is no floating or
+			dwm doesn'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. 
@@ -67,7 +68,7 @@
 			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.
+			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
@@ -88,15 +89,24 @@
 			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-20060714.png">Screenshot</a> (20060714)</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>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>&nbsp;<a href="http://dir.gmane.org/gmane.comp.window-managers.dwm">(GMANE Archive)</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-1.0.tar.gz">dwm 1.0</a> (15kb) (20060824)</li>
+			<li><a href="http://10kloc.org/download/dmenu-0.5.tar.gz">dmenu 0.5</a> (7kb) (20060824)</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:
@@ -104,15 +114,14 @@
 		<p>
 		<code>hg clone http://10kloc.org/cgi-bin/hgwebdir.cgi/dwm</code>
 		</p>
-		<h3>Download</h3>
-		<ul>
-			<li><a href="http://10kloc.org/download/dwm-0.3.tar.gz">dwm 0.3</a> (13kb) (20060719)</li>
-		</ul>
+		<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 (20060719)</small></p>
+		<p><small>--Anselm</small></p>
 	</body>
 </html>

event.c

@@ -3,64 +3,39 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <stdlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask       (ButtonMask | PointerMotionMask)
-
-/* CUSTOMIZE */
-const char *term[] = { "xterm", NULL };
-
-Key key[] = {
-	/* modifier				key			function	arguments */
-	{ ControlMask,			XK_0,		appendtag,	{ .i = Tscratch } }, 
-	{ ControlMask,			XK_1,		appendtag,	{ .i = Tdev } }, 
-	{ ControlMask,			XK_2,		appendtag,	{ .i = Twww } }, 
-	{ ControlMask,			XK_3,		appendtag,	{ .i = Twork } }, 
-	{ Mod1Mask,				XK_0,		view,		{ .i = Tscratch } }, 
-	{ Mod1Mask,				XK_1,		view,		{ .i = Tdev } }, 
-	{ Mod1Mask,				XK_2,		view,		{ .i = Twww } }, 
-	{ Mod1Mask,				XK_3,		view,		{ .i = Twork } }, 
-	{ Mod1Mask,				XK_j,		focusnext,		{ 0 } }, 
-	{ Mod1Mask,				XK_k,		focusprev,		{ 0 } },
-	{ Mod1Mask,				XK_m,		maximize,		{ 0 } }, 
-	{ Mod1Mask,				XK_space,	dotile,		{ 0 } }, 
-	{ Mod1Mask,				XK_Return,	zoom,		{ 0 } },
-	{ ControlMask|ShiftMask,XK_0,		heretag,	{ .i = Tscratch } }, 
-	{ ControlMask|ShiftMask,XK_1,		heretag,	{ .i = Tdev } }, 
-	{ ControlMask|ShiftMask,XK_2,		heretag,	{ .i = Twww } }, 
-	{ ControlMask|ShiftMask,XK_3,		heretag,	{ .i = Twork } }, 
-	{ Mod1Mask|ShiftMask,	XK_0,		replacetag,		{ .i = Tscratch } }, 
-	{ Mod1Mask|ShiftMask,	XK_1,		replacetag,		{ .i = Tdev } }, 
-	{ Mod1Mask|ShiftMask,	XK_2,		replacetag,		{ .i = Twww } }, 
-	{ Mod1Mask|ShiftMask,	XK_3,		replacetag,		{ .i = Twork } }, 
-	{ Mod1Mask|ShiftMask,	XK_c,		killclient,		{ 0 } }, 
-	{ Mod1Mask|ShiftMask,	XK_q,		quit,		{ 0 } },
-	{ Mod1Mask|ShiftMask,	XK_space,	dofloat,	{ 0 } }, 
-	{ Mod1Mask|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
-};
-
 /* 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)
 {
-	XEvent ev;
 	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)
+	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);
+		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
 		switch (ev.type) {
 		default: break;
 		case Expose:
@@ -68,8 +43,8 @@ movemouse(Client *c)
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
-			*c->x = ocx + (ev.xmotion.x - x1);
-			*c->y = ocy + (ev.xmotion.y - y1);
+			c->x = ocx + (ev.xmotion.x - x1);
+			c->y = ocy + (ev.xmotion.y - y1);
 			resize(c, False, TopLeft);
 			break;
 		case ButtonRelease:
@@ -82,18 +57,19 @@ movemouse(Client *c)
 static void
 resizemouse(Client *c)
 {
-	XEvent ev;
 	int ocx, ocy;
+	int nw, nh;
 	Corner sticky;
+	XEvent ev;
 
-	ocx = *c->x;
-	ocy = *c->y;
-	if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
+	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);
+	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
 	for(;;) {
-		XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
 		switch(ev.type) {
 		default: break;
 		case Expose:
@@ -101,10 +77,12 @@ resizemouse(Client *c)
 			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((nw = abs(ocx - ev.xmotion.x)))
+				c->w = abs(ocx - ev.xmotion.x);
+			if((nh = abs(ocy - ev.xmotion.y)))
+				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
@@ -123,51 +101,45 @@ buttonpress(XEvent *e)
 {
 	int x;
 	Arg a;
-	XButtonPressedEvent *ev = &e->xbutton;
 	Client *c;
+	XButtonPressedEvent *ev = &e->xbutton;
 
 	if(barwin == ev->window) {
-		switch(ev->button) {
-		default:
-			x = 0;
-			for(a.i = 0; a.i < TLast; a.i++) {
-				x += textw(tags[a.i]);
-				if(ev->x < x) {
+		x = 0;
+		for(a.i = 0; a.i < ntags; a.i++) {
+			x += textw(tags[a.i]);
+			if(ev->x < x) {
+				if(ev->button == Button1)
 					view(&a);
-					break;
-				}
+				else if(ev->button == Button3)
+					toggleview(&a);
+				return;
 			}
-			break;
-		case Button4:
-			a.i = (tsel + 1 < TLast) ? tsel + 1 : 0;
-			view(&a);
-			break;
-		case Button5:
-			a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1;
-			view(&a);
-			break;
+		}
+		if(ev->x < x + bmw) {
+			if(ev->button == Button1)
+				togglemode(NULL);
 		}
 	}
 	else if((c = getclient(ev->window))) {
+		focus(c);
+		if(CLEANMASK(ev->state) != MODKEY)
+			return;
 		switch(ev->button) {
 		default:
 			break;
 		case Button1:
-			if(arrange == dotile && !c->isfloat) {
-				if((ev->state & ControlMask) && (ev->button == Button1))
-					zoom(NULL);
-			}
-			else {
-				higher(c);
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+				restack(c);
 				movemouse(c);
 			}
 			break;
 		case Button2:
-			lower(c);
+			zoom(NULL);
 			break;
 		case Button3:
-			if(arrange == dofloat || c->isfloat) {
-				higher(c);
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+				restack(c);
 				resizemouse(c);
 			}
 			break;
@@ -178,38 +150,63 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
-	XConfigureRequestEvent *ev = &e->xconfigurerequest;
-	XWindowChanges wc;
+	unsigned long newmask;
 	Client *c;
+	XConfigureRequestEvent *ev = &e->xconfigurerequest;
+	XEvent synev;
+	XWindowChanges wc;
 
-	ev->value_mask &= ~CWSibling;
 	if((c = getclient(ev->window))) {
 		gravitate(c, True);
 		if(ev->value_mask & CWX)
-			*c->x = ev->x;
+			c->x = ev->x;
 		if(ev->value_mask & CWY)
-			*c->y = ev->y;
+			c->y = ev->y;
 		if(ev->value_mask & CWWidth)
-			*c->w = ev->width;
+			c->w = ev->width;
 		if(ev->value_mask & CWHeight)
-			*c->h = ev->height;
+			c->h = ev->height;
 		if(ev->value_mask & CWBorderWidth)
-			c->border = 1;
+			c->border = ev->border_width;
 		gravitate(c, False);
-		resize(c, True, TopLeft);
+		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);
 	}
-
-	wc.x = ev->x;
-	wc.y = ev->y;
-	wc.width = ev->width;
-	wc.height = ev->height;
-	wc.border_width = 1;
-	wc.sibling = None;
-	wc.stack_mode = Above;
-	ev->value_mask &= ~CWStackMode;
-	ev->value_mask |= CWBorderWidth;
-	XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-	XSync(dpy, False);
 }
 
 static void
@@ -225,23 +222,26 @@ destroynotify(XEvent *e)
 static void
 enternotify(XEvent *e)
 {
-	XCrossingEvent *ev = &e->xcrossing;
 	Client *c;
+	XCrossingEvent *ev = &e->xcrossing;
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
 
-	if((c = getclient(ev->window)))
+	if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
 		focus(c);
-	else if(ev->window == root)
+	else if(ev->window == root) {
 		issel = True;
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+		drawall();
+	}
 }
 
 static void
 expose(XEvent *e)
 {
-	XExposeEvent *ev = &e->xexpose;
 	Client *c;
+	XExposeEvent *ev = &e->xexpose;
 
 	if(ev->count == 0) {
 		if(barwin == ev->window)
@@ -254,18 +254,21 @@ expose(XEvent *e)
 static void
 keypress(XEvent *e)
 {
-	XKeyEvent *ev = &e->xkey;
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+	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) && (key[i].mod == ev->state)) {
+	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
@@ -273,15 +276,27 @@ leavenotify(XEvent *e)
 {
 	XCrossingEvent *ev = &e->xcrossing;
 
-	if((ev->window == root) && !ev->same_screen)
-		issel = True;
+	if((ev->window == root) && !ev->same_screen) {
+		issel = False;
+		drawall();
+	}
+}
+
+static void
+mappingnotify(XEvent *e)
+{
+	XMappingEvent *ev = &e->xmapping;
+
+	XRefreshKeyboardMapping(ev);
+	if(ev->request == MappingKeyboard)
+		grabkeys();
 }
 
 static void
 maprequest(XEvent *e)
 {
-	XMapRequestEvent *ev = &e->xmaprequest;
 	static XWindowAttributes wa;
+	XMapRequestEvent *ev = &e->xmaprequest;
 
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
@@ -299,9 +314,9 @@ maprequest(XEvent *e)
 static void
 propertynotify(XEvent *e)
 {
-	XPropertyEvent *ev = &e->xproperty;
-	Window trans;
 	Client *c;
+	Window trans;
+	XPropertyEvent *ev = &e->xproperty;
 
 	if(ev->state == PropertyDelete)
 		return; /* ignore */
@@ -349,6 +364,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[LeaveNotify] = leavenotify,
 	[Expose] = expose,
 	[KeyPress] = keypress,
+	[MappingNotify] = mappingnotify,
 	[MapRequest] = maprequest,
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
@@ -357,14 +373,33 @@ void (*handler[LASTEvent]) (XEvent *) = {
 void
 grabkeys()
 {
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeyCode code;
 
+	XUngrabKey(dpy, AnyKey, AnyModifier, root);
 	for(i = 0; i < len; i++) {
 		code = XKeysymToKeycode(dpy, key[i].keysym);
-		XUngrabKey(dpy, code, key[i].mod, root);
 		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);
 	}
 }
+
+void
+procevent()
+{
+	XEvent ev;
+
+	while(XPending(dpy)) {
+		XNextEvent(dpy, &ev);
+		if(handler[ev.type])
+			(handler[ev.type])(&ev); /* call handler */
+	}
+}
+

main.c

@@ -4,40 +4,66 @@
  */
 
 #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/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
+/* extern */
+
+char stext[1024];
+Bool *seltag;
+int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
+unsigned int ntags, numlockmask;
+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;
 
 /* static */
 
-static Bool otherwm;
 static int (*xerrorxlib)(Display *, XErrorEvent *);
+static Bool otherwm, readin;
 
 static void
 cleanup()
 {
+	close(STDIN_FILENO);
 	while(sel) {
 		resize(sel, True, TopLeft);
 		unmanage(sel);
 	}
+	if(dc.font.set)
+		XFreeFontSet(dpy, dc.font.set);
+	else
+		XFreeFont(dpy, dc.font.xfont);
+	XUngrabKey(dpy, AnyKey, AnyModifier, root);
+	XFreePixmap(dpy, dc.drawable);
+	XFreeGC(dpy, dc.gc);
+	XDestroyWindow(dpy, barwin);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+	XSync(dpy, False);
 }
 
 static void
 scan()
 {
 	unsigned int i, num;
-	Window *wins;
+	Window *wins, d1, d2;
 	XWindowAttributes wa;
-	Window d1, d2;
 
+	wins = NULL;
 	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
 		for(i = 0; i < num; i++) {
 			if(!XGetWindowAttributes(dpy, wins[i], &wa))
@@ -52,24 +78,81 @@ scan()
 		XFree(wins);
 }
 
-static int
-win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
+static void
+setup()
 {
-	Atom real;
-	int format;
-	unsigned long res, extra;
-	int status;
+	int i, j;
+	unsigned int mask;
+	Window w;
+	XModifierKeymap *modmap;
+	XSetWindowAttributes wa;
 
-	status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
-			&res, &extra, prop);
+	/* 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);
 
-	if(status != Success || *prop == 0) {
-		return 0;
+	/* init cursors */
+	cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
+	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
+	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
+
+	modmap = XGetModifierMapping(dpy);
+	for (i = 0; i < 8; i++) {
+		for (j = 0; j < modmap->max_keypermod; j++) {
+			if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+				numlockmask = (1 << i);
+		}
 	}
-	if(res == 0) {
-		free((void *) *prop);
-	}
-	return res;
+	XFree(modmap);
+
+	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask;
+	wa.cursor = cursor[CurNormal];
+	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+
+	grabkeys();
+	initrregs();
+
+	for(ntags = 0; tags[ntags]; ntags++);
+	seltag = emallocz(sizeof(Bool) * ntags);
+	seltag[0] = True;
+
+	/* style */
+	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
+	dc.sel[ColBG] = getcolor(SELBGCOLOR);
+	dc.sel[ColFG] = getcolor(SELFGCOLOR);
+	dc.status[ColBG] = getcolor(STATUSBGCOLOR);
+	dc.status[ColFG] = getcolor(STATUSFGCOLOR);
+	setfont(FONT);
+
+	bmw = textw(FLOATSYMBOL) > textw(TILESYMBOL) ? textw(FLOATSYMBOL) : textw(TILESYMBOL);
+	sx = sy = 0;
+	sw = DisplayWidth(dpy, screen);
+	sh = DisplayHeight(dpy, screen);
+	mw = (sw * MASTERW) / 100;
+
+	bx = by = 0;
+	bw = sw;
+	dc.h = bh = dc.font.height + 2;
+	wa.override_redirect = 1;
+	wa.background_pixmap = ParentRelative;
+	wa.event_mask = ButtonPressMask | ExposureMask;
+	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);
+	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+
+	issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+	strcpy(stext, "dwm-"VERSION);
 }
 
 /*
@@ -85,36 +168,22 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 
 /* extern */
 
-char stext[1024];
-int tsel = Tdev; /* default tag */
-int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-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)
 {
-	unsigned char *protocols;
-	long res;
-	int protos = 0;
-	int i;
+	int i, format, protos, status;
+	unsigned long extra, res;
+	Atom *protocols, real;
 
-	res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
-	if(res <= 0) {
+	protos = 0;
+	status = XGetWindowProperty(dpy, w, wmatom[WMProtocols], 0L, 20L, False,
+			XA_ATOM, &real, &format, &res, &extra, (unsigned char **)&protocols);
+	if(status != Success || protocols == 0)
 		return protos;
-	}
-	for(i = 0; i < res; i++) {
+	for(i = 0; i < res; i++)
 		if(protocols[i] == wmatom[WMDelete])
-			protos |= WM_PROTOCOL_DELWIN;
-	}
-	free((char *) protocols);
+			protos |= PROTODELWIN;
+	free(protocols);
 	return protos;
 }
 
@@ -136,7 +205,7 @@ sendevent(Window w, Atom a, long value)
 void
 quit(Arg *arg)
 {
-	running = False;
+	readin = running = False;
 }
 
 /*
@@ -148,162 +217,83 @@ 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))
+	|| (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);
+		ee->request_code, ee->error_code);
 	return xerrorxlib(dpy, ee); /* may call exit() */
 }
 
 int
 main(int argc, char *argv[])
 {
-	int i, n;
+	int r, xfd;
 	fd_set rd;
-	XSetWindowAttributes wa;
-	unsigned int mask;
-	Bool readstdin = True;
-	Window w;
-	XEvent ev;
 
-	for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
-		switch (argv[i][1]) {
-		default:
-			eprint("usage: dwm [-v]\n");
-			break;
-		case 'v':
-			fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-			exit(EXIT_SUCCESS);
-			break;
-		}
+	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 connect X server\n");
+		eprint("dwm: cannot open display\n");
 
+	xfd = ConnectionNumber(dpy);
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
 
-	/* check if another WM is already running */
 	otherwm = False;
 	XSetErrorHandler(xerrorstart);
-	/* this causes an error if some other WM is running */
+	/* 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");
 
+	XSync(dpy, False);
 	XSetErrorHandler(NULL);
 	xerrorxlib = XSetErrorHandler(xerror);
+	XSync(dpy, False);
 
-	/* 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();
-
-	/* 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);
+	setup();
 	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);
-
-	strcpy(stext, "dwm-"VERSION);
-
 	scan();
 
-	/* main event loop, reads status text from stdin as well */
-Mainloop:
+	/* main event loop, also reads status text from stdin */
+	XSync(dpy, False);
+	procevent();
+	readin = True;
 	while(running) {
 		FD_ZERO(&rd);
-		if(readstdin)
+		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)
+		FD_SET(xfd, &rd);
+		r = select(xfd + 1, &rd, NULL, NULL, NULL);
+		if((r == -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(readstdin && FD_ISSET(STDIN_FILENO, &rd)) {
-				i = n = 0;
-				for(;;) {
-					if((i = getchar()) == EOF) {
-						/* broken pipe/end of producer */
-						readstdin = False;
-						strcpy(stext, "broken pipe");
-						goto Mainloop;
-					}
-					if(i == '\n' || n >= sizeof(stext) - 1)
-						break;
-					stext[n++] = i;
-				}
-				stext[n] = 0;
+		if(r > 0) {
+			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();
 			}
 		}
+		else if(r < 0)
+			eprint("select failed\n");
+		procevent();
 	}
-
 	cleanup();
 	XCloseDisplay(dpy);
 

tag.c

@@ -3,204 +3,144 @@
  * 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 */
 
-/* CUSTOMIZE */ 
-static Rule rule[] = {
-	/* class			instance	tags						isfloat */
-	{ "Firefox-bin",	"firefox-bin",	{ [Twww] = "www" },			False },
-};
+TAGS
+RULES
+
+static RReg *rreg = NULL;
+static unsigned int len = 0;
 
 /* extern */
 
-/* CUSTOMIZE */
-char *tags[TLast] = {
-	[Tscratch] = "scratch",
-	[Tdev] = "dev",
-	[Twww] = "www",
-	[Twork] = "work",
-};
-void (*arrange)(Arg *) = dotile;
-
-void
-appendtag(Arg *arg)
+Client *
+getnext(Client *c)
 {
-	if(!sel)
-		return;
-
-	sel->tags[arg->i] = tags[arg->i];
-	arrange(NULL);
-}
-
-void
-dofloat(Arg *arg)
-{
-	Client *c;
-
-	arrange = dofloat;
-	for(c = clients; c; c = c->next) {
-		setgeom(c);
-		if(c->tags[tsel]) {
-			resize(c, True, TopLeft);
-		}
-		else
-			ban(c);
-	}
-	if(sel && !sel->tags[tsel]) {
-		if((sel = getnext(clients, tsel))) {
-			higher(sel);
-			focus(sel);
-		}
-	}
-	drawall();
-}
-
-void
-dotile(Arg *arg)
-{
-	Client *c;
-	int n, i, w, h;
-
-	w = sw - mw;
-	arrange = dotile;
-	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) {
-		setgeom(c);
-		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->border;
-				*c->h = sh - 2 * c->border - bh;
-			}
-			else if(i == 0) {
-				*c->x = sx;
-				*c->y = sy + bh;
-				*c->w = mw - 2 * c->border;
-				*c->h = sh - 2 * c->border - bh;
-			}
-			else if(h > bh) {
-				*c->x = sx + mw;
-				*c->y = sy + (i - 1) * h + bh;
-				*c->w = w - 2 * c->border;
-				*c->h = h - 2 * c->border;
-			}
-			else { /* fallback if h < bh */
-				*c->x = sx + mw;
-				*c->y = sy + bh;
-				*c->w = w - 2 * c->border;
-				*c->h = sh - 2 * c->border - bh;
-			}
-			resize(c, False, TopLeft);
-			i++;
-		}
-		else
-			ban(c);
-	}
-	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = getnext(clients, tsel))) {
-			higher(sel);
-			focus(sel);
-		}
-	}
-	drawall();
+	for(; c && !isvisible(c); c = c->next);
+	return c;
 }
 
 Client *
-getnext(Client *c, unsigned int t)
+getprev(Client *c)
 {
-	for(; c && !c->tags[t]; c = c->next);
+	for(; c && !isvisible(c); c = c->prev);
 	return c;
 }
 
 void
-heretag(Arg *arg)
+initrregs()
 {
-	int i;
-	Client *c;
+	unsigned int i;
+	regex_t *reg;
 
-	if(arg->i == tsel)
+	if(rreg)
 		return;
+	len = sizeof(rule) / sizeof(rule[0]);
+	rreg = emallocz(len * sizeof(RReg));
 
-	if(!(c = getnext(clients, arg->i)))
-		return;
-
-	for(i = 0; i < TLast; i++)
-		c->tags[i] = NULL;
-	c->tags[tsel] = tags[tsel];
-	pop(c);
-	focus(c);
-}
-
-void
-replacetag(Arg *arg)
-{
-	int i;
-	if(!sel)
-		return;
-
-	for(i = 0; i < TLast; i++)
-		sel->tags[i] = NULL;
-	appendtag(arg);
+	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
 settags(Client *c)
 {
-	XClassHint ch;
-	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+	char prop[512];
 	unsigned int i, j;
+	regmatch_t tmp;
 	Bool matched = False;
-
-	if(!len) {
-		c->tags[tsel] = tags[tsel];
-		return;
-	}
+	XClassHint ch;
 
 	if(XGetClassHint(dpy, c->win, &ch)) {
-		if(ch.res_class && ch.res_name) {
-			for(i = 0; i < len; i++)
-				if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
-					&& !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
-				{
-					for(j = 0; j < TLast; j++)
-						c->tags[j] = rule[i].tags[j];
-					c->isfloat = rule[i].isfloat;
-					matched = True;
-					break;
+		snprintf(prop, sizeof(prop), "%s:%s:%s",
+				ch.res_class ? ch.res_class : "",
+				ch.res_name ? ch.res_name : "", c->name);
+		for(i = 0; !matched && i < len; i++)
+			if(rreg[i].clregex && !regexec(rreg[i].clregex, prop, 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] = tags[tsel];
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = seltag[i];
 }
 
 void
-view(Arg *arg)
+tag(Arg *arg)
 {
-	tsel = arg->i;
-	arrange(NULL);
-	drawall();
+	unsigned int i;
+
+	if(!sel)
+		return;
+
+	for(i = 0; i < ntags; i++)
+		sel->tags[i] = False;
+	sel->tags[arg->i] = True;
+	settitle(sel);
+	if(!isvisible(sel))
+		arrange(NULL);
+	else
+		drawstatus();
+}
+
+void
+toggletag(Arg *arg)
+{
+	unsigned int i;
+
+	if(!sel)
+		return;
+
+	sel->tags[arg->i] = !sel->tags[arg->i];
+	for(i = 0; i < ntags && !sel->tags[i]; i++);
+	if(i == ntags)
+		sel->tags[arg->i] = True;
+	settitle(sel);
+	if(!isvisible(sel))
+		arrange(NULL);
+	else
+		drawstatus();
 }

util.c

@@ -3,59 +3,65 @@
  * 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)
-{
-	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-			(int) size);
-	exit(EXIT_FAILURE);
-}
-
 /* extern */
 
 void *
 emallocz(unsigned int size)
 {
 	void *res = calloc(1, size);
+
 	if(!res)
-		bad_malloc(size);
+		eprint("fatal: could not malloc() %u bytes\n", size);
 	return res;
 }
 
 void
-eprint(const char *errstr, ...) {
+eprint(const char *errstr, ...)
+{
 	va_list ap;
+
 	va_start(ap, errstr);
 	vfprintf(stderr, errstr, ap);
 	va_end(ap);
 	exit(EXIT_FAILURE);
 }
 
+void *
+erealloc(void *ptr, unsigned int size)
+{
+	void *res = realloc(ptr, size);
+	if(!res)
+		eprint("fatal: could not malloc() %u bytes\n", size);
+	return res;
+}
+
 void
 spawn(Arg *arg)
 {
-	char **argv = (char **)arg->argv;
-	if(!argv || !argv[0])
+	static char *shell = NULL;
+
+	if(!shell && !(shell = getenv("SHELL")))
+		shell = "/bin/sh";
+
+	if(!arg->cmd)
 		return;
+	/* the double-fork construct avoids zombie processes */
 	if(fork() == 0) {
 		if(fork() == 0) {
 			if(dpy)
 				close(ConnectionNumber(dpy));
 			setsid();
-			execvp(argv[0], argv);
-			fprintf(stderr, "dwm: execvp %s", argv[0]);
+			execl(shell, shell, "-c", arg->cmd, (char *)NULL);
+			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
 			perror(" failed");
 		}
-		exit(EXIT_FAILURE);
+		exit(0);
 	}
 	wait(0);
 }

view.c

@@ -0,0 +1,253 @@
+/*
+ * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+ * See LICENSE file for license details.
+ */
+#include "dwm.h"
+
+/* extern */
+
+void (*arrange)(Arg *) = DEFMODE;
+
+void
+dofloat(Arg *arg)
+{
+	Client *c;
+
+	for(c = clients; c; c = c->next) {
+		c->ismax = False;
+		if(isvisible(c)) {
+			resize(c, True, TopLeft);
+		}
+		else
+			ban(c);
+	}
+	if(!sel || !isvisible(sel))
+		sel = getnext(clients);
+	if(sel)
+		focus(sel);
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	restack();
+}
+
+void
+dotile(Arg *arg)
+{
+	int h, i, n, w;
+	Client *c;
+
+	w = sw - mw;
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !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(isvisible(c)) {
+			if(c->isfloat) {
+				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 || !isvisible(sel))
+		sel = getnext(clients);
+	if(sel)
+		focus(sel);
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	restack();
+}
+
+void
+focusnext(Arg *arg)
+{
+	Client *c;
+   
+	if(!sel)
+		return;
+
+	if(!(c = getnext(sel->next)))
+		c = getnext(clients);
+	if(c) {
+		focus(c);
+		restack();
+	}
+}
+
+void
+focusprev(Arg *arg)
+{
+	Client *c;
+
+	if(!sel)
+		return;
+
+	if(!(c = getprev(sel->prev))) {
+		for(c = clients; c && c->next; c = c->next);
+		c = getprev(c);
+	}
+	if(c) {
+		focus(c);
+		restack();
+	}
+}
+
+Bool
+isvisible(Client *c)
+{
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		if(c->tags[i] && seltag[i])
+			return True;
+	return False;
+}
+
+void
+restack()
+{
+	static unsigned int nwins = 0;
+	static Window *wins = NULL;
+	unsigned int f, fi, m, mi, n;
+	Client *c;
+	XEvent ev;
+
+	for(f = 0, m = 0, c = clients; c; c = c->next)
+		if(isvisible(c)) {
+			if(c->isfloat || arrange == dofloat)
+				f++;
+			else
+				m++;
+		}
+	if(!(n = 2 * (f + m))) {
+		drawstatus();
+		return;
+	}
+	if(nwins < n) {
+		nwins = n;
+		wins = erealloc(wins, nwins * sizeof(Window));
+	}
+
+	fi = 0;
+	mi = 2 * f;
+	if(sel->isfloat || arrange == dofloat) {
+		wins[fi++] = sel->twin;
+		wins[fi++] = sel->win;
+	}
+	else {
+		wins[mi++] = sel->twin;
+		wins[mi++] = sel->win;
+	}
+	for(c = clients; c; c = c->next)
+		if(isvisible(c) && c != sel) {
+			if(c->isfloat || arrange == dofloat) {
+				wins[fi++] = c->twin;
+				wins[fi++] = c->win;
+			}
+			else {
+				wins[mi++] = c->twin;
+				wins[mi++] = c->win;
+			}
+		}
+	XRestackWindows(dpy, wins, n);
+	drawall();
+	XSync(dpy, False);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+void
+togglemode(Arg *arg)
+{
+	arrange = (arrange == dofloat) ? dotile : dofloat;
+	if(sel)
+		arrange(NULL);
+	else
+		drawstatus();
+}
+
+void
+toggleview(Arg *arg)
+{
+	unsigned int i;
+
+	seltag[arg->i] = !seltag[arg->i];
+	for(i = 0; i < ntags && !seltag[i]; i++);
+	if(i == ntags)
+		seltag[arg->i] = True; /* cannot toggle last view */
+	arrange(NULL);
+}
+
+void
+view(Arg *arg)
+{
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		seltag[i] = False;
+	seltag[arg->i] = True;
+	arrange(NULL);
+}
+
+void
+zoom(Arg *arg)
+{
+	Client *c;
+
+	if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
+		return;
+
+	if(sel == getnext(clients))  {
+		if((c = getnext(sel->next)))
+			sel = c;
+		else
+			return;
+	}
+
+	/* pop */
+	sel->prev->next = sel->next;
+	if(sel->next)
+		sel->next->prev = sel->prev;
+	sel->prev = NULL;
+	clients->prev = sel;
+	sel->next = clients;
+	clients = sel;
+	focus(sel);
+	arrange(NULL);
+}