removed erealloc (not used)

.hgtags

@@ -14,3 +14,19 @@ 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

LICENSE

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

Makefile

@@ -1,5 +1,5 @@
 # dwm - dynamic window manager
-#   (C)opyright MMVI Anselm R. Garbe
+#   (C)opyright MMVII Anselm R. Garbe
 
 include config.mk
 

README

@@ -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

@@ -1,5 +1,4 @@
-/*
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -54,19 +53,6 @@ grabbuttons(Client *c, Bool focused) {
 				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) {
 	return 0;
@@ -74,12 +60,6 @@ xerrordummy(Display *dsply, XErrorEvent *ee) {
 
 /* extern functions */
 
-void
-ban(Client *c) {
-	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-	XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
-}
-
 void
 configure(Client *c) {
 	XEvent synev;
@@ -110,7 +90,7 @@ focus(Client *c) {
 		sel = c;
 		if(old) {
 			grabbuttons(old, False);
-			drawtitle(old);
+			XSetWindowBorder(dpy, old->win, dc.norm[ColBorder]);
 		}
 	}
 	if(c) {
@@ -118,11 +98,12 @@ focus(Client *c) {
 		c->snext = stack;
 		stack = c;
 		grabbuttons(c, True);
-		drawtitle(c);
+		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	drawstatus();
 }
 
 Client *
@@ -135,70 +116,6 @@ getclient(Window w) {
 	return NULL;
 }
 
-Client *
-getctitle(Window w) {
-	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(c->twin == w)
-			return c;
-	return NULL;
-}
-
-void
-gravitate(Client *c, Bool invert) {
-	int dx = 0, dy = 0;
-
-	switch(c->grav) {
-	default:
-		break;
-	case StaticGravity:
-	case NorthWestGravity:
-	case NorthGravity:
-	case NorthEastGravity:
-		dy = c->border;
-		break;
-	case EastGravity:
-	case CenterGravity:
-	case WestGravity:
-		dy = -(c->h / 2) + c->border;
-		break;
-	case SouthEastGravity:
-	case SouthGravity:
-	case SouthWestGravity:
-		dy = -(c->h);
-		break;
-	}
-
-	switch (c->grav) {
-	default:
-		break;
-	case StaticGravity:
-	case NorthWestGravity:
-	case WestGravity:
-	case SouthWestGravity:
-		dx = c->border;
-		break;
-	case NorthGravity:
-	case CenterGravity:
-	case SouthGravity:
-		dx = -(c->w / 2) + c->border;
-		break;
-	case NorthEastGravity:
-	case EastGravity:
-	case SouthEastGravity:
-		dx = -(c->w + c->border);
-		break;
-	}
-
-	if(invert) {
-		dx = -dx;
-		dy = -dy;
-	}
-	c->x += dx;
-	c->y += dy;
-}
-
 void
 killclient(Arg *arg) {
 	if(!sel)
@@ -213,62 +130,43 @@ void
 manage(Window w, XWindowAttributes *wa) {
 	Client *c;
 	Window trans;
-	XSetWindowAttributes twa;
 
 	c = emallocz(sizeof(Client));
 	c->tags = emallocz(ntags * sizeof(Bool));
 	c->win = w;
-	c->x = c->tx = wa->x;
-	c->y = c->ty = wa->y;
-	c->w = c->tw = wa->width;
-	c->h = wa->height;
-	c->th = bh;
-
 	c->border = 0;
-	updatesize(c);
+	c->x = wa->x;
-
+	c->y = wa->y;
-	if(c->x + c->w + 2 > sw)
+	c->w = wa->width;
-		c->x = sw - c->w - 2;
+	c->h = wa->height;
-	if(c->x < 0)
+	updatesizehints(c);
-		c->x = 0;
+	if(c->x + c->w + 2 * BORDERPX > sw)
-	if(c->y + c->h + 2 > sh)
+		c->x = sw - c->w - 2 * BORDERPX;
-		c->y = sh - c->h - 2;
+	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;
-
 	c->proto = getproto(c->win);
 	XSelectInput(dpy, c->win,
 		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
 	XGetTransientForHint(dpy, c->win, &trans);
-	twa.override_redirect = 1;
-	twa.background_pixmap = ParentRelative;
-	twa.event_mask = ExposureMask | EnterWindowMask;
-
-	c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
-			0, DefaultDepth(dpy, screen), CopyFromParent,
-			DefaultVisual(dpy, screen),
-			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
-
 	grabbuttons(c, False);
+	updatetitle(c);
 	settags(c, getclient(trans));
 	if(!c->isfloat)
-		c->isfloat = trans
+		c->isfloat = trans || c->isfixed;
-			|| (c->maxw && c->minw &&
-				c->maxw == c->minw && c->maxh == c->minh);
-
 	if(clients)
 		clients->prev = c;
 	c->next = clients;
 	c->snext = stack;
 	stack = clients = c;
-
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-	updatetitle(c);
-	ban(c);
 	XMapWindow(dpy, c->win);
-	XMapWindow(dpy, c->twin);
 	if(isvisible(c))
 		focus(c);
-	arrange(NULL);
+	arrange();
 }
 
 void
@@ -295,18 +193,15 @@ resize(Client *c, Bool sizehints, Corner sticky) {
 		c->x = right - c->w;
 	if(sticky == BotLeft || sticky == BotRight)
 		c->y = bottom - c->h;
-
 	/* offscreen appearance fixes */
-	if(c->x + c->w < 0)
+	if(c->x + c->w < sx)
-		c->x = 0;
+		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;
 	wc.width = c->w;
@@ -314,14 +209,14 @@ resize(Client *c, Bool sizehints, Corner sticky) {
 	if(c->w == sw && c->h == sh)
 		wc.border_width = 0;
 	else
-		wc.border_width = 1;
+		wc.border_width = BORDERPX;
 	XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
 	configure(c);
 	XSync(dpy, False);
 }
 
 void
-updatesize(Client *c) {
+updatesizehints(Client *c) {
 	long msize;
 	XSizeHints size;
 
@@ -352,10 +247,8 @@ updatesize(Client *c) {
 	}
 	else
 		c->minw = c->minh = 0;
-	if(c->flags & PWinGravity)
+	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
-		c->grav = size.win_gravity;
+				c->maxw == c->minw && c->maxh == c->minh);
-	else
-		c->grav = NorthWestGravity;
 }
 
 void
@@ -372,17 +265,16 @@ updatetitle(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);
 	else {
 		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
 				&& n > 0 && *list)
 		{
-			strncpy(c->name, *list, sizeof(c->name));
+			strncpy(c->name, *list, sizeof c->name);
 			XFreeStringList(list);
 		}
 	}
 	XFree(name.value);
-	resizetitle(c);
 }
 
 void
@@ -392,22 +284,17 @@ unmanage(Client *c) {
 	/* The server grab construct avoids race conditions. */
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
-
 	detach(c);
 	detachstack(c);
 	if(sel == c) {
 		for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
 		focus(nc);
 	}
-
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	XDestroyWindow(dpy, c->twin);
-
 	free(c->tags);
 	free(c);
-
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	arrange(NULL);
+	arrange();
 }

config.arg.h

@@ -1,68 +1,92 @@
-/*
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 
 #define TAGS \
-const char *tags[] = { "dev", "work", "net", "fnord", NULL };
+const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 
-#define DEFMODE			dotile /* dofloat */
+#define DEFMODE			dotile		/* dofloat */
 #define FLOATSYMBOL		"><>"
 #define TILESYMBOL		"[]="
 
-#define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
+#define FONT			"-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
-#define NORMBGCOLOR		"#333333"
+#define NORMBORDERCOLOR		"#333"
-#define NORMFGCOLOR		"#dddddd"
+#define NORMBGCOLOR		"#222"
-#define SELBGCOLOR		"#333366"
+#define NORMFGCOLOR		"#ccc"
-#define SELFGCOLOR		"#eeeeee"
+#define SELBORDERCOLOR		"#9cf"
-#define STATUSBGCOLOR		"#222222"
+#define SELBGCOLOR		"#555"
-#define STATUSFGCOLOR		"#9999cc"
+#define SELFGCOLOR		"#fff"
 
-#define MASTERW			60 /* percent */
+#define MASTER			600		/* per thousand */
 #define MODKEY			Mod1Mask
+#define NMASTER			1		/* clients in master area */
+#define SNAP			40		/* pixel */
 
 #define KEYS \
 static Key key[] = { \
-	/* modifier			key		function	arguments */ \
+	/* modifier			key		function	argument */ \
 	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
-		{ .cmd = "exec uxterm -bg '#111111' -fg '#eeeeee' -cr '#eeeeee' +sb -fn '"FONT"'" } }, \
+		{ .cmd = "exec uxterm -bg '#222' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" } }, \
 	{ MODKEY,			XK_p,		spawn, \
-		{ .cmd = "exe=\"$(IFS=:; for dir in $PATH; do " \
+		{ .cmd = "exe=\"$(lsx `echo $PATH | sed 's/:/ /g'` | sort -u " \
-			 "for file in \"$dir\"/*; do [ -x \"$file\" ] && echo \"${file##*/}\"; done; done " \
+			" | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' " \
-			 "| sort -u | dmenu -font '"FONT"' -normbg '"NORMBGCOLOR"' -normfg '"NORMFGCOLOR"' " \
+			"-sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"')\" && exec $exe" } }, \
-			 "-selbg '"SELBGCOLOR"' -selfg '"SELFGCOLOR"')\" && exec $exe" } }, \
 	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
 	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
 	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY,			XK_g,		resizecol,	{ .i = 20 } }, \
+	{ MODKEY,			XK_g,		resizemaster,	{ .i = 15 } }, \
-	{ MODKEY,			XK_s,		resizecol,	{ .i = -20 } }, \
+	{ MODKEY,			XK_s,		resizemaster,	{ .i = -15 } }, \
+	{ MODKEY,			XK_i,		incnmaster,	{ .i = 1 } }, \
+	{ MODKEY,			XK_d,		incnmaster,	{ .i = -1 } }, \
+	{ MODKEY|ShiftMask,		XK_0,		tag,		{ .i = -1 } }, \
 	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
 	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
 	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
 	{ MODKEY|ShiftMask,		XK_4,		tag,		{ .i = 3 } }, \
+	{ MODKEY|ShiftMask,		XK_5,		tag,		{ .i = 4 } }, \
+	{ MODKEY|ShiftMask,		XK_6,		tag,		{ .i = 5 } }, \
+	{ MODKEY|ShiftMask,		XK_7,		tag,		{ .i = 6 } }, \
+	{ MODKEY|ShiftMask,		XK_8,		tag,		{ .i = 7 } }, \
+	{ MODKEY|ShiftMask,		XK_9,		tag,		{ .i = 8 } }, \
 	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 0 } }, \
 	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 1 } }, \
 	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 2 } }, \
 	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	{ .i = 3 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	{ .i = 4 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	{ .i = 5 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	{ .i = 6 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	{ .i = 7 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	{ .i = 8 } }, \
 	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
 	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
-	{ MODKEY,			XK_0,		viewall,	{ 0 } }, \
+	{ MODKEY|ShiftMask,		XK_space,	togglefloat,	{ 0 } }, \
+	{ MODKEY,			XK_0,		view,		{ .i = -1 } }, \
 	{ MODKEY,			XK_1,		view,		{ .i = 0 } }, \
 	{ MODKEY,			XK_2,		view,		{ .i = 1 } }, \
 	{ MODKEY,			XK_3,		view,		{ .i = 2 } }, \
 	{ MODKEY,			XK_4,		view,		{ .i = 3 } }, \
+	{ MODKEY,			XK_5,		view,		{ .i = 4 } }, \
+	{ MODKEY,			XK_6,		view,		{ .i = 5 } }, \
+	{ MODKEY,			XK_7,		view,		{ .i = 6 } }, \
+	{ MODKEY,			XK_8,		view,		{ .i = 7 } }, \
+	{ MODKEY,			XK_9,		view,		{ .i = 8 } }, \
 	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 0 } }, \
 	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 1 } }, \
 	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 2 } }, \
 	{ MODKEY|ControlMask,		XK_4,		toggleview,	{ .i = 3 } }, \
