applied Marc Andre Tanners showhide patch, the removal of ntiled

.hgtags

@@ -55,3 +55,8 @@ d6d3085307d8d98b8b012b669e858fd787befeb1 4.7
 22c669b2dd3673785c3476b9976da21e8783f745 4.9
 06eb9644e2dad7667d97495eb7d7bc62aa0429e8 5.0
 ce355cea9bb89e162f61913737a46908cdfa7e45 5.1
+e4bcaca8e6ef13d2c3b81f1218ad15e5da4d68bd 5.2
+4004d61160355d869a7d2672561caad440751ba0 5.3
+335301ed102fec9b1a15d06bfa0184d53b38fa54 5.3.1
+8b7836a471f8f9ee61bec980df00971888d76343 5.4
+85a78d8afa0fe8b106a8223b5327e5bddb5dd5e3 5.4.1

LICENSE

@@ -1,6 +1,6 @@
 MIT/X Consortium License
 
-© 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
+© 2006-2009 Anselm R Garbe <garbeam at gmail dot com>
 © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
 © 2006-2007 Jukka Salmi <jukka at salmi dot ch>
 © 2007 Premysl Hruby <dfenze at gmail dot com>
@@ -9,6 +9,7 @@ MIT/X Consortium License
 © 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
 © 2007-2008 Peter Hartlich <sgkkr at hartlich dot com>
 © 2008 Martin Hurton <martin dot hurton at gmail dot com>
+© 2008 Neale Pickett <neale dot woozle dot org>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

README

@@ -40,9 +40,10 @@ like this in your .xinitrc:
 
     while true
     do
-        echo `date` `uptime | sed 's/.*,//'`
+        xsetroot -name "`date` `uptime | sed 's/.*,//'`"
         sleep 1
-    done | dwm
+    done &
+    exec dwm
 
 
 Configuration

config.def.h

@@ -12,7 +12,6 @@ static unsigned int borderpx        = 1;        /* border pixel of windows */
 static unsigned int snap            = 32;       /* snap pixel */
 static Bool showbar                 = True;     /* False means no bar */
 static Bool topbar                  = True;     /* False means bottom bar */
-static Bool readin                  = True;     /* False means do not read stdin */
 
 /* tagging */
 static const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };

config.mk

@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 5.2
+VERSION = 5.5
 
 # Customize below to fit your system
 
@@ -10,7 +10,7 @@ MANPREFIX = ${PREFIX}/share/man
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
-# Xinerama, comment if you don't want it
+# Xinerama, un-comment if you want it
 XINERAMALIBS = -L${X11LIB} -lXinerama
 XINERAMAFLAGS = -DXINERAMA
 

dwm.1

@@ -20,13 +20,13 @@ 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 layout,
-the title of the focused window, and the text read from standard input. A
-floating window is indicated with an empty square and a maximised
-floating window is indicated with a filled square before the windows
-title.  The selected tags are indicated with a different color. The tags of
-the focused window are indicated with a filled square in the top left
-corner.  The tags which are applied to one or more windows are indicated
-with an empty square in the top left corner.
+the title of the focused window, and the text read from the root window name
+property. A floating window is indicated with an empty square and a maximised
+floating window is indicated with a filled square before the windows title.
+The selected tags are indicated with a different color. The tags of the focused
+window are indicated with a filled square in the top left corner.  The tags
+which are applied to one or more windows are indicated with an empty square in
+the top left corner.
 .P
 dwm draws a small border around windows to indicate the focus state.
 .SH OPTIONS

dwm.c

@@ -6,16 +6,13 @@
  * 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.
+ * 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
+ * linked client list, the focus history is remembered through a global
  * stack list. Each client contains a bit array to indicate the tags of a
  * client.
  *
@@ -26,11 +23,11 @@
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/select.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <X11/cursorfont.h>
@@ -53,7 +50,8 @@
 #define MIN(a, b)               ((a) < (b) ? (a) : (b))
 #define MAXTAGLEN               16
 #define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
-#define NOBORDER(x)             ((x) - 2 * c->bw)
+#define WIDTH(x)                ((x)->w + 2 * (x)->bw)
+#define HEIGHT(x)               ((x)->h + 2 * (x)->bw)
 #define TAGMASK                 ((int)((1LL << LENGTH(tags)) - 1))
 #define TEXTW(x)                (textnw(x, strlen(x)) + dc.font.height)
 
@@ -131,13 +129,14 @@ typedef struct {
 
 /* function declarations */
 static void applyrules(Client *c);
+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h);
 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);
 static void buttonpress(XEvent *e);
 static void checkotherwm(void);
 static void cleanup(void);
