simplified dotile(), removed misleading line

.hgtags

@@ -10,5 +10,9 @@ fae61afa861755636c4a1070694209ace8efbb6c 0.9
 bbc98e77ae89a7c9232a5be0835f60ea00d8036e 1.0
 44a55e6e46bf6c231780b09d919977d6f01083de 1.1
 e3179ce2b90451d2807cd53b589d768412b8666b 1.2
-6413ea66b1c2496cfc2173fe58df67cb965eb1da 1.3
-dd44dc937e8b0a46abf1a15a333dba5304e4fe89 1.3
+f5f5cbf016a94b48a8fe9c47f0736e96d166d5d4 1.3
+3cff9403766bf83a9fc2a0aef230115d68de2a8e 1.4
+728c9089b079721b43c3347124639a29baa22a97 1.5
+ad3fa2d185426c51fd5deceae809770363f8d33c 1.6
+4dbdb61c8b8ce21dee5c7050a6b103855964ed20 1.7
+d5ad819f2a66a40fa75dd2e44429f3bfc884d07b 1.7.1

README

@@ -1,5 +1,5 @@
 dwm - dynamic window manager
-----------------------------
+============================
 dwm is an extremely fast, small, and dynamic window manager for X.
 
 
@@ -37,7 +37,7 @@ like this in your .xinitrc:
 
     while true
     do
-        echo `date` `uptime | sed 's/.*://; s/,//g'`
+        echo `date` `uptime | sed 's/.*,//'`
         sleep 1
     done | dwm
 

client.c

@@ -11,11 +11,17 @@
 /* static functions */
 
 static void
