prepared dwm-0.9

.hgtags

@@ -0,0 +1,8 @@
+d31b5ad96b0ba7b5b0a30928fcf000428339a577 0.1
+0a6472e2203994bc5738d40a340d26f7ec9d6062 0.2
+7e66082e5092fb0bccd18a3695a0bec52c80fdb2 0.3
+eb3165734f00fe7f7da8aeebaed00e60a57caac9 0.4
+22213b9a2114167ee8ba019a012e27da0422a61a 0.5
+c11f86db4550cac5d0a648a3fe4d6d3b9a4fcf7e 0.6
+3fb41412e2492f66476d92ce8f007a8b48fb1d2a 0.7
+cd15de32e173f8ce97bfe1c9b6607937b59056b4 0.8

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 = bar.c client.c dev.c draw.c event.c main.c util.c
+SRC = client.c draw.c event.c main.c tag.c util.c
 OBJ = ${SRC:.c=.o}
-MAN1 = dwm.1 
-BIN = dwm
 
-all: config dwm
-	@echo finished
+all: options dwm
 
-config:
+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
+	@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 X11 window manager.
 
 
 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 the wm.h source file. To
-customize the key bindings edit dev.c.
+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)

bar.c

@@ -1,46 +0,0 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
-#include "dwm.h"
-
-void
-barclick(XButtonPressedEvent *e)
-{
-	int x = 0;
-	Arg a;
-	for(a.i = 0; a.i < TLast; a.i++) {
-		x += textw(tags[a.i]) + dc.font.height;
-		if(e->x < x) {
-			view(&a);
-			return;
-		}
-	}
-}
-
-void
-draw_bar()
-{
-	int i;
-	dc.x = dc.y = 0;
-	dc.w = bw;
-	drawtext(NULL, False, False);
-
-	dc.w = 0;
-	for(i = 0; i < TLast; i++) {
-		dc.x += dc.w;
-		dc.w = textw(tags[i]) + dc.font.height;
-		drawtext(tags[i], i == tsel, True);
-	}
-	if(sel) {
-		dc.x += dc.w;
-		dc.w = textw(sel->name) + dc.font.height;
-		drawtext(sel->name, True, True);
-	}
-	dc.w = textw(stext) + dc.font.height;
-	dc.x = bx + bw - dc.w;
-	drawtext(stext, False, False);
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
-	XFlush(dpy);
-}

client.c

@@ -2,274 +2,321 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
-
+#include "dwm.h"
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-#include "dwm.h"
-
-void (*arrange)(Arg *) = tiling;
-
-static Rule rule[] = {
-	/* class			instance	tags						floating */
-	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
-};
-
-static Client *
-next(Client *c)
-{
-	for(; c && !c->tags[tsel]; c = c->next);
-	return c;
-}
-
-void
-zoom(Arg *arg)
-{
-	Client **l, *c;
-
-	if(!sel)
-		return;
-
-	if(sel == next(clients) && sel->next)  {
-		if((c = next(sel->next)))
-			sel = c;
-	}
-
-	for(l = &clients; *l && *l != sel; l = &(*l)->next);
-	*l = sel->next;
-
-	sel->next = clients; /* pop */
-	clients = sel;
-	arrange(NULL);
-	focus(sel);
-}
-
-void
-max(Arg *arg)
-{
-	if(!sel)
-		return;
-	sel->x = sx;
-	sel->y = sy + bh;
-	sel->w = sw - 2 * sel->border;
-	sel->h = sh - 2 * sel->border - bh;
-	craise(sel);
-	resize(sel, False);
-}
-
-void
-view(Arg *arg)
-{
-	Client *c;
-
-	tsel = arg->i;
-	arrange(NULL);
-
-	for(c = clients; c; c = next(c->next))
-		draw_client(c);
-	draw_bar();
-}
-
-void
-tappend(Arg *arg)
-{
-	if(!sel)
-		return;
-
-	sel->tags[arg->i] = tags[arg->i];
-	arrange(NULL);
-}
-
-void
-ttrunc(Arg *arg)
-{
-	int i;
-	if(!sel)
-		return;
-
-	for(i = 0; i < TLast; i++)
-		sel->tags[i] = NULL;
-	tappend(arg);
-}
+/* static functions */
 
 static void
-ban_client(Client *c)
+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(isvisible(c))
+		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
-floating(Arg *arg)
+focus(Client *c)
 {
-	Client *c;
+	Client *old = sel;
 
-	arrange = floating;
-	for(c = clients; c; c = c->next) {
-		if(c->tags[tsel])
-			resize(c, True);
-		else
-			ban_client(c);
-	}
-	if(sel && !sel->tags[tsel]) {
-		if((sel = next(clients))) {
-			craise(sel);
-			focus(sel);
-		}
-	}
-}
-
-void
-tiling(Arg *arg)
-{
-	Client *c;
-	int n, i, w, h;
-
-	w = sw - mw;
-	arrange = tiling;
-	for(n = 0, c = clients; c; c = c->next)
-		if(c->tags[tsel] && !c->floating)
-			n++;
-
-	if(n > 1)
-		h = (sh - bh) / (n - 1);
-	else
-		h = sh - bh;
-
-	for(i = 0, c = clients; c; c = c->next) {
-		if(c->tags[tsel]) {
-			if(c->floating) {
-				craise(c);
-				resize(c, True);
-				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 {
-				c->x = sx + mw;
-				c->y = sy + (i - 1) * h + bh;
-				c->w = w - 2 * c->border;
-				c->h = h - 2 * c->border;
-			}
-			resize(c, False);
-			i++;
-		}
-		else
-			ban_client(c);
-	}
-	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = next(clients))) {
-			craise(sel);
-			focus(sel);
-		}
-	}
-}
-
-void
-prevc(Arg *arg)
-{
-	Client *c;
-
-	if(!sel)
+	if (!issel)
 		return;
-
-	if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
-		craise(c);
-		focus(c);
-	}
+	if(sel && sel->ismax)
+		togglemax(NULL);
+	sel = c;
+	if(old && old != c)
+		drawtitle(old);
+	drawtitle(c);
+	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 }
 
 void