+	{ MODKEY|ControlMask,		XK_5,		toggleview,	{ .i = 4 } }, \
+	{ MODKEY|ControlMask,		XK_6,		toggleview,	{ .i = 5 } }, \
+	{ MODKEY|ControlMask,		XK_7,		toggleview,	{ .i = 6 } }, \
+	{ MODKEY|ControlMask,		XK_8,		toggleview,	{ .i = 7 } }, \
+	{ MODKEY|ControlMask,		XK_9,		toggleview,	{ .i = 8 } }, \
 	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
 };
 
 #define RULES \
 static Rule rule[] = { \
 	/* class:instance:title regex	tags regex	isfloat */ \
-	{ "Firefox.*",			"net",		True}, \
+	{ "Firefox.*",			"3",		False }, \
-	{ "Gimp.*",			NULL,		True}, \
+	{ "Gimp.*",			NULL,		True }, \
-	{ "MPlayer.*",			NULL,		True}, \
+	{ "MPlayer.*",			NULL,		True }, \
-	{ "Acroread.*",			NULL,		True}, \
+	{ "Acroread.*",			NULL,		True }, \
 };

config.default.h

@@ -1,58 +1,79 @@
-/*
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 
 #define TAGS \
-const char *tags[] = { "1", "2", "3", "4", "5", NULL };
+const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 
-#define DEFMODE			dotile /* dofloat */
+#define DEFMODE			dotile		/* dofloat */
 #define FLOATSYMBOL		"><>"
 #define TILESYMBOL		"[]="
 