-static void clearurgent(void);
+static void clearurgent(Client *c);
 static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);
@@ -171,7 +170,7 @@ static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
-static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static void resize(Client *c, int x, int y, int w, int h);
 static void resizemouse(const Arg *arg);
 static void restack(void);
 static void run(void);
@@ -181,6 +180,7 @@ static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void showhide(Client *c);
+static void sigchld(int signal);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static int textnw(const char *text, unsigned int len);
@@ -195,6 +195,7 @@ static void updatebar(void);
 static void updategeom(void);
 static void updatenumlockmask(void);
 static void updatesizehints(Client *c);
+static void updatestatus(void);
 static void updatetitle(Client *c);
 static void updatewmhints(Client *c);
 static void view(const Arg *arg);
@@ -251,6 +252,7 @@ applyrules(Client *c) {
 	XClassHint ch = { 0 };
 
 	/* rule matching */
+	c->isfloating = c->tags = 0;
 	if(XGetClassHint(dpy, c->win, &ch)) {
 		for(i = 0; i < LENGTH(rules); i++) {
 			r = &rules[i];
@@ -258,7 +260,7 @@ applyrules(Client *c) {
 			&& (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
 			&& (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
 				c->isfloating = r->isfloating;
-				c->tags |= r->tags & TAGMASK;
+				c->tags |= r->tags; 
 			}
 		}
 		if(ch.res_class)
@@ -266,8 +268,72 @@ applyrules(Client *c) {
 		if(ch.res_name)
 			XFree(ch.res_name);
 	}
-	if(!c->tags)
-		c->tags = tagset[seltags];
+	c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : tagset[seltags];
+}
+
+Bool
+applysizehints(Client *c, int *x, int *y, int *w, int *h) {
+	Bool baseismin;
+
+	/* set minimum possible */
+	*w = MAX(1, *w);
+	*h = MAX(1, *h);
+
+	if(*x > sx + sw)
+		*x = sw - WIDTH(c);
+	if(*y > sy + sh)
+		*y = sh - HEIGHT(c);
+	if(*x + *w + 2 * c->bw < sx)
+		*x = sx;
+	if(*y + *h + 2 * c->bw < sy)
+		*y = sy;
+	if(*h < bh)
+		*h = bh;
+	if(*w < bh)
+		*w = bh;
+
+	if(resizehints || c->isfloating) {
+		/* see last two sentences in ICCCM 4.1.2.3 */
+		baseismin = c->basew == c->minw && c->baseh == c->minh;
+
+		if(!baseismin) { /* temporarily remove base dimensions */
+			*w -= c->basew;
+			*h -= c->baseh;
+		}
+
+		/* adjust for aspect limits */
+		if(c->mina > 0 && c->maxa > 0) {
+			if(c->maxa < (float)*w / *h)
+				*w = *h * c->maxa;
+			else if(c->mina < (float)*h / *w)
+				*h = *w * c->mina;
+		}
+
+		if(baseismin) { /* increment calculation requires this */
+			*w -= c->basew;
+			*h -= c->baseh;
+		}
+
+		/* adjust for increment value */
+		if(c->incw)
+			*w -= *w % c->incw;
+		if(c->inch)
+			*h -= *h % c->inch;
+
+		/* restore base dimensions */
+		*w += c->basew;
+		*h += c->baseh;
+
+		*w = MAX(*w, c->minw);
+		*h = MAX(*h, c->minh);
+
+		if(c->maxw)
+			*w = MIN(*w, c->maxw);
+
+		if(c->maxh)
+			*h = MIN(*h, c->maxh);
+	}
+	return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
 }
 
 void
@@ -343,7 +409,6 @@ cleanup(void) {
 	Arg a = {.ui = ~0};
 	Layout foo = { "", NULL };
 
-	close(STDIN_FILENO);
 	view(&a);
 	lt[sellt] = &foo;
 	while(stack)
@@ -364,20 +429,15 @@ cleanup(void) {
 }
 
 void
-clearurgent(void) {
+clearurgent(Client *c) {
 	XWMHints *wmh;
-	Client *c;
 
-	for(c = clients; c; c = c->next)
-		if(ISVISIBLE(c) && c->isurgent) {
-			c->isurgent = False;
-			if (!(wmh = XGetWMHints(dpy, c->win)))
-				continue;
-
-			wmh->flags &= ~XUrgencyHint;
-			XSetWMHints(dpy, c->win, wmh);
-			XFree(wmh);
-		}
+	c->isurgent = False;
+	if(!(wmh = XGetWMHints(dpy, c->win)))
+		return;
+	wmh->flags &= ~XUrgencyHint;
+	XSetWMHints(dpy, c->win, wmh);
+	XFree(wmh);
 }
 
 void
@@ -616,6 +676,8 @@ focus(Client *c) {
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
 	}
 	if(c) {
+		if(c->isurgent)
+			clearurgent(c);
 		detachstack(c);
 		attachstack(c);
 		grabbuttons(c, True);
@@ -868,10 +930,10 @@ manage(Window w, XWindowAttributes *wa) {
 		c->bw = 0;
 	}
 	else {
-		if(c->x + c->w + 2 * c->bw > sx + sw)
-			c->x = sx + sw - NOBORDER(c->w);
-		if(c->y + c->h + 2 * c->bw > sy + sh)
-			c->y = sy + sh - NOBORDER(c->h);
+		if(c->x + WIDTH(c) > sx + sw)
+			c->x = sx + sw - WIDTH(c);
+		if(c->y + HEIGHT(c) > sy + sh)
+			c->y = sy + sh - HEIGHT(c);
 		c->x = MAX(c->x, sx);
 		/* only fix client y-offset, if the client center might cover the bar */
 		c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
@@ -930,8 +992,9 @@ void
 monocle(void) {
 	Client *c;
 
-	for(c = nexttiled(clients); c; c = nexttiled(c->next))
-		resize(c, wx, wy, NOBORDER(ww), NOBORDER(wh), resizehints);
+	for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+		resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+	}
 }
 
 void
@@ -960,24 +1023,23 @@ movemouse(const Arg *arg) {
 			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
-			XSync(dpy, False);
 			nx = ocx + (ev.xmotion.x - x);
 			ny = ocy + (ev.xmotion.y - y);
 			if(snap && nx >= wx && nx <= wx + ww
 			        && ny >= wy && ny <= wy + wh) {
 				if(abs(wx - nx) < snap)
 					nx = wx;
-				else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
-					nx = wx + ww - NOBORDER(c->w);
+				else if(abs((wx + ww) - (nx + WIDTH(c))) < snap)
+					nx = wx + ww - WIDTH(c);
 				if(abs(wy - ny) < snap)
 					ny = wy;
-				else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
-					ny = wy + wh - NOBORDER(c->h);
+				else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap)
+					ny = wy + wh - HEIGHT(c);
 				if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
 					togglefloating(NULL);
 			}
 			if(!lt[sellt]->arrange || c->isfloating)
-				resize(c, nx, ny, c->w, c->h, False);
+				resize(c, nx, ny, c->w, c->h);
 			break;
 		}
 	}
@@ -997,9 +1059,11 @@ propertynotify(XEvent *e) {
 	Window trans;
 	XPropertyEvent *ev = &e->xproperty;
 
-	if(ev->state == PropertyDelete)
+	if((ev->window == root) && (ev->atom == XA_WM_NAME))
+		updatestatus();
+	else if(ev->state == PropertyDelete)
 		return; /* ignore */
-	if((c = getclient(ev->window))) {
+	else if((c = getclient(ev->window))) {
 		switch (ev->atom) {
 		default: break;
 		case XA_WM_TRANSIENT_FOR:
@@ -1025,73 +1089,14 @@ propertynotify(XEvent *e) {
 
 void
 quit(const Arg *arg) {
-	readin = running = False;
+	running = False;
 }
 
 void
-resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+resize(Client *c, int x, int y, int w, int h) {
 	XWindowChanges wc;
 
-	if(sizehints) {
-		/* see last two sentences in ICCCM 4.1.2.3 */
-		Bool baseismin = c->basew == c->minw && c->baseh == c->minh;
-
-		/* set minimum possible */
-		w = MAX(1, w);
-		h = MAX(1, h);
-
-		if(!baseismin) { /* temporarily remove base dimensions */
-			w -= c->basew;
-			h -= c->baseh;
-		}
-
-		/* adjust for aspect limits */
-		if(c->mina > 0 && c->maxa > 0) {
-			if(c->maxa < (float)w / h)
-				w = h * c->maxa;
-			else if(c->mina < (float)h / w)
-				h = w * c->mina;
-		}
-
-		if(baseismin) { /* increment calculation requires this */
-			w -= c->basew;
-			h -= c->baseh;
-		}
-
-		/* adjust for increment value */
-		if(c->incw)
-			w -= w % c->incw;
-		if(c->inch)
-			h -= h % c->inch;
-
-		/* restore base dimensions */
-		w += c->basew;
-		h += c->baseh;
-
-		w = MAX(w, c->minw);
-		h = MAX(h, c->minh);
-
-		if(c->maxw)
-			w = MIN(w, c->maxw);
-
-		if(c->maxh)
-			h = MIN(h, c->maxh);
-	}
-	if(w <= 0 || h <= 0)
-		return;
-	if(x > sx + sw)
-		x = sw - NOBORDER(w);
-	if(y > sy + sh)
-		y = sh - NOBORDER(h);
-	if(x + w + 2 * c->bw < sx)
-		x = sx;
-	if(y + h + 2 * c->bw < sy)
-		y = sy;
-	if(h < bh)
-		h = bh;
-	if(w < bh)
-		w = bh;
-	if(c->x != x || c->y != y || c->w != w || c->h != h) {
+	if(applysizehints(c, &x, &y, &w, &h)) {
 		c->x = wc.x = x;
 		c->y = wc.y = y;
 		c->w = wc.width = w;
@@ -1129,9 +1134,8 @@ resizemouse(const Arg *arg) {
 			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
-			XSync(dpy, False);
-			nw = MAX(ev.xmotion.x - NOBORDER(ocx) + 1, 1);
-			nh = MAX(ev.xmotion.y - NOBORDER(ocy) + 1, 1);
+			nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+			nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
 
 			if(snap && nw >= wx && nw <= wx + ww
 			        && nh >= wy && nh <= wy + wh) {
@@ -1140,7 +1144,7 @@ resizemouse(const Arg *arg) {
 					togglefloating(NULL);
 			}
 			if(!lt[sellt]->arrange || c->isfloating)
-				resize(c, c->x, c->y, nw, nh, True);
+				resize(c, c->x, c->y, nw, nh);
 			break;
 		}
 	}
@@ -1176,60 +1180,13 @@ restack(void) {
 
 void
 run(void) {
-	char *p;
-	char sbuf[sizeof stext];
-	fd_set rd;
-	int r, xfd;
-	unsigned int len, offset;
 	XEvent ev;
 
-	/* main event loop, also reads status text from stdin */
+	/* main event loop */
 	XSync(dpy, False);
-	xfd = ConnectionNumber(dpy);
-	offset = 0;
-	len = sizeof stext - 1;
-	sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
-	while(running) {
-		FD_ZERO(&rd);
-		if(readin)
-			FD_SET(STDIN_FILENO, &rd);
-		FD_SET(xfd, &rd);
-		if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
-			if(errno == EINTR)
-				continue;
-			die("select failed\n");
-		}
-		if(FD_ISSET(STDIN_FILENO, &rd)) {
-			switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
-			case -1:
-				strncpy(stext, strerror(errno), len);
-				readin = False;
-				break;
-			case 0:
-				strncpy(stext, "EOF", 4);
-				readin = False;
-				break;
-			default:
-				for(p = sbuf + offset; r > 0; p++, r--, offset++)
-					if(*p == '\n' || *p == '\0') {
-						*p = '\0';
-						strncpy(stext, sbuf, len);
-						p += r - 1; /* p is sbuf + offset + r - 1 */
-						for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
-						offset = r;
-						if(r)
-							memmove(sbuf, p - r + 1, r);
-						break;
-					}
-				break;
-			}
-			drawbar();
-		}
-		while(XPending(dpy)) {
-			XNextEvent(dpy, &ev);
-			if(handler[ev.type])
-				(handler[ev.type])(&ev); /* call handler */
-		}
+	while(running && !XNextEvent(dpy, &ev)) {
+		if(handler[ev.type])
+			(handler[ev.type])(&ev); /* call handler */
 	}
 }
 
@@ -1332,7 +1289,7 @@ setup(void) {
 	dc.sel[ColBG] = getcolor(selbgcolor);
 	dc.sel[ColFG] = getcolor(selfgcolor);
 	dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
-	dc.gc = XCreateGC(dpy, root, 0, 0);
+	dc.gc = XCreateGC(dpy, root, 0, NULL);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 	if(!dc.font.set)
 		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
@@ -1343,7 +1300,7 @@ setup(void) {
 		blw = MAX(blw, w);
 	}
 
-	wa.override_redirect = 1;
+	wa.override_redirect = True;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ButtonPressMask|ExposureMask;
 
@@ -1352,8 +1309,7 @@ setup(void) {
 			CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
 	XMapRaised(dpy, barwin);
-	strcpy(stext, "dwm-"VERSION);
-	drawbar();
+	updatestatus();
 
 	/* EWMH support per view */
 	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
@@ -1361,7 +1317,8 @@ setup(void) {
 
 	/* select for events */
 	wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
-			|EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+			|EnterWindowMask|LeaveWindowMask|StructureNotifyMask
+			|PropertyChangeMask;
 	XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
 	XSelectInput(dpy, root, wa.event_mask);
 
@@ -1375,7 +1332,7 @@ showhide(Client *c) {
 	if(ISVISIBLE(c)) { /* show clients top down */
 		XMoveWindow(dpy, c->win, c->x, c->y);
 		if(!lt[sellt]->arrange || c->isfloating)
-			resize(c, c->x, c->y, c->w, c->h, True);
+			resize(c, c->x, c->y, c->w, c->h);
 		showhide(c->snext);
 	}
 	else { /* hide clients bottom up */
@@ -1384,22 +1341,24 @@ showhide(Client *c) {
 	}
 }
 
+
+void
+sigchld(int signal) {
+	while(0 < waitpid(-1, NULL, WNOHANG));
+}
+
 void
 spawn(const Arg *arg) {
-	/* The double-fork construct avoids zombie processes and keeps the code
-	 * clean from stupid signal handlers. */
+	signal(SIGCHLD, sigchld);
 	if(fork() == 0) {
-		if(fork() == 0) {
-			if(dpy)
-				close(ConnectionNumber(dpy));
-			setsid();
-			execvp(((char **)arg->v)[0], (char **)arg->v);
-			fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
-			perror(" failed");
-		}
+		if(dpy)
+			close(ConnectionNumber(dpy));
+		setsid();
+		execvp(((char **)arg->v)[0], (char **)arg->v);
+		fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
+		perror(" failed");
 		exit(0);
 	}
-	wait(0);
 }
 
 void
@@ -1434,7 +1393,7 @@ tile(void) {
 	/* master */
 	c = nexttiled(clients);
 	mw = mfact * ww;
-	resize(c, wx, wy, NOBORDER(n == 1 ? ww : mw), NOBORDER(wh), resizehints);
+	resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw);
 
 	if(--n == 0)
 		return;
@@ -1448,10 +1407,10 @@ tile(void) {
 		h = wh;
 
 	for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
-		resize(c, x, y, NOBORDER(w), /* remainder */ ((i + 1 == n)
-		       ? NOBORDER(wy + wh) - y : h), resizehints);
+		resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
+		       ? wy + wh - y - 2 * c->bw : h - 2 * c->bw));
 		if(h != wh)
-			y = c->y + c->h + 2 * c->bw;
+			y = c->y + HEIGHT(c);
 	}
 }
 
@@ -1469,7 +1428,7 @@ togglefloating(const Arg *arg) {
 		return;
 	sel->isfloating = !sel->isfloating || sel->isfixed;
 	if(sel->isfloating)
-		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+		resize(sel, sel->x, sel->y, sel->w, sel->h);
 	arrange();
 }
 
@@ -1481,7 +1440,7 @@ toggletag(const Arg *arg) {
 		return;
 	
 	mask = sel->tags ^ (arg->ui & TAGMASK);
-	if(sel && mask) {
+	if(mask) {
 		sel->tags = mask;
 		arrange();
 	}
@@ -1493,7 +1452,6 @@ toggleview(const Arg *arg) {
 
 	if(mask) {
 		tagset[seltags] = mask;
-		clearurgent();
 		arrange();
 	}
 }
@@ -1643,12 +1601,19 @@ updatetitle(Client *c) {
 		gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
 }
 
+void
+updatestatus() {
+	if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+		strcpy(stext, "dwm-"VERSION);
+	drawbar();
+}
+
 void
 updatewmhints(Client *c) {
 	XWMHints *wmh;
 
 	if((wmh = XGetWMHints(dpy, c->win))) {
-		if(ISVISIBLE(c) && wmh->flags & XUrgencyHint) {
+		if(c == sel && wmh->flags & XUrgencyHint) {
 			wmh->flags &= ~XUrgencyHint;
 			XSetWMHints(dpy, c->win, wmh);
 		}
@@ -1666,7 +1631,6 @@ view(const Arg *arg) {
 	seltags ^= 1; /* toggle sel tagset */
 	if(arg->ui & TAGMASK)
 		tagset[seltags] = arg->ui & TAGMASK;
-	clearurgent();
 	arrange();
 }
 
@@ -1721,14 +1685,14 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))
-		die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+		die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
 	else if(argc != 1)
 		die("usage: dwm [-v]\n");
 
 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-		fprintf(stderr, "warning: no locale support\n");
+		fputs("warning: no locale support\n", stderr);
 
-	if(!(dpy = XOpenDisplay(0)))
+	if(!(dpy = XOpenDisplay(NULL)))
 		die("dwm: cannot open display\n");
 
 	checkotherwm();