restoring tip to be a working dwm again (switching FONT to terminus in config.arg.h)

.hgtags

@@ -1 +1,47 @@
 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
+44a55e6e46bf6c231780b09d919977d6f01083de 1.1
+e3179ce2b90451d2807cd53b589d768412b8666b 1.2
+f5f5cbf016a94b48a8fe9c47f0736e96d166d5d4 1.3
+3cff9403766bf83a9fc2a0aef230115d68de2a8e 1.4
+728c9089b079721b43c3347124639a29baa22a97 1.5
+ad3fa2d185426c51fd5deceae809770363f8d33c 1.6
+4dbdb61c8b8ce21dee5c7050a6b103855964ed20 1.7
+d5ad819f2a66a40fa75dd2e44429f3bfc884d07b 1.7.1
+c71952fa3c7ca848ec38a6923b5c6d0e18fff431 1.8
+a5567a0d30112822db2627a04a2e7aa3b6c38148 1.9
+12deea36603da407e3f32640048846a3bd74a9ec 2.0
+a2c465098a3b972bbed00feda9804b6aae1e9531 2.1
+7e92f58754ae6edb3225f26d754bd89c1ff458cf 2.2
+719b37b37b0df829d7cf017ac70e353088fe5849 2.3
+32b246925086910d63147483160281a91a47479f 2.4
+dcbbfabc8ecc5f33a6cc950584de87da1a368045 2.5
+c7f84f23ec5aef29988dcdc4ec22a7352ee8f58e 2.5.1
+5308dd22b6ee8e3218c81d9e7e4125f235bb5778 2.6
+21951c0dfbae5af68ed77821a4d87253ee91803f 2.7
+107719a9ce3bd0c79f9f1f626596eb338a276561 2.8
+3a5910fac3ccb522a98aeeba7af7008530b25092 2.9
+76b58d21ea98257c05565a3b9c850b9b26a32968 3.0
+e1c8bef05e6e48df4f26471ea0712aa43ab9d949 3.1
+4ce65f61f01b055fa6c2901c6d2527ef741aa4bf 3.2
+f2cabc83a18f9b5b548159329ddd4dee904fa31f 3.2.1
+d3876aa792923f9a95f7ad0c7f0134533404df35 3.2.2
+0f91934037b04221ff5d1ba3a6c39c1ff26e3661 3.3
+9ede7b2d2450537e750d5505789fbe63960e97e6 3.4
+63ad05e7f9e1f4f1881fb02f529cb6c6ae81e693 3.5
+75b1b25fe0d7e29400baf30568153f668324928b 3.6
+20ec6976cee1fcfee0c2f354ae382ee3f9f68efa 3.6.1
+baee494346e520f8dee2cee9491b8350064770d2 3.7
+2ea201354cf016407ea93e1e390d1422940d29b0 3.8
+55478328b2422c700c5404a774c85e77322f41a3 3.9
+018c3846842291cb6c009dc087e7fe2f0ef53bea 4.0
+00f4180df72b49aadb2933804fde4bfb33e5666d 4.1
+c13cb8c6b7a56af74cc88346e71d2490470b546f 4.2

LICENSE

@@ -1,6 +1,10 @@
 MIT/X Consortium License
 
-(C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+© 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+© 2006-2007 Jukka Salmi <jukka at salmi dot ch>
+© 2007 Premysl Hruby <dfenze at gmail dot com>
+© 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

Makefile

@@ -1,19 +1,15 @@
 # dwm - dynamic window manager
-#   (C)opyright MMVI Anselm R. Garbe
+# © 2006-2007 Anselm R. Garbe, Sander van Dijk
 
 include config.mk
 
-SRC = client.c draw.c event.c main.c tag.c util.c
+SRC = client.c draw.c event.c layout.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}"
@@ -22,34 +18,43 @@ config:
 	@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 $@
+	@echo CC -o $@
 	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 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/.*,//'`
+        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)

client.c

@@ -1,317 +1,347 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-/* static functions */
+/* static */
 
 static void