-nextc(Arg *arg)
+focusnext(Arg *arg)
 {
 	Client *c;
    
 	if(!sel)
 		return;
 
-	if(!(c = next(sel->next)))
-		c = next(clients);
+	if(!(c = getnext(sel->next)))
+		c = getnext(clients);
 	if(c) {
-		craise(c);
-		c->revert = sel;
 		focus(c);
+		restack();
 	}
 }
 
 void
-ckill(Arg *arg)
+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();
+	}
+}
+
+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
+killclient(Arg *arg)
 {
 	if(!sel)
 		return;
-	if(sel->proto & WM_PROTOCOL_DELWIN)
-		send_message(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+	if(sel->proto & PROTODELWIN)
+		sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
 	else
 		XKillClient(dpy, sel->win);
 }
 
-static void
-resize_title(Client *c)
+void
+manage(Window w, XWindowAttributes *wa)
 {
-	int i;
+	Client *c;
+	Window trans;
+	XSetWindowAttributes twa;
 
-	c->tw = 0;
-	for(i = 0; i < TLast; i++)
-		if(c->tags[i])
-			c->tw += textw(c->tags[i]) + dc.font.height;
-	c->tw += textw(c->name) + dc.font.height;
-	if(c->tw > c->w)
-		c->tw = c->w + 2;
-	c->tx = c->x + c->w - c->tw + 2;
-	c->ty = c->y;
-	XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+	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);
+
+	if(isvisible(c))
+		sel = c;
+	arrange(NULL);
+	XMapWindow(dpy, c->win);
+	XMapWindow(dpy, c->title);
+	if(isvisible(c))
+		focus(c);
 }
 
 void
-update_name(Client *c)
+resize(Client *c, Bool sizehints, Corner sticky)
 {
-	XTextProperty name;
-	int n;
-	char **list = NULL;
+	int bottom = c->y + c->h;
+	int right = c->x + c->w;
+	/*XConfigureEvent e;*/
+	XWindowChanges wc;
 
-	name.nitems = 0;
-	c->name[0] = 0;
-	XGetTextProperty(dpy, c->win, &name, net_atom[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);
-		}
+	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;
 	}
-	XFree(name.value);
-	resize_title(c);
+	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
-update_size(Client *c)
+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;
@@ -304,313 +351,116 @@ update_size(Client *c)
 }
 
 void