-#define FONT			"fixed"
+#define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
-#define NORMBGCOLOR		"#333366"
+#define NORMBORDERCOLOR		"#dddddd"
-#define NORMFGCOLOR		"#cccccc"
+#define NORMBGCOLOR		"#eeeeee"
-#define SELBGCOLOR		"#666699"
+#define NORMFGCOLOR		"#222222"
-#define SELFGCOLOR		"#eeeeee"
+#define SELBORDERCOLOR		"#ff0000"
-#define STATUSBGCOLOR		"#dddddd"
+#define SELBGCOLOR		"#006699"
-#define STATUSFGCOLOR		"#222222"
+#define SELFGCOLOR		"#ffffff"
 
-#define MASTERW			60 /* percent */
+#define MASTER			600		/* per thousand */
 #define MODKEY			Mod1Mask
+#define NMASTER			1		/* clients in master area */
+#define SNAP			20		/* pixel */
 
 #define KEYS \
 static Key key[] = { \
-	/* modifier			key		function	arguments */ \
+	/* modifier			key		function	argument */ \
 	{ MODKEY|ShiftMask,		XK_Return,	spawn,		{ .cmd = "exec xterm" } }, \
 	{ MODKEY,			XK_Tab,		focusnext,	{ 0 } }, \
 	{ MODKEY|ShiftMask,		XK_Tab,		focusprev,	{ 0 } }, \
 	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY,			XK_g,		resizecol,	{ .i = 20 } }, \
+	{ MODKEY,			XK_g,		resizemaster,	{ .i = 15 } }, \
-	{ MODKEY,			XK_s,		resizecol,	{ .i = -20 } }, \
+	{ MODKEY,			XK_s,		resizemaster,	{ .i = -15 } }, \
+	{ MODKEY,			XK_i,		incnmaster,	{ .i = 1 } }, \
+	{ MODKEY,			XK_d,		incnmaster,	{ .i = -1 } }, \
+	{ MODKEY|ShiftMask,		XK_0,		tag,		{ .i = -1 } }, \
 	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
 	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
 	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
 	{ MODKEY|ShiftMask,		XK_4,		tag,		{ .i = 3 } }, \
 	{ MODKEY|ShiftMask,		XK_5,		tag,		{ .i = 4 } }, \
+	{ MODKEY|ShiftMask,		XK_6,		tag,		{ .i = 5 } }, \
+	{ MODKEY|ShiftMask,		XK_7,		tag,		{ .i = 6 } }, \
+	{ MODKEY|ShiftMask,		XK_8,		tag,		{ .i = 7 } }, \
+	{ MODKEY|ShiftMask,		XK_9,		tag,		{ .i = 8 } }, \
 	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	{ .i = 0 } }, \
 	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	{ .i = 1 } }, \
 	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	{ .i = 2 } }, \
 	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	{ .i = 3 } }, \
 	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	{ .i = 4 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	{ .i = 5 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	{ .i = 6 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	{ .i = 7 } }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	{ .i = 8 } }, \
 	{ MODKEY|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
 	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
-	{ MODKEY,			XK_0,		viewall,	{ 0 } }, \
+	{ MODKEY|ShiftMask,		XK_space,	togglefloat,	{ 0 } }, \
+	{ MODKEY,			XK_0,		view,		{ .i = -1 } }, \
 	{ MODKEY,			XK_1,		view,		{ .i = 0 } }, \
 	{ MODKEY,			XK_2,		view,		{ .i = 1 } }, \
 	{ MODKEY,			XK_3,		view,		{ .i = 2 } }, \
 	{ MODKEY,			XK_4,		view,		{ .i = 3 } }, \
 	{ MODKEY,			XK_5,		view,		{ .i = 4 } }, \
+	{ MODKEY,			XK_6,		view,		{ .i = 5 } }, \
+	{ MODKEY,			XK_7,		view,		{ .i = 6 } }, \
+	{ MODKEY,			XK_8,		view,		{ .i = 7 } }, \
+	{ MODKEY,			XK_9,		view,		{ .i = 8 } }, \
 	{ MODKEY|ControlMask,		XK_1,		toggleview,	{ .i = 0 } }, \
 	{ MODKEY|ControlMask,		XK_2,		toggleview,	{ .i = 1 } }, \
 	{ MODKEY|ControlMask,		XK_3,		toggleview,	{ .i = 2 } }, \
 	{ MODKEY|ControlMask,		XK_4,		toggleview,	{ .i = 3 } }, \
 	{ MODKEY|ControlMask,		XK_5,		toggleview,	{ .i = 4 } }, \
+	{ MODKEY|ControlMask,		XK_6,		toggleview,	{ .i = 5 } }, \
+	{ MODKEY|ControlMask,		XK_7,		toggleview,	{ .i = 6 } }, \
+	{ MODKEY|ControlMask,		XK_8,		toggleview,	{ .i = 7 } }, \
+	{ MODKEY|ControlMask,		XK_9,		toggleview,	{ .i = 8 } }, \
 	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } }, \
 };
 
@@ -61,6 +82,5 @@ static Key key[] = { \
 #define RULES \
 static Rule rule[] = { \
 	/* class:instance:title regex	tags regex	isfloat */ \
-	{ "Firefox.*",			"2",		False }, \
+	{ "Gimp.*",			NULL,		True }, \
-	{ "Gimp.*",			NULL,		True}, \
 };

config.mk

@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 1.7
+VERSION = 3.1
 
 # Customize below to fit your system
 
@@ -20,6 +20,11 @@ LDFLAGS = ${LIBS}
 #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = -g ${LIBS}
 
+# Solaris
+#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+#LDFLAGS = ${LIBS}
+#CFLAGS += -xtarget=ultra
+
 # compiler and linker
 CC = cc
 LD = ${CC}

draw.c

@@ -1,14 +1,22 @@
-/*
+/* (C)opyright MMIV-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xlocale.h>
 
 /* static */
 
+static 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(const char *text, unsigned int len) {
 	XRectangle r;
@@ -21,30 +29,27 @@ 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 filledsquare, Bool emptysquare) {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+	XPoint pt[5];
 
 	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))