-resizetitle(Client *c)
-{
-	int i;
+attachstack(Client *c) {
+	c->snext = stack;
+	stack = c;
+}
 
-	c->tw = 0;
-	for(i = 0; i < TLast; i++)
-		if(c->tags[i])
-			c->tw += textw(c->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;
-	XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+static void
+detachstack(Client *c) {
+	Client **tc;
+
+	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+	*tc = c->snext;
+}
+
+static void
+grabbuttons(Client *c, Bool focused) {
+	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+
+	if(focused) {
+		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 Bool
+isprotodel(Client *c) {
+	int i, n;
+	Atom *protocols;
+	Bool ret = False;
+
+	if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+		for(i = 0; !ret && i < n; i++)
+			if(protocols[i] == wmatom[WMDelete])
+				ret = True;
+		XFree(protocols);
+	}
+	return ret;
+}
+
+static void
+setclientstate(Client *c, long state) {
+	long data[] = {state, None};
+
+	XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
+			PropModeReplace, (unsigned char *)data, 2);
 }
 
 static int
-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
+xerrordummy(Display *dsply, XErrorEvent *ee) {
 	return 0;
 }
 
-/* extern functions */
+/* extern */
 
 void
-ban(Client *c)
-{
-	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-	XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+attach(Client *c) {
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	clients = c;
 }
 
 void
-focus(Client *c)
-{
-	Client *old = sel;
+ban(Client *c) {
+	if (c->isbanned)
+		return;
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	c->isbanned = True;
+}
+
+void
+configure(Client *c) {
+	XConfigureEvent ce;
+
+	ce.type = ConfigureNotify;
+	ce.display = dpy;
+	ce.event = c->win;
+	ce.window = c->win;
+	ce.x = c->x;
+	ce.y = c->y;
+	ce.width = c->w;
+	ce.height = c->h;
+	ce.border_width = c->border;
+	ce.above = None;
+	ce.override_redirect = False;
+	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
+}
+
+void
+detach(Client *c) {
+	if(c->prev)
+		c->prev->next = c->next;
+	if(c->next)
+		c->next->prev = c->prev;
+	if(c == clients)
+		clients = c->next;
+	c->next = c->prev = NULL;
+}
+
+void
+focus(Client *c) {
+	if((!c && selscreen)|| (c && !isvisible(c)))
+		for(c = stack; c && !isvisible(c); c = c->snext);
+	if(sel && sel != c) {
+		grabbuttons(sel, False);
+		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
+	}
+	if(c) {
+		detachstack(c);
+		attachstack(c);
+		grabbuttons(c, True);
+	}
+	sel = c;
+	drawstatus();
+	if(!selscreen)
+		return;
+	if(c) {
+		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
+		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+	}
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
+
+void
+killclient(const char *arg) {
 	XEvent ev;
 
-	sel = c;
-	if(old && old != c)
-		drawtitle(old);
-	drawtitle(c);
-	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-	XSync(dpy, False);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
-focusnext(Arg *arg)
-{
-	Client *c;
-   
 	if(!sel)
 		return;
-
-	if(!(c = getnext(sel->next)))
-		c = getnext(clients);
-	if(c) {
-		higher(c);
-		c->revert = sel;
-		focus(c);
+	if(isprotodel(sel)) {
+		ev.type = ClientMessage;
+		ev.xclient.window = sel->win;
+		ev.xclient.message_type = wmatom[WMProtocols];
+		ev.xclient.format = 32;
+		ev.xclient.data.l[0] = wmatom[WMDelete];
+		ev.xclient.data.l[1] = CurrentTime;
+		XSendEvent(dpy, sel->win, False, NoEventMask, &ev);
 	}
-}
-
-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;
-	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) {
-	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
-higher(Client *c)
-{
-	XRaiseWindow(dpy, c->win);
-	XRaiseWindow(dpy, c->title);
-}
-
-void
-killclient(Arg *arg)
-{
-	if(!sel)
-		return;
-	if(sel->proto & WM_PROTOCOL_DELWIN)
-		sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
 	else
 		XKillClient(dpy, sel->win);
 }
 
 void
-lower(Client *c)
-{
-	XLowerWindow(dpy, c->title);
-	XLowerWindow(dpy, c->win);
+manage(Window w, XWindowAttributes *wa) {
+	Client *c, *t = NULL;
+	Window trans;
+	Status rettrans;
+	XWindowChanges wc;
+
+	c = emallocz(sizeof(Client));
+	c->tags = emallocz(ntags * sizeof(Bool));
+	c->win = w;
+	c->x = wa->x;
+	c->y = wa->y;
+	c->w = wa->width;
+	c->h = wa->height;
+	c->oldborder = wa->border_width;
+	if(c->w == sw && c->h == sh) {
+		c->x = sx;
+		c->y = sy;
+		c->border = wa->border_width;
+	}
+	else {
+		if(c->x + c->w + 2 * c->border > wax + waw)
+			c->x = wax + waw - c->w - 2 * c->border;
+		if(c->y + c->h + 2 * c->border > way + wah)
+			c->y = way + wah - c->h - 2 * c->border;
+		if(c->x < wax)
+			c->x = wax;
+		if(c->y < way)
+			c->y = way;
+		c->border = BORDERPX;
+	}
+	wc.border_width = c->border;
+	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+	XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
+	configure(c); /* propagates border_width, if size doesn't change */
+	updatesizehints(c);
+	XSelectInput(dpy, w,
+		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+	grabbuttons(c, False);
+	updatetitle(c);
+	if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
+		for(t = clients; t && t->win != trans; t = t->next);
+	settags(c, t);
+	if(!c->isfloating)
+		c->isfloating = (rettrans == Success) || c->isfixed;
+	attach(c);
+	attachstack(c);
+	ban(c);
+	XMapWindow(dpy, w);
+	setclientstate(c, NormalState);
+	focus(c);
+	lt->arrange();
 }
 
 void
-manage(Window w, XWindowAttributes *wa)
-{
-	Client *c;
-	XSetWindowAttributes twa;
-	Window trans;
+resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+	float dx, dy, max, min, ratio;
+	XWindowChanges wc;
 
-	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 = getproto(c->win);
-	setsize(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);
-
-	settitle(c);
-	settags(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);
-
-	if(!c->isfloat)
-		c->isfloat = 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);
+	if(w <= 0 || h <= 0)
+		return;
+	if(sizehints) {
+		if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0) {
+			dx = (float)(w - c->basew);
+			dy = (float)(h - c->baseh);
+			min = (float)(c->minax) / (float)(c->minay);
+			max = (float)(c->maxax) / (float)(c->maxay);
+			ratio = dx / dy;
+			if(max > 0 && min > 0 && ratio > 0) {
+				if(ratio < min) {
+					dy = (dx * min + dy) / (min * min + 1);
+					dx = dy * min;
+					w = (int)dx + c->basew;
+					h = (int)dy + c->baseh;
+				}
+				else if(ratio > max) {
+					dy = (dx * min + dy) / (max * max + 1);
+					dx = dy * min;
+					w = (int)dx + c->basew;
+					h = (int)dy + c->baseh;
+				}
+			}
+		}
+		if(c->minw && w < c->minw)
+			w = c->minw;
+		if(c->minh && h < c->minh)
+			h = c->minh;
+		if(c->maxw && w > c->maxw)
+			w = c->maxw;
+		if(c->maxh && h > c->maxh)
+			h = c->maxh;
+		if(c->incw)
+			w -= (w - c->basew) % c->incw;
+		if(c->inch)
+			h -= (h - c->baseh) % c->inch;
 	}
-	else {
-		ban(c);
-		XMapRaised(dpy, c->win);
-		XMapRaised(dpy, c->title);
+	if(w <= 0 || h <= 0)
+		return;
+	/* offscreen appearance fixes */
+	if(x > sw)
+		x = sw - w - 2 * c->border;
+	if(y > sh)
+		y = sh - h - 2 * c->border;
+	if(x + w + 2 * c->border < sx)
+		x = sx;
+	if(y + h + 2 * c->border < sy)
+		y = sy;
+	if(c->x != x || c->y != y || c->w != w || c->h != h) {
+		c->x = wc.x = x;
+		c->y = wc.y = y;
+		c->w = wc.width = w;
+		c->h = wc.height = h;
+		wc.border_width = c->border;
+		XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+		configure(c);
 		XSync(dpy, False);
 	}
 }
 
 void
-maximize(Arg *arg)
-{
-	if(!sel)
+togglefloating(const char *arg) {
+	if(!sel || lt->arrange == floating)
 		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);
+	sel->isfloating = !sel->isfloating;
+	if(sel->isfloating)
+		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+	lt->arrange();
 }
 
 void
-resize(Client *c, Bool inc)
-{
-	XConfigureEvent e;
+unban(Client *c) {
+	if (!c->isbanned)
+		return;
+	XMoveWindow(dpy, c->win, c->x, c->y);
+	c->isbanned = False;
+}
 
-	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;
-	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);
+void
+unmanage(Client *c) {
+	XWindowChanges wc;
+
+	wc.border_width = c->oldborder;
+	/* The server grab construct avoids race conditions. */
+	XGrabServer(dpy);
+	XSetErrorHandler(xerrordummy);
+	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+	detach(c);
+	detachstack(c);
+	if(sel == c)
+		focus(NULL);
+	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+	setclientstate(c, WithdrawnState);
+	free(c->tags);
+	free(c);
 	XSync(dpy, False);
+	XSetErrorHandler(xerror);
+	XUngrabServer(dpy);
+	lt->arrange();
 }
 
 void
-setsize(Client *c)
-{
-	XSizeHints size;
+updatesizehints(Client *c) {
 	long msize;
+	XSizeHints size;
+
 	if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
 		size.flags = PSize;
 	c->flags = size.flags;
@@ -319,6 +349,10 @@ setsize(Client *c)
 		c->basew = size.base_width;
 		c->baseh = size.base_height;
 	}
+	else if(c->flags & PMinSize) {
+		c->basew = size.min_width;
+		c->baseh = size.min_height;
+	}
 	else
 		c->basew = c->baseh = 0;
 	if(c->flags & PResizeInc) {
@@ -337,20 +371,29 @@ setsize(Client *c)
 		c->minw = size.min_width;
 		c->minh = size.min_height;
 	}
+	else if(c->flags & PBaseSize) {
+		c->minw = size.base_width;
+		c->minh = size.base_height;
+	}
 	else
 		c->minw = c->minh = 0;
-	if(c->flags & PWinGravity)
-		c->grav = size.win_gravity;
+	if(c->flags & PAspect) {
+		c->minax = size.min_aspect.x;
+		c->maxax = size.max_aspect.x;
+		c->minay = size.min_aspect.y;
+		c->maxay = size.max_aspect.y;
+	}
 	else
-		c->grav = NorthWestGravity;
+		c->minax = c->maxax = c->minay = c->maxay = 0;
+	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
+			&& c->maxw == c->minw && c->maxh == c->minh);
 }
 
 void
-settitle(Client *c)
-{
-	XTextProperty name;
-	int n;
+updatetitle(Client *c) {
 	char **list = NULL;
+	int n;
+	XTextProperty name;
 
 	name.nitems = 0;
 	c->name[0] = 0;
@@ -360,66 +403,15 @@ settitle(Client *c)
 	if(!name.nitems)
 		return;
 	if(name.encoding == XA_STRING)
-		strncpy(c->name, (char *)name.value, sizeof(c->name));
+		strncpy(c->name, (char *)name.value, sizeof c->name - 1);
 	else {
 		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-				&& n > 0 && *list)
+		&& n > 0 && *list)
 		{
-			strncpy(c->name, *list, sizeof(c->name));
+			strncpy(c->name, *list, sizeof c->name - 1);
 			XFreeStringList(list);
 		}
 	}
+	c->name[sizeof c->name - 1] = '\0';
 	XFree(name.value);
-	resizetitle(c);
-}
-
-void
-unmanage(Client *c)
-{
-	Client **l;
-
-	XGrabServer(dpy);
-	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(sel == c)
-		sel = sel->revert ? sel->revert : clients;
-
-	free(c);
-
-	XSync(dpy, False);
-	XSetErrorHandler(xerror);
-	XUngrabServer(dpy);
-	arrange(NULL);
-	if(sel)
-		focus(sel);
-}
-
-void
-zoom(Arg *arg)
-{
-	Client **l, *c;
-
-	if(!sel)
-		return;
-
-	if(sel == getnext(clients) && sel->next)  {
-		if((c = getnext(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);
 }

config.arg.h

@@ -0,0 +1,98 @@
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+#define BARPOS			BarTop /* BarBot, BarOff */
+#define BORDERPX		1
+#define FONT			"-*-terminus-medium-r-*-*-14-*-*-*-*-*-iso10646-*"
+#define NORMBORDERCOLOR		"#333"
+#define NORMBGCOLOR		"#222"
+#define NORMFGCOLOR		"#ccc"
+#define SELBORDERCOLOR		"#8c8"
+#define SELBGCOLOR		"#555"
+#define SELFGCOLOR		"#fff"
+
+/* tagging */
+#define TAGS \
+const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
+#define RULES \
+static Rule rule[] = { \
+	/* class:instance:title regex	tags regex	isfloating */ \
+	{ "Firefox",			"3",		False }, \
+	{ "Gimp",			NULL,		True }, \
+	{ "MPlayer",			NULL,		True }, \
+	{ "Acroread",			NULL,		True }, \
+};
+
+/* layout(s) */
+#define LAYOUTS \
+static Layout layout[] = { \
+	/* symbol		function */ \
+	{ "[]=",		tile }, /* first entry is default */ \
+	{ "><>",		floating }, \
+};
+#define MASTERWIDTH		600		/* master width per thousand */
+#define NMASTER			1		/* clients in master area */
+#define SNAP			32		/* snap pixel */
+
+/* key definitions */
+#define MODKEY			Mod1Mask
+#define KEYS \
+static Key key[] = { \
+	/* modifier			key		function	argument */ \
+	{ MODKEY,			XK_p,		spawn, \
+		"exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'" \
+		" -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" }, \
+	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
+		"exec urxvtcd -tr -bg '#222' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" }, \
+	{ MODKEY,			XK_space,	setlayout,	NULL }, \
+	{ MODKEY,			XK_b,		togglebar,	NULL }, \
+	{ MODKEY,			XK_h,		incmasterw,	"-32" }, \
+	{ MODKEY,			XK_l,		incmasterw,	"32" }, \
+	{ MODKEY|ShiftMask,		XK_j,		incnmaster,	"1" }, \
+	{ MODKEY|ShiftMask,		XK_k,		incnmaster,	"-1" }, \
+	{ MODKEY,			XK_j,		focusclient,	"1" }, \
+	{ MODKEY,			XK_k,		focusclient,	"-1" }, \
+	{ MODKEY,			XK_m,		togglemax,	NULL }, \
+	{ MODKEY,			XK_Return,	zoom,		NULL }, \
+	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL }, \
+	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL }, \
+	{ MODKEY,			XK_0,		view,		NULL }, \
+	{ MODKEY,			XK_1,		view,		"0" }, \
+	{ MODKEY,			XK_2,		view,		"1" }, \
+	{ MODKEY,			XK_3,		view,		"2" }, \
+	{ MODKEY,			XK_4,		view,		"3" }, \
+	{ MODKEY,			XK_5,		view,		"4" }, \
+	{ MODKEY,			XK_6,		view,		"5" }, \
+	{ MODKEY,			XK_7,		view,		"6" }, \
+	{ MODKEY,			XK_8,		view,		"7" }, \
+	{ MODKEY,			XK_9,		view,		"8" }, \
+	{ MODKEY|ControlMask,		XK_1,		toggleview,	"0" }, \
+	{ MODKEY|ControlMask,		XK_2,		toggleview,	"1" }, \
+	{ MODKEY|ControlMask,		XK_3,		toggleview,	"2" }, \
+	{ MODKEY|ControlMask,		XK_4,		toggleview,	"3" }, \
+	{ MODKEY|ControlMask,		XK_5,		toggleview,	"4" }, \
+	{ MODKEY|ControlMask,		XK_6,		toggleview,	"5" }, \
+	{ MODKEY|ControlMask,		XK_7,		toggleview,	"6" }, \
+	{ MODKEY|ControlMask,		XK_8,		toggleview,	"7" }, \
+	{ MODKEY|ControlMask,		XK_9,		toggleview,	"8" }, \
+	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL }, \
+	{ MODKEY|ShiftMask,		XK_1,		tag,		"0" }, \
+	{ MODKEY|ShiftMask,		XK_2,		tag,		"1" }, \
+	{ MODKEY|ShiftMask,		XK_3,		tag,		"2" }, \
+	{ MODKEY|ShiftMask,		XK_4,		tag,		"3" }, \
+	{ MODKEY|ShiftMask,		XK_5,		tag,		"4" }, \
+	{ MODKEY|ShiftMask,		XK_6,		tag,		"5" }, \
+	{ MODKEY|ShiftMask,		XK_7,		tag,		"6" }, \
+	{ MODKEY|ShiftMask,		XK_8,		tag,		"7" }, \
+	{ MODKEY|ShiftMask,		XK_9,		tag,		"8" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	"0" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	"1" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	"2" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	"3" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	"4" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	"5" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	"6" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	"7" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	"8" }, \
+	{ MODKEY|ShiftMask,		XK_q,		quit,		NULL }, \
+};

config.default.h

@@ -0,0 +1,96 @@
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+#define BARPOS			BarTop /* BarBot, BarOff */
+#define BORDERPX		1
+#define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
+#define NORMBORDERCOLOR		"#dddddd"
+#define NORMBGCOLOR		"#eeeeee"
+#define NORMFGCOLOR		"#222222"
+#define SELBORDERCOLOR		"#ff0000"
+#define SELBGCOLOR		"#006699"
+#define SELFGCOLOR		"#ffffff"
+
+/* tagging */
+#define TAGS \
+const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
+/* 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	isfloating */ \
+	{ "Gimp",			NULL,		True }, \
+	{ "MPlayer",			NULL,		True }, \
+	{ "Acroread",			NULL,		True }, \
+};
+
+/* layout(s) */
+#define LAYOUTS \
+static Layout layout[] = { \
+	/* symbol		function */ \
+	{ "[]=",		tile }, /* first entry is default */ \
+	{ "><>",		floating }, \
+};
+#define MASTERWIDTH		600		/* master width per thousand */
+#define NMASTER			1		/* clients in master area */
+#define SNAP			32		/* snap pixel */
+
+/* key definitions */
+#define MODKEY			Mod1Mask
+#define KEYS \
+static Key key[] = { \
+	/* modifier			key		function	argument */ \
+	{ MODKEY|ShiftMask,		XK_Return,	spawn,		"exec xterm" }, \
+	{ MODKEY,			XK_p,		spawn, 		"exe=`dmenu_path | dmenu` && exec $exe" }, \
+	{ MODKEY,			XK_space,	setlayout,	NULL }, \
+	{ MODKEY,			XK_b,		togglebar,	NULL }, \
+	{ MODKEY,			XK_h,		incmasterw,	"-32" }, \
+	{ MODKEY,			XK_l,		incmasterw,	"32" }, \
+	{ MODKEY|ShiftMask,		XK_j,		incnmaster,	"1" }, \
+	{ MODKEY|ShiftMask,		XK_k,		incnmaster,	"-1" }, \
+	{ MODKEY,			XK_j,		focusclient,	"1" }, \
+	{ MODKEY,			XK_k,		focusclient,	"-1" }, \
+	{ MODKEY,			XK_m,		togglemax,	NULL }, \
+	{ MODKEY,			XK_Return,	zoom,		NULL }, \
+	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL }, \
+	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL }, \
+	{ MODKEY,			XK_0,		view,		NULL }, \
+	{ MODKEY,			XK_1,		view,		"0" }, \
+	{ MODKEY,			XK_2,		view,		"1" }, \
+	{ MODKEY,			XK_3,		view,		"2" }, \
+	{ MODKEY,			XK_4,		view,		"3" }, \
+	{ MODKEY,			XK_5,		view,		"4" }, \
+	{ MODKEY,			XK_6,		view,		"5" }, \
+	{ MODKEY,			XK_7,		view,		"6" }, \
+	{ MODKEY,			XK_8,		view,		"7" }, \
+	{ MODKEY,			XK_9,		view,		"8" }, \
+	{ MODKEY|ControlMask,		XK_1,		toggleview,	"0" }, \
+	{ MODKEY|ControlMask,		XK_2,		toggleview,	"1" }, \
+	{ MODKEY|ControlMask,		XK_3,		toggleview,	"2" }, \
+	{ MODKEY|ControlMask,		XK_4,		toggleview,	"3" }, \
+	{ MODKEY|ControlMask,		XK_5,		toggleview,	"4" }, \
+	{ MODKEY|ControlMask,		XK_6,		toggleview,	"5" }, \
+	{ MODKEY|ControlMask,		XK_7,		toggleview,	"6" }, \
+	{ MODKEY|ControlMask,		XK_8,		toggleview,	"7" }, \
+	{ MODKEY|ControlMask,		XK_9,		toggleview,	"8" }, \
+	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL }, \
+	{ MODKEY|ShiftMask,		XK_1,		tag,		"0" }, \
+	{ MODKEY|ShiftMask,		XK_2,		tag,		"1" }, \
+	{ MODKEY|ShiftMask,		XK_3,		tag,		"2" }, \
+	{ MODKEY|ShiftMask,		XK_4,		tag,		"3" }, \
+	{ MODKEY|ShiftMask,		XK_5,		tag,		"4" }, \
+	{ MODKEY|ShiftMask,		XK_6,		tag,		"5" }, \
+	{ MODKEY|ShiftMask,		XK_7,		tag,		"6" }, \
+	{ MODKEY|ShiftMask,		XK_8,		tag,		"7" }, \
+	{ MODKEY|ShiftMask,		XK_9,		tag,		"8" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	"0" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	"1" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	"2" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	"3" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	"4" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	"5" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	"6" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	"7" }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	"8" }, \
+	{ MODKEY|ShiftMask,		XK_q,		quit,		NULL }, \
+};