-craise(Client *c)
+settitle(Client *c)
 {
-	XRaiseWindow(dpy, c->win);
-	XRaiseWindow(dpy, c->title);
+	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
-lower(Client *c)
+togglemax(Arg *arg)
 {
-	XLowerWindow(dpy, c->title);
-	XLowerWindow(dpy, c->win);
-}
-
-void
-focus(Client *c)
-{
-	Client *old = sel;
+	int ox, oy, ow, oh;
 	XEvent ev;
 
-	XFlush(dpy);
-	sel = c;
-	if(old && old != c)
-		draw_client(old);
-	draw_client(c);
-	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-	XFlush(dpy);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-static void
-init_tags(Client *c)
-{
-	XClassHint ch;
-	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
-	unsigned int i, j;
-	Bool matched = False;
-
-	if(!len) {
-		c->tags[tsel] = tags[tsel];
+	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;
 	}
-
-	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->floating = rule[i].floating;
-					matched = True;
-					break;
-				}
-		}
-		if(ch.res_class)
-			XFree(ch.res_class);
-		if(ch.res_name)
-			XFree(ch.res_name);
-	}
-
-	if(!matched)
-		c->tags[tsel] = tags[tsel];
-}
-
-void
-manage(Window w, XWindowAttributes *wa)
-{
-	Client *c, **l;
-	XSetWindowAttributes twa;
-	Window trans;
-
-	c = emallocz(sizeof(Client));
-	c->win = w;
-	c->tx = c->x = wa->x;
-	c->ty = c->y = wa->y;
-	if(c->y < bh)
-		c->ty = c->y += bh;
-	c->tw = c->w = wa->width;
-	c->h = wa->height;
-	c->th = bh;
-	c->border = 1;
-	c->proto = win_proto(c->win);
-	update_size(c);
-	XSelectInput(dpy, c->win,
-			StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-	XGetTransientForHint(dpy, c->win, &trans);
-	twa.override_redirect = 1;
-	twa.background_pixmap = ParentRelative;
-	twa.event_mask = ExposureMask;
-
-	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);
-
-	update_name(c);
-	init_tags(c);
-
-	for(l = &clients; *l; l = &(*l)->next);
-	c->next = *l; /* *l == nil */
-	*l = c;
-
-	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);
-
-	if(!c->floating)
-		c->floating = trans
-			|| ((c->maxw == c->minw) && (c->maxh == c->minh));
-
-	arrange(NULL);
-	/* mapping the window now prevents flicker */
-	if(c->tags[tsel]) {
-		XMapRaised(dpy, c->win);
-		XMapRaised(dpy, c->title);
-		focus(c);
-	}
-	else {
-		ban_client(c);
-		XMapRaised(dpy, c->win);
-		XMapRaised(dpy, c->title);
-	}
-}
-
-void
-gravitate(Client *c, Bool invert)
-{
-	int dx = 0, dy = 0;
-
-	switch(c->grav) {
-	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;
-	default:
-		break;
-	}
-
-	switch (c->grav) {
-	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;
-	default:
-		break;
-	}
-
-	if(invert) {
-		dx = -dx;
-		dy = -dy;
-	}
-	c->x += dx;
-	c->y += dy;
-}
-
-
-void
-resize(Client *c, Bool inc)
-{
-	XConfigureEvent e;
-
-	if(inc) {
-		if(c->incw)
-			c->w -= (c->w - c->basew) % c->incw;
-		if(c->inch)
-			c->h -= (c->h - c->baseh) % c->inch;
-	}
-	if(c->x > sw) /* might happen on restart */
-		c->x = sw - c->w;
-	if(c->y > sh)
-		c->ty = 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;
-	resize_title(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);
-	XFlush(dpy);
-}
-
-static int
-dummy_error_handler(Display *dsply, XErrorEvent *err)
-{
-	return 0;
+	else
+		resize(sel, False, TopLeft);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
 unmanage(Client *c)
 {
-	Client **l;
-
 	XGrabServer(dpy);
-	XSetErrorHandler(dummy_error_handler);
+	XSetErrorHandler(xerrordummy);
 
 	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(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 = sel->revert ? sel->revert : clients;
-
+		sel = getnext(clients);
+	free(c->tags);
 	free(c);
 
-	XFlush(dpy);
-	XSetErrorHandler(error_handler);
+	XSync(dpy, False);
+	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	arrange(NULL);
 	if(sel)
 		focus(sel);
-}
-
-Client *
-gettitle(Window w)
-{
-	Client *c;
-	for(c = clients; c; c = c->next)
-		if(c->title == w)
-			return c;
-	return NULL;
-}
-
-Client *
-getclient(Window w)
-{
-	Client *c;
-	for(c = clients; c; c = c->next)
-		if(c->win == w)
-			return c;
-	return NULL;
+	arrange(NULL);
 }
 
 void
-draw_client(Client *c)
+zoom(Arg *arg)
 {
-	int i;
-	if(c == sel) {
-		draw_bar();
-		XUnmapWindow(dpy, c->title);
-		XSetWindowBorder(dpy, c->win, dc.fg);
+	Client *c;
+
+	if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
 		return;
+
+	if(sel == getnext(clients))  {
+		if((c = getnext(sel->next)))
+			sel = c;
+		else
+			return;
 	}
 
-	XSetWindowBorder(dpy, c->win, dc.bg);
-	XMapWindow(dpy, c->title);
-
-	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]) + dc.font.height;
-			drawtext(c->tags[i], False, True);
-		}
-	}
-	dc.x += dc.w;
-	dc.w = textw(c->name) + dc.font.height;
-	drawtext(c->name, False, True);
-	XCopyArea(dpy, dc.drawable, c->title, dc.gc,
-			0, 0, c->tw, c->th, 0, 0);
-	XFlush(dpy);
+	/* 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);
 }

config.arg.h

@@ -0,0 +1,54 @@
+/*
+ * (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			"#0d121d"
+#define FGCOLOR			"#eeeeee"
+#define BORDERCOLOR		"#3f484d"
+#define MODKEY			Mod1Mask
+#define MASTERW			60 /* percent */
+
+#define KEYS \
+static Key key[] = { \
+	/* modifier			key		function	arguments */ \
+	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
+		{ .cmd = "exec urxvt +sb -tr -bg black -fg '#eeeeee' -fn '"FONT"'" } }, \
+	{ 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_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 regex		tags regex	isfloat */ \
+	{ "Firefox.*",			"net",		False }, \
+	{ "Gimp.*",			NULL,		True}, \
+	{ "MPlayer.*",			NULL,		True}, \
+	{ "Acroread.*",			NULL,		True}, \
+};

config.default.h

@@ -0,0 +1,56 @@
+/*
+ * (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 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_0,		tag,		{ .i = 0 } }, \
+	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 1 } }, \
+	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 2 } }, \
+	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 3 } }, \
+	{ MODKEY|ShiftMask,		XK_4,		tag,		{ .i = 4 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_0,		toggletag,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 3 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	{ .i = 4 } }, \
+	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
+	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
+	{ 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|ControlMask,		XK_0,		toggleview,	{ .i = 0 } }, \
+	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 1 } }, \
+	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 2 } }, \
+	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 3 } }, \
+	{ MODKEY|ControlMask,		XK_4,		toggleview,	{ .i = 4 } }, \
+	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
+};
+
+#define RULES \
+static Rule rule[] = { \
+	/* class:instance regex		tags regex	isfloat */ \
+	{ "Firefox.*",			"2",		False }, \
+	{ "Gimp.*",			NULL,		True}, \
+};

config.mk

@@ -1,31 +1,25 @@
-# Customize to fit your system
+# dwm version
+VERSION = 0.9
+
+# Customize below to fit your system
 
 # paths
 PREFIX = /usr/local
-CONFPREFIX = ${PREFIX}/etc
 MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
-VERSION = 0.1
-
 # includes and libs
-LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
+INCS = -I/usr/lib -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}

dev.c

