prepared 1.2

.hgtags

@@ -8,3 +8,4 @@ c11f86db4550cac5d0a648a3fe4d6d3b9a4fcf7e 0.6
 cd15de32e173f8ce97bfe1c9b6607937b59056b4 0.8
 fae61afa861755636c4a1070694209ace8efbb6c 0.9
 bbc98e77ae89a7c9232a5be0835f60ea00d8036e 1.0
+44a55e6e46bf6c231780b09d919977d6f01083de 1.1

client.c

@@ -52,8 +52,6 @@ grabbuttons(Client *c, Bool focus)
 static void
 resizetitle(Client *c)
 {
-	int i;
-
 	c->tw = textw(c->name);
 	if(c->tw > c->w)
 		c->tw = c->w + 2;
@@ -232,13 +230,7 @@ manage(Window w, XWindowAttributes *wa)
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
-	if(clients)
-		clients->prev = c;
-	c->next = clients;
-	clients = c;
-
 	grabbuttons(c, False);
-
 	if((tc = getclient(trans))) /* inherit tags */
 		for(i = 0; i < ntags; i++)
 			c->tags[i] = tc->tags[i];
@@ -248,6 +240,12 @@ manage(Window w, XWindowAttributes *wa)
 		c->isfloat = trans
 			|| (c->maxw && c->minw &&
 				c->maxw == c->minw && c->maxh == c->minh);
+
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	clients = c;
+
 	settitle(c);
 	if(isvisible(c))
 		sel = c;
@@ -340,7 +338,7 @@ void
 settitle(Client *c)
 {
 	char **list = NULL;
-	int i, n;
+	int n;
 	XTextProperty name;
 
 	name.nitems = 0;
@@ -409,12 +407,7 @@ unmanage(Client *c)
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	XDestroyWindow(dpy, c->twin);
 
-	if(c->prev)
+	detach(c);
-		c->prev->next = c->next;
-	if(c->next)
-		c->next->prev = c->prev;
-	if(c == clients)
-		clients = c->next;
 	if(sel == c) {
 		if(trans && (tc = getclient(trans)) && isvisible(tc))
 			sel = tc;

config.arg.h

@@ -4,7 +4,7 @@
  */
 
 #define TAGS \
-const char *tags[] = { "work", "net", "fnord", NULL };
+const char *tags[] = { "dev", "work", "net", "fnord", NULL };
 
 #define DEFMODE			dotile /* dofloat */
 #define FLOATSYMBOL		"><>"
@@ -27,8 +27,9 @@ static Key key[] = { \
 	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
 		{ .cmd = "exec uxterm -bg '#111111' -fg '#eeeeee' -cr '#eeeeee' +sb -fn '"FONT"'" } }, \
 	{ MODKEY,			XK_p,		spawn, \
-		{ .cmd = "exec `ls -lL /usr/bin /usr/X11R6/bin /usr/local/bin 2>/dev/null | " \
+		{ .cmd = "exec \"$(IFS=:; for dir in $PATH; do " \
-			"awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort -u | dmenu`" } }, \
+			"for file in \"$dir\"/*; do [ -x \"$file\" ] && echo \"${file##*/}\"; done; " \
+			"done | sort -u | dmenu)\"" } }, \
 	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
 	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
 	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
@@ -36,17 +37,21 @@ static Key key[] = { \
 	{ 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|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|ShiftMask,		XK_c,		killclient,	{ 0 } }, \
 	{ MODKEY,			XK_space,	togglemode,	{ 0 } }, \
 	{ MODKEY,			XK_1,		view,		{ .i = 0 } }, \
 	{ MODKEY,			XK_2,		view,		{ .i = 1 } }, \
 	{ MODKEY,			XK_3,		view,		{ .i = 2 } }, \
+	{ MODKEY,			XK_4,		view,		{ .i = 3 } }, \
 	{ MODKEY|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|ShiftMask,		XK_q,		quit,		{ 0 } }, \
 };
 

config.mk

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

draw.c

@@ -133,8 +133,6 @@ drawstatus()
 void
 drawtitle(Client *c)
 {
-	int i;
-
 	if(c == sel && issel) {
 		drawstatus();
 		XUnmapWindow(dpy, c->twin);

dwm.h

@@ -56,7 +56,7 @@ struct Client {
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int grav;
 	long flags; 
-	unsigned int border;
+	unsigned int border, weight;
 	Bool isfloat;
 	Bool ismax;
 	Bool *tags;
@@ -127,6 +127,7 @@ extern void *erealloc(void *ptr, unsigned int size);
 extern void spawn(Arg *arg);
 
 /* view.c */
+extern void detach(Client *c);
 extern void dofloat(Arg *arg);
 extern void dotile(Arg *arg);
 extern void focusnext(Arg *arg);

dwm.html

@@ -104,8 +104,8 @@
 		</ul>
 		<h3>Download</h3>
 		<ul>
-			<li><a href="http://10kloc.org/download/dwm-1.0.tar.gz">dwm 1.0</a> (15kb) (20060824)</li>
+			<li><a href="http://10kloc.org/download/dwm-1.2.tar.gz">dwm 1.2</a> (15kb) (20060830)</li>
-			<li><a href="http://10kloc.org/download/dmenu-0.5.tar.gz">dmenu 0.5</a> (7kb) (20060824)</li>
+			<li><a href="http://10kloc.org/download/dmenu-0.6.tar.gz">dmenu 0.6</a> (7kb) (20060828)</li>
 		</ul>
 		<h3>Development</h3>
 		<p>

event.c

@@ -147,16 +147,38 @@ buttonpress(XEvent *e)
 	}
 }
 
+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)
 {
 	unsigned long newmask;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
-	XEvent synev;
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
+		if(!c->isfloat && (arrange != dofloat) && c->ismax) {
+			synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
+			XSync(dpy, False);
+			return;
+		}
 		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
@@ -176,20 +198,8 @@ configurerequest(XEvent *e)
 		newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
 		if(newmask)
 			XConfigureWindow(dpy, c->win, newmask, &wc);
-		else {
+		else
-			synev.type = ConfigureNotify;
+			synconfig(c, c->x, c->y, c->w, c->h, c->border);
-			synev.xconfigure.display = dpy;
-			synev.xconfigure.event = c->win;
-			synev.xconfigure.window = c->win;
-			synev.xconfigure.x = c->x;
-			synev.xconfigure.y = c->y;
-			synev.xconfigure.width = c->w;
-			synev.xconfigure.height = c->h;
-			synev.xconfigure.border_width = c->border;
-			synev.xconfigure.above = None;
-			/* Send synthetic ConfigureNotify */
-			XSendEvent(dpy, c->win, True, NoEventMask, &synev);
-		}
 		XSync(dpy, False);
 		if(c->isfloat)
 			resize(c, False, TopLeft);

tag.c

@@ -30,6 +30,17 @@ RULES
 static RReg *rreg = NULL;
 static unsigned int len = 0;
 
+static void
+commit()
+{
+	/* asserts sel != NULL */
+	settitle(sel);
+	if(!isvisible(sel))
+		arrange(NULL);
+	else
+		drawstatus();
+}
+
 /* extern */
 
 Client *
@@ -106,6 +117,8 @@ 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;
 }
 
 void
@@ -119,11 +132,7 @@ tag(Arg *arg)
 	for(i = 0; i < ntags; i++)
 		sel->tags[i] = False;
 	sel->tags[arg->i] = True;
-	settitle(sel);
+	commit();
-	if(!isvisible(sel))
-		arrange(NULL);
-	else
-		drawstatus();
 }
 
 void
@@ -138,9 +147,5 @@ toggletag(Arg *arg)
 	for(i = 0; i < ntags && !sel->tags[i]; i++);
 	if(i == ntags)
 		sel->tags[arg->i] = True;
-	settitle(sel);
+	commit();
-	if(!isvisible(sel))
-		arrange(NULL);
-	else
-		drawstatus();
 }