config.mk

@@ -1,31 +1,29 @@
-# Customize to fit your system
+# dwm version
+VERSION = 4.3
+
+# 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.2
-
 # includes and libs
-LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
-
-# Linux/BSD
-#CFLAGS = -Os -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
-#	-DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-CFLAGS = -g -Wall -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
-	-DVERSION=\"${VERSION}\"
-LDFLAGS = -g ${LIBS}
+INCS = -I. -I/usr/include -I${X11INC}
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
 
+# flags
+CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+LDFLAGS = -s ${LIBS}
+#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
+#LDFLAGS = -g ${LIBS}
 
 # Solaris
-#CFLAGS = -fast -xtarget=ultra ${INCLUDES} -DVERSION=\"${VERSION}\"
-#LIBS += -lnsl -lsocket
+#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+#LDFLAGS = ${LIBS}
+#CFLAGS += -xtarget=ultra
 
-AR = ar cr
+# compiler and linker
 CC = cc
-RANLIB = ranlib

draw.c

@@ -1,38 +1,44 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and 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);
+drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+	int x;
+	XGCValues gcv;
+	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+
+	gcv.foreground = col[ColFG];
+	XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+	x = (dc.font.ascent + dc.font.descent + 2) / 4;
+	r.x = dc.x + 1;
+	r.y = dc.y + 1;
+	if(filled) {
+		r.width = r.height = x + 1;
+		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+	}
+	else if(empty) {
+		r.width = r.height = x;
+		XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+	}
+}
+
+static Bool
+isoccupied(unsigned int t) {
+	Client *c;
+
+	for(c = clients; c; c = c->next)
+		if(c->tags[t])
+			return True;
+	return False;
 }
 
 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;
@@ -40,196 +46,89 @@ textnw(char *text, unsigned int len)
 	return XTextWidth(dc.font.xfont, text, len);
 }
 
-static 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);
-	if(len >= sizeof(buf))
-		len = sizeof(buf) - 1;
-	memcpy(buf, text, len);
-	buf[len] = 0;
-
-	h = dc.font.ascent + dc.font.descent;
-	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
-	x = dc.x + (h / 2);
-
-	/* shorten text if necessary */
-	while(len && (w = textnw(buf, len)) > dc.w - h)
-		buf[--len] = 0;
-
-	if(w > dc.w)
-		return; /* too long */
-
-	gcv.foreground = invert ? dc.bg : dc.fg;
-	gcv.background = invert ? dc.fg : dc.bg;
-	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-		XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
-				x, y, buf, len);
-	}
-	else {
-		gcv.font = dc.font.xfont->fid;
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
-		XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-	}
-}
-
 /* extern */
 
 void
-drawall()
-{
-	Client *c;
-
-	for(c = clients; c; c = getnext(c->next))
-		drawtitle(c);
-	drawstatus();
-}
-
-void
-drawstatus()
-{
-	int i;
-	Bool istile = arrange == dotile;
+drawstatus(void) {
+	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);
-		else
-			drawtext(tags[i], (i != tsel), True);
-	}
-	if(sel) {
+		if(seltag[i]) {
+			drawtext(tags[i], dc.sel);
+			drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
+		}
+		else {
+			drawtext(tags[i], dc.norm);
+			drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
+		}
 		dc.x += dc.w;
-		dc.w = textw(sel->name);
-		drawtext(sel->name, istile, True);
 	}
+	dc.w = blw;
+	drawtext(lt->symbol, dc.norm);
+	x = dc.x + dc.w;
 	dc.w = textw(stext);
-	dc.x = bx + bw - dc.w;
-	drawtext(stext, !istile, False);
-
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+	dc.x = sw - dc.w;
+	if(dc.x < x) {
+		dc.x = x;
+		dc.w = sw - x;
+	}
+	drawtext(stext, dc.norm);
+	if((dc.w = dc.x - x) > bh) {
+		dc.x = x;
+		if(sel) {
+			drawtext(sel->name, dc.sel);
+			drawsquare(sel->ismax, sel->isfloating, dc.sel);
+		}
+		else
+			drawtext(NULL, dc.norm);
+	}
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
 	XSync(dpy, False);
 }
 
 void