@@ -1,151 +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 <unistd.h>
-#include <X11/keysym.h>
-
-/********** CUSTOMIZE **********/
-
-const char *term[] = { 
-	"urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-fn",
-	"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*",NULL
-};
-const char *browse[] = { "firefox", NULL };
-const char *xlock[] = { "xlock", NULL };
-
-static Key key[] = {
-	/* modifier				key			function	arguments */
-	{ Mod1Mask,				XK_Return,	zoom,		{ 0 } },
-	{ Mod1Mask,				XK_k,		prevc,		{ 0 } },
-	{ Mod1Mask,				XK_j,		nextc,		{ 0 } }, 
-	{ Mod1Mask,				XK_m,		max,		{ 0 } }, 
-	{ 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_space,	tiling,		{ 0 } }, 
-	{ Mod1Mask|ShiftMask,	XK_space,	floating,	{ 0 } }, 
-	{ Mod1Mask|ShiftMask,	XK_0,		ttrunc,		{ .i = Tscratch } }, 
-	{ Mod1Mask|ShiftMask,	XK_1,		ttrunc,		{ .i = Tdev } }, 
-	{ Mod1Mask|ShiftMask,	XK_2,		ttrunc,		{ .i = Twww } }, 
-	{ Mod1Mask|ShiftMask,	XK_3,		ttrunc,		{ .i = Twork } }, 
-	{ Mod1Mask|ShiftMask,	XK_c,		ckill,		{ 0 } }, 
-	{ Mod1Mask|ShiftMask,	XK_q,		quit,		{ 0 } },
-	{ Mod1Mask|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
-	{ Mod1Mask|ShiftMask,	XK_w,		spawn,		{ .argv = browse } },
-	{ Mod1Mask|ShiftMask,	XK_l,		spawn,		{ .argv = xlock } },
-	{ ControlMask,			XK_0,		tappend,	{ .i = Tscratch } }, 
-	{ ControlMask,			XK_1,		tappend,	{ .i = Tdev } }, 
-	{ ControlMask,			XK_2,		tappend,	{ .i = Twww } }, 
-	{ ControlMask,			XK_3,		tappend,	{ .i = Twork } }, 
-};
-
-/********** CUSTOMIZE **********/
-
-void
-update_keys(void)
-{
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
-	unsigned int i;
-	KeyCode code;
-
-	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);
-	}
-}
-
-void
-keypress(XEvent *e)
-{
-	XKeyEvent *ev = &e->xkey;
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
-	unsigned int i;
-	KeySym keysym;
-
-	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-	for(i = 0; i < len; i++)
-		if((keysym == key[i].keysym) && (key[i].mod == ev->state)) {
-			if(key[i].func)
-				key[i].func(&key[i].arg);
-			return;
-		}
-}
-
-#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask       (ButtonMask | PointerMotionMask)
-
-void
-mresize(Client *c)
-{
-	XEvent ev;
-	int ocx, ocy;
-
-	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:
-			XFlush(dpy);
-			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;
-			resize(c, True);
-			break;
-		case ButtonRelease:
-			XUngrabPointer(dpy, CurrentTime);
-			return;
-		}
-	}
-}
-
-void
-mmove(Client *c)
-{
-	XEvent ev;
-	int x1, y1, ocx, ocy, di;
-	unsigned int dui;
-	Window dummy;
-
-	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:
-			XFlush(dpy);
-			c->x = ocx + (ev.xmotion.x - x1);
-			c->y = ocy + (ev.xmotion.y - y1);
-			resize(c, False);
-			break;
-		case ButtonRelease:
-			XUngrabPointer(dpy, CurrentTime);
-			return;
-		}
-	}
-}

draw.c

@@ -2,18 +2,37 @@
  * (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>
 
-#include "dwm.h"
+/* static */
+
+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
-drawborder(void)
+drawtext(const char *text, Bool invert)
 {
+	int x, y, w, h;
+	static char buf[256];
+	unsigned int len, olen;
+	XGCValues gcv;
 	XPoint points[5];
+	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);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 	XSetForeground(dpy, dc.gc, dc.border);
 	points[0].x = dc.x;
@@ -27,28 +46,12 @@ drawborder(void)
 	points[4].x = 0;
 	points[4].y = -(dc.h - 1);
 	XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-}
-
-void
-drawtext(const char *text, Bool invert, Bool border)
-{
-	int x, y, w, h;
-	unsigned int len;
-	static char buf[256];
-	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);
-
-	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);
@@ -61,6 +64,14 @@ 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 */
@@ -79,35 +90,94 @@ drawtext(const char *text, Bool invert, Bool border)
 	}
 }
 
-unsigned long
-initcolor(const char *colstr)
+/* 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], seltag[i]);
+		else
+			drawtext(tags[i], !seltag[i]);
+	}
+	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 = c->tw - dc.x;
+	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)
 {
-	XColor color;
 	Colormap cmap = DefaultColormap(dpy, screen);
+	XColor color;
 
 	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
 	return color.pixel;
 }
 
-unsigned int
-textnw(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);
-}
-
-unsigned int
-textw(char *text)
-{
-	return textnw(text, strlen(text));
-}
-
 void
-initfont(const char *fontstr)
+setfont(const char *fontstr)
 {
 	char **missing, *def;
 	int i, n;
@@ -150,9 +220,15 @@ initfont(const char *fontstr)
 		if (!dc.font.xfont)
 			dc.font.xfont = XLoadQueryFont(dpy, "fixed");
 		if (!dc.font.xfont)
-			error("error, cannot init 'fixed' font\n");
+			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;
+}

dwm.1

@@ -1,98 +1,148 @@
-.TH DWM 1 dwm-0.1
+.TH DWM 1 dwm-VERSION
 .SH NAME
 dwm \- dynamic window manager
 .SH SYNOPSIS
 .B dwm
 .RB [ \-v ]
 .SH DESCRIPTION
-.SS Overview
 .B dwm
-is a dynamic window manager for X11.
-.SS Options
+is a dynamic window manager for X11. 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 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. 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
+has a small status bar which displays the text read from standard
+input, if written. Besides that, it displays all available tags, and the title
+of the focused window. It draws a 1-pixel border around windows to
+indicate the focus state. Unfocused windows contain a small bar in front of
+them displaying their tags and title.
+.SH OPTIONS
 .TP
 .B \-v
-prints version information to stdout, then exits.
-.SS Status text
-.B dwm
-reads from stdin to display status text if provided.
-.SS Default Key Bindings
-.TP 16
-.I Key	
-.I Action
+prints version information to standard output, then exits.
+.SH USAGE
+.SS Status bar
 .TP
-.B Mod1-Return
-Zoom
-.B window
-to the 
-.B master
-track
+.B Standard input
+is read and displayed in the status text area.
 .TP
-.B Mod1-k
-Focus previous
-.B window
+.B Button1
+click on a tag label views all windows with that
+.BR tag .
 .TP
-.B Mod1-j
-Focus next
-.B window
-.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
-.TP
-.B Mod1-Shift-[0..n]
-Apply
-.B nth
-tag to current
-.B window
-.TP
-.B Mod1-Shift-q
-Quit
-.B dwm
+.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
-.B terminal
+.BR xterm (1).
 .TP
-.B Mod1-Shift-w
-Start
-.B web browser
+.B Mod1-Tab
+Focus next
+.BR window .
 .TP
-.B Mod1-Shift-l
-Lock
-.B screen
+.B Mod1-Shift-Tab
+Focus previous
+.BR window .
 .TP
-.B Control-[0..n]
-Append
-.B nth
-tag to cureent
+.B Mod1-Return
+Zoom current
 .B window
-.SS Default Mouse Bindings
+to the 
+.B master
+column
+.RB ( tiling
+mode only).
+.TP
+.B Mod1-m
+Maximize current
+.BR window .
+.TP
+.B Mod1-Shift-[0..n]
+Apply
+.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.
+.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 by creating a custom config.h and (re)compiling the source
+code. This keeps it fast, secure and simple.
+.SH CAVEATS
+The status bar displays
+.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,153 +3,136 @@
  * See LICENSE file for license details.
  */
 