view.c

@@ -3,11 +3,57 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
+#include <stdio.h>
+
+/* static */
+
+static Client *
+minclient()
+{
+	Client *c, *min;
+
+	for(min = c = clients; c; c = c->next)
+		if(c->weight < min->weight)
+			min = c;
+	return min;
+}
+
+
+static void
+reorder()
+{
+	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;
+}
 
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 
+void
+detach(Client *c)
+{
+	if(c->prev)
+		c->prev->next = c->next;
+	if(c->next)
+		c->next->prev = c->prev;
+	if(c == clients)
+		clients = c->next;
+	c->next = c->prev = NULL;
+}
+
 void
 dofloat(Arg *arg)
 {
@@ -21,9 +67,7 @@ dofloat(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
+	if((sel = getnext(clients)))
-		sel = getnext(clients);
-	if(sel)
 		focus(sel);
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
@@ -86,9 +130,7 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
+	if((sel = getnext(clients)))
-		sel = getnext(clients);
-	if(sel)
 		focus(sel);
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
@@ -211,6 +253,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(NULL);
 }
 
@@ -222,32 +265,25 @@ view(Arg *arg)
 	for(i = 0; i < ntags; i++)
 		seltag[i] = False;
 	seltag[arg->i] = True;
+	reorder();
 	arrange(NULL);
 }
 
 void
 zoom(Arg *arg)
 {
-	Client *c;
+	Client *c = sel;
 
-	if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
+	if(!c || (arrange != dotile) || c->isfloat || c->ismax)
 		return;
 
-	if(sel == getnext(clients))  {
+	if(c == getnext(clients))
-		if((c = getnext(sel->next)))
+		if(!(c = getnext(c->next)))
-			sel = c;
-		else
 			return;
-	}
+	detach(c);
-
+	c->next = clients;
-	/* pop */
+	clients->prev = c;
-	sel->prev->next = sel->next;
+	clients = c;
-	if(sel->next)
+	focus(c);
-		sel->next->prev = sel->prev;
-	sel->prev = NULL;
-	clients->prev = sel;
-	sel->next = clients;
-	clients = sel;
-	focus(sel);
 	arrange(NULL);
 }