-drawtitle(Client *c)
-{
-	int i;
-	Bool istile = arrange == dotile;
+drawtext(const char *text, unsigned long col[ColLast]) {
+	int x, y, w, h;
+	static char buf[256];
+	unsigned int len, olen;
+	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-	if(c == sel) {
-		drawstatus();
-		XUnmapWindow(dpy, c->title);
-		XSetWindowBorder(dpy, c->win, dc.fg);
+	XSetForeground(dpy, dc.gc, col[ColBG]);
+	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+	if(!text)
 		return;
+	w = 0;
+	olen = len = strlen(text);
+	if(len >= sizeof buf)
+		len = sizeof buf - 1;
+	memcpy(buf, text, len);
+	buf[len] = 0;
+	h = dc.font.ascent + dc.font.descent;
+	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
+	x = dc.x + (h / 2);
+	/* shorten text if necessary */
+	while(len && (w = textnw(buf, len)) > dc.w - h)
+		buf[--len] = 0;
+	if(len < olen) {
+		if(len > 1)
+			buf[len - 1] = '.';
+		if(len > 2)
+			buf[len - 2] = '.';
+		if(len > 3)
+			buf[len - 3] = '.';
 	}
-
-	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]);
-			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);
-	XSync(dpy, False);
-}
-
-unsigned long
-getcolor(const char *colstr)
-{
-	XColor color;
-	Colormap cmap = DefaultColormap(dpy, screen);
-
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-	return color.pixel;
-}
-
-void
-setfont(const char *fontstr)
-{
-	char **missing, *def;
-	int i, n;
-
-	missing = NULL;
-	setlocale(LC_ALL, "");
+	if(w > dc.w)
+		return; /* too long */
+	XSetForeground(dpy, dc.gc, col[ColFG]);
 	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
-	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-	if(missing) {
-		while(n--)
-			fprintf(stderr, "missing fontset: %s\n", missing[n]);
-		XFreeStringList(missing);
-		if(dc.font.set) {
-			XFreeFontSet(dpy, dc.font.set);
-			dc.font.set = NULL;
-		}
-	}
-	if(dc.font.set) {
-		XFontSetExtents *font_extents;
-		XFontStruct **xfonts;
-		char **font_names;
-
-		dc.font.ascent = dc.font.descent = 0;
-		font_extents = XExtentsOfFontSet(dc.font.set);
-		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-			if(dc.font.ascent < (*xfonts)->ascent)
-				dc.font.ascent = (*xfonts)->ascent;
-			if(dc.font.descent < (*xfonts)->descent)
-				dc.font.descent = (*xfonts)->descent;
-			xfonts++;
-		}
-	}
-	else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
-		dc.font.xfont = XLoadQueryFont(dpy, fontstr);
-		if (!dc.font.xfont)
-			dc.font.xfont = XLoadQueryFont(dpy, "fixed");
-		if (!dc.font.xfont)
-			eprint("error, cannot init 'fixed' font\n");
-		dc.font.ascent = dc.font.xfont->ascent;
-		dc.font.descent = dc.font.xfont->descent;
-	}
-	dc.font.height = dc.font.ascent + dc.font.descent;
+		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+	else
+		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
 unsigned int