+#include "config.h"
 #include <X11/Xlib.h>
 
-/********** CUSTOMIZE **********/
-
-#define FONT				"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
-#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 **********/
+/* 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 DC DC;
 typedef struct Client Client;
+typedef struct DC DC;
 typedef struct Fnt Fnt;
-typedef struct Key Key;
-typedef struct Rule Rule;
 
 union Arg {
-	const char **argv;
+	const char *cmd;
 	int i;
 };
 
 /* atoms */
-enum { WMProtocols, WMDelete, WMLast };
 enum { NetSupported, NetWMName, NetLast };
+enum { WMProtocols, WMDelete, WMLast };
 
 /* cursor */
-enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
+enum { CurNormal, CurResize, CurMove, CurLast };
+
+/* windowcorners */
+typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
 
 struct Fnt {
-	XFontStruct *xfont;
-	XFontSet set;
 	int ascent;
 	int descent;
 	int height;
+	XFontSet set;
+	XFontStruct *xfont;
 };
 
 struct DC { /* draw context */
-	GC gc;
-	Drawable drawable;
 	int x, y, w, h;
-	Fnt font;
 	unsigned long bg;
 	unsigned long fg;
 	unsigned long border;
+	Drawable drawable;
+	Fnt font;
+	GC gc;
 };
 
 struct Client {
 	char name[256];
-	char *tags[TLast];
 	int proto;
 	int x, y, w, h;
-	int tx, ty, tw, th;
+	int tx, ty, tw, th; /* title */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int grav;
-	unsigned int border;
 	long flags; 
-	Bool floating;
+	unsigned int border;
+	Bool isfloat;
+	Bool ismax;
+	Bool *tags;
+	Client *next;
+	Client *prev;
 	Window win;
 	Window title;
-	Client *next;
-	Client *revert;
 };
 
-struct Rule {
-	const char *class;
-	const char *instance;
-	char *tags[TLast];
-	Bool floating;
-};
-
-struct Key {
-	unsigned long mod;
-	KeySym keysym;
-	void (*func)(Arg *arg);
-	Arg arg;
-};
-
-extern Display *dpy;
-extern Window root, barwin;
-extern Atom wm_atom[WMLast], net_atom[NetLast];
-extern Cursor cursor[CurLast];
-extern Bool running, issel;
+extern const char *tags[];
+extern char stext[1024];
+extern int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+extern unsigned int ntags, numlockmask;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
-
-extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-extern char *tags[TLast], stext[1024];
-
-extern DC dc;
+extern Atom wmatom[WMLast], netatom[NetLast];
+extern Bool running, issel, *seltag;
 extern Client *clients, *sel;
-
-/* bar.c */
-extern void draw_bar();
-extern void barclick(XButtonPressedEvent *e);
+extern Cursor cursor[CurLast];
+extern DC dc;
+extern Display *dpy;
+extern Window root, barwin;
 
 /* client.c */
-extern void manage(Window w, XWindowAttributes *wa);
-extern void unmanage(Client *c);
-extern Client *getclient(Window w);
+extern void ban(Client *c);
 extern void focus(Client *c);
-extern void update_name(Client *c);
-extern void draw_client(Client *c);
-extern void resize(Client *c, Bool inc);
-extern void update_size(Client *c);
-extern Client *gettitle(Window w);
-extern void craise(Client *c);
-extern void lower(Client *c);
-extern void ckill(Arg *arg);
-extern void nextc(Arg *arg);
-extern void prevc(Arg *arg);
-extern void max(Arg *arg);
-extern void floating(Arg *arg);
-extern void tiling(Arg *arg);
-extern void ttrunc(Arg *arg);
-extern void tappend(Arg *arg);
-extern void view(Arg *arg);
-extern void zoom(Arg *arg);
+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 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 drawtext(const char *text, Bool invert, Bool border);
-extern unsigned long initcolor(const char *colstr);
-extern void initfont(const char *fontstr);
-extern unsigned int textnw(char *text, unsigned int len);
-extern unsigned int textw(char *text);
-extern unsigned int texth(void);
+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);
 
-/* dev.c */
-extern void update_keys(void);
-extern void keypress(XEvent *e);
-extern void mresize(Client *c);
-extern void mmove(Client *c);
+/* event.c */
+extern void grabkeys();
+extern void procevent();
 
 /* main.c */