+	if(len >= sizeof buf)
-		len = sizeof(buf) - 1;
+		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;
@@ -56,7 +61,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
 		if(len > 3)
 			buf[len - 3] = '.';
 	}
-
 	if(w > dc.w)
 		return; /* too long */
 	gcv.foreground = col[ColFG];
@@ -69,78 +73,58 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
 		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
-	if(highlight) {
+	x = (h + 2) / 4;
-		r.x = dc.x + 2;
+	if(filledsquare) {
-		r.y = dc.y + 2;
+		r.x = dc.x + 1;
-		r.width = r.height = 3;
+		r.y = dc.y + 1;
+		r.width = r.height = x + 1;
 		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
+	else if(emptysquare) {
+		pt[0].x = dc.x + 1;
+		pt[0].y = dc.y + 1;
+		pt[1].x = x;
+		pt[1].y = 0;
+		pt[2].x = 0;
+		pt[2].y = x;
+		pt[3].x = -x;
+		pt[3].y = 0;
+		pt[4].x = 0;
+		pt[4].y = -x;
+		XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious);
+	}
 }
 
 /* extern */
 
-void
-drawall(void) {
-	Client *c;
-
-	for(c = clients; c; c = getnext(c->next))
-		drawtitle(c);
-	drawstatus();
-}
-
 void
 drawstatus(void) {
 	int i, x;
 
 	dc.x = dc.y = 0;
-
 	for(i = 0; i < ntags; i++) {
 		dc.w = textw(tags[i]);
 		if(seltag[i])
-			drawtext(tags[i], dc.sel, sel && sel->tags[i]);
+			drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i));
 		else
-			drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+			drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i));
 		dc.x += dc.w;
 	}
-
 	dc.w = bmw;
-	drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False);
+	drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);
-
 	x = dc.x + dc.w;
 	dc.w = textw(stext);
-	dc.x = bx + bw - dc.w;
+	dc.x = sw - dc.w;
 	if(dc.x < x) {
 		dc.x = x;
-		dc.w = bw - x;
+		dc.w = sw - x;
 	}
-	drawtext(stext, dc.status, False);
+	drawtext(stext, dc.norm, False, False);
-
 	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
-		if(sel)
+		drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
-			drawtext(sel->name, dc.sel, False);
-		else
-			drawtext(NULL, dc.norm, False);
 	}
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
-	XSync(dpy, False);
-}
-
-void
-drawtitle(Client *c) {
-	if(c == sel && issel) {
-		drawstatus();
-		XUnmapWindow(dpy, c->twin);
-		XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
-		return;
-	}
-
-	XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
-	XMapWindow(dpy, c->twin);
-	dc.x = dc.y = 0;
-	dc.w = c->tw;
-	drawtext(c->name, dc.norm, False);
-	XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
 	XSync(dpy, False);
 }
 
@@ -156,11 +140,10 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
-	char **missing, *def;
+	char *def, **missing;
 	int i, n;
 
 	missing = NULL;
-	setlocale(LC_ALL, "");
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
@@ -168,16 +151,11 @@ setfont(const char *fontstr) {
 		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);
@@ -193,11 +171,8 @@ setfont(const char *fontstr) {
 		if(dc.font.xfont)
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
-		dc.font.xfont = XLoadQueryFont(dpy, fontstr);
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
-		if (!dc.font.xfont)
+			eprint("error, cannot load font: '%s'\n", fontstr);
-			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;
 	}

dwm.1

@@ -9,22 +9,23 @@ 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
+In tiling mode windows are managed in a master and stacking area. The master
-column contains the window which currently needs most attention, whereas the
+area contains the windows which currently need most attention, whereas the
-stacking column contains all other windows. In floating mode windows can be
+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.
+regardless of the mode applied.
 .P
 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
 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
+selected tags are indicated with a different color. The tags of the focused
-window are highlighted with a small point.
+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 1-pixel border around windows to indicate the focus state.
-Unfocused windows contain a small bar in front of them displaying their title.
 .SH OPTIONS
 .TP
 .B \-v
@@ -37,11 +38,17 @@ is read and displayed in the status text area.
 .TP
 .B Button1
 click on a tag label to display all windows with that tag, click on the mode
-label toggles between tiled and floating mode.
+label toggles between tiling and floating mode.
 .TP
 .B Button3
 click on a tag label adds/removes all windows with that tag to/from the view.
 .TP
+.B Button4
+click on the mode label increases the number of windows in the master area (tiling mode only).
+.TP
+.B Button5
+click on the mode label decreases the number of windows in the master area (tiling mode only).
+.TP
 .B Mod1-Button1
 click on a tag label applies that tag to the focused window.
 .TP
@@ -60,19 +67,28 @@ Focus next window.
 Focus previous window.
 .TP
 .B Mod1-Return
-Zooms/cycles current window to/from master column (tiling mode), toggles maximization current window (floating mode).
+Zooms/cycles current window to/from master area (tiling mode), toggles maximization current window (floating mode).
 .TP
 .B Mod1-g
-Grow current column (tiling mode only).
+Grow master area (tiling mode only).
 .TP
 .B Mod1-s