-grabbuttons(Client *c, Bool focus)
-{
+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(focus) {
+	if(focused) {
 		XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
 		XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
@@ -46,51 +52,47 @@ grabbuttons(Client *c, Bool focus)
 	else
 		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
-
-}
-
-static void
-resizetitle(Client *c)
-{
-	c->tw = textw(c->name);
-	if(c->tw > c->w)
-		c->tw = c->w + 2;
-	c->tx = c->x + c->w - c->tw + 2;
-	c->ty = c->y;
-	if(isvisible(c))
-		XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
-	else
-		XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
-
 }
 
 static int
-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
+xerrordummy(Display *dsply, XErrorEvent *ee) {
 	return 0;
 }
 
 /* extern functions */
 
 void
-ban(Client *c)
-{
+ban(Client *c) {
 	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void
-focus(Client *c)
-{
+configure(Client *c) {
+	XEvent synev;
+
+	synev.type = ConfigureNotify;
+	synev.xconfigure.display = dpy;
+	synev.xconfigure.event = c->win;
+	synev.xconfigure.window = c->win;
+	synev.xconfigure.x = c->x;
+	synev.xconfigure.y = c->y;
+	synev.xconfigure.width = c->w;
+	synev.xconfigure.height = c->h;
+	synev.xconfigure.border_width = c->border;
+	synev.xconfigure.above = None;
+	XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+}
+
+void
+focus(Client *c) {
 	Client *old;
 
-	if(!issel)
+	if(!issel || (c && !isvisible(c)))
 		return;
 	if(!sel)
 		sel = c;
 	else if(sel != c) {
-		if(maximized)
-			togglemax(NULL);
 		old = sel;
 		sel = c;
 		if(old) {
@@ -99,6 +101,9 @@ focus(Client *c)
 		}
 	}
 	if(c) {
+		detachstack(c);
+		c->snext = stack;
+		stack = c;
 		grabbuttons(c, True);
 		drawtitle(c);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
@@ -108,8 +113,7 @@ focus(Client *c)
 }
 
 Client *
-getclient(Window w)
-{
+getclient(Window w) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
@@ -119,8 +123,7 @@ getclient(Window w)
 }
 
 Client *
-getctitle(Window w)
-{
+getctitle(Window w) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
@@ -130,8 +133,7 @@ getctitle(Window w)
 }
 
 void
-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {
 	int dx = 0, dy = 0;
 
 	switch(c->grav) {
@@ -185,8 +187,7 @@ gravitate(Client *c, Bool invert)
 }
 
 void
-killclient(Arg *arg)
-{
+killclient(Arg *arg) {
 	if(!sel)
 		return;
 	if(sel->proto & PROTODELWIN)
@@ -196,10 +197,8 @@ killclient(Arg *arg)
 }
 
 void
-manage(Window w, XWindowAttributes *wa)
-{
-	unsigned int i;
-	Client *c, *tc;
+manage(Window w, XWindowAttributes *wa) {
+	Client *c;
 	Window trans;
 	XSetWindowAttributes twa;
 
@@ -213,14 +212,14 @@ manage(Window w, XWindowAttributes *wa)
 	c->th = bh;
 
 	c->border = 0;
-	setsize(c);
+	updatesize(c);
 
-	if(c->x + c->w + 2 > sw)
-		c->x = sw - c->w - 2;
-	if(c->x < 0)
-		c->x = 0;
-	if(c->y + c->h + 2 > sh)
-		c->y = sh - c->h - 2;
+	if(c->x + c->w + 2 * BORDERPX > sw)
+		c->x = sw - c->w - 2 * BORDERPX;
+	if(c->x < sx)
+		c->x = sx;
+	if(c->y + c->h + 2 * BORDERPX > sh)
+		c->y = sh - c->h - 2 * BORDERPX;
 	if(c->h != sh && c->y < bh)
 		c->y = bh;
 
@@ -238,22 +237,20 @@ manage(Window w, XWindowAttributes *wa)
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
 	grabbuttons(c, False);
-	if((tc = getclient(trans))) /* inherit tags */
-		for(i = 0; i < ntags; i++)
-			c->tags[i] = tc->tags[i];
-	else
-		settags(c);
+	updatetitle(c);
+	settags(c, getclient(trans));
 	if(!c->isfloat)
 		c->isfloat = trans
 			|| (c->maxw && c->minw &&
 				c->maxw == c->minw && c->maxh == c->minh);
+	resizetitle(c);
 
 	if(clients)
 		clients->prev = c;
 	c->next = clients;
-	clients = c;
+	c->snext = stack;
+	stack = clients = c;
 
-	settitle(c);
 	ban(c);
 	XMapWindow(dpy, c->win);
 	XMapWindow(dpy, c->twin);
@@ -263,8 +260,7 @@ manage(Window w, XWindowAttributes *wa)
 }
 
 void
-resize(Client *c, Bool sizehints, Corner sticky)
-{
+resize(Client *c, Bool sizehints, Corner sticky) {
 	int bottom = c->y + c->h;
 	int right = c->x + c->w;
 	XWindowChanges wc;
@@ -288,6 +284,16 @@ resize(Client *c, Bool sizehints, Corner sticky)
 	if(sticky == BotLeft || sticky == BotRight)
 		c->y = bottom - c->h;
 
+	/* offscreen appearance fixes */
+	if(c->x + c->w < sx)
+		c->x = sx;
+	if(c->y + c->h < bh)
+		c->y = bh;
+	if(c->x > sw)
+		c->x = sw - c->w;
+	if(c->y > sh)
+		c->y = sh - c->h;
+
 	resizetitle(c);
 	wc.x = c->x;
 	wc.y = c->y;
@@ -296,14 +302,27 @@ resize(Client *c, Bool sizehints, Corner sticky)
 	if(c->w == sw && c->h == sh)
 		wc.border_width = 0;
 	else
-		wc.border_width = 1;
-	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+		wc.border_width = BORDERPX;
+	XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+	configure(c);
 	XSync(dpy, False);
 }
 
 void
-setsize(Client *c)
-{
+resizetitle(Client *c) {
+	c->tw = textw(c->name);
+	if(c->tw > c->w)
+		c->tw = c->w + 2 * BORDERPX;
+	c->tx = c->x + c->w - c->tw + 2 * BORDERPX;
+	c->ty = c->y;
+	if(isvisible(c))
+		XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
+	else
+		XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
+}
+
+void
+updatesize(Client *c) {
 	long msize;
 	XSizeHints size;
 
@@ -341,8 +360,7 @@ setsize(Client *c)
 }
 
 void
-settitle(Client *c)
-{
+updatetitle(Client *c) {
 	char **list = NULL;
 	int n;
 	XTextProperty name;
@@ -365,61 +383,21 @@ settitle(Client *c)
 		}
 	}
 	XFree(name.value);
-	resizetitle(c);
 }
 
 void
-togglemax(Arg *arg)
-{
-	int ox, oy, ow, oh;
-	Client *c;
-	XEvent ev;
+unmanage(Client *c) {
+	Client *nc;
 
-	if(!sel)
-		return;
-
-	if((maximized = !maximized)) {
-		ox = sel->x;
-		oy = sel->y;
-		ow = sel->w;
-		oh = sel->h;
-		sel->x = sx;
-		sel->y = sy + bh;
-		sel->w = sw - 2;
-		sel->h = sh - 2 - bh;
-
-		restack();
-		for(c = getnext(clients); c; c = getnext(c->next))
-			if(c != sel)
-				ban(c);
-		resize(sel, arrange == dofloat, TopLeft);
-
-		sel->x = ox;
-		sel->y = oy;
-		sel->w = ow;
-		sel->h = oh;
-	}
-	else
-		arrange(NULL);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
-unmanage(Client *c)
-{
-	Client *tc, *fc;
-	Window trans;
+	/* The server grab construct avoids race conditions. */
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
 
 	detach(c);
+	detachstack(c);
 	if(sel == c) {
-		XGetTransientForHint(dpy, c->win, &trans);
-		if(trans && (tc = getclient(trans)) && isvisible(tc))
-			fc = tc;
-		else
-			fc = getnext(clients);
-		focus(fc);
+		for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+		focus(nc);
 	}
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);

config.arg.h

@@ -6,20 +6,22 @@
 #define TAGS \
 const char *tags[] = { "dev", "work", "net", "fnord", NULL };
 
-#define DEFMODE			dotile /* dofloat */
+#define DEFMODE			dotile		/* dofloat */
 #define FLOATSYMBOL		"><>"
-#define TILESYMBOL		"[]="
+#define STACKPOS		StackRight	/* StackLeft */
+#define BSTACKSYMBOL		"==="
+#define VSTACKSYMBOL		"[]="
 
 #define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
-#define SELBGCOLOR		"#333366"
-#define SELFGCOLOR		"#eeeeee"
 #define NORMBGCOLOR		"#333333"
 #define NORMFGCOLOR		"#dddddd"
+#define SELBGCOLOR		"#333366"
+#define SELFGCOLOR		"#eeeeee"
 #define STATUSBGCOLOR		"#222222"
 #define STATUSFGCOLOR		"#9999cc"
 
+#define MASTER			60 /* percent */
 #define MODKEY			Mod1Mask
-#define MASTERW			60 /* percent */
 
 #define KEYS \
 static Key key[] = { \
@@ -28,12 +30,15 @@ static Key key[] = { \
 		{ .cmd = "exec uxterm -bg '#111111' -fg '#eeeeee' -cr '#eeeeee' +sb -fn '"FONT"'" } }, \
 	{ MODKEY,			XK_p,		spawn, \
 		{ .cmd = "exe=\"$(IFS=:; for dir in $PATH; do " \
-			 "for file in \"$dir\"/*; do [ -x \"$file\" ] && echo \"${file##*/}\"; done; " \
-			 "done | sort -u | dmenu)\" && exec \"$exe\"" } }, \
+			 "for file in \"$dir\"/*; do [ -x \"$file\" ] && echo \"${file##*/}\"; done; done " \
+			 "| sort -u | dmenu -font '"FONT"' -normbg '"NORMBGCOLOR"' -normfg '"NORMFGCOLOR"' " \
+			 "-selbg '"SELBGCOLOR"' -selfg '"SELFGCOLOR"')\" && exec $exe" } }, \
 	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
 	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
 	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
+	{ MODKEY,			XK_b,		togglestackpos,	{ 0 } }, \
+	{ MODKEY,			XK_g,		resizecol,	{ .i = 1 } }, \
+	{ MODKEY,			XK_s,		resizecol,	{ .i = -1 } }, \
 	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
 	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
 	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
@@ -59,7 +64,7 @@ static Key key[] = { \
 #define RULES \
 static Rule rule[] = { \
 	/* class:instance:title regex	tags regex	isfloat */ \
-	{ "Firefox.*",			"net",		False }, \
+	{ "Firefox.*",			"net",		False}, \
 	{ "Gimp.*",			NULL,		True}, \
 	{ "MPlayer.*",			NULL,		True}, \
 	{ "Acroread.*",			NULL,		True}, \

config.default.h

@@ -7,19 +7,21 @@
 const char *tags[] = { "1", "2", "3", "4", "5", NULL };
 
 #define DEFMODE			dotile /* dofloat */
-#define FLOATSYMBOL		"~"
-#define TILESYMBOL		"#"
+#define FLOATSYMBOL		"><>"
+#define STACKPOS		StackRight	/* StackLeft */
+#define BSTACKSYMBOL		"==="
+#define VSTACKSYMBOL		"[]="
 
 #define FONT			"fixed"
-#define SELBGCOLOR		"#666699"
-#define SELFGCOLOR		"#eeeeee"
 #define NORMBGCOLOR		"#333366"
 #define NORMFGCOLOR		"#cccccc"
+#define SELBGCOLOR		"#666699"
+#define SELFGCOLOR		"#eeeeee"
 #define STATUSBGCOLOR		"#dddddd"
 #define STATUSFGCOLOR		"#222222"
 
+#define MASTER			60 /* percent */
 #define MODKEY			Mod1Mask
-#define MASTERW			60 /* percent */
 
 #define KEYS \
 static Key key[] = { \
@@ -28,7 +30,9 @@ static Key key[] = { \
 	{ MODKEY,			XK_Tab,		focusnext,	{ 0 } }, \
 	{ MODKEY|ShiftMask,		XK_Tab,		focusprev,	{ 0 } }, \
 	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY,			XK_m,		togglemax,	{ 0 } }, \
+	{ MODKEY,			XK_b,		togglestackpos,	{ 0 } }, \
+	{ MODKEY,			XK_g,		resizecol,	{ .i = 1 } }, \
+	{ MODKEY,			XK_s,		resizecol,	{ .i = -1 } }, \
 	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
 	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
 	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \

config.mk

@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 1.3
+VERSION = 1.8
 
 # Customize below to fit your system
 

draw.c

@@ -10,8 +10,7 @@
 /* static */
 
 static unsigned int
-textnw(const char *text, unsigned int len)
-{
+textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
 	if(dc.font.set) {
@@ -22,8 +21,7 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
-drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
-{
+drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
@@ -74,7 +72,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
 	if(highlight) {
 		r.x = dc.x + 2;
 		r.y = dc.y + 2;
-		r.width = r.height = 3;
+		r.width = r.height = (h + 2) / 4;
 		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
 }
@@ -82,8 +80,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
 /* extern */
 
 void
-drawall()
-{
+drawall(void) {
 	Client *c;
 
 	for(c = clients; c; c = getnext(c->next))
@@ -92,8 +89,7 @@ drawall()
 }
 
 void
-drawstatus()
-{
+drawstatus(void) {
 	int i, x;
 
 	dc.x = dc.y = 0;
@@ -108,7 +104,9 @@ drawstatus()
 	}
 
 	dc.w = bmw;
-	drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
+	drawtext(arrange == dofloat ?
+		FLOATSYMBOL : stackpos == StackBottom ?
+			BSTACKSYMBOL : VSTACKSYMBOL, dc.status, False);
 
 	x = dc.x + dc.w;
 	dc.w = textw(stext);
@@ -131,8 +129,7 @@ drawstatus()
 }
 
 void
-drawtitle(Client *c)
-{
+drawtitle(Client *c) {
 	if(c == sel && issel) {
 		drawstatus();
 		XUnmapWindow(dpy, c->twin);
@@ -150,18 +147,17 @@ drawtitle(Client *c)
 }
 
 unsigned long
-getcolor(const char *colstr)
-{
+getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
 
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+		eprint("error, cannot allocate color '%s'\n", colstr);
 	return color.pixel;
 }
 
 void
-setfont(const char *fontstr)
-{
+setfont(const char *fontstr) {
 	char **missing, *def;
 	int i, n;
 
@@ -211,7 +207,6 @@ setfont(const char *fontstr)
 }
 
 unsigned int
-textw(const char *text)
-{
+textw(const char *text) {
 	return textnw(text, strlen(text)) + dc.font.height;
 }

dwm.1

@@ -5,28 +5,25 @@ dwm \- dynamic window manager
 .B dwm
 .RB [ \-v ]
 .SH DESCRIPTION
-.B dwm
-is a dynamic window manager for X. It manages windows in tiling and floating
-modes. Either mode can be applied dynamically, optimizing the environment for
-the application in use and the task performed.
+dwm is a dynamic window manager for X. It manages windows in tiling and
+floating modes. Either mode can be applied dynamically, optimizing the
+environment for the application in use and the task performed.
 .P
-In tiling mode windows are managed in a master and stacking column. The master
-column contains the window which currently needs most attention, whereas the
-stacking column contains all other windows. In floating mode windows can be
+In tiling mode windows are managed in a master and stacking area. The master
+area contains the window which currently needs most attention, whereas the
+stacking area contains all other windows. In floating mode windows can be
 resized and moved freely. Dialog windows are always managed floating,
 regardless of the mode selected.
 .P
 Windows are grouped by tags. Each window can be tagged with one or multiple
-tags. Selecting a certain tag for viewing will display all windows with that
-tag.
+tags. Selecting certain tags displays all windows with these tags.
 .P
-.B dwm
-contains a small status bar which displays all available tags, the mode, the
-title of the focused window, and the text read from standard input. The tags of
-the focused window are highlighted with a small point.
+dwm contains a small status bar which displays all available tags, the mode,
+the title of the focused window, and the text read from standard input. The
+selected tags are highlighted with a different color, the tags of the focused
+window are highlighted with a small point.
 .P
-.B dwm
-draws a 1-pixel border around windows to indicate the focus state.
+dwm draws a 1-pixel border around windows to indicate the focus state.
 Unfocused windows contain a small bar in front of them displaying their title.
 .SH OPTIONS
 .TP
@@ -39,30 +36,18 @@ prints version information to standard output, then exits.
 is read and displayed in the status text area.
 .TP
 .B Button1
-click on a tag label views all windows with that
-.BR tag ,
-click on the mode label toggles between
-.B tiled
-and
-.B floating
-mode.
+click on a tag label to display all windows with that tag, click on the mode
+label toggles between tiling and floating mode.
 .TP
 .B Button3
-click on a tag label adds/removes all windows with that
-.B tag
-to/from the view.
+click on a tag label adds/removes all windows with that tag to/from the view,
+click on the mode label toggles the stack position (tiling mode).
 .TP
 .B Mod1-Button1
-click on a tag label applies that
-.B tag
-to the focused
-.BR window .
+click on a tag label applies that tag to the focused window.
 .TP
 .B Mod1-Button3
-click on a tag label adds/removes that
-.B tag
-to/from the focused
-.BR window .
+click on a tag label adds/removes that tag to/from the focused window.
 .SS Keyboard commands
 .TP
 .B Mod1-Shift-Return
@@ -70,102 +55,72 @@ Start
 .BR xterm (1).
 .TP
 .B Mod1-Tab
-Focus next
-.BR window .
+Focus next window.
 .TP
 .B Mod1-Shift-Tab
-Focus previous
-.BR window .
+Focus previous window.
 .TP
 .B Mod1-Return
-Zoom current
-.B window
-to the 
-.B master
-column
-.RB ( tiling
-mode only).
+Zooms/cycles current window to/from master area (tiling mode), toggles maximization current window (floating mode).
 .TP
-.B Mod1-m
-Maximize current
-.BR window .
+.B Mod1-b
+Toggle stack position (tiling mode only).
+.TP
+.B Mod1-g
+Grow current area (tiling mode only).
+.TP
+.B Mod1-s
+Shrink current area (tiling mode only).
 .TP
 .B Mod1-Shift-[1..n]
 Apply
-.B nth tag
-to current
-.BR window .
+.RB nth
+tag to current window.
 .TP
 .B Mod1-Control-Shift-[1..n]
 Add/remove
-.B nth tag
-to/from current
-.BR window .
+.B nth
+tag to/from current window.
 .TP
 .B Mod1-Shift-c
-Close focused
-.B window.
+Close focused window.
 .TP
 .B Mod1-space
-Toggle between
-.B tiled
-and
-.B floating
-mode (affects
-.BR "all windows" ).
+Toggle between tiling and floating mode (affects all windows).
 .TP
 .B Mod1-[1..n]
 View all windows with
-.BR "tag n" .
+.BR nth
+tag.
 .TP
 .B Mod1-0
-View all windows with any
-.BR "tag" .
+View all windows with any tag.
 .TP
 .B Mod1-Control-[1..n]
 Add/remove all windows with
-.B tag n
-to/from the view.
+.BR nth
+tag to/from the view.
 .TP
 .B Mod1-Shift-q
-Quit
-.B dwm.
+Quit dwm.
 .SS Mouse commands
 .TP
 .B Mod1-Button1
-Move current
-.B window
-while dragging
-.RB ( floating
-mode only).
+Move current window while dragging (floating mode only).
 .TP
 .B Mod1-Button2
-Zoom current
-.B window
-to the 
-.B master
-column
-.RB ( tiling
-mode only).
+Zoom current window to the master area (tiling mode only).
 .TP
 .B Mod1-Button3
-Resize current
-.B window
-while dragging
-.RB ( floating
-mode only).
+Resize current window while dragging (floating mode only).
 .SH CUSTOMIZATION
-.B dwm
-is customized by creating a custom config.h and (re)compiling the source
+dwm is customized by creating a custom config.h and (re)compiling the source
 code. This keeps it fast, secure and simple.
 .SH CAVEATS
 The status bar may display
-.B broken pipe
-when
-.B dwm
-has been started by
+.BR "broken pipe"
+when dwm has been started by
 .BR xdm (1),
-because it closes standard output before executing
-.BR dwm .
+because it closes standard output before executing dwm.
 .SH SEE ALSO
 .BR dmenu (1)

dwm.h

@@ -1,6 +1,35 @@
 /*
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for 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 mode is
+ * represented by the arrange() function pointer, which wether points to
+ * dofloat() or dotile(). 
+ *
+ * To understand everything else, start reading main.c:main().
  */
 
 #include "config.h"
@@ -9,25 +38,27 @@
 /* mask shorthands, used in event.c and client.c */
 #define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
 #define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
+/* other stuff used in different places */
+#define BORDERPX		1
 #define PROTODELWIN		1
 
+enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
+enum { WMProtocols, WMDelete, WMLast };			/* default atoms */
+enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
+enum { ColFG, ColBG, ColLast };				/* color */
+
+typedef enum {
+	StackLeft, StackBottom, StackRight
+} StackPos; /* stack position*/
+
+typedef enum {
+	TopLeft, TopRight, BotLeft, BotRight
+} Corner; /* window corners */
+
 typedef union {
 	const char *cmd;
 	int i;
-} Arg;
-
-/* atoms */
-enum { NetSupported, NetWMName, NetLast };
-enum { WMProtocols, WMDelete, WMLast };
-
-/* cursor */
-enum { CurNormal, CurResize, CurMove, CurLast };
-
-/* color */
-enum { ColFG, ColBG, ColLast };
-
-/* window corners */
-typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
+} Arg; /* argument type */
 
 typedef struct {
 	int ascent;
@@ -37,7 +68,7 @@ typedef struct {
 	XFontStruct *xfont;
 } Fnt;
 
-typedef struct { /* draw context */
+typedef struct {
 	int x, y, w, h;
 	unsigned long norm[ColLast];
 	unsigned long sel[ColLast];
@@ -45,96 +76,103 @@ typedef struct { /* draw context */
 	Drawable drawable;
 	Fnt font;
 	GC gc;
-} DC;
+} DC; /* draw context */
 
 typedef struct Client Client;
 struct Client {
 	char name[256];
 	int proto;
 	int x, y, w, h;
-	int tx, ty, tw, th; /* title */
+	int rx, ry, rw, rh; /* revert geometry */
+	int tx, ty, tw, th; /* title window geometry */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int grav;
 	long flags; 
 	unsigned int border, weight;
-	Bool isfloat;
+	Bool isfloat, ismax;
 	Bool *tags;
 	Client *next;
 	Client *prev;
+	Client *snext;
 	Window win;
 	Window twin;
 };
 
-extern const char *tags[];
-extern char stext[1024];
-extern int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
-extern unsigned int ntags, numlockmask;
-extern void (*handler[LASTEvent])(XEvent *);
-extern void (*arrange)(Arg *);
+extern const char *tags[];			/* all tags */
+extern char stext[1024];			/* status text */
+extern int bx, by, bw, bh, bmw;			/* bar geometry, bar mode label width */
+extern int screen, sx, sy, sw, sh;		/* screen geometry */
+extern unsigned int master, ntags, numlockmask;	/* master percent, number of tags, dynamic lock mask */
+extern void (*handler[LASTEvent])(XEvent *);	/* event handler */
+extern void (*arrange)(Arg *);			/* arrange function, indicates mode  */
 extern Atom wmatom[WMLast], netatom[NetLast];
-extern Bool running, issel, maximized, *seltag;
-extern Client *clients, *sel;
+extern Bool running, issel, *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 StackPos stackpos;
 extern Window root, barwin;
 
 /* client.c */
-extern void ban(Client *c);
-extern void focus(Client *c);
-extern Client *getclient(Window w);
-extern Client *getctitle(Window w);
-extern void gravitate(Client *c, Bool invert);
-extern void killclient(Arg *arg);
-extern void manage(Window w, XWindowAttributes *wa);
-extern void resize(Client *c, Bool sizehints, Corner sticky);
-extern void setsize(Client *c);
-extern void settitle(Client *c);
-extern void togglemax(Arg *arg);
-extern void unmanage(Client *c);
+extern void ban(Client *c);			/* ban c from screen */
+extern void configure(Client *c);		/* send synthetic configure event */
+extern void focus(Client *c);			/* focus c, c may be NULL */
+extern Client *getclient(Window w);		/* return client of w */
+extern Client *getctitle(Window w);		/* return client of title window */
+extern void gravitate(Client *c, Bool invert);	/* gravitate c */
+extern void killclient(Arg *arg);		/* kill c nicely */
+extern void manage(Window w, XWindowAttributes *wa);	/* manage new client */
+extern void resize(Client *c, Bool sizehints, Corner sticky); /* resize c*/
+extern void resizetitle(Client *c);		/* resizes c->twin correctly */
+extern void updatesize(Client *c);			/* update the size structs of c */
+extern void updatetitle(Client *c);		/* update the name of c */
+extern void unmanage(Client *c);		/* destroy 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(const char *text);
+extern void drawall(void);			/* draw all visible client titles and the bar */
+extern void drawstatus(void);			/* draw the bar */
+extern void drawtitle(Client *c);		/* draw title of c */
+extern unsigned long getcolor(const char *colstr);	/* return color of colstr */
+extern void setfont(const char *fontstr);	/* set the font for DC */
+extern unsigned int textw(const char *text);	/* return the width of text in px*/
 
 /* event.c */
-extern void grabkeys();
-extern void procevent();
+extern void grabkeys(void);			/* grab all keys defined in config.h */
+extern void procevent(void);			/* process pending X events */
 
 /* 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);
+extern int getproto(Window w);			/* return protocol mask of WMProtocols property of w */
+extern void quit(Arg *arg);			/* quit dwm nicely */
+extern void sendevent(Window w, Atom a, long value);	/* send synthetic event to w */
+extern int xerror(Display *dsply, XErrorEvent *ee);	/* dwm's X error handler */
 
 /* tag.c */
-extern void initrregs();
-extern Client *getnext(Client *c);
-extern Client *getprev(Client *c);
-extern void settags(Client *c);
-extern void tag(Arg *arg);
-extern void toggletag(Arg *arg);
+extern void initrregs(void);			/* initialize regexps of rules defined in config.h */
+extern Client *getnext(Client *c);		/* returns next visible client */
+extern Client *getprev(Client *c);		/* returns previous visible client */
+extern void settags(Client *c, Client *trans);	/* sets tags of c */
+extern void tag(Arg *arg);			/* tags c with arg's index */
+extern void toggletag(Arg *arg);		/* toggles c tags with arg's index */
 
 /* util.c */
-extern void *emallocz(unsigned int size);
-extern void eprint(const char *errstr, ...);
-extern void *erealloc(void *ptr, unsigned int size);
-extern void spawn(Arg *arg);
+extern void *emallocz(unsigned int size);	/* allocates zero-initialized memory, exits on error */
+extern void eprint(const char *errstr, ...);	/* prints errstr and exits with 1 */
+extern void *erealloc(void *ptr, unsigned int size);	/* reallocates memory, exits on error */
+extern void spawn(Arg *arg);			/* forks a new subprocess with to arg's cmd */
 
 /* view.c */
-extern void detach(Client *c);
-extern void dofloat(Arg *arg);
-extern void dotile(Arg *arg);
-extern void focusnext(Arg *arg);
-extern void focusprev(Arg *arg);
-extern Bool isvisible(Client *c);
-extern void restack();
-extern void togglemode(Arg *arg);
-extern void toggleview(Arg *arg);
-extern void view(Arg *arg);
-extern void viewall(Arg *arg);
-extern void zoom(Arg *arg);
+extern void detach(Client *c);			/* detaches c from global client list */
+extern void dofloat(Arg *arg);			/* arranges all windows floating, arg is ignored */
+extern void dotile(Arg *arg);			/* arranges all windows, arg is ignored */
+extern void focusnext(Arg *arg);		/* focuses next visible client, arg is ignored  */
+extern void focusprev(Arg *arg);		/* focuses previous visible client, arg is ignored */
+extern Bool isvisible(Client *c);		/* returns True if client is visible */
+extern void resizecol(Arg *arg);		/* resizes the master percent with arg's index value */
+extern void restack(void);			/* restores z layers of all clients */
+extern void togglestackpos(Arg *arg);		/* toggles stack position */
+extern void togglemode(Arg *arg);		/* toggles global arrange function (dotile/dofloat) */
+extern void toggleview(Arg *arg);		/* toggles the tag with arg's index (in)visible */
+extern void view(Arg *arg);			/* views the tag with arg's index */
+extern void viewall(Arg *arg);			/* views all tags, arg is ignored */
+extern void zoom(Arg *arg);			/* zooms the focused client to master area, arg is ignored */

event.c

@@ -21,8 +21,7 @@ KEYS
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 
 static void
-movemouse(Client *c)
-{
+movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di;
 	unsigned int dui;
 	Window dummy;
@@ -33,11 +32,15 @@ movemouse(Client *c)
 	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);
 		switch (ev.type) {
-		default: break;
+		case ButtonRelease:
+			resize(c, True, TopLeft);
+			XUngrabPointer(dpy, CurrentTime);
+			return;
 		case Expose:
 			handler[Expose](&ev);
 			break;
@@ -47,16 +50,12 @@ movemouse(Client *c)
 			c->y = ocy + (ev.xmotion.y - y1);
 			resize(c, False, TopLeft);
 			break;
-		case ButtonRelease:
-			XUngrabPointer(dpy, CurrentTime);
-			return;
 		}
 	}
 }
 
 static void
-resizemouse(Client *c)
-{
+resizemouse(Client *c) {
 	int ocx, ocy;
 	int nw, nh;
 	Corner sticky;
@@ -67,20 +66,24 @@ resizemouse(Client *c)
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 				None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
+	c->ismax = False;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
 	for(;;) {
 		XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
 		switch(ev.type) {
-		default: break;
+		case ButtonRelease:
+			resize(c, True, TopLeft);
+			XUngrabPointer(dpy, CurrentTime);
+			return;
 		case Expose:
 			handler[Expose](&ev);
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
 			if((nw = abs(ocx - ev.xmotion.x)))
-				c->w = abs(ocx - ev.xmotion.x);
+				c->w = nw;
 			if((nh = abs(ocy - ev.xmotion.y)))
-				c->h = abs(ocy - ev.xmotion.y);
+				c->h = nh;
 			c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
 			c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
 			if(ocx <= ev.xmotion.x)
@@ -89,16 +92,12 @@ resizemouse(Client *c)
 				sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
 			resize(c, True, sticky);
 			break;
-		case ButtonRelease:
-			XUngrabPointer(dpy, CurrentTime);
-			return;
 		}
 	}
 }
 
 static void
-buttonpress(XEvent *e)
-{
+buttonpress(XEvent *e) {
 	int x;
 	Arg a;
 	Client *c;
@@ -127,57 +126,36 @@ buttonpress(XEvent *e)
 		if(ev->x < x + bmw) {
 			if(ev->button == Button1)
 				togglemode(NULL);
+			else if(ev->button == Button3)
+				togglestackpos(NULL);
 		}
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		if(maximized || CLEANMASK(ev->state) != MODKEY)
+		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
-			restack(c);
+			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
 		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
-			restack(c);
+			restack();
 			resizemouse(c);
 		}
 	}
 }
 
 static void
-synconfig(Client *c, int x, int y, int w, int h, unsigned int border)
-{
-	XEvent synev;
-
-	synev.type = ConfigureNotify;
-	synev.xconfigure.display = dpy;
-	synev.xconfigure.event = c->win;
-	synev.xconfigure.window = c->win;
-	synev.xconfigure.x = x;
-	synev.xconfigure.y = y;
-	synev.xconfigure.width = w;
-	synev.xconfigure.height = h;
-	synev.xconfigure.border_width = border;
-	synev.xconfigure.above = None;
-	XSendEvent(dpy, c->win, True, NoEventMask, &synev);
-}
-
-static void
-configurerequest(XEvent *e)
-{
+configurerequest(XEvent *e) {
 	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
-		if((c == sel) && !c->isfloat && (arrange != dofloat) && maximized) {
-			synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
-			XSync(dpy, False);
-			return;
-		}
+		c->ismax = False;
 		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
@@ -198,10 +176,13 @@ configurerequest(XEvent *e)
 		if(newmask)
 			XConfigureWindow(dpy, c->win, newmask, &wc);
 		else
-			synconfig(c, c->x, c->y, c->w, c->h, c->border);
+			configure(c);
 		XSync(dpy, False);
-		if(c->isfloat)
+		if(c->isfloat) {
 			resize(c, False, TopLeft);
+			if(!isvisible(c))
+				ban(c);
+		}
 		else
 			arrange(NULL);
 	}
@@ -219,8 +200,7 @@ configurerequest(XEvent *e)
 }
 
 static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
 
@@ -229,15 +209,14 @@ destroynotify(XEvent *e)
 }
 
 static void
-enternotify(XEvent *e)
-{
+enternotify(XEvent *e) {
 	Client *c;
 	XCrossingEvent *ev = &e->xcrossing;
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
 
-	if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
+	if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
 		focus(c);
 	else if(ev->window == root) {
 		issel = True;
@@ -247,8 +226,7 @@ enternotify(XEvent *e)
 }
 
 static void
-expose(XEvent *e)
-{
+expose(XEvent *e) {
 	Client *c;
 	XExposeEvent *ev = &e->xexpose;
 
@@ -261,8 +239,7 @@ expose(XEvent *e)
 }
 
 static void
-keypress(XEvent *e)
-{
+keypress(XEvent *e) {
 	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeySym keysym;
@@ -270,8 +247,8 @@ keypress(XEvent *e)
 
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
 	for(i = 0; i < len; i++) {
-		if(keysym == key[i].keysym &&
-				CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+		if(keysym == key[i].keysym
+			&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
 		{
 			if(key[i].func)
 				key[i].func(&key[i].arg);
@@ -281,8 +258,7 @@ keypress(XEvent *e)
 }
 
 static void
-leavenotify(XEvent *e)
-{
+leavenotify(XEvent *e) {
 	XCrossingEvent *ev = &e->xcrossing;
 
 	if((ev->window == root) && !ev->same_screen) {
@@ -292,8 +268,7 @@ leavenotify(XEvent *e)
 }
 
 static void
-mappingnotify(XEvent *e)
-{
+mappingnotify(XEvent *e) {
 	XMappingEvent *ev = &e->xmapping;
 
 	XRefreshKeyboardMapping(ev);
@@ -302,8 +277,7 @@ mappingnotify(XEvent *e)
 }
 
 static void
-maprequest(XEvent *e)
-{
+maprequest(XEvent *e) {
 	static XWindowAttributes wa;
 	XMapRequestEvent *ev = &e->xmaprequest;
 
@@ -321,8 +295,7 @@ maprequest(XEvent *e)
 }
 
 static void
-propertynotify(XEvent *e)
-{
+propertynotify(XEvent *e) {
 	Client *c;
 	Window trans;
 	XPropertyEvent *ev = &e->xproperty;
@@ -343,19 +316,19 @@ propertynotify(XEvent *e)
 					arrange(NULL);
 				break;
 			case XA_WM_NORMAL_HINTS:
-				setsize(c);
+				updatesize(c);
 				break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-			settitle(c);
+			updatetitle(c);
+			resizetitle(c);
 			drawtitle(c);
 		}
 	}
 }
 
 static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
 	Client *c;
 	XUnmapEvent *ev = &e->xunmap;
 
@@ -380,8 +353,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 };
 
 void
-grabkeys()
-{
+grabkeys(void) {
 	static unsigned int len = sizeof(key) / sizeof(key[0]);
 	unsigned int i;
 	KeyCode code;
@@ -401,8 +373,7 @@ grabkeys()
 }
 
 void
-procevent()
-{
+procevent(void) {
 	XEvent ev;
 
 	while(XPending(dpy)) {
@@ -411,4 +382,3 @@ procevent()
 			(handler[ev.type])(&ev); /* call handler */
 	}
 }
-

main.c

@@ -19,14 +19,14 @@
 
 char stext[1024];
 Bool *seltag;
-int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
-unsigned int ntags, numlockmask;
+int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh;
+unsigned int master, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
-Bool maximized = False;
 Client *clients = NULL;
 Client *sel = NULL;
+Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
@@ -38,8 +38,7 @@ static int (*xerrorxlib)(Display *, XErrorEvent *);
 static Bool otherwm, readin;
 
 static void
-cleanup()
-{
+cleanup(void) {
 	close(STDIN_FILENO);
 	while(sel) {
 		resize(sel, True, TopLeft);
@@ -55,11 +54,11 @@ cleanup()
 	XDestroyWindow(dpy, barwin);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 	XSync(dpy, False);
+	free(seltag);
 }
 
 static void
-scan()
-{
+scan(void) {
 	unsigned int i, num;
 	Window *wins, d1, d2;
 	XWindowAttributes wa;
@@ -80,8 +79,7 @@ scan()
 }
 
 static void
-setup()
-{
+setup(void) {
 	int i, j;
 	unsigned int mask;
 	Window w;
@@ -110,7 +108,8 @@ setup()
 	}
 	XFree(modmap);
 
-	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask;
+	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
+		| EnterWindowMask | LeaveWindowMask;
 	wa.cursor = cursor[CurNormal];
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
@@ -129,12 +128,15 @@ setup()
 	dc.status[ColBG] = getcolor(STATUSBGCOLOR);
 	dc.status[ColFG] = getcolor(STATUSFGCOLOR);
 	setfont(FONT);
-
-	bmw = textw(FLOATSYMBOL) > textw(TILESYMBOL) ? textw(FLOATSYMBOL) : textw(TILESYMBOL);
+ 
+	bmw = textw(VSTACKSYMBOL) > textw(BSTACKSYMBOL) ?
+		textw(VSTACKSYMBOL) : textw(BSTACKSYMBOL);
+	bmw = bmw > textw(FLOATSYMBOL) ?
+		bmw : textw(FLOATSYMBOL);
 	sx = sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
-	mw = (sw * MASTERW) / 100;
+	master = MASTER;
 
 	bx = by = 0;
 	bw = sw;
@@ -161,8 +163,7 @@ setup()
  * is already running.
  */
 static int
-xerrorstart(Display *dsply, XErrorEvent *ee)
-{
+xerrorstart(Display *dsply, XErrorEvent *ee) {
 	otherwm = True;
 	return -1;
 }
@@ -170,8 +171,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 /* extern */
 
 int
-getproto(Window w)
-{
+getproto(Window w) {
 	int i, format, protos, status;
 	unsigned long extra, res;
 	Atom *protocols, real;
@@ -189,8 +189,7 @@ getproto(Window w)
 }
 
 void
-sendevent(Window w, Atom a, long value)
-{
+sendevent(Window w, Atom a, long value) {
 	XEvent e;
 
 	e.type = ClientMessage;
@@ -204,35 +203,33 @@ sendevent(Window w, Atom a, long value)
 }
 
 void
-quit(Arg *arg)
-{
+quit(Arg *arg) {
 	readin = 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().
+ * default error handler, which may call exit.
  */
 int
-xerror(Display *dpy, XErrorEvent *ee)
-{
+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_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() */
+	return xerrorxlib(dpy, ee); /* may call exit */
 }
 
 int
-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {
 	int r, xfd;
 	fd_set rd;
 

tag.c

@@ -33,22 +33,19 @@ static unsigned int len = 0;
 /* extern */
 
 Client *
-getnext(Client *c)
-{
+getnext(Client *c) {
 	for(; c && !isvisible(c); c = c->next);
 	return c;
 }
 
 Client *
-getprev(Client *c)
-{
+getprev(Client *c) {
 	for(; c && !isvisible(c); c = c->prev);
 	return c;
 }
 
 void
-initrregs()
-{
+initrregs(void) {
 	unsigned int i;
 	regex_t *reg;
 
@@ -76,15 +73,18 @@ initrregs()
 }
 
 void
-settags(Client *c)
-{
+settags(Client *c, Client *trans) {
 	char prop[512];
 	unsigned int i, j;
 	regmatch_t tmp;
-	Bool matched = False;
+	Bool matched = trans != NULL;
 	XClassHint ch;
 
-	if(XGetClassHint(dpy, c->win, &ch)) {
+	if(matched) {
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = trans->tags[i];
+	}
+	else if(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);
@@ -106,13 +106,11 @@ settags(Client *c)
 	if(!matched)
 		for(i = 0; i < ntags; i++)
 			c->tags[i] = seltag[i];
-	for(i = 0; i < ntags && !c->tags[i]; i++);
-	c->weight = i;
+	for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
 }
 
 void
-tag(Arg *arg)
-{
+tag(Arg *arg) {
 	unsigned int i;
 
 	if(!sel)
@@ -121,12 +119,12 @@ tag(Arg *arg)
 	for(i = 0; i < ntags; i++)
 		sel->tags[i] = False;
 	sel->tags[arg->i] = True;
+	sel->weight = arg->i;
 	arrange(NULL);
 }
 
 void
-toggletag(Arg *arg)
-{
+toggletag(Arg *arg) {
 	unsigned int i;
 
 	if(!sel)
@@ -136,5 +134,6 @@ toggletag(Arg *arg)
 	for(i = 0; i < ntags && !sel->tags[i]; i++);
 	if(i == ntags)
 		sel->tags[arg->i] = True;
+	sel->weight = (i == ntags) ? arg->i : i;
 	arrange(NULL);
 }

util.c

@@ -12,8 +12,7 @@
 /* extern */
 
 void *
-emallocz(unsigned int size)
-{
+emallocz(unsigned int size) {
 	void *res = calloc(1, size);
 
 	if(!res)
@@ -22,8 +21,7 @@ emallocz(unsigned int size)
 }
 
 void
-eprint(const char *errstr, ...)
-{
+eprint(const char *errstr, ...) {
 	va_list ap;
 
 	va_start(ap, errstr);
@@ -33,8 +31,7 @@ eprint(const char *errstr, ...)
 }
 
 void *
-erealloc(void *ptr, unsigned int size)
-{
+erealloc(void *ptr, unsigned int size) {
 	void *res = realloc(ptr, size);
 	if(!res)
 		eprint("fatal: could not malloc() %u bytes\n", size);
@@ -42,8 +39,7 @@ erealloc(void *ptr, unsigned int size)
 }
 
 void
-spawn(Arg *arg)
-{
+spawn(Arg *arg) {
 	static char *shell = NULL;
 
 	if(!shell && !(shell = getenv("SHELL")))
@@ -51,7 +47,8 @@ spawn(Arg *arg)
 
 	if(!arg->cmd)
 		return;
-	/* the double-fork construct avoids zombie processes */
+	/* The double-fork construct avoids zombie processes and keeps the code
+	 * clean from stupid signal handlers. */
 	if(fork() == 0) {
 		if(fork() == 0) {
 			if(dpy)

view.c

@@ -3,25 +3,29 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-#include <stdio.h>
 
 /* static */
 
 static Client *
-minclient()
-{
+minclient(void) {
 	Client *c, *min;
 
+	if((clients && clients->isfloat) || arrange == dofloat)
+		return clients; /* don't touch floating order */
 	for(min = c = clients; c; c = c->next)
 		if(c->weight < min->weight)
 			min = c;
 	return min;
 }
 
+static Client *
+nexttiled(Client *c) {
+	for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+	return c;
+}
 
 static void
-reorder()
-{
+reorder(void) {
 	Client *c, *newclients, *tail;
 
 	newclients = tail = NULL;
@@ -38,13 +42,33 @@ reorder()
 	clients = newclients;
 }
 
+static void
+togglemax(Client *c)
+{
+	XEvent ev;
+	if((c->ismax = !c->ismax)) {
+		c->rx = c->x; c->x = sx;
+		c->ry = c->y; c->y = bh;
+		c->rw = c->w; c->w = sw - 2 * BORDERPX;
+		c->rh = c->h; c->h = sh - bh - 2 * BORDERPX;
+	}
+	else {
+		c->x = c->rx;
+		c->y = c->ry;
+		c->w = c->rw;
+		c->h = c->rh;
+	}
+	resize(c, True, TopLeft);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
+StackPos stackpos = STACKPOS;
 
 void
-detach(Client *c)
-{
+detach(Client *c) {
 	if(c->prev)
 		c->prev->next = c->next;
 	if(c->next)
@@ -55,12 +79,9 @@ detach(Client *c)
 }
 
 void
-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {
 	Client *c;
 
-	maximized = False;
-
 	for(c = clients; c; c = c->next) {
 		if(isvisible(c)) {
 			resize(c, True, TopLeft);
@@ -68,28 +89,42 @@ dofloat(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		focus(getnext(clients));
+	if(!sel || !isvisible(sel)) {
+		for(c = stack; c && !isvisible(c); c = c->snext);
+		focus(c);
+	}
 	restack();
 }
 
+/* This algorithm is based on a (M)aster area and a (S)tacking area.
+ * It supports following arrangements:
+ * 	SSMMM	MMMMM	MMMSS
+ * 	SSMMM	SSSSS	MMMSS
+ */
 void
-dotile(Arg *arg)
-{
-	int h, i, n, w;
+dotile(Arg *arg) {
+	unsigned int i, n, md, stackw, stackh, tw, th;
 	Client *c;
 
-	maximized = False;
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+		n++;
 
-	w = sw - mw;
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
-			n++;
+	if(stackpos == StackBottom) {
+		md = ((sh - bh) * master) / 100;
+		stackw = sw;
+		stackh = sh - bh - md;
+	}
+	else {
+		md = (sw * master) / 100;
+		stackw = sw - md;
+		stackh = sh - bh;
+	}
 
+	tw = stackw;
 	if(n > 1)
-		h = (sh - bh) / (n - 1);
+		th = stackh / (n - 1);
 	else
-		h = sh - bh;
+		th = stackh;
 
 	for(i = 0, c = clients; c; c = c->next) {
 		if(isvisible(c)) {
@@ -97,32 +132,54 @@ dotile(Arg *arg)
 				resize(c, True, TopLeft);
 				continue;
 			}
-			if(n == 1) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = sw - 2;
-				c->h = sh - 2 - bh;
+			c->ismax = False;
+			c->x = sx;
+			c->y = sy + bh;
+			if(n == 1) { /* only 1 window */
+				c->w = sw - 2 * BORDERPX;
+				c->h = sh - 2 * BORDERPX - bh;
 			}
-			else if(i == 0) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = mw - 2;
-				c->h = sh - 2 - bh;
+			else if(i == 0) { /* master window */
+				if(stackpos == StackLeft)
+					c->x += stackw;
+				switch(stackpos) {
+				case StackLeft:
+				case StackRight:
+					c->w = md - 2 * BORDERPX;
+					c->h = sh - bh - 2 * BORDERPX;
+					break;
+				case StackBottom:
+					c->w = sw - 2 * BORDERPX;
+					c->h = md - 2 * BORDERPX;
+					break;
+				}
 			}
-			else if(h > bh) {
-				c->x = sx + mw;
-				c->y = sy + (i - 1) * h + bh;
-				c->w = w - 2;
-				if(i + 1 == n)
-					c->h = sh - c->y - 2;
-				else
-					c->h = h - 2;
-			}
-			else { /* fallback if h < bh */
-				c->x = sx + mw;
-				c->y = sy + bh;
-				c->w = w - 2;
-				c->h = sh - 2 - bh;
+			else {  /* tile window */
+				if(stackpos == StackRight)
+					c->x += md;
+				if(th > bh) {
+					switch(stackpos) {
+					case StackLeft:
+					case StackRight:
+						c->y = sy + (i - 1) * th + bh;
+						if(i + 1 == n)
+							c->h = sh - c->y - 2 * BORDERPX;
+						break;
+					case StackBottom:
+						c->y = sy + md + (i - 1) * th + bh;
+						if(i + 1 == n)
+							c->h = sh - c->y - 2 * BORDERPX;
+						break;
+					}
+					c->w = tw - 2 * BORDERPX;
+					c->h = th - 2 * BORDERPX;
+				}
+				else { /* fallback if th < bh */
+					if(stackpos == StackBottom)
+						c->y += md;
+					c->w = stackw - 2 * BORDERPX;
+					c->h = stackh - 2 * BORDERPX;
+				}
 			}
 			resize(c, False, TopLeft);
 			i++;
@@ -130,14 +187,15 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		focus(getnext(clients));
+	if(!sel || !isvisible(sel)) {
+		for(c = stack; c && !isvisible(c); c = c->snext);
+		focus(c);
+	}
 	restack();
 }
 
 void
-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {
 	Client *c;
    
 	if(!sel)
@@ -152,8 +210,7 @@ focusnext(Arg *arg)
 }
 
 void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
 	Client *c;
 
 	if(!sel)
@@ -170,8 +227,7 @@ focusprev(Arg *arg)
 }
 
 Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -181,60 +237,61 @@ isvisible(Client *c)
 }
 
 void
-restack()
-{
-	static unsigned int nwins = 0;
-	static Window *wins = NULL;
-	unsigned int f, fi, m, mi, n;
+resizecol(Arg *arg) {
+	unsigned int n;
+	Client *c;
+
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
+			n++;
+	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
+		return;
+
+	if(sel == getnext(clients)) {
+		if(master + arg->i > 95 || master + arg->i < 5)
+			return;
+		master += arg->i;
+	}
+	else {
+		if(master - arg->i > 95 || master - arg->i < 5)
+			return;
+		master -= arg->i;
+	}
+	arrange(NULL);
+}
+
+void
+restack(void) {
 	Client *c;
 	XEvent ev;
 
-	for(f = 0, m = 0, c = clients; c; c = c->next)
-		if(isvisible(c)) {
-			if(c->isfloat || arrange == dofloat)
-				f++;
-			else
-				m++;
-		}
-	if(!(n = 2 * (f + m))) {
+	if(!sel) {
 		drawstatus();
 		return;
 	}
-	if(nwins < n) {
-		nwins = n;
-		wins = erealloc(wins, nwins * sizeof(Window));
-	}
-
-	fi = 0;
-	mi = 2 * f;
 	if(sel->isfloat || arrange == dofloat) {
-		wins[fi++] = sel->twin;
-		wins[fi++] = sel->win;
+		XRaiseWindow(dpy, sel->win);
+		XRaiseWindow(dpy, sel->twin);
 	}
-	else {
-		wins[mi++] = sel->twin;
-		wins[mi++] = sel->win;
-	}
-	for(c = clients; c; c = c->next)
-		if(isvisible(c) && c != sel) {
-			if(c->isfloat || arrange == dofloat) {
-				wins[fi++] = c->twin;
-				wins[fi++] = c->win;
-			}
-			else {
-				wins[mi++] = c->twin;
-				wins[mi++] = c->win;
-			}
+	if(arrange != dofloat) {
+		if(!sel->isfloat) {
+			XLowerWindow(dpy, sel->twin);
+			XLowerWindow(dpy, sel->win);
 		}
-	XRestackWindows(dpy, wins, n);
+		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+			if(c == sel)
+				continue;
+			XLowerWindow(dpy, c->twin);
+			XLowerWindow(dpy, c->win);
+		}
+	}
 	drawall();
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
-togglemode(Arg *arg)
-{
+togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
 	if(sel)
 		arrange(NULL);
@@ -243,8 +300,7 @@ togglemode(Arg *arg)
 }
 
 void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
 	unsigned int i;
 
 	seltag[arg->i] = !seltag[arg->i];
@@ -256,8 +312,18 @@ toggleview(Arg *arg)
 }
 
 void
-view(Arg *arg)
-{
+togglestackpos(Arg *arg) {
+	if(arrange == dofloat)
+		return;
+	if(stackpos == StackBottom)
+		stackpos = STACKPOS;
+	else
+		stackpos = StackBottom;
+	arrange(NULL);
+}
+
+void
+view(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -268,8 +334,7 @@ view(Arg *arg)
 }
 
 void
-viewall(Arg *arg)
-{
+viewall(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -278,20 +343,34 @@ viewall(Arg *arg)
 	arrange(NULL);
 }
 
-void
-zoom(Arg *arg)
-{
-	Client *c = sel;
 
-	if(!c || (arrange != dotile) || c->isfloat || maximized)
+
+void
+zoom(Arg *arg) {
+	unsigned int n;
+	Client *c;
+
+	if(!sel)
 		return;
 
-	if(c == getnext(clients))
-		if(!(c = getnext(c->next)))
+	if(sel->isfloat || (arrange == dofloat)) {
+		togglemax(sel);
+		return;
+	}
+
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
+			n++;
+	if(n < 2 || (arrange == dofloat))
+		return;
+
+	if((c = sel) == nexttiled(clients))
+		if(!(c = nexttiled(c->next)))
 			return;
 	detach(c);
+	if(clients)
+		clients->prev = c;
 	c->next = clients;
-	clients->prev = c;
 	clients = c;
 	focus(c);
 	arrange(NULL);