-extern int error_handler(Display *dsply, XErrorEvent *e);
-extern void send_message(Window w, Atom a, long value);
-extern int win_proto(Window w);
+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 dofloat(Arg *arg);
+extern void dotile(Arg *arg);
+extern void initrregs();
+extern Bool isvisible(Client *c);
+extern Client *getnext(Client *c);
+extern Client *getprev(Client *c);
+extern void restack();
+extern void settags(Client *c);
+extern void tag(Arg *arg);
+extern void togglemode(Arg *arg);
+extern void toggletag(Arg *arg);
+extern void toggleview(Arg *arg);
+extern void view(Arg *arg);
 
 /* util.c */
-extern void error(const char *errstr, ...);
 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);

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,86 +22,106 @@
 		<p>
 		dwm is a dynamic window manager for X11.
 		</p>
-		<h3>Philosophy</h3>
+		<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.
+		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>
-		<h3>Differences to wmii</h3	
+		<h4>Differences to ion, larswm, and wmii</h4>
 		<p>
-		In contrast to wmii, dwm is only a window manager, and nothing else.
-		Hence, it is much smaller, faster and simpler.
+		In contrast to ion, larswm, and wmii, dwm is much smaller, faster and simpler.
 		</p>
 		<ul>
 			<li>
-			dwm has no 9P support, no menu, no editable tagbars,
-			no shell-based configuration and remote control and comes without
-			any additional tools like printing the selection or warping the
-			mouse.
+			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 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. 
+			</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.
+			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>
-			dwm is based on tagging and dynamic window management (however simpler
-			than wmii or larswm).
-			</li>
-			<li>
-			dwm don't distinguishes between layers, there is no floating or
-			managed layer. Wether the clients of currently selected tag are
-			managed or not, you can re-arrange all clients on the fly. Popup-
-			and fixed-size windows are treated unmanaged. 
+			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.
+			estate to clients. Small titlebars are only drawn in front of
+			unfocused clients.
 			</li>
 			<li>
-			dwm reads from <b>stdin</b> to print arbitrary status text (like the
-			date, load, battery charge). That's much simpler than larsremote,
-			wmiir and what not...
+			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>
-			garbeam <b>does not</b> want any feedback to dwm. If you ask for support,
-			feature requests, or if you report bugs, they will be <b>ignored</b>
-			with a high chance. dwm is only intended to fit garbeams needs.
-			However you are free to download and distribute/relicense it, with the
-			conditions of the <a href="http://wmii.de/cgi-bin/hgwebdir.cgi/dwm?f=f10eb1139362;file=LICENSE;style=raw">MIT/X Consortium license</a>.
+			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>
-		<h3>Screenshot</h3>
-		<p>
-		<a href="http://wmii.de/shots/dwm-20060714.png">Click here for a screenshot</a> (20060714)
-		</p>
-		<h3>Development</h3>
-		<p>
-		dwm is actively developed in parallel to wmii. You can <a href="http://wmii.de/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://wmii.de/cgi-bin/hgwebdir.cgi/dwm</code>
-		</p>
+		<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://wmii.de/download/dwm-0.1.tar.gz">dwm 0.1</a> (12kb) (20060714)</li>
+			<li><a href="http://10kloc.org/download/dwm-0.9.tar.gz">dwm 0.9</a> (15kb) (20060815)</li>
+			<li><a href="http://10kloc.org/download/dmenu-0.4.tar.gz">dmenu 0.4</a> (7kb) (20060815)</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 garbeam.
+		if you like dwm and the dwm logo, which has been designed by Anselm.
 		</p>
-		<p><small>--Anselm (20060714)</small></p>
+		<p><small>--Anselm</small></p>
 	</body>
 </html>

event.c

@@ -2,63 +2,140 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
-
-#include <fcntl.h>
-#include <stdio.h>
+#include "dwm.h"
 #include <stdlib.h>
-#include <string.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#include "dwm.h"
+/* static */
 
-/* local functions */
-static void buttonpress(XEvent *e);
-static void configurerequest(XEvent *e);
-static void destroynotify(XEvent *e);
-static void enternotify(XEvent *e);
-static void leavenotify(XEvent *e);
-static void expose(XEvent *e);
-static void keymapnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void propertynotify(XEvent *e);
-static void unmapnotify(XEvent *e);
+typedef struct {
+	unsigned long mod;
+	KeySym keysym;
+	void (*func)(Arg *arg);
+	Arg arg;
+} Key;
 
-void (*handler[LASTEvent]) (XEvent *) = {
-	[ButtonPress] = buttonpress,
-	[ConfigureRequest] = configurerequest,
-	[DestroyNotify] = destroynotify,
-	[EnterNotify] = enternotify,
-	[LeaveNotify] = leavenotify,
-	[Expose] = expose,
-	[KeyPress] = keypress,
-	[KeymapNotify] = keymapnotify,
-	[MapRequest] = maprequest,
-	[PropertyNotify] = propertynotify,
-	[UnmapNotify] = unmapnotify
-};
+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;
+	int nw, nh;
+	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);
+			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
+				sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
+			resize(c, True, sticky);
+			break;
+		case ButtonRelease:
+			XUngrabPointer(dpy, CurrentTime);
+			return;
+		}
+	}
+}
 
 static void
 buttonpress(XEvent *e)
 {
-	XButtonPressedEvent *ev = &e->xbutton;
+	int x;
+	Arg a;
 	Client *c;
+	XButtonPressedEvent *ev = &e->xbutton;
 
-	if(barwin == ev->window)
-		barclick(ev);
+	if(barwin == ev->window) {
+		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);
+				else if(ev->button == Button3)
+					toggleview(&a);
+				return;
+			}
+		}
+	}
 	else if((c = getclient(ev->window))) {
-		craise(c);
+		focus(c);
 		switch(ev->button) {
 		default:
 			break;
 		case Button1:
-			mmove(c);
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+				restack(c);
+				movemouse(c);
+			}
 			break;
 		case Button2:
-			lower(c);
+			zoom(NULL);
 			break;
 		case Button3:
-			mresize(c);
+			if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+				restack(c);
+				resizemouse(c);
+			}
 			break;
 		}
 	}