-Shrink current column (tiling mode only).
+Shrink master area (tiling mode only).
+.TP
+.B Mod1-i
+Increase the number of windows in the master area (tiling mode only).
+.TP
+.B Mod1-d
+Decrease the number of windows in the master area (tiling mode 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
@@ -82,7 +98,10 @@ tag to/from current window.
 Close focused window.
 .TP
 .B Mod1-space
-Toggle between tiled and floating mode (affects all windows).
+Toggle between tiling and floating mode (affects all windows).
+.TP
+.B Mod1-Shift-space
+Toggle focused window between floating and non-floating state (tiling mode only).
 .TP
 .B Mod1-[1..n]
 View all windows with
@@ -105,7 +124,7 @@ Quit dwm.
 Move current window while dragging (floating mode only).
 .TP
 .B Mod1-Button2
-Zoom current window to the master column (tiling mode only).
+Zoom current window to the master area (tiling mode only).
 .TP
 .B Mod1-Button3
 Resize current window while dragging (floating mode only).
@@ -114,9 +133,17 @@ 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
-.BR "broken pipe"
+.BR "EOF"
-when dwm has been started by
+when dwm has been started by an X session manager like
 .BR xdm (1),
-because it closes standard output before executing dwm.
+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 .
 .SH SEE ALSO
 .BR dmenu (1)

dwm.h

@@ -1,5 +1,4 @@
-/*
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (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
@@ -37,13 +36,14 @@
 
 /* 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 */
+enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
 
 typedef enum {
 	TopLeft, TopRight, BotLeft, BotRight
@@ -66,7 +66,6 @@ typedef struct {
 	int x, y, w, h;
 	unsigned long norm[ColLast];
 	unsigned long sel[ColLast];
-	unsigned long status[ColLast];
 	Drawable drawable;
 	Fnt font;
 	GC gc;
@@ -78,27 +77,26 @@ struct Client {
 	int proto;
 	int x, y, w, h;
 	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;
+	unsigned int border;
-	Bool isfloat, ismax;
+	Bool isfloat, isfixed, ismax;
 	Bool *tags;
 	Client *next;
 	Client *prev;
 	Client *snext;
 	Window win;
-	Window twin;
 };
 
 extern const char *tags[];			/* all tags */
-extern char stext[1024];			/* status text */
+extern char stext[256];				/* status text */
-extern int bx, by, bw, bh, bmw;			/* bar geometry, bar mode label width */
+extern int bh, bmw;				/* bar height, bar mode label width */
-extern int mw, screen, sx, sy, sw, sh;		/* screen geometry, master width */
+extern int screen, sx, sy, sw, sh;		/* screen geometry */
+extern int wax, way, wah, waw;			/* windowarea geometry */
+extern unsigned int master, nmaster;		/* master percent, number of master clients */
 extern unsigned int ntags, numlockmask;		/* number of tags, dynamic lock mask */
 extern void (*handler[LASTEvent])(XEvent *);	/* event handler */
-extern void (*arrange)(Arg *);			/* arrange function, indicates mode  */
+extern void (*arrange)(void);			/* arrange function, indicates mode  */
 extern Atom wmatom[WMLast], netatom[NetLast];
 extern Bool running, issel, *seltag;		/* seltag is array of Bool */
 extern Client *clients, *sel, *stack;		/* global client list and stack */
@@ -108,23 +106,18 @@ extern Display *dpy;
 extern Window root, barwin;
 
 /* 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 updatesize(Client *c);			/* update the size structs of c */
+extern void updatesizehints(Client *c);		/* update the size hint variables of c */
 extern void updatetitle(Client *c);		/* update the name of c */
 extern void unmanage(Client *c);		/* destroy c */
 
 /* draw.c */
-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*/
@@ -150,20 +143,20 @@ extern void toggletag(Arg *arg);		/* toggles c tags with arg's index */
 /* util.c */
 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);			/* detaches c from global client list */
-extern void dofloat(Arg *arg);			/* arranges all windows floating, arg is ignored */
+extern void dofloat(void);			/* arranges all windows floating */
-extern void dotile(Arg *arg);			/* arranges all windows, arg is ignored */
+extern void dotile(void);			/* arranges all windows tiled */
 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 void incnmaster(Arg *arg);		/* increments nmaster with arg's index value */
 extern Bool isvisible(Client *c);		/* returns True if client is visible */
-extern void resizecol(Arg *arg);		/* resizes the master width with arg's index value */
+extern void resizemaster(Arg *arg);		/* resizes the master percent with arg's index value */
 extern void restack(void);			/* restores z layers of all clients */
+extern void togglefloat(Arg *arg);		/* toggles focusesd client between floating/non-floating state */
 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 */
-extern void zoom(Arg *arg);			/* zooms the focused client to master column, arg is ignored */

event.c

@@ -1,5 +1,4 @@
-/*
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -19,6 +18,7 @@ typedef struct {
 KEYS
 
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 
 static void
 movemouse(Client *c) {
@@ -48,6 +48,14 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			c->x = ocx + (ev.xmotion.x - x1);
 			c->y = ocy + (ev.xmotion.y - y1);
+			if(abs(wax + c->x) < SNAP)
+				c->x = wax;
+			else if(abs((wax + waw) - (c->x + c->w)) < SNAP)
+				c->x = wax + waw - c->w - 2 * BORDERPX;
+			if(abs(way - c->y) < SNAP)
+				c->y = way;
+			else if(abs((way + wah) - (c->y + c->h)) < SNAP)
+				c->y = way + wah - c->h - 2 * BORDERPX;
 			resize(c, False, TopLeft);
 			break;
 		}
@@ -64,7 +72,7 @@ resizemouse(Client *c) {
 	ocx = c->x;
 	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-				None, cursor[CurResize], CurrentTime) != GrabSuccess)
+			None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
 	c->ismax = False;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
@@ -123,10 +131,20 @@ buttonpress(XEvent *e) {
 				return;
 			}
 		}
-		if(ev->x < x + bmw) {
+		if(ev->x < x + bmw)
-			if(ev->button == Button1)
+			switch(ev->button) {
+			case Button1:
 				togglemode(NULL);
-		}
+				break;
+			case Button4:
+				a.i = 1;
+				incnmaster(&a);
+				break;
+			case Button5:
+				a.i = -1;
+				incnmaster(&a);
+				break;
+			}
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
@@ -138,7 +156,8 @@ buttonpress(XEvent *e) {
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
-		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
+				!c->isfixed) {
 			restack();
 			resizemouse(c);
 		}
@@ -150,12 +169,10 @@ configurerequest(XEvent *e) {
 	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
-	XEvent synev;
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
 		c->ismax = False;
-		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
 		if(ev->value_mask & CWY)
@@ -166,7 +183,6 @@ configurerequest(XEvent *e) {
 			c->h = ev->height;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		gravitate(c, False);
 		wc.x = c->x;
 		wc.y = c->y;
 		wc.width = c->w;
@@ -177,10 +193,13 @@ configurerequest(XEvent *e) {
 		else
 			configure(c);
 		XSync(dpy, False);
-		if(c->isfloat)
+		if(c->isfloat) {
 			resize(c, False, TopLeft);
+			if(!isvisible(c))
+				XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+		}
 		else
-			arrange(NULL);
+			arrange();
 	}
 	else {
 		wc.x = ev->x;
@@ -211,32 +230,27 @@ enternotify(XEvent *e) {
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
-
+	if((c = getclient(ev->window)) && isvisible(c))
-	if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
 		focus(c);
 	else if(ev->window == root) {
 		issel = True;
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-		drawall();
 	}
 }
 
 static void
 expose(XEvent *e) {
-	Client *c;
 	XExposeEvent *ev = &e->xexpose;
 
 	if(ev->count == 0) {
 		if(barwin == ev->window)
 			drawstatus();
-		else if((c = getctitle(ev->window)))
-			drawtitle(c);
 	}
 }
 
 static void
 keypress(XEvent *e) {
-	static unsigned int len = sizeof(key) / sizeof(key[0]);
+	static unsigned int len = sizeof key / sizeof key[0];
 	unsigned int i;
 	KeySym keysym;
 	XKeyEvent *ev = &e->xkey;
@@ -248,7 +262,6 @@ keypress(XEvent *e) {
 		{
 			if(key[i].func)
 				key[i].func(&key[i].arg);
-			return;
 		}
 	}
 }
@@ -257,10 +270,8 @@ static void
 leavenotify(XEvent *e) {
 	XCrossingEvent *ev = &e->xcrossing;
 
-	if((ev->window == root) && !ev->same_screen) {
+	if((ev->window == root) && !ev->same_screen)
 		issel = False;
-		drawall();
-	}
 }
 
 static void
@@ -279,13 +290,11 @@ maprequest(XEvent *e) {
 
 	if(!XGetWindowAttributes(dpy, ev->window, &wa))
 		return;
-
 	if(wa.override_redirect) {
 		XSelectInput(dpy, ev->window,
 				(StructureNotifyMask | PropertyChangeMask));
 		return;
 	}
-
 	if(!getclient(ev->window))
 		manage(ev->window, &wa);
 }
@@ -298,7 +307,6 @@ propertynotify(XEvent *e) {
 
 	if(ev->state == PropertyDelete)
 		return; /* ignore */
-
 	if((c = getclient(ev->window))) {
 		if(ev->atom == wmatom[WMProtocols]) {
 			c->proto = getproto(c->win);
@@ -309,15 +317,16 @@ propertynotify(XEvent *e) {
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
 				if(!c->isfloat && (c->isfloat = (trans != 0)))
-					arrange(NULL);
+					arrange();
 				break;
 			case XA_WM_NORMAL_HINTS:
-				updatesize(c);
+				updatesizehints(c);
 				break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 			updatetitle(c);
-			drawtitle(c);
+			if(c == sel)
+				drawstatus();
 		}
 	}
 }
@@ -349,7 +358,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 
 void
 grabkeys(void) {
-	static unsigned int len = sizeof(key) / sizeof(key[0]);
+	static unsigned int len = sizeof key / sizeof key[0];
 	unsigned int i;
 	KeyCode code;
 

main.c

@@ -1,10 +1,10 @@
-/*
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 
 #include "dwm.h"
 #include <errno.h>
+#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,10 +17,10 @@
 
 /* extern */
 
-char stext[1024];
+char stext[256];
 Bool *seltag;
-int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;
+int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;
-unsigned int ntags, numlockmask;
+unsigned int master, nmaster, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
@@ -40,9 +40,9 @@ static Bool otherwm, readin;
 static void
 cleanup(void) {
 	close(STDIN_FILENO);
-	while(sel) {
+	while(stack) {
-		resize(sel, True, TopLeft);
+		resize(stack, True, TopLeft);
-		unmanage(sel);
+		unmanage(stack);
 	}
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
@@ -52,6 +52,9 @@ cleanup(void) {
 	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);
@@ -93,12 +96,12 @@ setup(void) {
 	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 */
+	numlockmask = 0;
 	modmap = XGetModifierMapping(dpy);
 	for (i = 0; i < 8; i++) {
 		for (j = 0; j < modmap->max_keypermod; j++) {
@@ -106,53 +109,54 @@ setup(void) {
 				numlockmask = (1 << i);
 		}
 	}
-	XFree(modmap);
+	XFreeModifiermap(modmap);
-
+	/* select for events */
 	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
 		| EnterWindowMask | LeaveWindowMask;
 	wa.cursor = cursor[CurNormal];
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-
 	grabkeys();
 	initrregs();
-
 	for(ntags = 0; tags[ntags]; ntags++);
 	seltag = emallocz(sizeof(Bool) * ntags);
 	seltag[0] = True;
-
 	/* style */
+	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
 	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
 	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
+	dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
 	dc.sel[ColBG] = getcolor(SELBGCOLOR);
 	dc.sel[ColFG] = getcolor(SELFGCOLOR);
-	dc.status[ColBG] = getcolor(STATUSBGCOLOR);
-	dc.status[ColFG] = getcolor(STATUSFGCOLOR);
 	setfont(FONT);
-
+	/* geometry */
-	bmw = textw(FLOATSYMBOL) > textw(TILESYMBOL) ? textw(FLOATSYMBOL) : textw(TILESYMBOL);
 	sx = sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
-	mw = (sw * MASTERW) / 100;
+	master = MASTER;
-
+	nmaster = NMASTER;
-	bx = by = 0;
+	bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
-	bw = sw;
+	/* 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, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+	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]);
 	XMapRaised(dpy, barwin);
-
+	strcpy(stext, "dwm-"VERSION);
+	/* windowarea */
+	wax = sx;
+	way = sy + bh;
+	wah = sh - bh;
+	waw = sw;
+	/* 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);
-
+	/* multihead support */
 	issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
-	strcpy(stext, "dwm-"VERSION);
 }
 
 /*
@@ -204,8 +208,7 @@ quit(Arg *arg) {
 	readin = running = False;
 }
 
-/*
+/* There's no way to check accesses to destroyed windows, thus those cases are
- * 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.
  */
@@ -227,30 +230,28 @@ xerror(Display *dpy, XErrorEvent *ee) {
 
 int
 main(int argc, char *argv[]) {
+	char *p;
 	int r, xfd;
 	fd_set rd;
 
 	if(argc == 2 && !strncmp("-v", argv[1], 3)) {
-		fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+		fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
 		exit(EXIT_SUCCESS);
 	}
 	else if(argc != 1)
 		eprint("usage: dwm [-v]\n");
-
+	setlocale(LC_CTYPE, "");
 	dpy = XOpenDisplay(0);
 	if(!dpy)
 		eprint("dwm: cannot open display\n");
-
 	xfd = ConnectionNumber(dpy);
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
-
 	otherwm = False;
 	XSetErrorHandler(xerrorstart);
 	/* this causes an error if some other window manager is running */
 	XSelectInput(dpy, root, SubstructureRedirectMask);
 	XSync(dpy, False);
-
 	if(otherwm)
 		eprint("dwm: another window manager is already running\n");
 
@@ -258,7 +259,6 @@ main(int argc, char *argv[]) {
 	XSetErrorHandler(NULL);
 	xerrorxlib = XSetErrorHandler(xerror);
 	XSync(dpy, False);
-
 	setup();
 	drawstatus();
 	scan();
@@ -272,25 +272,34 @@ main(int argc, char *argv[]) {
 		if(readin)
 			FD_SET(STDIN_FILENO, &rd);
 		FD_SET(xfd, &rd);
-		r = select(xfd + 1, &rd, NULL, NULL, NULL);
+		if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
-		if((r == -1) && (errno == EINTR))
+			if(errno == EINTR)
-			continue;
+				continue;
-		if(r > 0) {
-			if(readin && FD_ISSET(STDIN_FILENO, &rd)) {
-				readin = NULL != fgets(stext, sizeof(stext), stdin);
-				if(readin)
-					stext[strlen(stext) - 1] = 0;
-				else 
-					strcpy(stext, "broken pipe");
-				drawstatus();
-			}
-		}
-		else if(r < 0)
 			eprint("select failed\n");
-		procevent();
+		}
+		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 + strlen(stext) - 1; p >= stext && *p != '\n'; --p);
+				if(p > stext)
+					strncpy(stext, p + 1, sizeof stext);
+			}
+			drawstatus();
+		}
+		if(FD_ISSET(xfd, &rd))
+			procevent();
 	}
 	cleanup();
 	XCloseDisplay(dpy);
-
 	return 0;
 }

tag.c

@@ -1,5 +1,4 @@
-/*
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -51,20 +50,19 @@ initrregs(void) {
 
 	if(rreg)
 		return;
-	len = sizeof(rule) / sizeof(rule[0]);
+	len = sizeof rule / sizeof rule[0];
 	rreg = emallocz(len * sizeof(RReg));
-
 	for(i = 0; i < len; i++) {
 		if(rule[i].clpattern) {
 			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rule[i].clpattern, 0))
+			if(regcomp(reg, rule[i].clpattern, REG_EXTENDED))
 				free(reg);
 			else
 				rreg[i].clregex = reg;
 		}
 		if(rule[i].tpattern) {
 			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rule[i].tpattern, 0))
+			if(regcomp(reg, rule[i].tpattern, REG_EXTENDED))
 				free(reg);
 			else
 				rreg[i].tregex = reg;
@@ -85,10 +83,10 @@ settags(Client *c, Client *trans) {
 			c->tags[i] = trans->tags[i];
 	}
 	else if(XGetClassHint(dpy, c->win, &ch)) {
-		snprintf(prop, sizeof(prop), "%s:%s:%s",
+		snprintf(prop, sizeof prop, "%s:%s:%s",
 				ch.res_class ? ch.res_class : "",
 				ch.res_name ? ch.res_name : "", c->name);
-		for(i = 0; !matched && i < len; i++)
+		for(i = 0; i < len; i++)
 			if(rreg[i].clregex && !regexec(rreg[i].clregex, prop, 1, &tmp, 0)) {
 				c->isfloat = rule[i].isfloat;
 				for(j = 0; rreg[i].tregex && j < ntags; j++) {
@@ -106,7 +104,6 @@ settags(Client *c, Client *trans) {
 	if(!matched)
 		for(i = 0; i < ntags; i++)
 			c->tags[i] = seltag[i];
-	for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
 }
 
 void
@@ -115,12 +112,11 @@ tag(Arg *arg) {
 
 	if(!sel)
 		return;
-
 	for(i = 0; i < ntags; i++)
-		sel->tags[i] = False;
+		sel->tags[i] = (arg->i == -1) ? True : False;
-	sel->tags[arg->i] = True;
+	if(arg->i >= 0 && arg->i < ntags)
-	sel->weight = arg->i;
+		sel->tags[arg->i] = True;
-	arrange(NULL);
+	arrange();
 }
 
 void
@@ -129,11 +125,9 @@ toggletag(Arg *arg) {
 
 	if(!sel)
 		return;
-
 	sel->tags[arg->i] = !sel->tags[arg->i];
 	for(i = 0; i < ntags && !sel->tags[i]; i++);
 	if(i == ntags)
 		sel->tags[arg->i] = True;
-	sel->weight = (i == ntags) ? arg->i : i;
+	arrange();
-	arrange(NULL);
 }

util.c

@@ -1,5 +1,4 @@
-/*
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -30,21 +29,12 @@ eprint(const char *errstr, ...) {
 	exit(EXIT_FAILURE);
 }
 
-void *
-erealloc(void *ptr, unsigned int size) {
-	void *res = realloc(ptr, size);
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", size);
-	return res;
-}
-
 void
 spawn(Arg *arg) {
 	static char *shell = NULL;
 
 	if(!shell && !(shell = getenv("SHELL")))
 		shell = "/bin/sh";
-
 	if(!arg->cmd)
 		return;
 	/* The double-fork construct avoids zombie processes and keeps the code

view.c

@@ -1,23 +1,11 @@
-/*
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
+#include <stdio.h>
 
 /* static */
 
-static Client *
-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));
@@ -25,32 +13,17 @@ nexttiled(Client *c) {
 }
 
 static void
-reorder(void) {
+togglemax(Client *c) {
-	Client *c, *newclients, *tail;
-
-	newclients = tail = NULL;
-	while((c = minclient())) {
-		detach(c);
-		if(tail) {
-			c->prev = tail;
-			tail->next = c;
-			tail = c;
-		}
-		else
-			tail = newclients = c;
-	}
-	clients = newclients;
-}
-
-static void
-togglemax(Client *c)
-{
 	XEvent ev;
+		
+	if(c->isfixed)
+		return;
+
 	if((c->ismax = !c->ismax)) {
-		c->rx = c->x; c->x = sx;
+		c->rx = c->x; c->x = wax;
-		c->ry = c->y; c->y = bh;
+		c->ry = c->y; c->y = way;
-		c->rw = c->w; c->w = sw;
+		c->rw = c->w; c->w = waw - 2 * BORDERPX;
-		c->rh = c->h; c->h = sh - bh - 2;
+		c->rh = c->h; c->h = wah - 2 * BORDERPX;
 	}
 	else {
 		c->x = c->rx;
@@ -64,7 +37,7 @@ togglemax(Client *c)
 
 /* extern */
 
-void (*arrange)(Arg *) = DEFMODE;
+void (*arrange)(void) = DEFMODE;
 
 void
 detach(Client *c) {
@@ -78,7 +51,7 @@ detach(Client *c) {
 }
 
 void
-dofloat(Arg *arg) {
+dofloat(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next) {
@@ -86,7 +59,7 @@ dofloat(Arg *arg) {
 			resize(c, True, TopLeft);
 		}
 		else
-			ban(c);
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
@@ -96,59 +69,47 @@ dofloat(Arg *arg) {
 }
 
 void
-dotile(Arg *arg) {
+dotile(void) {
-	int h, i, n, w;
+	unsigned int i, n, mw, mh, tw, th;
 	Client *c;
 
-	w = sw - mw;
 	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 * master) / 1000 : waw;
+	th = (n > nmaster) ? wah / (n - nmaster) : 0;
+	tw = waw - mw;
 
-	if(n > 1)
+	for(i = 0, c = clients; c; c = c->next)
-		h = (sh - bh) / (n - 1);
-	else
-		h = sh - bh;
-
-	for(i = 0, c = clients; c; c = c->next) {
 		if(isvisible(c)) {
 			if(c->isfloat) {
 				resize(c, True, TopLeft);
 				continue;
 			}
 			c->ismax = False;
-			if(n == 1) {
+			c->x = wax;
-				c->x = sx;
+			c->y = way;
-				c->y = sy + bh;
+			if(i < nmaster) {
-				c->w = sw - 2;
+				c->y += i * mh;
-				c->h = sh - 2 - bh;
+				c->w = mw - 2 * BORDERPX;
+				c->h = mh - 2 * BORDERPX;
 			}
-			else if(i == 0) {
+			else {  /* tile window */
-				c->x = sx;
+				c->x += mw;
-				c->y = sy + bh;
+				c->w = tw - 2 * BORDERPX;
-				c->w = mw - 2;
+				if(th > bh) {
-				c->h = sh - 2 - bh;
+					c->y += (i - nmaster) * th;
-			}
+					c->h = th - 2 * BORDERPX;
-			else if(h > bh) {
+				}
-				c->x = sx + mw;
+				else /* fallback if th < bh */
-				c->y = sy + (i - 1) * h + bh;
+					c->h = wah - 2 * BORDERPX;
-				c->w = w - 2;
-				if(i + 1 == n)
-					c->h = sh - c->y - 2;
-				else
-					c->h = h - 2;
-			}
-			else { /* fallback if h < bh */
-				c->x = sx + mw;
-				c->y = sy + bh;
-				c->w = w - 2;
-				c->h = sh - 2 - bh;
 			}
 			resize(c, False, TopLeft);
 			i++;
 		}
 		else
-			ban(c);
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-	}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
 		focus(c);
@@ -162,7 +123,6 @@ focusnext(Arg *arg) {
    
 	if(!sel)
 		return;
-
 	if(!(c = getnext(sel->next)))
 		c = getnext(clients);
 	if(c) {
@@ -177,7 +137,6 @@ focusprev(Arg *arg) {
 
 	if(!sel)
 		return;
-
 	if(!(c = getprev(sel->prev))) {
 		for(c = clients; c && c->next; c = c->next);
 		c = getprev(c);
@@ -188,6 +147,17 @@ focusprev(Arg *arg) {
 	}
 }
 
+void
+incnmaster(Arg *arg) {
+	if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+		return;
+	nmaster += arg->i;
+	if(sel)
+		arrange();
+	else
+		drawstatus();
+}
+
 Bool
 isvisible(Client *c) {
 	unsigned int i;
@@ -199,27 +169,15 @@ isvisible(Client *c) {
 }
 
 void
-resizecol(Arg *arg) {
+resizemaster(Arg *arg) {
-	unsigned int n;
+	if(arg->i == 0)
-	Client *c;
+		master = MASTER;
-
-	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(mw + arg->i > sw - 100 || mw + arg->i < 100)
-			return;
-		mw += arg->i;
-	}
 	else {
-		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+		if(master + arg->i > 950 || master + arg->i < 50)
 			return;
-		mw -= arg->i;
+		master += arg->i;
 	}
-	arrange(NULL);
+	arrange();
 }
 
 void
@@ -227,29 +185,37 @@ restack(void) {
 	Client *c;
 	XEvent ev;
 
-	if(!sel) {
+	drawstatus();
-		drawstatus();
+	if(!sel)
 		return;
-	}
+	if(sel->isfloat || arrange == dofloat)
-	if(sel->isfloat || arrange == dofloat) {
 		XRaiseWindow(dpy, sel->win);
-		XRaiseWindow(dpy, sel->twin);
+	if(arrange != dofloat) {
-	}
+		if(!sel->isfloat)
-	if(arrange != dofloat)
+			XLowerWindow(dpy, sel->win);
 		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
-			XLowerWindow(dpy, c->twin);
+			if(c == sel)
+				continue;
 			XLowerWindow(dpy, c->win);
 		}
-	drawall();
+	}
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
+void
+togglefloat(Arg *arg) {
+	if (!sel || arrange == dofloat)
+		return;
+	sel->isfloat = !sel->isfloat;
+	arrange();
+}
+
 void
 togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
 	if(sel)
-		arrange(NULL);
+		arrange();
 	else
 		drawstatus();
 }
@@ -262,8 +228,7 @@ toggleview(Arg *arg) {
 	for(i = 0; i < ntags && !seltag[i]; i++);
 	if(i == ntags)
 		seltag[arg->i] = True; /* cannot toggle last view */
-	reorder();
+	arrange();
-	arrange(NULL);
 }
 
 void
@@ -271,20 +236,10 @@ view(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
-		seltag[i] = False;
+		seltag[i] = (arg->i == -1) ? True : False;
-	seltag[arg->i] = True;
+	if(arg->i >= 0 && arg->i < ntags)
-	reorder();
+		seltag[arg->i] = True;
-	arrange(NULL);
+	arrange();
-}
-
-void
-viewall(Arg *arg) {
-	unsigned int i;
-
-	for(i = 0; i < ntags; i++)
-		seltag[i] = True;
-	reorder();
-	arrange(NULL);
 }
 
 void
@@ -294,17 +249,12 @@ zoom(Arg *arg) {
 
 	if(!sel)
 		return;
-
 	if(sel->isfloat || (arrange == dofloat)) {
 		togglemax(sel);
 		return;
 	}
-
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-	for(n = 0, c = clients; c; c = c->next)
+		n++;
-		if(isvisible(c) && !c->isfloat)
-			n++;
-	if(n < 2 || (arrange == dofloat))
-		return;
 
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))
@@ -315,5 +265,5 @@ zoom(Arg *arg) {
 	c->next = clients;
 	clients = c;
 	focus(c);
-	arrange(NULL);
+	arrange();
 }