-textw(char *text)
-{
+textw(const char *text) {
 	return textnw(text, strlen(text)) + dc.font.height;
 }

dwm.1

@@ -1,119 +1,159 @@
-.TH DWM 1 dwm-0.2
+.TH DWM 1 dwm\-VERSION
 .SH NAME
 dwm \- dynamic window manager
 .SH SYNOPSIS
 .B dwm
 .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.
+dwm is a dynamic window manager for X. It manages windows in tiled and
+floating layouts. Either layout 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.
+In tiled layout windows are managed in a master and stacking area. The master
+area contains the windows which currently need most attention, whereas the
+stacking area contains all other windows. In floating layout windows can be
+resized and moved freely. Dialog windows are always managed floating,
+regardless of the layout applied.
 .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 certain tags displays all windows with these tags.
 .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.
+dwm contains a small status bar which displays all available tags, the layout,
+the title of the focused window, and the text read from standard input. A
+floating window is indicated with an empty square and a maximized
+floating window is indicated with a filled square before the windows
+title.  The selected tags are indicated with a different color. The tags of
+the focused window are indicated with a filled square in the top left
+corner.  The tags which are applied to one or more windows are indicated
+with an empty square in the top left corner.
+.P
+dwm draws a small border around windows to indicate the focus state.
 .SH OPTIONS
 .TP
 .B \-v
 prints version information to standard output, then exits.
 .SH USAGE
+.SS Status bar
 .TP
-.B Mod1-Return
-Zoom
-.B window
-to the 
-.B master
-column
+.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 to display all windows with that tag, click on the layout
+label toggles between tiled and floating layout.
 .TP
-.B Mod1-j
-Focus next
-.B window
+.B Button3
+click on a tag label adds/removes all windows with that tag to/from the view.
 .TP
-.B Mod1-m
-Maximize current
-.B window
+.B Mod1\-Button1
+click on a tag label applies that tag to the focused window.
 .TP
-.B Mod1-[0..n]
-Focus
-.B nth
-tag
+.B Mod1\-Button3
+click on a tag label adds/removes that tag to/from the focused window.
+.SS Keyboard commands
 .TP
-.B Mod1-space
-(Re-)arrange
-.B all
-windows tiled
+.B Mod1\-Shift\-Return
+Start
+.BR xterm.
 .TP
-.B Mod1-Shift-space
-(Re-)arrange
-.B all
-windows floating
+.B Mod1\-Return
+Zooms/cycles current window to/from master area (tiled layout only).
 .TP
-.B Mod1-Shift-[0..n]
+.B Mod1\-b
+Shows/hides the status bar.
+.TP
+.B Mod1\-j
+Focus next window.
+.TP
+.B Mod1\-k
+Focus previous window.
+.TP
+.B Mod1\-Shift\-j
+Increase the number of windows in the master area (tiled layout only).
+.TP
+.B Mod1\-Shift\-k
+Decrease the number of windows in the master area (tiled layout only).
+.TP
+.B Mod1\-l
+Increase master area width (tiled layout only).
+.TP
+.B Mod1\-h
+Decrease master area width (tiled layout only).
+.TP
+.B Mod1\-m
+Toggles maximization of current window (floating layout only).
+.TP
+.B Mod1\-Shift\-[1..n]
 Apply
+.RB nth
+tag to current window.
+.TP
+.B Mod1\-Shift\-0
+Apply all tags to current window.
+.TP
+.B Mod1\-Control\-Shift\-[1..n]
+Add/remove
 .B nth
-tag to current
-.B window
+tag to/from current window.
 .TP
-.B Mod1-Shift-q
-Quit
-.B dwm
+.B Mod1\-Shift\-c
+Close focused window.
 .TP
-.B Mod1-Shift-Return
-Start
-.B terminal
+.B Mod1\-space
+Toggle between tiled and floating layout (affects all windows).
 .TP
-.B Mod1-Shift-w
-Start
-.B web browser
+.B Mod1\-Shift\-space
+Toggle focused window between tiled and floating state (tiled layout only).
 .TP
-.B Mod1-Shift-l
-Lock
-.B screen
+.B Mod1\-[1..n]
+View all windows with
+.BR nth
+tag.
 .TP
-.B Control-[0..n]
-Append
-.B nth
-tag to cureent
-.B window
+.B Mod1\-0
+View all windows with any tag.
 .TP
-.B Control-Button1
-Zooms the clicked
-.B window
-to master column
+.B Mod1\-Control\-[1..n]
+Add/remove all windows with
+.BR nth
+tag to/from the view.
 .TP
-.B Mod1-Button1
-Moves current
-.B window
-while dragging
+.B Mod1\-Shift\-q
+Quit dwm.
+.SS Mouse commands
 .TP
-.B Mod1-Button2
-Lowers current
-.B window
+.B Mod1\-Button1
+Move current window while dragging (floating layout only).
 .TP
-.B Mod1-Button3
-Resizes current
-.B window
-while dragging
+.B Mod1\-Button2
+Zooms/cycles current window to/from master area (tiled layout only).
+.TP
+.B Mod1\-Button3
+Resize current window while dragging (floating layout 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.
+dwm is customized by creating a custom config.h and (re)compiling the source
+code. This keeps it fast, secure and simple.
+.SH SEE ALSO
+.BR dmenu (1)
+.SH BUGS
+The status bar may display
+.BR "EOF"
+when dwm has been started by an X session manager like
+.BR xdm (1),
+because those close standard output before executing dwm.
+.P
+Java applications which use the XToolkit/XAWT backend may draw grey windows
+only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
+JDK 1.6 versions, because it assumes a reparenting window manager. As a workaround
+you can use JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or you
+can set the following environment variable (to use the older Motif
+backend instead):
+.BR AWT_TOOLKIT=MToolkit .
+.P
+Recent GTK 2.10.9+ versions contain a broken
+.BR Save\-As
+file dialog implementation,
+which requests to reconfigure its window size in an endless loop. However, its
+window is still respondable during this state, so you can simply ignore the flicker
+until a new GTK version appears, which will fix this bug, approximately
+GTK 2.10.12+ versions.

dwm.h

@@ -1,156 +1,151 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
+/* See LICENSE file for copyright and license details.
+ *
+ * dynamic window manager is designed like any other X client as well. It is
+ * driven through handling X events. In contrast to other X clients, a window
+ * manager selects for SubstructureRedirectMask on the root window, to receive
+ * events about window (dis-)appearance.  Only one X connection at a time is
+ * allowed to select for this event mask.
+ *
+ * Calls to fetch an X event from the event queue are blocking.  Due reading
+ * status text from standard input, a select()-driven main loop has been
+ * implemented which selects for reads on the X connection and STDIN_FILENO to
+ * handle all data smoothly. The event handlers of dwm are organized in an
+ * array which is accessed whenever a new event has been fetched. This allows
+ * event dispatching in O(1) time.
+ *
+ * Each child of the root window is called a client, except windows which have
+ * set the override_redirect flag.  Clients are organized in a global
+ * doubly-linked client list, the focus history is remembered through a global
+ * stack list. Each client contains an array of Bools of the same size as the
+ * global tags array to indicate the tags of a client.  For each client dwm
+ * creates a small title window, which is resized whenever the (_NET_)WM_NAME
+ * properties are updated or the client is moved/resized.
+ *
+ * Keys and tagging rules are organized as arrays and defined in the config.h
+ * file. These arrays are kept static in event.o and tag.o respectively,
+ * because no other part of dwm needs access to them.  The current layout is
+ * represented by the lt pointer.
+ *
+ * To understand everything else, start reading main.c:main().
  */
 
+#include "config.h"
 #include <X11/Xlib.h>
 
-/********** CUSTOMIZE **********/
+/* mask shorthands, used in event.c and client.c */
+#define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
 
-#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
+enum { BarTop, BarBot, BarOff };			/* bar position */
+enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
+enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
+enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
+enum { WMProtocols, WMDelete, WMState, WMLast };	/* default atoms */
 
-/* tags */
-enum { Tscratch, Tdev, Twww, Twork, TLast };
-
-/********** CUSTOMIZE **********/
-
-typedef union Arg Arg;
-typedef struct DC DC;
 typedef struct Client Client;
-typedef struct Fnt Fnt;
-typedef struct Key Key;
-typedef struct Rule Rule;
-
-union Arg {
-	const char **argv;
-	int i;
-};
-
-/* atoms */
-enum { NetSupported, NetWMName, NetLast };
-enum { WMProtocols, WMDelete, WMLast };
-
-/* cursor */
-enum { CurNormal, CurResize, CurMove, CurLast };
-
-struct Fnt {
-	int ascent;
-	int descent;
-	int height;
-	XFontSet set;
-	XFontStruct *xfont;
-};
-
-struct DC { /* draw context */
-	int x, y, w, h;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
-	Drawable drawable;
-	Fnt font;
-	GC gc;
-};
-
 struct Client {
 	char name[256];
-	char *tags[TLast];
-	int proto;
 	int x, y, w, h;
-	int tx, ty, tw, th;
+	int rx, ry, rw, rh; /* revert geometry */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
-	int grav;
-	unsigned int border;
+	int minax, maxax, minay, maxay;
 	long flags; 
-	Bool isfloat;
+	unsigned int border, oldborder;
+	Bool isbanned, isfixed, ismax, isfloating;
+	Bool *tags;
 	Client *next;
-	Client *revert;
+	Client *prev;
+	Client *snext;
 	Window win;
-	Window title;
 };
 
-struct Rule {
-	const char *class;
-	const char *instance;
-	char *tags[TLast];
-	Bool isfloat;
-};
+typedef struct {
+	int x, y, w, h;
+	unsigned long norm[ColLast];
+	unsigned long sel[ColLast];
+	Drawable drawable;
+	GC gc;
+	struct {
+		int ascent;
+		int descent;
+		int height;
+		XFontSet set;
+		XFontStruct *xfont;
+	} font;
+} DC; /* draw context */
 
-struct Key {
-	unsigned long mod;
-	KeySym keysym;
-	void (*func)(Arg *arg);
-	Arg arg;
-};
+typedef struct {
+	const char *symbol;
+	void (*arrange)(void);
+} Layout;
 
-extern char *tags[TLast], stext[1024];
-extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-extern void (*handler[LASTEvent])(XEvent *);
-extern void (*arrange)(Arg *);
+extern const char *tags[];			/* all tags */
+extern char stext[256];				/* status text */
+extern int screen, sx, sy, sw, sh;		/* screen geometry */
+extern int wax, way, wah, waw;			/* windowarea geometry */
+extern unsigned int bh, blw, bpos;		/* bar height, bar layout label width, bar position */
+extern unsigned int ntags, numlockmask;		/* number of tags, numlock mask */
+extern void (*handler[LASTEvent])(XEvent *);	/* event handler */
 extern Atom wmatom[WMLast], netatom[NetLast];
-extern Bool running, issel;
-extern Client *clients, *sel;
+extern Bool selscreen, *seltag;			/* seltag is array of Bool */
+extern Client *clients, *sel, *stack;		/* global client list and stack */
 extern Cursor cursor[CurLast];
-extern DC dc;
+extern DC dc;					/* global draw context */
 extern Display *dpy;
-extern Key key[];
+extern Layout *lt;
 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 resize(Client *c, Bool inc);
-extern void setsize(Client *c);
-extern void settitle(Client *c);
-extern void unmanage(Client *c);
-extern void zoom(Arg *arg);
+void attach(Client *c);			/* attaches c to global client list */
+void ban(Client *c);			/* bans c */
+void configure(Client *c);		/* send synthetic configure event */
+void detach(Client *c);			/* detaches c from global client list */
+void focus(Client *c);			/* focus c if visible && !NULL, or focus top visible */
+void killclient(const char *arg);	/* kill sel  nicely */
+void manage(Window w, XWindowAttributes *wa);	/* manage new client */
+void resize(Client *c, int x, int y,
+		int w, int h, Bool sizehints);	/* resize with given coordinates c*/
+void togglefloating(const char *arg);	/* toggles sel between floating/tiled state */
+void unban(Client *c);			/* unbans c */
+void unmanage(Client *c);		/* destroy c */
+void updatesizehints(Client *c);	/* update the size hint variables of c */
+void updatetitle(Client *c);		/* update the name of c */
 
 /* draw.c */
-extern void drawall();
-extern void drawstatus();
-extern void drawtitle(Client *c);
-extern unsigned long getcolor(const char *colstr);
-extern void setfont(const char *fontstr);
-extern unsigned int textw(char *text);
+void drawstatus(void);			/* draw the bar */
+void drawtext(const char *text, unsigned long col[ColLast]);	/* draw text */
+unsigned int textw(const char *text);	/* return the width of text in px*/
 
 /* event.c */
-extern void grabkeys();
+void grabkeys(void);			/* grab all keys defined in config.h */
+
+/* layout.c */
+void floating(void);			/* arranges all windows floating */
+void focusclient(const char *arg);	/* focuses next(1)/previous(-1) visible client */
+void incmasterw(const char *arg);	/* increments the master width with arg's index value */
+void incnmaster(const char *arg);	/* increments nmaster with arg's index value */
+void initlayouts(void);			/* initialize layout array */
+Client *nexttiled(Client *c);		/* returns tiled successor of c */
+void restack(void);			/* restores z layers of all clients */
+void setlayout(const char *arg);	/* sets layout, NULL means next layout */
+void togglebar(const char *arg);	/* shows/hides the bar */
+void togglemax(const char *arg);	/* toggles maximization of floating client */
+void zoom(const char *arg);		/* zooms the focused client to master area, arg is ignored */
 
 /* main.c */
-extern int getproto(Window w);
-extern void quit(Arg *arg);
-extern void sendevent(Window w, Atom a, long value);
-extern int xerror(Display *dsply, XErrorEvent *ee);
+void updatebarpos(void);		/* updates the bar position */
+void quit(const char *arg);		/* quit dwm nicely */
+int xerror(Display *dsply, XErrorEvent *ee);	/* dwm's X error handler */
 
 /* tag.c */
-extern void appendtag(Arg *arg);
-extern void dofloat(Arg *arg);
-extern void dotile(Arg *arg);
-extern Client *getnext(Client *c);
-extern void replacetag(Arg *arg);
-extern void settags(Client *c);
-extern void view(Arg *arg);
+void compileregs(void);			/* initialize regexps of rules defined in config.h */
+Bool isvisible(Client *c);		/* returns True if client is visible */
+void settags(Client *c, Client *trans);	/* sets tags of c */
+void tag(const char *arg);		/* tags sel with arg's index */
+void toggletag(const char *arg);	/* toggles sel tags with arg's index */
+void toggleview(const char *arg);	/* toggles the tag with arg's index (in)visible */
+void view(const char *arg);		/* views the tag with arg's index */
 
 /* util.c */
-extern void *emallocz(unsigned int size);
-extern void eprint(const char *errstr, ...);
-extern void spawn(Arg *arg);
+void *emallocz(unsigned int size);	/* allocates zero-initialized memory, exits on error */
+void eprint(const char *errstr, ...);	/* prints errstr and exits with 1 */
+void spawn(const char *arg);		/* forks a new subprocess with arg's cmd */

dwm.html

@@ -1,105 +0,0 @@
-<html>
-	<head>
-		<title>dwm - dynamic window manager</title>
-		<meta name="author" content="Anselm R. Garbe">
-		<meta name="generator" content="ed">
-		<meta name="copyright" content="(C)opyright 2006 by Anselm R. Garbe">
-		<style type="text/css">
-			body {
-				color: #000000;
-				font-family: sans-serif;
-				margin: 20px 20px 20px 20px;
-			}
-		</style>
-	</head>
-	<body>
-		<center>
-			<img src="dwm.png"/><br />
-			<h3>dynamic window manager</h3>
-		</center>
-		<h3>Description</h3>
-		<p>
-		dwm is a dynamic window manager for X11.
-		</p>
-		<h3>Philosophy</h3>
-		<p>
-		As founder and main developer of wmii I came to the conclusion that
-		wmii is too clunky for my needs. I don't need so many funky features
-		and all this hype about remote control through a 9P service, I only
-		want to manage my windows in a simple, but dynamic way. wmii never got
-		finished because I listened to users, who proposed arbitrary ideas I
-		considered useful. This resulted in an extreme <a href="http://www.jwz.org/doc/cadt.html">CADT</a>
-		development model, which was a mistake. Thus the philosophy of
-		dwm is simply <i>to fit my needs</i> (maybe yours as well). That's it.
-		</p>
-		<h3>Differences to wmii</h3	
-		<p>
-		In contrast to wmii, dwm is only a window manager, and nothing else.
-		Hence, it is much smaller, faster and simpler.
-		</p>
-		<ul>
-			<li>
-			dwm has no 9P support, no editable tagbars, no shell-based
-			configuration and 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 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.
-			</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. 
-			</li>
-			<li>
-			dwm uses 1-pixel borders to provide the maximum of screen real
-			estate to clients. Small titlebars are only drawn in front of unfocused
-			clients.
-			</li>
-			<li>
-			dwm reads from <b>stdin</b> to print arbitrary status text (like the
-			date, load, battery charge). That's much simpler than larsremote,
-			wmiir and what not...
-			</li>
-			<li>
-			Anselm <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 Anselms 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>.
-			</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>
-		<h3>Download</h3>
-		<ul>
-			<li><a href="http://wmii.de/download/dwm-0.2.tar.gz">dwm 0.2</a> (13kb) (20060717)</li>
-		</ul>
-		<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 (20060714)</small></p>
-	</body>
-</html>

event.c

@@ -1,217 +1,231 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
-
+#include <stdio.h>
 #include <stdlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask       (ButtonMask | PointerMotionMask)
-
-/* CUSTOMIZE */
-const char *browse[] = { "firefox", NULL };
-const char *gimp[] = { "gimp", NULL };
-const char *term[] = { 
-	"urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
-	"-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
-};
-const char *xlock[] = { "xlock", 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 } },
-	{ 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_g,		spawn,		{ .argv = gimp } },
-	{ Mod1Mask|ShiftMask,	XK_l,		spawn,		{ .argv = xlock } },
-	{ Mod1Mask|ShiftMask,	XK_q,		quit,		{ 0 } },
-	{ Mod1Mask|ShiftMask,	XK_space,	dofloat,	{ 0 } }, 
-	{ Mod1Mask|ShiftMask,	XK_w,		spawn,		{ .argv = browse } },
-	{ Mod1Mask|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
-};
-
 /* static */
 
+typedef struct {
+	unsigned long mod;
+	KeySym keysym;
+	void (*func)(const char *arg);
+	const char *arg;
+} Key;
+
+KEYS
+
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
+
+static Client *
+getclient(Window w) {
+	Client *c;
+
+	for(c = clients; c && c->win != w; c = c->next);
+	return c;
+}
+
 static void
-movemouse(Client *c)
-{
-	XEvent ev;
-	int x1, y1, ocx, ocy, di;
+movemouse(Client *c) {
+	int x1, y1, ocx, ocy, di, nx, ny;
 	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 = nx = c->x;
+	ocy = ny = c->y;
+	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+			None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
+	c->ismax = False;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
-		XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &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);
-			break;
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
 			return;
+		case ConfigureRequest:
+		case Expose:
+		case MapRequest:
+			handler[ev.type](&ev);
+			break;
+		case MotionNotify:
+			XSync(dpy, False);
+			nx = ocx + (ev.xmotion.x - x1);
+			ny = ocy + (ev.xmotion.y - y1);
+			if(abs(wax + nx) < SNAP)
+				nx = wax;
+			else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
+				nx = wax + waw - c->w - 2 * c->border;
+			if(abs(way - ny) < SNAP)
+				ny = way;
+			else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
+				ny = way + wah - c->h - 2 * c->border;
+			resize(c, nx, ny, c->w, c->h, False);
+			break;
 		}
 	}
 }
 
 static void