@@ -67,11 +144,12 @@ 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)
@@ -83,22 +161,46 @@ configurerequest(XEvent *e)
 		if(ev->value_mask & CWHeight)
 			c->h = ev->height;
 		if(ev->value_mask & CWBorderWidth)
-			c->border = 1;
+			c->border = ev->border_width;
 		gravitate(c, False);
-		resize(c, True);
+		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);
-	XFlush(dpy);
 }
 
 static void
@@ -114,16 +216,53 @@ 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)
+{
+	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
@@ -131,33 +270,27 @@ leavenotify(XEvent *e)
 {
 	XCrossingEvent *ev = &e->xcrossing;
 
-	if((ev->window == root) && !ev->same_screen)
-		issel = True;
-}
-
-static void
-expose(XEvent *e)
-{
-	XExposeEvent *ev = &e->xexpose;
-	Client *c;
-
-	if(ev->count == 0) {
-		if((c = gettitle(ev->window)))
-			draw_client(c);
+	if((ev->window == root) && !ev->same_screen) {
+		issel = False;
+		drawall();
 	}
 }
 
 static void
-keymapnotify(XEvent *e)
+mappingnotify(XEvent *e)
 {
-	update_keys();
+	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;
@@ -175,32 +308,32 @@ 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 */
 
 	if((c = getclient(ev->window))) {
-		if(ev->atom == wm_atom[WMProtocols]) {
-			c->proto = win_proto(c->win);
+		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->floating && (c->floating = (trans != 0)))
+				if(!c->isfloat && (c->isfloat = (trans != 0)))
 					arrange(NULL);
 				break;
 			case XA_WM_NORMAL_HINTS:
-				update_size(c);
+				setsize(c);
 				break;
 		}
-		if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
-			update_name(c);
-			draw_client(c);
+		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
+			settitle(c);
+			drawtitle(c);
 		}
 	}
 }
@@ -214,3 +347,53 @@ unmapnotify(XEvent *e)
 	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,
+	[MappingNotify] = mappingnotify,
+	[MapRequest] = maprequest,
+	[PropertyNotify] = propertynotify,
+	[UnmapNotify] = unmapnotify
+};
+
+void
+grabkeys()
+{
+	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);
+		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

@@ -3,62 +3,50 @@
  * See LICENSE file for license details.
  */
 
+#include "dwm.h"
 #include <errno.h>
-#include <stdarg.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>
 
-#include "dwm.h"
+/* static */
 
-/********** CUSTOMIZE **********/
-
-char *tags[TLast] = {
-	[Tscratch] = "scratch",
-	[Tdev] = "dev",
-	[Twww] = "www",
-	[Twork] = "work",
-};
-
-/********** CUSTOMIZE **********/
-
-/* X structs */
-Display *dpy;
-Window root, barwin;
-Atom wm_atom[WMLast], net_atom[NetLast];
-Cursor cursor[CurLast];
-Bool running = True;
-Bool issel;
-
-int tsel = Tdev; /* default tag */
-int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-char stext[1024];
-
-DC dc = {0};
-Client *clients = NULL;
-Client *sel = NULL;
-
-static Bool other_wm_running;
-static const char version[] =
-	"dwm-" VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
-static int (*x_error_handler) (Display *, XErrorEvent *);
+static int (*xerrorxlib)(Display *, XErrorEvent *);
+static Bool otherwm;
 
 static void
-usage() {	error("usage: dwm [-v]\n"); }
+cleanup()
+{
+	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);
+	XDestroyWindow(dpy, barwin);
+	XFreePixmap(dpy, dc.drawable);
+	XFreeGC(dpy, dc.gc);
+	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+	XSync(dpy, False);
+}
 
 static void
-scan_wins()
+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))
@@ -76,10 +64,9 @@ scan_wins()
 static int
 win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {
-	Atom real;
-	int format;
+	int status, format;
 	unsigned long res, extra;
-	int status;
+	Atom real;
 
 	status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
 			&res, &extra, prop);
@@ -93,28 +80,56 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 	return res;
 }
 
-int
-win_proto(Window w)
+/*
+ * 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];
+Bool *seltag;
+int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+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;
+
+int
+getproto(Window w)
 {
-	unsigned char *protocols;
-	long res;
 	int protos = 0;
 	int i;
+	long res;
+	Atom *protocols;
 
-	res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L, &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] == wm_atom[WMDelete])
-			protos |= WM_PROTOCOL_DELWIN;
+		if(protocols[i] == wmatom[WMDelete])
+			protos |= PROTODELWIN;
 	}
 	free((char *) protocols);
 	return protos;
 }
 
 void
-send_message(Window w, Atom a, long value)
+sendevent(Window w, Atom a, long value)
 {
 	XEvent e;
 
@@ -125,56 +140,7 @@ send_message(Window w, Atom a, long value)
 	e.xclient.data.l[0] = value;
 	e.xclient.data.l[1] = CurrentTime;
 	XSendEvent(dpy, w, False, NoEventMask, &e);
-	XFlush(dpy);
-}
-
-/*
- * There's no way to check accesses to destroyed windows, thus
- * those cases are ignored (especially on UnmapNotify's).
- * Other types of errors call Xlib's default error handler, which
- * calls exit().
- */
-int
-error_handler(Display *dpy, XErrorEvent *error)
-{
-	if(error->error_code == BadWindow
-			|| (error->request_code == X_SetInputFocus
-				&& error->error_code == BadMatch)
-			|| (error->request_code == X_PolyText8
-				&& error->error_code == BadDrawable)
-			|| (error->request_code == X_PolyFillRectangle
-				&& error->error_code == BadDrawable)
-			|| (error->request_code == X_PolySegment
-				&& error->error_code == BadDrawable)
-			|| (error->request_code == X_ConfigureWindow
-				&& error->error_code == BadMatch)
-			|| (error->request_code == X_GrabKey
-				&& error->error_code == BadAccess))
-		return 0;
-	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-			error->request_code, error->error_code);
-	return x_error_handler(dpy, error); /* may call exit() */
-}
-
-/*
- * Startup Error handler to check if another window manager
- * is already running.
- */
-static int
-startup_error_handler(Display *dpy, XErrorEvent *error)
-{
-	other_wm_running = True;
-	return -1;
-}
-
-static void
-cleanup()
-{
-	while(sel) {
-		resize(sel, True);
-		unmanage(sel);
-	}
-	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+	XSync(dpy, False);
 }
 
 void
@@ -183,82 +149,117 @@ 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, n;
-	fd_set rd;
-	XSetWindowAttributes wa;
+	int i, j, xfd;
 	unsigned int mask;
-	Bool readstdin = True;
+	fd_set rd;
+	Bool readin = True;
 	Window w;
-	XEvent ev;
+	XModifierKeymap *modmap;
+	XSetWindowAttributes wa;
 
-	for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
-		switch (argv[i][1]) {
-		case 'v':
-			fprintf(stdout, "%s", version);
-			exit(0);
-			break;
-		default:
-			usage();
-			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)
-		error("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 */
-	other_wm_running = False;
-	XSetErrorHandler(startup_error_handler);
-	/* this causes an error if some other WM is running */
+	otherwm = False;
+	XSetErrorHandler(xerrorstart);
+	/* this causes an error if some other window manager is running */
 	XSelectInput(dpy, root, SubstructureRedirectMask);
-	XFlush(dpy);
+	XSync(dpy, False);
 
-	if(other_wm_running)
-		error("dwm: another window manager is already running\n");
+	if(otherwm)
+		eprint("dwm: another window manager is already running\n");
 
-	XSetErrorHandler(0);
-	x_error_handler = XSetErrorHandler(error_handler);
+	XSync(dpy, False);
+	XSetErrorHandler(NULL);
+	xerrorxlib = XSetErrorHandler(xerror);
+	XSync(dpy, False);
 
 	/* init atoms */
-	wm_atom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
-	wm_atom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-	net_atom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
-	net_atom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-	XChangeProperty(dpy, root, net_atom[NetSupported], XA_ATOM, 32,
-			PropModeReplace, (unsigned char *) net_atom, NetLast);
+	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);
 
-	update_keys();
+	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);
+		}
+	}
+	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[DEFTAG] = True;
 
 	/* style */
-	dc.bg = initcolor(BGCOLOR);
-	dc.fg = initcolor(FGCOLOR);
-	dc.border = initcolor(BORDERCOLOR);
-	initfont(FONT);
+	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;
+	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);
@@ -267,59 +268,39 @@ main(int argc, char *argv[])
 
 	dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
-	draw_bar();
+
+	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];
+	scan();
 
-	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-
-	strcpy(stext, "dwm-"VERSION);
-	scan_wins();
-
-	/* main event loop, reads status text from stdin as well */
-Mainloop:
+	/* main event loop, also reads status text from stdin */
+	XSync(dpy, False);
+	procevent();
 	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);
+		FD_SET(xfd, &rd);
+		i = select(xfd + 1, &rd, NULL, NULL, NULL);
 		if(i == -1 && errno == EINTR)
 			continue;
 		if(i < 0)
-			error("select failed\n");
+			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;
-				draw_bar();
+			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();
 			}
 		}
+		procevent();
 	}
-
 	cleanup();
 	XCloseDisplay(dpy);
 

tag.c

@@ -0,0 +1,326 @@
+/*
+ * (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
+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);
+		restack();
+	}
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
+
+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();
+}
+
+Client *
+getnext(Client *c)
+{
+	for(; c && !isvisible(c); c = c->next);
+	return c;
+}
+
+Client *
+getprev(Client *c)
+{
+	for(; c && !isvisible(c); 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;
+		}
+	}
+}
+
+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->title;
+		wins[fi++] = sel->win;
+	}
+	else {
+		wins[mi++] = sel->title;
+		wins[mi++] = sel->win;
+	}
+	for(c = clients; c; c = c->next)
+		if(isvisible(c) && c != sel) {
+			if(c->isfloat || arrange == dofloat) {
+				wins[fi++] = c->title;
+				wins[fi++] = c->win;
+			}
+			else {
+				wins[mi++] = c->title;
+				wins[mi++] = c->win;
+			}
+		}
+	XRestackWindows(dpy, wins, n);
+	drawall();
+	XSync(dpy, False);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+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)
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = seltag[i];
+}
+
+void
+tag(Arg *arg)
+{
+	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);
+}
+
+void
+togglemode(Arg *arg)
+{
+	arrange = arrange == dofloat ? dotile : dofloat;
+	arrange(NULL);
+}
+
+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);
+}
+
+
+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);
+}

util.c

@@ -2,37 +2,48 @@
  * (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/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "dwm.h"
-
-void
-error(const char *errstr, ...) {
-	va_list ap;
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(1);
-}
+/* static */
 
 static void
 bad_malloc(unsigned int size)
 {
-	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-			(int) size);
-	exit(1);
+	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 *
+erealloc(void *ptr, unsigned int size)
+{
+	void *res = realloc(ptr, size);
 	if(!res)
 		bad_malloc(size);
 	return res;
@@ -41,19 +52,23 @@ emallocz(unsigned int size)
 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;
 	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, NULL);
+			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg->cmd);
 			perror(" failed");
 		}
-		exit (0);
+		exit(0);
 	}
 	wait(0);
 }