-resizemouse(Client *c)
-{
-	XEvent ev;
+resizemouse(Client *c) {
 	int ocx, ocy;
+	int nw, nh;
+	XEvent ev;
 
 	ocx = c->x;
 	ocy = c->y;
-	if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
-				None, cursor[CurResize], CurrentTime) != GrabSuccess)
+	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);
+	c->ismax = False;
+	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
 	for(;;) {
-		XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
 		switch(ev.type) {
-		default: break;
+		case ButtonRelease:
+			XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
+					c->w + c->border - 1, c->h + c->border - 1);
+			XUngrabPointer(dpy, CurrentTime);
+			while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+			return;
+		case ConfigureRequest:
 		case Expose:
-			handler[Expose](&ev);
+		case MapRequest:
+			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
-			c->w = abs(ocx - ev.xmotion.x);
-			c->h = abs(ocy - ev.xmotion.y);
-			c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
-			c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
-			resize(c, True);
+			if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
+				nw = 1;
+			if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
+				nh = 1;
+			resize(c, c->x, c->y, nw, nh, True);
 			break;
-		case ButtonRelease:
-			XUngrabPointer(dpy, CurrentTime);
-			return;
 		}
 	}
 }
 
 static void
-buttonpress(XEvent *e)
-{
-	int x;
-	Arg a;
-	XButtonPressedEvent *ev = &e->xbutton;
+buttonpress(XEvent *e) {
+	static char buf[32];
+	unsigned int i, x;
 	Client *c;
+	XButtonPressedEvent *ev = &e->xbutton;
 
+	buf[0] = 0;
 	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) {
-					view(&a);
-					break;
+		x = 0;
+		for(i = 0; i < ntags; i++) {
+			x += textw(tags[i]);
+			if(ev->x < x) {
+				snprintf(buf, sizeof buf, "%d", i);
+				if(ev->button == Button1) {
+					if(ev->state & MODKEY)
+						tag(buf);
+					else
+						view(buf);
 				}
+				else if(ev->button == Button3) {
+					if(ev->state & MODKEY)
+						toggletag(buf);
+					else
+						toggleview(buf);
+				}
+				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 + blw)
+			switch(ev->button) {
+			case Button1:
+				setlayout(NULL);
+				break;
+			}
 	}
 	else if((c = getclient(ev->window))) {
-		if(arrange == dotile && !c->isfloat) {
-			if((ev->state & ControlMask) && (ev->button == Button1))
-				zoom(NULL);
+		focus(c);
+		if(CLEANMASK(ev->state) != MODKEY)
 			return;
-		}
-		/* floating windows */
-		higher(c);
-		switch(ev->button) {
-		default:
-			break;
-		case Button1:
+		if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) {
+			restack();
 			movemouse(c);
-			break;
-		case Button2:
-			lower(c);
-			break;
-		case Button3:
+		}
+		else if(ev->button == Button2)
+			zoom(NULL);
+		else if(ev->button == Button3
+		&& (lt->arrange == floating || c->isfloating) && !c->isfixed)
+		{
+			restack();
 			resizemouse(c);
-			break;
 		}
 	}
 }
 
 static void
-configurerequest(XEvent *e)
-{
+configurerequest(XEvent *e) {
+	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
-	Client *c;
 
-	ev->value_mask &= ~CWSibling;
 	if((c = getclient(ev->window))) {
-		gravitate(c, True);
-		if(ev->value_mask & CWX)
-			c->x = ev->x;
-		if(ev->value_mask & CWY)
-			c->y = ev->y;
-		if(ev->value_mask & CWWidth)
-			c->w = ev->width;
-		if(ev->value_mask & CWHeight)
-			c->h = ev->height;
+		c->ismax = False;
 		if(ev->value_mask & CWBorderWidth)
-			c->border = 1;
-		gravitate(c, False);
-		resize(c, True);
+			c->border = ev->border_width;
+		if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
+			if(ev->value_mask & CWX)
+				c->x = ev->x;
+			if(ev->value_mask & CWY)
+				c->y = ev->y;
+			if(ev->value_mask & CWWidth)
+				c->w = ev->width;
+			if(ev->value_mask & CWHeight)
+				c->h = ev->height;
+			if((c->x + c->w) > sw && c->isfloating)
+				c->x = sw / 2 - c->w / 2; /* center in x direction */
+			if((c->y + c->h) > sh && c->isfloating)
+				c->y = sh / 2 - c->h / 2; /* center in y direction */
+			if((ev->value_mask & (CWX | CWY))
+			&& !(ev->value_mask & (CWWidth | CWHeight)))
+				configure(c);
+			if(isvisible(c))
+				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+		}
+		else
+			configure(c);
+	}
+	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);
 	}
-
-	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
-destroynotify(XEvent *e)
-{
+configurenotify(XEvent *e) {
+	XConfigureEvent *ev = &e->xconfigure;
+
+	if (ev->window == root && (ev->width != sw || ev->height != sh)) {
+		sw = ev->width;
+		sh = ev->height;
+		XFreePixmap(dpy, dc.drawable);
+		dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+		XResizeWindow(dpy, barwin, sw, bh);
+		updatebarpos();
+		lt->arrange();
+	}
+}
+
+static void
+destroynotify(XEvent *e) {
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
 
@@ -220,115 +234,109 @@ destroynotify(XEvent *e)
 }
 
 static void
-enternotify(XEvent *e)
-{
-	XCrossingEvent *ev = &e->xcrossing;
+enternotify(XEvent *e) {
 	Client *c;
+	XCrossingEvent *ev = &e->xcrossing;
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
-
 	if((c = getclient(ev->window)))
 		focus(c);
-	else if(ev->window == root)
-		issel = True;
+	else if(ev->window == root) {
+		selscreen = True;
+		focus(NULL);
+	}
 }
 
 static void
-expose(XEvent *e)
-{
+expose(XEvent *e) {
 	XExposeEvent *ev = &e->xexpose;
-	Client *c;
 
 	if(ev->count == 0) {
 		if(barwin == ev->window)
 			drawstatus();
-		else if((c = getctitle(ev->window)))
-			drawtitle(c);
 	}
 }
 
 static void
-keypress(XEvent *e)
-{
-	XKeyEvent *ev = &e->xkey;
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+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) && (key[i].mod == ev->state)) {
+		if(keysym == key[i].keysym
+		&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+		{
 			if(key[i].func)
-				key[i].func(&key[i].arg);
-			return;
+				key[i].func(key[i].arg);
 		}
 }
 
 static void
-leavenotify(XEvent *e)
-{
+leavenotify(XEvent *e) {
 	XCrossingEvent *ev = &e->xcrossing;
 
-	if((ev->window == root) && !ev->same_screen)
-		issel = True;
+	if((ev->window == root) && !ev->same_screen) {
+		selscreen = False;
+		focus(NULL);
+	}
 }
 
 static void
-maprequest(XEvent *e)
-{
-	XMapRequestEvent *ev = &e->xmaprequest;
+mappingnotify(XEvent *e) {
+	XMappingEvent *ev = &e->xmapping;
+
+	XRefreshKeyboardMapping(ev);
+	if(ev->request == MappingKeyboard)
+		grabkeys();
+}
+
+static void
+maprequest(XEvent *e) {
 	static XWindowAttributes wa;
+	XMapRequestEvent *ev = &e->xmaprequest;
 
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
-
-	if(wa.override_redirect) {
-		XSelectInput(dpy, ev->window,
-				(StructureNotifyMask | PropertyChangeMask));
+	if(wa.override_redirect)
 		return;
-	}
-
 	if(!getclient(ev->window))
 		manage(ev->window, &wa);
 }
 
 static void
-propertynotify(XEvent *e)
-{
-	XPropertyEvent *ev = &e->xproperty;
-	Window trans;
+propertynotify(XEvent *e) {
 	Client *c;
+	Window trans;
+	XPropertyEvent *ev = &e->xproperty;
 
 	if(ev->state == PropertyDelete)
 		return; /* ignore */
-
 	if((c = getclient(ev->window))) {
-		if(ev->atom == wmatom[WMProtocols]) {
-			c->proto = getproto(c->win);
-			return;
-		}
 		switch (ev->atom) {
 			default: break;
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
-				if(!c->isfloat && (c->isfloat = (trans != 0)))
-					arrange(NULL);
+				if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+					lt->arrange();
 				break;
 			case XA_WM_NORMAL_HINTS:
-				setsize(c);
+				updatesizehints(c);
 				break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-			settitle(c);
-			drawtitle(c);
+			updatetitle(c);
+			if(c == sel)
+				drawstatus();
 		}
 	}
 }
 
 static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
 	Client *c;
 	XUnmapEvent *ev = &e->xunmap;
 
@@ -341,27 +349,34 @@ unmapnotify(XEvent *e)
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
+	[ConfigureNotify] = configurenotify,
 	[DestroyNotify] = destroynotify,
 	[EnterNotify] = enternotify,
 	[LeaveNotify] = leavenotify,
 	[Expose] = expose,
 	[KeyPress] = keypress,
+	[MappingNotify] = mappingnotify,
 	[MapRequest] = maprequest,
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
 };
 
 void
-grabkeys()
-{
-	static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+grabkeys(void) {
+	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);
 	}
 }

layout.c

@@ -0,0 +1,255 @@
+/* See LICENSE file for copyright and license details. */
+#include "dwm.h"
+#include <stdlib.h>
+
+unsigned int blw = 0;
+Layout *lt = NULL;
+
+/* static */
+
+static unsigned int nlayouts = 0;
+static unsigned int masterw = MASTERWIDTH;
+static unsigned int nmaster = NMASTER;
+
+static void
+tile(void) {
+	unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
+	Client *c;
+
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+		n++;
+	/* window geoms */
+	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
+	mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
+	th = (n > nmaster) ? wah / (n - nmaster) : 0;
+	tw = waw - mw;
+
+	for(i = 0, c = clients; c; c = c->next)
+		if(isvisible(c)) {
+			unban(c);
+			if(c->isfloating)
+				continue;
+			c->ismax = False;
+			nx = wax;
+			ny = way;
+			if(i < nmaster) {
+				ny += i * mh;
+				nw = mw - 2 * c->border;
+				nh = mh;
+				if(i + 1 == (n < nmaster ? n : nmaster)) /* remainder */
+					nh = wah - mh * i;
+				nh -= 2 * c->border;
+			}
+			else {  /* tile window */
+				nx += mw;
+				nw = tw - 2 * c->border;
+				if(th > 2 * c->border) {
+					ny += (i - nmaster) * th;
+					nh = th;
+					if(i + 1 == n) /* remainder */
+						nh = wah - th * (i - nmaster);
+					nh -= 2 * c->border;
+				}
+				else /* fallback if th <= 2 * c->border */
+					nh = wah - 2 * c->border;
+			}
+			resize(c, nx, ny, nw, nh, False);
+			i++;
+		}
+		else
+			ban(c);
+	focus(NULL);
+	restack();
+}
+
+LAYOUTS
+
+/* extern */
+
+void
+floating(void) {
+	Client *c;
+
+	for(c = clients; c; c = c->next)
+		if(isvisible(c)) {
+			unban(c);
+			resize(c, c->x, c->y, c->w, c->h, True);
+		}
+		else
+			ban(c);
+	focus(NULL);
+	restack();
+}
+
+void
+focusclient(const char *arg) {
+	Client *c;
+   
+	if(!sel || !arg)
+		return;
+	if(atoi(arg) < 0) {
+		for(c = sel->prev; c && !isvisible(c); c = c->prev);
+		if(!c) {
+			for(c = clients; c && c->next; c = c->next);
+			for(; c && !isvisible(c); c = c->prev);
+		}
+	}
+	else {
+		for(c = sel->next; c && !isvisible(c); c = c->next);
+		if(!c)
+			for(c = clients; c && !isvisible(c); c = c->next);
+	}
+	if(c) {
+		focus(c);
+		restack();
+	}
+}
+
+void
+incmasterw(const char *arg) {
+	int i;
+	if(lt->arrange != tile)
+		return;
+	if(!arg)
+		masterw = MASTERWIDTH;
+	else {
+		i = atoi(arg);
+		if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX 
+		|| waw * (masterw + i) / 1000 <= 2 * BORDERPX)
+			return;
+		masterw += i;
+	}
+	lt->arrange();
+}
+
+void
+incnmaster(const char *arg) {
+	int i;
+
+	if(!arg)
+		nmaster = NMASTER;
+	else {
+		i = atoi(arg);
+		if((lt->arrange != tile) || (nmaster + i < 1)
+		|| (wah / (nmaster + i) <= 2 * BORDERPX))
+			return;
+		nmaster += i;
+	}
+	if(sel)
+		lt->arrange();
+	else
+		drawstatus();
+}
+
+void
+initlayouts(void) {
+	unsigned int i, w;
+
+	lt = &layout[0];
+	nlayouts = sizeof layout / sizeof layout[0];
+	for(blw = i = 0; i < nlayouts; i++) {
+		w = textw(layout[i].symbol);
+		if(w > blw)
+			blw = w;
+	}
+}
+
+Client *
+nexttiled(Client *c) {
+	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+	return c;
+}
+
+void
+restack(void) {
+	Client *c;
+	XEvent ev;
+	XWindowChanges wc;
+
+	drawstatus();
+	if(!sel)
+		return;
+	if(sel->isfloating || lt->arrange == floating)
+		XRaiseWindow(dpy, sel->win);
+	if(lt->arrange != floating) {
+		wc.stack_mode = Below;
+		wc.sibling = barwin;
+		if(!sel->isfloating) {
+			XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+			wc.sibling = sel->win;
+		}
+		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+			if(c == sel)
+				continue;
+			XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+			wc.sibling = c->win;
+		}
+	}
+	XSync(dpy, False);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+void
+setlayout(const char *arg) {
+	int i;
+
+	if(!arg) {
+		lt++;
+		if(lt == layout + nlayouts)
+			lt = layout;
+	}
+	else {
+		i = atoi(arg);
+		if(i < 0 || i >= nlayouts)
+			return;
+		lt = &layout[i];
+	}
+	if(sel)
+		lt->arrange();
+	else
+		drawstatus();
+}
+
+void
+togglebar(const char *arg) {
+	if(bpos == BarOff)
+		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+	else
+		bpos = BarOff;
+	updatebarpos();
+	lt->arrange();
+}
+
+void
+togglemax(const char *arg) {
+	XEvent ev;
+
+	if(!sel || (lt->arrange != floating && !sel->isfloating) || sel->isfixed)
+		return;
+	if((sel->ismax = !sel->ismax)) {
+		sel->rx = sel->x;
+		sel->ry = sel->y;
+		sel->rw = sel->w;
+		sel->rh = sel->h;
+		resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
+	}
+	else
+		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
+	drawstatus();
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+void
+zoom(const char *arg) {
+	Client *c;
+
+	if(!sel || lt->arrange == floating || sel->isfloating)
+		return;
+	if((c = sel) == nexttiled(clients))
+		if(!(c = nexttiled(c->next)))
+			return;
+	detach(c);
+	attach(c);
+	focus(c);
+	lt->arrange();
+}

main.c

@@ -1,48 +1,126 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
-
 #include <errno.h>
+#include <locale.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[256];
+int screen, sx, sy, sw, sh, wax, way, waw, wah;
+unsigned int bh, ntags;
+unsigned int bpos = BARPOS;
+unsigned int numlockmask = 0;
+Atom wmatom[WMLast], netatom[NetLast];
+Bool *seltag;
+Bool selscreen = True;
+Client *clients = NULL;
+Client *sel = NULL;
+Client *stack = 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 Bool running = True;
 
 static void
-cleanup()
-{
-	while(sel) {
-		resize(sel, True);
-		unmanage(sel);
+cleanup(void) {
+	close(STDIN_FILENO);
+	while(stack) {
+		unban(stack);
+		unmanage(stack);
 	}
+	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);
+	XFreeCursor(dpy, cursor[CurNormal]);
+	XFreeCursor(dpy, cursor[CurResize]);
+	XFreeCursor(dpy, cursor[CurMove]);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+	XSync(dpy, False);
+	free(seltag);
+}
+
+static unsigned long
+initcolor(const char *colstr) {
+	Colormap cmap = DefaultColormap(dpy, screen);
+	XColor color;
+
+	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+		eprint("error, cannot allocate color '%s'\n", colstr);
+	return color.pixel;
 }
 
 static void
-scan()
-{
-	unsigned int i, num;
-	Window *wins;
-	XWindowAttributes wa;
-	Window d1, d2;
+initfont(const char *fontstr) {
+	char *def, **missing;
+	int i, n;
 
+	missing = NULL;
+	if(dc.font.set)
+		XFreeFontSet(dpy, dc.font.set);
+	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+	if(missing) {
+		while(n--)
+			fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
+		XFreeStringList(missing);
+	}
+	if(dc.font.set) {
+		XFontSetExtents *font_extents;
+		XFontStruct **xfonts;
+		char **font_names;
+		dc.font.ascent = dc.font.descent = 0;
+		font_extents = XExtentsOfFontSet(dc.font.set);
+		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+			if(dc.font.ascent < (*xfonts)->ascent)
+				dc.font.ascent = (*xfonts)->ascent;
+			if(dc.font.descent < (*xfonts)->descent)
+				dc.font.descent = (*xfonts)->descent;
+			xfonts++;
+		}
+	}
+	else {
+		if(dc.font.xfont)
+			XFreeFont(dpy, dc.font.xfont);
+		dc.font.xfont = NULL;
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+			eprint("error, cannot load font: '%s'\n", fontstr);
+		dc.font.ascent = dc.font.xfont->ascent;
+		dc.font.descent = dc.font.xfont->descent;
+	}
+	dc.font.height = dc.font.ascent + dc.font.descent;
+}
+
+static void
+scan(void) {
+	unsigned int i, num;
+	Window *wins, d1, d2;
+	XWindowAttributes wa;
+
+	wins = NULL;
 	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
 		for(i = 0; i < num; i++) {
-			if(!XGetWindowAttributes(dpy, wins[i], &wa))
-				continue;
-			if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+			if(!XGetWindowAttributes(dpy, wins[i], &wa)
+			|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
 				continue;
 			if(wa.map_state == IsViewable)
 				manage(wins[i], &wa);
@@ -52,24 +130,79 @@ scan()
 		XFree(wins);
 }
 
-static int
-win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
-{
-	Atom real;
-	int format;
-	unsigned long res, extra;
-	int status;
+static void
+setup(void) {
+	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);
-
-	if(status != Success || *prop == 0) {
-		return 0;
-	}
-	if(res == 0) {
-		free((void *) *prop);
-	}
-	return res;
+	/* init atoms */
+	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
+	wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
+	wmatom[WMState] = XInternAtom(dpy, "WM_STATE", 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);
+	/* init modifier map */
+	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);
+		}
+	XFreeModifiermap(modmap);
+	/* select for events */
+	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
+		| EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
+	wa.cursor = cursor[CurNormal];
+	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+	XSelectInput(dpy, root, wa.event_mask);
+	grabkeys();
+	compileregs();
+	for(ntags = 0; tags[ntags]; ntags++);
+	seltag = emallocz(sizeof(Bool) * ntags);
+	seltag[0] = True;
+	/* style */
+	dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
+	dc.norm[ColBG] = initcolor(NORMBGCOLOR);
+	dc.norm[ColFG] = initcolor(NORMFGCOLOR);
+	dc.sel[ColBorder] = initcolor(SELBORDERCOLOR);
+	dc.sel[ColBG] = initcolor(SELBGCOLOR);
+	dc.sel[ColFG] = initcolor(SELFGCOLOR);
+	initfont(FONT);
+	/* geometry */
+	sx = sy = 0;
+	sw = DisplayWidth(dpy, screen);
+	sh = DisplayHeight(dpy, screen);
+	initlayouts();
+	/* bar */
+	dc.h = bh = dc.font.height + 2;
+	wa.override_redirect = 1;
+	wa.background_pixmap = ParentRelative;
+	wa.event_mask = ButtonPressMask | ExposureMask;
+	barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0,
+			DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
+			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+	XDefineCursor(dpy, barwin, cursor[CurNormal]);
+	updatebarpos();
+	XMapRaised(dpy, barwin);
+	strcpy(stext, "dwm-"VERSION);
+	/* pixmap for everything */
+	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);
+	if(!dc.font.set)
+		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+	/* multihead support */
+	selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 }
 
 /*
@@ -77,235 +210,136 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
  * is already running.
  */
 static int
-xerrorstart(Display *dsply, XErrorEvent *ee)
-{
+xerrorstart(Display *dsply, XErrorEvent *ee) {
 	otherwm = True;
 	return -1;
 }
 
 /* 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;
-
-	res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
-	if(res <= 0) {
-		return protos;
-	}
-	for(i = 0; i < res; i++) {
-		if(protocols[i] == wmatom[WMDelete])
-			protos |= WM_PROTOCOL_DELWIN;
-	}
-	free((char *) protocols);
-	return protos;
+void
+quit(const char *arg) {
+	readin = running = False;
 }
 
 void
-sendevent(Window w, Atom a, long value)
-{
-	XEvent e;
-
-	e.type = ClientMessage;
-	e.xclient.window = w;
-	e.xclient.message_type = a;
-	e.xclient.format = 32;
-	e.xclient.data.l[0] = value;
-	e.xclient.data.l[1] = CurrentTime;
-	XSendEvent(dpy, w, False, NoEventMask, &e);
-	XSync(dpy, False);
-}
-
-void
-quit(Arg *arg)
-{
-	running = False;
-}
-
-/*
- * There's no way to check accesses to destroyed windows, thus those cases are
- * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
- * default error handler, which calls exit().
- */
-int
-xerror(Display *dpy, XErrorEvent *ee)
-{
-	if(ee->error_code == BadWindow
-			|| (ee->request_code == X_SetInputFocus
-				&& ee->error_code == BadMatch)
-			|| (ee->request_code == X_PolyText8
-				&& ee->error_code == BadDrawable)
-			|| (ee->request_code == X_PolyFillRectangle
-				&& ee->error_code == BadDrawable)
-			|| (ee->request_code == X_PolySegment
-				&& ee->error_code == BadDrawable)
-			|| (ee->request_code == X_ConfigureWindow
-				&& ee->error_code == BadMatch)
-			|| (ee->request_code == X_GrabKey
-				&& ee->error_code == BadAccess))
-		return 0;
-	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-			ee->request_code, ee->error_code);
-	return xerrorxlib(dpy, ee); /* may call exit() */
-}
-
-int
-main(int argc, char *argv[])
-{
-	int i, n;
-	fd_set rd;
-	XSetWindowAttributes wa;
-	unsigned int mask;
-	Bool readstdin = True;
-	Window w;
+updatebarpos(void) {
 	XEvent ev;
 
-	for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
-		switch (argv[i][1]) {
-		case 'v':
-			fprintf(stdout, "%s",
-					"dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n");
-			exit(0);
-			break;
-		default:
-			eprint("usage: dwm [-v]\n");
-			break;
-		}
+	wax = sx;
+	way = sy;
+	wah = sh;
+	waw = sw;
+	switch(bpos) {
+	default:
+		wah -= bh;
+		way += bh;
+		XMoveWindow(dpy, barwin, sx, sy);
+		break;
+	case BarBot:
+		wah -= bh;
+		XMoveWindow(dpy, barwin, sx, sy + wah);
+		break;
+	case BarOff:
+		XMoveWindow(dpy, barwin, sx, sy - bh);
+		break;
 	}
+	XSync(dpy, False);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
 
-	dpy = XOpenDisplay(0);
-	if(!dpy)
-		eprint("dwm: cannot connect X server\n");
+/* 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 may call 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)
+	|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
+		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[]) {
+	char *p;
+	int r, xfd;
+	fd_set rd;
+	XEvent ev;
+
+	if(argc == 2 && !strcmp("-v", argv[1]))
+		eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
+	else if(argc != 1)
+		eprint("usage: dwm [-v]\n");
+	setlocale(LC_CTYPE, "");
+	if(!(dpy = XOpenDisplay(0)))
+		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);
-
-	/* 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);
+	XSync(dpy, False);
+	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);
+	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)
-			continue;
-		if(i < 0)
+		FD_SET(xfd, &rd);
+		if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
+			if(errno == EINTR)
+				continue;
 			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;
-				drawstatus();
+		}
+		if(FD_ISSET(STDIN_FILENO, &rd)) {
+			switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
+			case -1:
+				strncpy(stext, strerror(errno), sizeof stext - 1);
+				stext[sizeof stext - 1] = '\0';
+				readin = False;
+				break;
+			case 0:
+				strncpy(stext, "EOF", 4);
+				readin = False;
+				break;
+			default:
+				for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
+				for(; p >= stext && *p != '\n'; --p);
+				if(p > stext)
+					strncpy(stext, p + 1, sizeof stext);
 			}
+			drawstatus();
+		}
+		while(XPending(dpy)) {
+			XNextEvent(dpy, &ev);
+			if(handler[ev.type])
+				(handler[ev.type])(&ev); /* call handler */
 		}
 	}
-
 	cleanup();
 	XCloseDisplay(dpy);
-
 	return 0;
 }

tag.c

@@ -1,178 +1,152 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
-
-#include <string.h>
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xutil.h>
 
 /* static */
 
-/* CUSTOMIZE */ 
-static Rule rule[] = {
-	/* class			instance	tags						isfloat */
-	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
-};
+typedef struct {
+	const char *prop;
+	const char *tags;
+	Bool isfloating;
+} Rule;
+
+typedef struct {
+	regex_t *propregex;
+	regex_t *tagregex;
+} Regs;
+
+TAGS
+RULES
+
+static Regs *regs = NULL;
+static unsigned int nrules = 0;
 
 /* extern */
 
-/* CUSTOMIZE */
-char *tags[TLast] = {
-	[Tscratch] = "scratch",
-	[Tdev] = "dev",
-	[Twww] = "www",
-	[Twork] = "work",
-};
-void (*arrange)(Arg *) = dotile;
-
 void
-appendtag(Arg *arg)
-{
-	if(!sel)
+compileregs(void) {
+	unsigned int i;
+	regex_t *reg;
+
+	if(regs)
 		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) {
-		if(c->tags[tsel])
-			resize(c, True);
-		else
-			ban(c);
-	}
-	if(sel && !sel->tags[tsel]) {
-		if((sel = getnext(clients))) {
-			higher(sel);
-			focus(sel);
+	nrules = sizeof rule / sizeof rule[0];
+	regs = emallocz(nrules * sizeof(Regs));
+	for(i = 0; i < nrules; i++) {
+		if(rule[i].prop) {
+			reg = emallocz(sizeof(regex_t));
+			if(regcomp(reg, rule[i].prop, REG_EXTENDED))
+				free(reg);
+			else
+				regs[i].propregex = reg;
+		}
+		if(rule[i].tags) {
+			reg = emallocz(sizeof(regex_t));
+			if(regcomp(reg, rule[i].tags, REG_EXTENDED))
+				free(reg);
+			else
+				regs[i].tagregex = reg;
 		}
 	}
-	drawall();
+}
+
+Bool
+isvisible(Client *c) {
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		if(c->tags[i] && seltag[i])
+			return True;
+	return False;
 }
 
 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) {
-		if(c->tags[tsel]) {
-			if(c->isfloat) {
-				higher(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(c);
-	}
-	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = getnext(clients))) {
-			higher(sel);
-			focus(sel);
-		}
-	}
-	drawall();
-}
-
-Client *
-getnext(Client *c)
-{
-	for(; c && !c->tags[tsel]; c = c->next);
-	return c;
-}
-
-void
-replacetag(Arg *arg)
-{
-	int i;
-	if(!sel)
-		return;
-
-	for(i = 0; i < TLast; i++)
-		sel->tags[i] = NULL;
-	appendtag(arg);
-}
-
-void
-settags(Client *c)
-{
-	XClassHint ch;
-	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+settags(Client *c, Client *trans) {
+	char prop[512];
 	unsigned int i, j;
-	Bool matched = False;
+	regmatch_t tmp;
+	Bool matched = trans != NULL;
+	XClassHint ch = { 0 };
 
-	if(!len) {
-		c->tags[tsel] = tags[tsel];
-		return;
-	}
-
-	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;
+	if(matched)
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = trans->tags[i];
+	else {
+		XGetClassHint(dpy, c->win, &ch);
+		snprintf(prop, sizeof prop, "%s:%s:%s",
+				ch.res_class ? ch.res_class : "",
+				ch.res_name ? ch.res_name : "", c->name);
+		for(i = 0; i < nrules; i++)
+			if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
+				c->isfloating = rule[i].isfloating;
+				for(j = 0; regs[i].tagregex && j < ntags; j++) {
+					if(!regexec(regs[i].tagregex, 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)
-{
-	tsel = arg->i;
-	arrange(NULL);
-	drawall();
+tag(const char *arg) {
+	int i;
+
+	if(!sel)
+		return;
+	for(i = 0; i < ntags; i++)
+		sel->tags[i] = arg == NULL;
+	i = arg ? atoi(arg) : 0;
+	if(i >= 0 && i < ntags)
+		sel->tags[i] = True;
+	lt->arrange();
+}
+
+void
+toggletag(const char *arg) {
+	int i, j;
+
+	if(!sel)
+		return;
+	i = arg ? atoi(arg) : 0;
+	sel->tags[i] = !sel->tags[i];
+	for(j = 0; j < ntags && !sel->tags[j]; j++);
+	if(j == ntags)
+		sel->tags[i] = True;
+	lt->arrange();
+}
+
+void
+toggleview(const char *arg) {
+	int i, j;
+
+	i = arg ? atoi(arg) : 0;
+	seltag[i] = !seltag[i];
+	for(j = 0; j < ntags && !seltag[j]; j++);
+	if(j == ntags)
+		seltag[i] = True; /* cannot toggle last view */
+	lt->arrange();
+}
+
+void
+view(const char *arg) {
+	int i;
+
+	for(i = 0; i < ntags; i++)
+		seltag[i] = arg == NULL;
+	i = arg ? atoi(arg) : 0;
+	if(i >= 0 && i < ntags)
+		seltag[i] = True;
+	lt->arrange();
 }

util.c

@@ -1,61 +1,52 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and 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(1);
-}
-
 /* extern */
 
 void *
-emallocz(unsigned int size)
-{
+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, ...) {
 	va_list ap;
+
 	va_start(ap, errstr);
 	vfprintf(stderr, errstr, ap);
 	va_end(ap);
-	exit(1);
+	exit(EXIT_FAILURE);
 }
 
 void
-spawn(Arg *arg)
-{
-	char **argv = (char **)arg->argv;
-	if(!argv || !argv[0])
+spawn(const char *arg) {
+	static char *shell = NULL;
+
+	if(!shell && !(shell = getenv("SHELL")))
+		shell = "/bin/sh";
+	if(!arg)
 		return;
+	/* The double-fork construct avoids zombie processes and keeps the code
+	 * clean from stupid signal handlers. */
 	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, (char *)NULL);
+			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
 			perror(" failed");
 		}
-		exit (0);
+		exit(0);
 	}
 	wait(0);
 }