X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=0e8c92759d8e566daa9446c463dba256ce7a9698;hp=64bafb7d1be853ce153d959a6b68daa6493a8704;hb=2ce37bc69ee72af7ea88376c73133f8a833204cf;hpb=a06b9193c7dcbed307c163ab778ad3bf66807af3

diff --git a/dwm.c b/dwm.c
index 64bafb7..0e8c927 100644
--- a/dwm.c
+++ b/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>
@@ -41,42 +38,41 @@
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
-#endif
+#endif /* XINERAMA */
 
 /* macros */
-#define MAX(a, b)       ((a) > (b) ? (a) : (b))
-#define MIN(a, b)       ((a) < (b) ? (a) : (b))
-#define BUTTONMASK      (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
-#define LENGTH(x)       (sizeof x / sizeof x[0])
-#define MAXTAGLEN       16
-#define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
-#define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
-#define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)
+#define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask))
+#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define ISVISIBLE(x)            (x->tags & tagset[mon[x->mon].seltags])
+#define LENGTH(x)               (sizeof x / sizeof x[0])
+#define MAX(a, b)               ((a) > (b) ? (a) : (b))
+#define MIN(a, b)               ((a) < (b) ? (a) : (b))
+#define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
+#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)
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
-enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
-enum { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle,
+enum { WMProtocols, WMDelete, WMState, WMLast };        /* default atoms */
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
 
-/* typedefs */
-typedef unsigned int uint;
-typedef unsigned long ulong;
-
 typedef union {
 	int i;
-	uint ui;
+	unsigned int ui;
 	float f;
 	void *v;
 } Arg;
 
 typedef struct {
-	uint click;
-	uint mask;
-	uint button;
+	unsigned int click;
+	unsigned int mask;
+	unsigned int button;
 	void (*func)(const Arg *arg);
 	const Arg arg;
 } Button;
@@ -88,8 +84,9 @@ struct Client {
 	int x, y, w, h;
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int bw, oldbw;
-	uint tags;
-	Bool isbanned, isfixed, isfloating, ismoved, isurgent;
+	unsigned int tags;
+	unsigned int mon;
+	Bool isfixed, isfloating, isurgent;
 	Client *next;
 	Client *snext;
 	Window win;
@@ -97,8 +94,8 @@ struct Client {
 
 typedef struct {
 	int x, y, w, h;
-	ulong norm[ColLast];
-	ulong sel[ColLast];
+	unsigned long norm[ColLast];
+	unsigned long sel[ColLast];
 	Drawable drawable;
 	GC gc;
 	struct {
@@ -111,90 +108,105 @@ typedef struct {
 } DC; /* draw context */
 
 typedef struct {
-	uint mod;
+	unsigned int mod;
 	KeySym keysym;
 	void (*func)(const Arg *);
 	const Arg arg;
 } Key;
 
 typedef struct {
+	char symbol[4];
+	int by, btx;          /* bar geometry */
+	int wx, wy, ww, wh;   /* window area  */
+	unsigned int seltags;
+	unsigned int sellt;
+	Bool showbar;
+	Bool topbar;
+	Window barwin;
+} Monitor;
+
+typedef struct {
 	const char *symbol;
-	void (*arrange)(void);
+	void (*arrange)(Monitor *);
 } Layout;
 
 typedef struct {
 	const char *class;
 	const char *instance;
 	const char *title;
-	uint tags;
+	unsigned int tags;
 	Bool isfloating;
 } Rule;
 
 /* 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(Client *c);
 static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);
 static void destroynotify(XEvent *e);
 static void detach(Client *c);
 static void detachstack(Client *c);
-static void drawbar(void);
-static void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
-static void drawtext(const char *text, ulong col[ColLast], Bool invert);
+static void die(const char *errstr, ...);
+static void drawbar(Monitor *m);
+static void drawbars();
+static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
 static void enternotify(XEvent *e);
-static void eprint(const char *errstr, ...);
 static void expose(XEvent *e);
 static void focus(Client *c);
 static void focusin(XEvent *e);
 static void focusstack(const Arg *arg);
 static Client *getclient(Window w);
-static ulong getcolor(const char *colstr);
+static unsigned long getcolor(const char *colstr);
 static long getstate(Window w);
-static Bool gettextprop(Window w, Atom atom, char *text, uint size);
+static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);
 static void initfont(const char *fontstr);
-static Bool isoccupied(uint t);
 static Bool isprotodel(Client *c);
-static Bool isurgent(uint t);
 static void keypress(XEvent *e);
 static void killclient(const Arg *arg);
 static void manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);
+static void monocle(Monitor *m);
 static void movemouse(const Arg *arg);
-static Client *nexttiled(Client *c);
+static Client *nexttiled(Monitor *m, 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 restack(Monitor *m);
 static void run(void);
 static void scan(void);
 static void setclientstate(Client *c, long state);
+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, uint len);
-static void tile(void);
+static int textnw(const char *text, unsigned int len);
+static void tile(Monitor *);
 static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
-static void togglelayout(const Arg *arg);
-static void togglemax(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unmanage(Client *c);
 static void unmapnotify(XEvent *e);
-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);
@@ -202,14 +214,18 @@ static int xerror(Display *dpy, XErrorEvent *ee);
 static int xerrordummy(Display *dpy, XErrorEvent *ee);
 static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
+#ifdef XINERAMA
+static void focusmon(const Arg *arg);
+static void tagmon(const Arg *arg);
+#endif /* XINERAMA */
 
 /* variables */
 static char stext[256];
-static int screen, sx, sy, sw, sh;
-static int by, bh, blw, wx, wy, ww, wh;
-static uint seltags = 0;
+static int screen;
+static int sx, sy, sw, sh;   /* X display screen geometry x, y, width, height */
+static int bh, blw = 0;      /* bar geometry */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
-static uint numlockmask = 0;
+static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
@@ -225,73 +241,126 @@ static void (*handler[LASTEvent]) (XEvent *) = {
 	[UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];
-static Bool ismax = False;
-static Bool otherwm, readin;
+static Bool otherwm;
 static Bool running = True;
-static uint tagset[] = {1, 1}; /* after start, first tag is selected */
 static Client *clients = NULL;
 static Client *sel = NULL;
 static Client *stack = NULL;
 static Cursor cursor[CurLast];
 static Display *dpy;
-static DC dc = {0};
-static Layout *lt = NULL;
-static Window root, barwin;
+static DC dc;
+static Layout *lt[] = { NULL, NULL };
+static Monitor *mon = NULL, *selmon = NULL;
+static unsigned int nmons;
+static Window root;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-/* compile-time check if all tags fit into an uint bit array. */
-struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
+/* compile-time check if all tags fit into an unsigned int bit array. */
+struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
 
 /* function implementations */
 void
 applyrules(Client *c) {
-	uint i;
+	unsigned int i;
 	Rule *r;
 	XClassHint ch = { 0 };
 
 	/* rule matching */
-	XGetClassHint(dpy, c->win, &ch);
-	for(i = 0; i < LENGTH(rules); i++) {
-		r = &rules[i];
-		if((!r->title || strstr(c->name, r->title))
-		&& (!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->isfloating = c->tags = 0;
+	if(XGetClassHint(dpy, c->win, &ch)) {
+		for(i = 0; i < LENGTH(rules); i++) {
+			r = &rules[i];
+			if((!r->title || strstr(c->name, r->title))
+			&& (!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;
+			}
 		}
+		if(ch.res_class)
+			XFree(ch.res_class);
+		if(ch.res_name)
+			XFree(ch.res_name);
 	}
-	if(ch.res_class)
-		XFree(ch.res_class);
-	if(ch.res_name)
-		XFree(ch.res_name);
-	if(!c->tags)
-		c->tags = tagset[seltags];
+	c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : tagset[mon[c->mon].seltags];
 }
 
-void
-arrange(void) {
-	Client *c;
+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;
+		}
 
-	for(c = clients; c; c = c->next)
-		if(c->tags & tagset[seltags]) { /* is visible */
-			if(ismax && !c->isfixed) {
-				XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
-				c->ismoved = True;
-			}
-			else if(!lt->arrange || c->isfloating)
-				resize(c, c->x, c->y, c->w, c->h, True);
-			c->isbanned = False;
+		/* 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;
 		}
-		else if(!c->isbanned) {
-			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-			c->isbanned = c->ismoved = True;
+
+		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
+arrange(void) {
+	unsigned int i;
+	showhide(stack);
 	focus(NULL);
-	if(lt->arrange && !ismax)
-		lt->arrange();
-	restack();
+	for(i = 0; i < nmons; i++) {
+		if(lt[mon[i].sellt]->arrange)
+			lt[mon[i].sellt]->arrange(&mon[i]);
+		restack(&mon[i]);
+	}
 }
 
 void
@@ -308,21 +377,25 @@ attachstack(Client *c) {
 
 void
 buttonpress(XEvent *e) {
-	uint i, x, click;
+	unsigned int i, x, click;
+	Arg arg = {0};
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
 	click = ClkRootWin;
-	if(ev->window == barwin) {
-		i = x = 0;
+	if(ev->window == selmon->barwin) {
+		i = 0;
+		x = selmon->btx;
 		do
 			x += TEXTW(tags[i]);
 		while(ev->x >= x && ++i < LENGTH(tags));
-		if(i < LENGTH(tags))
-			click = i;
+		if(i < LENGTH(tags)) {
+			click = ClkTagBar;
+			arg.ui = 1 << i;
+		}
 		else if(ev->x < x + blw)
 			click = ClkLtSymbol;
-		else if(ev->x > wx + ww - TEXTW(stext))
+		else if(ev->x > selmon->wx + selmon->ww - TEXTW(stext))
 			click = ClkStatusText;
 		else
 			click = ClkWinTitle;
@@ -335,32 +408,31 @@ buttonpress(XEvent *e) {
 	for(i = 0; i < LENGTH(buttons); i++)
 		if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
 		   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-			buttons[i].func(&buttons[i].arg);
+			buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
 }
 
 void
 checkotherwm(void) {
 	otherwm = False;
-	XSetErrorHandler(xerrorstart);
+	xerrorxlib = XSetErrorHandler(xerrorstart);
 
 	/* this causes an error if some other window manager is running */
 	XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
 	XSync(dpy, False);
 	if(otherwm)
-		eprint("dwm: another window manager is already running\n");
-	XSetErrorHandler(NULL);
-	xerrorxlib = XSetErrorHandler(xerror);
+		die("dwm: another window manager is already running\n");
+	XSetErrorHandler(xerror);
 	XSync(dpy, False);
 }
 
 void
 cleanup(void) {
-	Arg a = {.i = ~0};
+	unsigned int i;
+	Arg a = {.ui = ~0};
 	Layout foo = { "", NULL };
 
-	close(STDIN_FILENO);
 	view(&a);
-	lt = &foo;
+	lt[selmon->sellt] = &foo;
 	while(stack)
 		unmanage(stack);
 	if(dc.font.set)
@@ -373,12 +445,26 @@ cleanup(void) {
 	XFreeCursor(dpy, cursor[CurNormal]);
 	XFreeCursor(dpy, cursor[CurResize]);
 	XFreeCursor(dpy, cursor[CurMove]);
-	XDestroyWindow(dpy, barwin);
+	for(i = 0; i < nmons; i++)
+		XDestroyWindow(dpy, mon[i].barwin);
+	free(mon);
 	XSync(dpy, False);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 
 void
+clearurgent(Client *c) {
+	XWMHints *wmh;
+
+	c->isurgent = False;
+	if(!(wmh = XGetWMHints(dpy, c->win)))
+		return;
+	wmh->flags &= ~XUrgencyHint;
+	XSetWMHints(dpy, c->win, wmh);
+	XFree(wmh);
+}
+
+void
 configure(Client *c) {
 	XConfigureEvent ce;
 
@@ -398,13 +484,18 @@ configure(Client *c) {
 
 void
 configurenotify(XEvent *e) {
+	unsigned int i;
 	XConfigureEvent *ev = &e->xconfigure;
 
 	if(ev->window == root && (ev->width != sw || ev->height != sh)) {
 		sw = ev->width;
 		sh = ev->height;
 		updategeom();
-		updatebar();
+		if(dc.drawable != 0)
+			XFreePixmap(dpy, dc.drawable);
+		dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
+		for(i = 0; i < nmons; i++)
+			XMoveResizeWindow(dpy, mon[i].barwin, mon[i].wx, mon[i].by, mon[i].ww, bh);
 		arrange();
 	}
 }
@@ -418,9 +509,7 @@ configurerequest(XEvent *e) {
 	if((c = getclient(ev->window))) {
 		if(ev->value_mask & CWBorderWidth)
 			c->bw = ev->border_width;
-		if(ismax && !c->isbanned && !c->isfixed)
-			XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw);
-		else if(c->isfloating || !lt->arrange) {
+		else if(c->isfloating || !lt[selmon->sellt]->arrange) {
 			if(ev->value_mask & CWX)
 				c->x = sx + ev->x;
 			if(ev->value_mask & CWY)
@@ -433,10 +522,9 @@ configurerequest(XEvent *e) {
 				c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
 			if((c->y - sy + c->h) > sh && c->isfloating)
 				c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
-			if((ev->value_mask & (CWX|CWY))
-			&& !(ev->value_mask & (CWWidth|CWHeight)))
+			if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
 				configure(c);
-			if(!c->isbanned)
+			if(ISVISIBLE(c))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
@@ -466,16 +554,10 @@ destroynotify(XEvent *e) {
 
 void
 detach(Client *c) {
-	Client *i;
+	Client **tc;
 
-	if (c != clients) {
-		for(i = clients; i->next != c; i = i->next);
-		i->next = c->next;
-	}
-	else {
-		clients = c->next;
-	}
-	c->next =  NULL;
+	for(tc = &clients; *tc && *tc != c; tc = &(*tc)->next);
+	*tc = c->next;
 }
 
 void
@@ -487,53 +569,90 @@ detachstack(Client *c) {
 }
 
 void
-drawbar(void) {
-	int i, x;
+die(const char *errstr, ...) {
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+void
+drawbar(Monitor *m) {
+	int x;
+	unsigned int i, occ = 0, urg = 0;
+	unsigned long *col;
 	Client *c;
 
+	for(c = clients; c; c = c->next) {
+		if(m == &mon[c->mon]) {
+			occ |= c->tags;
+			if(c->isurgent)
+				urg |= c->tags;
+		}
+	}
+
 	dc.x = 0;
-	for(c = stack; c && c->isbanned; c = c->snext);
+#ifdef XINERAMA
+	{
+		dc.w = TEXTW(m->symbol);
+		drawtext(m->symbol, selmon == m ? dc.sel : dc.norm, False);
+		dc.x += dc.w;
+	}
+#endif /* XINERAMA */
+	m->btx = dc.x;
 	for(i = 0; i < LENGTH(tags); i++) {
 		dc.w = TEXTW(tags[i]);
-		if(tagset[seltags] & 1 << i) {
-			drawtext(tags[i], dc.sel, isurgent(i));
-			drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
-		}
-		else {
-			drawtext(tags[i], dc.norm, isurgent(i));
-			drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
-		}
+		col = tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
+		drawtext(tags[i], col, urg & 1 << i);
+		drawsquare(m == selmon && sel && sel->tags & 1 << i,
+		           occ & 1 << i, urg & 1 << i, col);
 		dc.x += dc.w;
 	}
 	if(blw > 0) {
 		dc.w = blw;
-		drawtext(lt->symbol, dc.norm, ismax);
+		drawtext(lt[m->sellt]->symbol, dc.norm, False);
 		x = dc.x + dc.w;
 	}
 	else
 		x = dc.x;
-	dc.w = TEXTW(stext);
-	dc.x = ww - dc.w;
-	if(dc.x < x) {
-		dc.x = x;
-		dc.w = ww - x;
-	}
-	drawtext(stext, dc.norm, False);
-	if((dc.w = dc.x - x) > bh) {
-		dc.x = x;
-		if(c) {
-			drawtext(c->name, dc.sel, False);
-			drawsquare(c->isfixed, c->isfloating, False, dc.sel);
+	if(m == selmon) {
+		dc.w = TEXTW(stext);
+		dc.x = m->ww - dc.w;
+		if(dc.x < x) {
+			dc.x = x;
+			dc.w = m->ww - x;
+		}
+		drawtext(stext, dc.norm, False);
+		if((dc.w = dc.x - x) > bh) {
+			dc.x = x;
+			if(sel) {
+				drawtext(sel->name, dc.sel, False);
+				drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);
+			}
+			else
+				drawtext(NULL, dc.norm, False);
 		}
-		else
-			drawtext(NULL, dc.norm, False);
 	}
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
+	else {
+		dc.w = m->ww - x;
+		drawtext(NULL, dc.norm, False);
+	}
+	XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
 	XSync(dpy, False);
 }
 
 void
-drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
+drawbars() {
+	unsigned int i;
+
+	for(i = 0; i < nmons; i++)
+		drawbar(&mon[i]);
+}
+
+void
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 	int x;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
@@ -554,25 +673,24 @@ drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
 }
 
 void
-drawtext(const char *text, ulong col[ColLast], Bool invert) {
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
+	char buf[256];
 	int i, x, y, h, len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-	char buf[256];
 
 	XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	if(!text)
 		return;
 	olen = strlen(text);
-	len = MIN(olen, sizeof buf);
-	memcpy(buf, text, len);
 	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 */
-	for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
+	for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
 	if(!len)
 		return;
+	memcpy(buf, text, len);
 	if(len < olen)
 		for(i = len; i && i > len - 3; buf[--i] = '.');
 	XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
@@ -596,32 +714,28 @@ enternotify(XEvent *e) {
 }
 
 void
-eprint(const char *errstr, ...) {
-	va_list ap;
-
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(EXIT_FAILURE);
-}
-
-void
 expose(XEvent *e) {
+	unsigned int i;
 	XExposeEvent *ev = &e->xexpose;
 
-	if(ev->count == 0 && (ev->window == barwin))
-		drawbar();
+	for(i = 0; i < nmons; i++)
+		if(ev->count == 0 && (ev->window == mon[i].barwin)) {
+			drawbar(&mon[i]);
+			break;
+		}
 }
 
 void
 focus(Client *c) {
-	if(!c || c->isbanned)
-		for(c = stack; c && c->isbanned; c = c->snext);
+	if(!c || !ISVISIBLE(c))
+		for(c = stack; c && !ISVISIBLE(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
 	}
 	if(c) {
+		if(c->isurgent)
+			clearurgent(c);
 		detachstack(c);
 		attachstack(c);
 		grabbuttons(c, True);
@@ -631,7 +745,9 @@ focus(Client *c) {
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	sel = c;
-	drawbar();
+	if(c)
+		selmon = &mon[c->mon];
+	drawbars();
 }
 
 void
@@ -642,29 +758,40 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 		XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
 }
 
+#ifdef XINERAMA
+void
+focusmon(const Arg *arg) {
+	if(arg->ui >= nmons)
+		return;
+	selmon = &mon[arg->ui];
+	focus(NULL);
+	drawbars();
+}
+#endif /* XINERAMA */
+
 void
 focusstack(const Arg *arg) {
 	Client *c = NULL, *i;
 
 	if(!sel)
 		return;
-	if (arg->i > 0) {
-		for(c = sel->next; c && c->isbanned; c = c->next);
+	if(arg->i > 0) {
+		for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
 		if(!c)
-			for(c = clients; c && c->isbanned; c = c->next);
+			for(c = clients; c && !ISVISIBLE(c); c = c->next);
 	}
 	else {
 		for(i = clients; i != sel; i = i->next)
-			if (!i->isbanned)
+			if(ISVISIBLE(i))
 				c = i;
 		if(!c)
 			for(; i; i = i->next)
-				if (!i->isbanned)
+				if(ISVISIBLE(i))
 					c = i;
 	}
 	if(c) {
 		focus(c);
-		restack();
+		restack(selmon);
 	}
 }
 
@@ -676,13 +803,13 @@ getclient(Window w) {
 	return c;
 }
 
-ulong
+unsigned long
 getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
 
 	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-		eprint("error, cannot allocate color '%s'\n", colstr);
+		die("error, cannot allocate color '%s'\n", colstr);
 	return color.pixel;
 }
 
@@ -691,7 +818,7 @@ getstate(Window w) {
 	int format, status;
 	long result = -1;
 	unsigned char *p = NULL;
-	ulong n, extra;
+	unsigned long n, extra;
 	Atom real;
 
 	status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
@@ -705,7 +832,7 @@ getstate(Window w) {
 }
 
 Bool
-gettextprop(Window w, Atom atom, char *text, uint size) {
+gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 	char **list = NULL;
 	int n;
 	XTextProperty name;
@@ -732,47 +859,40 @@ gettextprop(Window w, Atom atom, char *text, uint size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
-	int i, j;
-	uint buttons[]   = { Button1, Button2, Button3 };
-	uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
-
-	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	if(focused)
-		for(i = 0; i < LENGTH(buttons); i++)
-			for(j = 0; j < LENGTH(modifiers); j++)
-				XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
-					BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
-	else
-		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
-			BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+	updatenumlockmask();
+	{
+		unsigned int i, j;
+		unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+		XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+		if(focused) {
+			for(i = 0; i < LENGTH(buttons); i++)
+				if(buttons[i].click == ClkClientWin)
+					for(j = 0; j < LENGTH(modifiers); j++)
+						XGrabButton(dpy, buttons[i].button,
+						            buttons[i].mask | modifiers[j],
+						            c->win, False, BUTTONMASK,
+						            GrabModeAsync, GrabModeSync, None, None);
+		} else
+			XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+			            BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+	}
 }
 
 void
 grabkeys(void) {
-	uint i, j;
-	KeyCode code;
-	XModifierKeymap *modmap;
-
-	/* init modifier map */
-	modmap = XGetModifierMapping(dpy);
-	for(i = 0; i < 8; i++)
-		for(j = 0; j < modmap->max_keypermod; j++) {
-			if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
-				numlockmask = (1 << i);
+	updatenumlockmask();
+	{ /* grab keys */
+		unsigned int i, j;
+		unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+		KeyCode code;
+
+		XUngrabKey(dpy, AnyKey, AnyModifier, root);
+		for(i = 0; i < LENGTH(keys); i++) {
+			if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
+				for(j = 0; j < LENGTH(modifiers); j++)
+					XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
+						 True, GrabModeAsync, GrabModeAsync);
 		}
-	XFreeModifiermap(modmap);
-
-	XUngrabKey(dpy, AnyKey, AnyModifier, root);
-	for(i = 0; i < LENGTH(keys); i++) {
-		code = XKeysymToKeycode(dpy, keys[i].keysym);
-		XGrabKey(dpy, code, keys[i].mod, root, True,
-				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod|LockMask, root, True,
-				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,
-				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,
-				GrabModeAsync, GrabModeAsync);
 	}
 }
 
@@ -782,8 +902,6 @@ initfont(const char *fontstr) {
 	int i, n;
 
 	missing = NULL;
-	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
 	if(missing) {
 		while(n--)
@@ -804,12 +922,9 @@ initfont(const char *fontstr) {
 		}
 	}
 	else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
 		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
 		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
-			eprint("error, cannot load font: '%s'\n", fontstr);
+			die("error, cannot load font: '%s'\n", fontstr);
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
 	}
@@ -817,16 +932,6 @@ initfont(const char *fontstr) {
 }
 
 Bool
-isoccupied(uint t) {
-	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(c->tags & 1 << t)
-			return True;
-	return False;
-}
-
-Bool
 isprotodel(Client *c) {
 	int i, n;
 	Atom *protocols;
@@ -841,19 +946,9 @@ isprotodel(Client *c) {
 	return ret;
 }
 
-Bool
-isurgent(uint t) {
-	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(c->isurgent && c->tags & 1 << t)
-			return True;
-	return False;
-}
-
 void
 keypress(XEvent *e) {
-	uint i;
+	unsigned int i;
 	KeySym keysym;
 	XKeyEvent *ev;
 
@@ -887,14 +982,16 @@ killclient(const Arg *arg) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
+	static Client cz;
 	Client *c, *t = NULL;
-	Status rettrans;
-	Window trans;
+	Window trans = None;
 	XWindowChanges wc;
 
-	if(!(c = calloc(1, sizeof(Client))))
-		eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
+	if(!(c = malloc(sizeof(Client))))
+		die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+	*c = cz;
 	c->win = w;
+	for(c->mon = 0; selmon != &mon[c->mon]; c->mon++);
 
 	/* geometry */
 	c->x = wa->x;
@@ -905,15 +1002,17 @@ manage(Window w, XWindowAttributes *wa) {
 	if(c->w == sw && c->h == sh) {
 		c->x = sx;
 		c->y = sy;
-		c->bw = wa->border_width;
+		c->bw = 0;
 	}
 	else {
-		if(c->x + c->w + 2 * c->bw > sx + sw)
-			c->x = sx + sw - c->w - 2 * c->bw;
-		if(c->y + c->h + 2 * c->bw > sy + sh)
-			c->y = sy + sh - c->h - 2 * c->bw;
+		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);
-		c->y = MAX(c->y, by == 0 ? bh : sy);
+		/* only fix client y-offset, if the client center might cover the bar */
+		c->y = MAX(c->y, ((selmon->by == 0) && (c->x + (c->w / 2) >= selmon->wx)
+		           && (c->x + (c->w / 2) < selmon->wx + selmon->ww)) ? bh : sy);
 		c->bw = borderpx;
 	}
 
@@ -925,19 +1024,19 @@ manage(Window w, XWindowAttributes *wa) {
 	XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
 	grabbuttons(c, False);
 	updatetitle(c);
-	if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
-		for(t = clients; t && t->win != trans; t = t->next);
+	if(XGetTransientForHint(dpy, w, &trans))
+		t = getclient(trans);
 	if(t)
 		c->tags = t->tags;
 	else
 		applyrules(c);
 	if(!c->isfloating)
-		c->isfloating = (rettrans == Success) || c->isfixed;
+		c->isfloating = trans != None || c->isfixed;
 	if(c->isfloating)
 		XRaiseWindow(dpy, c->win);
 	attach(c);
 	attachstack(c);
-	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
+	XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
 	XMapWindow(dpy, c->win);
 	setclientstate(c, NormalState);
 	arrange();
@@ -966,60 +1065,68 @@ maprequest(XEvent *e) {
 }
 
 void
+monocle(Monitor *m) {
+	Client *c;
+
+	for(c = nexttiled(m, clients); c; c = nexttiled(m, c->next))
+		resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw);
+}
+
+void
 movemouse(const Arg *arg) {
-	int x1, y1, ocx, ocy, di, nx, ny;
-	uint dui;
+	int x, y, ocx, ocy, di, nx, ny;
+	unsigned int dui;
 	Client *c;
 	Window dummy;
 	XEvent ev;
 
 	if(!(c = sel))
 		return;
-	restack();
-	ocx = nx = c->x;
-	ocy = ny = c->y;
+	restack(selmon);
+	ocx = c->x;
+	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 	None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
-	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
-	for(;;) {
+	XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
+	do {
 		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
 		switch (ev.type) {
-		case ButtonRelease:
-			XUngrabPointer(dpy, CurrentTime);
-			return;
 		case ConfigureRequest:
 		case Expose:
 		case MapRequest:
 			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
-			XSync(dpy, False);
-			nx = ocx + (ev.xmotion.x - x1);
-			ny = ocy + (ev.xmotion.y - y1);
-			if(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 - c->w - 2 * c->bw;
-				if(abs(wy - ny) < snap)
-					ny = wy;
-				else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
-					ny = wy + wh - c->h - 2 * c->bw;
-				if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+			nx = ocx + (ev.xmotion.x - x);
+			ny = ocy + (ev.xmotion.y - y);
+			if(snap && nx >= selmon->wx && nx <= selmon->wx + selmon->ww
+			        && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
+				if(abs(selmon->wx - nx) < snap)
+					nx = selmon->wx;
+				else if(abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
+					nx = selmon->wx + selmon->ww - WIDTH(c);
+				if(abs(selmon->wy - ny) < snap)
+					ny = selmon->wy;
+				else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
+					ny = selmon->wy + selmon->wh - HEIGHT(c);
+				if(!c->isfloating && lt[selmon->sellt]->arrange
+				                  && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
 					togglefloating(NULL);
 			}
-			if(!lt->arrange || c->isfloating)
-				resize(c, nx, ny, c->w, c->h, False);
+			if(!lt[selmon->sellt]->arrange || c->isfloating)
+				resize(c, nx, ny, c->w, c->h);
 			break;
 		}
 	}
+	while(ev.type != ButtonRelease);
+	XUngrabPointer(dpy, CurrentTime);
 }
 
 Client *
-nexttiled(Client *c) {
-	for(; c && (c->isfloating || c->isbanned); c = c->next);
+nexttiled(Monitor *m, Client *c) {
+	// TODO: m handling
+	for(; c && (c->isfloating || m != &mon[c->mon] || !ISVISIBLE(c)); c = c->next);
 	return c;
 }
 
@@ -1029,9 +1136,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:
@@ -1044,78 +1153,27 @@ propertynotify(XEvent *e) {
 			break;
 		case XA_WM_HINTS:
 			updatewmhints(c);
-			drawbar();
+			drawbars();
 			break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 			updatetitle(c);
 			if(c == sel)
-				drawbar();
+				drawbars();
 		}
 	}
 }
 
 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) {
-		/* set minimum possible */
-		w = MAX(1, w);
-		h = MAX(1, h);
-
-		/* 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;
-		}
-
-		/* 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 - w - 2 * c->bw;
-	if(y > sy + sh)
-		y = sh - h - 2 * c->bw;
-	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 || c->ismoved) {
-		c->ismoved = False;
+	if(applysizehints(c, &x, &y, &w, &h)) {
 		c->x = wc.x = x;
 		c->y = wc.y = y;
 		c->w = wc.width = w;
@@ -1137,61 +1195,58 @@ resizemouse(const Arg *arg) {
 
 	if(!(c = sel))
 		return;
-	restack();
+	restack(selmon);
 	ocx = c->x;
 	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 	None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-	for(;;) {
-		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
+	do {
+		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
 		switch(ev.type) {
-		case ButtonRelease:
-			XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
-					c->w + c->bw - 1, c->h + c->bw - 1);
-			XUngrabPointer(dpy, CurrentTime);
-			while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-			return;
 		case ConfigureRequest:
 		case Expose:
 		case MapRequest:
 			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
-			XSync(dpy, False);
 			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) {
-				if(!c->isfloating && lt->arrange
+			if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww
+			        && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {
+				if(!c->isfloating && lt[selmon->sellt]->arrange
 				   && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
 					togglefloating(NULL);
 			}
-			if(!lt->arrange || c->isfloating)
-				resize(c, c->x, c->y, nw, nh, True);
+			if(!lt[selmon->sellt]->arrange || c->isfloating)
+				resize(c, c->x, c->y, nw, nh);
 			break;
 		}
 	}
+	while(ev.type != ButtonRelease);
+	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
+	XUngrabPointer(dpy, CurrentTime);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
-restack(void) {
+restack(Monitor *m) {
 	Client *c;
 	XEvent ev;
 	XWindowChanges wc;
 
-	drawbar();
+	drawbars();
 	if(!sel)
 		return;
-	if(ismax || sel->isfloating || !lt->arrange)
+	if(m == selmon && (sel->isfloating || !lt[m->sellt]->arrange))
 		XRaiseWindow(dpy, sel->win);
-	if(!ismax && lt->arrange) {
+	if(lt[m->sellt]->arrange) {
 		wc.stack_mode = Below;
-		wc.sibling = barwin;
+		wc.sibling = m->barwin;
 		for(c = stack; c; c = c->snext)
-			if(!c->isfloating && !c->isbanned) {
+			if(!c->isfloating && m == &mon[c->mon] && ISVISIBLE(c)) {
 				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
 				wc.sibling = c->win;
 			}
@@ -1202,71 +1257,22 @@ restack(void) {
 
 void
 run(void) {
-	char *p;
-	char sbuf[sizeof stext];
-	fd_set rd;
-	int r, xfd;
-	uint len, offset;
 	XEvent ev;
 
-	/* main event loop, also reads status text from stdin */
+	/* main event loop */
 	XSync(dpy, False);
-	xfd = ConnectionNumber(dpy);
-	readin = True;
-	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;
-			eprint("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 */
 	}
 }
 
 void
 scan(void) {
-	uint i, num;
-	Window *wins, d1, d2;
+	unsigned int i, num;
+	Window d1, d2, *wins = NULL;
 	XWindowAttributes wa;
 
-	wins = NULL;
 	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
 		for(i = 0; i < num; i++) {
 			if(!XGetWindowAttributes(dpy, wins[i], &wa)
@@ -1282,9 +1288,9 @@ scan(void) {
 			&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
 				manage(wins[i], &wa);
 		}
+		if(wins)
+			XFree(wins);
 	}
-	if(wins)
-		XFree(wins);
 }
 
 void
@@ -1295,12 +1301,24 @@ setclientstate(Client *c, long state) {
 			PropModeReplace, (unsigned char *)data, 2);
 }
 
+void
+setlayout(const Arg *arg) {
+	if(!arg || !arg->v || arg->v != lt[selmon->sellt])
+		selmon->sellt ^= 1;
+	if(arg && arg->v)
+		lt[selmon->sellt] = (Layout *)arg->v;
+	if(sel)
+		arrange();
+	else
+		drawbars();
+}
+
 /* arg > 1.0 will set mfact absolutly */
 void
 setmfact(const Arg *arg) {
 	float f;
 
-	if(!arg || !lt->arrange)
+	if(!arg || !lt[selmon->sellt]->arrange)
 		return;
 	f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
 	if(f < 0.1 || f > 0.9)
@@ -1311,7 +1329,7 @@ setmfact(const Arg *arg) {
 
 void
 setup(void) {
-	uint i;
+	unsigned int i;
 	int w;
 	XSetWindowAttributes wa;
 
@@ -1324,13 +1342,13 @@ setup(void) {
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	bh = dc.h = dc.font.height + 2;
-	lt = layouts;
+	lt[0] = &layouts[0];
+	lt[1] = &layouts[1 % LENGTH(layouts)];
 	updategeom();
 
 	/* init atoms */
 	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
 	wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-	wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False);
 	wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
 	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
 	netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
@@ -1348,28 +1366,29 @@ 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);
 
-	/* init bar */
+	/* init bars */
+	wa.override_redirect = True;
+	wa.background_pixmap = ParentRelative;
+	wa.event_mask = ButtonPressMask|ExposureMask;
 	for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
 		w = TEXTW(layouts[i].symbol);
 		blw = MAX(blw, w);
 	}
 
-	wa.override_redirect = 1;
-	wa.background_pixmap = ParentRelative;
-	wa.event_mask = ButtonPressMask|ExposureMask;
+	for(i = 0; i < nmons; i++) {
+		mon[i].barwin = XCreateWindow(dpy, root, mon[i].wx, mon[i].by, mon[i].ww, bh, 0, DefaultDepth(dpy, screen),
 
-	barwin = XCreateWindow(dpy, root, wx, by, ww, 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);
-	drawbar();
+		                              CopyFromParent, DefaultVisual(dpy, screen),
+		                              CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+		XDefineCursor(dpy, mon[i].barwin, cursor[CurNormal]);
+		XMapRaised(dpy, mon[i].barwin);
+	}
+	updatestatus();
 
 	/* EWMH support per view */
 	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
@@ -1377,31 +1396,48 @@ 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);
 
-
-	/* grab keys */
 	grabkeys();
 }
 
 void
+showhide(Client *c) {
+	if(!c)
+		return;
+	if(ISVISIBLE(c)) { /* show clients top down */
+		XMoveWindow(dpy, c->win, c->x, c->y);
+		if(!lt[selmon->sellt]->arrange || c->isfloating)
+			resize(c, c->x, c->y, c->w, c->h);
+		showhide(c->snext);
+	}
+	else { /* hide clients bottom up */
+		showhide(c->snext);
+		XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	}
+}
+
+
+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
@@ -1412,8 +1448,18 @@ tag(const Arg *arg) {
 	}
 }
 
+#ifdef XINERAMA
+void
+tagmon(const Arg *arg) {
+	if(!sel || arg->ui >= nmons)
+		return;
+	sel->mon = arg->ui;
+	arrange();
+}
+#endif /* XINERAMA */
+
 int
-textnw(const char *text, uint len) {
+textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
 	if(dc.font.set) {
@@ -1424,44 +1470,44 @@ textnw(const char *text, uint len) {
 }
 
 void
-tile(void) {
+tile(Monitor *m) {
 	int x, y, h, w, mw;
-	uint i, n;
+	unsigned int i, n;
 	Client *c;
 
-	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+	for(n = 0, c = nexttiled(m, clients); c; c = nexttiled(m, c->next), n++);
 	if(n == 0)
 		return;
 
 	/* master */
-	c = nexttiled(clients);
-	mw = mfact * ww;
-	resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+	c = nexttiled(m, clients);
+	mw = mfact * m->ww;
+	resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw);
 
 	if(--n == 0)
 		return;
 
 	/* tile stack */
-	x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw;
-	y = wy;
-	w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
-	h = wh / n;
+	x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
+	y = m->wy;
+	w = (m->wx + mw > c->x + c->w) ? m->wx + m->ww - x : m->ww - mw;
+	h = m->wh / n;
 	if(h < bh)
-		h = wh;
+		h = m->wh;
 
-	for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+	for(i = 0, c = nexttiled(m, c->next); c; c = nexttiled(m, c->next), i++) {
 		resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
-		       ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
-		if(h != wh)
-			y = c->y + c->h + 2 * c->bw;
+		       ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
+		if(h != m->wh)
+			y = c->y + HEIGHT(c);
 	}
 }
 
 void
 togglebar(const Arg *arg) {
-	showbar = !showbar;
+	selmon->showbar = !selmon->showbar;
 	updategeom();
-	updatebar();
+	XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
 	arrange();
 }
 
@@ -1471,38 +1517,32 @@ 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);
-	arrange();
-}
-
-void
-togglelayout(const Arg *arg) {
-	if(arg && arg->v)
-		lt = (Layout *)arg->v;
-	else if(++lt == &layouts[LENGTH(layouts)])
-		lt = &layouts[0];
-	if(sel)
-		arrange();
-	else
-		drawbar();
-}
-
-void
-togglemax(const Arg *arg) {
-	ismax = !ismax;
+		resize(sel, sel->x, sel->y, sel->w, sel->h);
 	arrange();
 }
 
 void
 toggletag(const Arg *arg) {
-	if(sel && (sel->tags ^= (arg->ui & TAGMASK)))
+	unsigned int mask;
+
+	if(!sel)
+		return;
+	
+	mask = sel->tags ^ (arg->ui & TAGMASK);
+	if(mask) {
+		sel->tags = mask;
 		arrange();
+	}
 }
 
 void
 toggleview(const Arg *arg) {
-	if((tagset[seltags] ^= (arg->ui & TAGMASK)))
+	unsigned int mask = tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
+
+	if(mask) {
+		tagset[selmon->seltags] = mask;
 		arrange();
+	}
 }
 
 void
@@ -1537,39 +1577,86 @@ unmapnotify(XEvent *e) {
 }
 
 void
-updatebar(void) {
-	if(dc.drawable != 0)
-		XFreePixmap(dpy, dc.drawable);
-	dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
-	XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
-}
-
-void
 updategeom(void) {
 #ifdef XINERAMA
-	int i;
+	int di, x, y, n;
+	unsigned int dui, i = 0;
+	Bool pquery;
+	Client *c;
+	Window dummy;
 	XineramaScreenInfo *info = NULL;
 
 	/* window area geometry */
-	if(XineramaIsActive(dpy)) {
-		info = XineramaQueryScreens(dpy, &i);
-		wx = info[xidx].x_org;
-		wy = showbar && topbar ?  info[xidx].y_org + bh : info[xidx].y_org;
-		ww = info[xidx].width;
-		wh = showbar ? info[xidx].height - bh : info[xidx].height;
+	if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+		nmons = (unsigned int)n;
+		for(c = clients; c; c = c->next)
+			if(c->mon >= nmons)
+				c->mon = nmons - 1;
+		if(!(mon = (Monitor *)realloc(mon, sizeof(Monitor) * nmons)))
+			die("fatal: could not realloc() %u bytes\n", sizeof(Monitor) * nmons);
+		pquery = XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
+		for(i = 0; i < nmons; i++) {
+			/* TODO: consider re-using XineramaScreenInfo */
+			mon[i].symbol[0] = '[';
+			mon[i].symbol[1] = '0' + info[i].screen_number;
+			mon[i].symbol[2] = ']';
+			mon[i].symbol[3] = 0;
+			mon[i].showbar = showbar;
+			mon[i].topbar = topbar;
+			mon[i].wx = info[i].x_org;
+			mon[i].wy = mon[i].showbar && mon[i].topbar ? info[i].y_org + bh : info[i].y_org;
+			mon[i].ww = info[i].width;
+			mon[i].wh = mon[i].showbar ? info[i].height - bh : info[i].height;
+			mon[i].seltags = 0;
+			mon[i].sellt = 0;
+			if(mon[i].showbar)
+				mon[i].by = mon[i].topbar ? info[i].y_org : mon[i].wy + mon[i].wh;
+			else
+				mon[i].by = -bh;
+			if(pquery && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+				selmon = &mon[i];
+		}
 		XFree(info);
 	}
 	else
-#endif
+#endif /* XINERAMA */
 	{
-		wx = sx;
-		wy = showbar && topbar ? sy + bh : sy;
-		ww = sw;
-		wh = showbar ? sh - bh : sh;
+		nmons = 1;
+		if(!(mon = (Monitor *)realloc(mon, sizeof(Monitor))))
+			die("fatal: could not realloc() %u bytes\n", sizeof(Monitor));
+		selmon = &mon[0];
+		mon[0].symbol[0] = '[';
+		mon[0].symbol[1] = '0';
+		mon[0].symbol[2] = ']';
+		mon[0].symbol[3] = 0;
+		mon[0].showbar = showbar;
+		mon[0].topbar = topbar;
+		mon[0].wx = sx;
+		mon[0].wy = mon[0].showbar && mon[0].topbar ? sy + bh : sy;
+		mon[0].ww = sw;
+		mon[0].wh = mon[0].showbar ? sh - bh : sh;
+		mon[0].seltags = 0;
+		mon[0].sellt = 0;
+		if(mon[0].showbar)
+			mon[0].by = mon[0].topbar ? sy : mon[0].wy + mon[0].wh;
+		else
+			mon[0].by = -bh;
 	}
+}
 
-	/* bar position */
-	by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
+void
+updatenumlockmask(void) {
+	unsigned int i, j;
+	XModifierKeymap *modmap;
+
+	numlockmask = 0;
+	modmap = XGetModifierMapping(dpy);
+	for(i = 0; i < 8; i++)
+		for(j = 0; j < modmap->max_keypermod; j++)
+			if(modmap->modifiermap[i * modmap->max_keypermod + j]
+			   == XKeysymToKeycode(dpy, XK_Num_Lock))
+				numlockmask = (1 << i);
+	XFreeModifiermap(modmap);
 }
 
 void
@@ -1577,7 +1664,9 @@ updatesizehints(Client *c) {
 	long msize;
 	XSizeHints size;
 
-	XGetWMNormalHints(dpy, c->win, &size, &msize);
+	if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
+		/* size is uninitialized, ensure that size.flags aren't used */
+		size.flags = PSize;
 	if(size.flags & PBaseSize) {
 		c->basew = size.base_width;
 		c->baseh = size.base_height;
@@ -1617,13 +1706,20 @@ updatesizehints(Client *c) {
 	else
 		c->maxa = c->mina = 0.0;
 	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
-			&& c->maxw == c->minw && c->maxh == c->minh);
+	             && c->maxw == c->minw && c->maxh == c->minh);
 }
 
 void
 updatetitle(Client *c) {
 	if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
-		gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
+		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(selmon);
 }
 
 void
@@ -1631,19 +1727,24 @@ updatewmhints(Client *c) {
 	XWMHints *wmh;
 
 	if((wmh = XGetWMHints(dpy, c->win))) {
-		if(c == sel)
-			sel->isurgent = False;
+		if(c == sel && wmh->flags & XUrgencyHint) {
+			wmh->flags &= ~XUrgencyHint;
+			XSetWMHints(dpy, c->win, wmh);
+		}
 		else
 			c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+
 		XFree(wmh);
 	}
 }
 
 void
 view(const Arg *arg) {
-	seltags ^= 1; /* toggle sel tagset */
-	if(arg && (arg->ui & TAGMASK))
-		tagset[seltags] = arg->i & TAGMASK;
+	if((arg->ui & TAGMASK) == tagset[selmon->seltags])
+		return;
+	selmon->seltags ^= 1; /* toggle sel tagset */
+	if(arg->ui & TAGMASK)
+		tagset[selmon->seltags] = arg->ui & TAGMASK;
 	arrange();
 }
 
@@ -1684,10 +1785,10 @@ void
 zoom(const Arg *arg) {
 	Client *c = sel;
 
-	if(ismax || !lt->arrange || (sel && sel->isfloating))
+	if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (sel && sel->isfloating))
 		return;
-	if(c == nexttiled(clients))
-		if(!c || !(c = nexttiled(c->next)))
+	if(c == nexttiled(selmon, clients))
+		if(!c || !(c = nexttiled(selmon, c->next)))
 			return;
 	detach(c);
 	attach(c);
@@ -1698,13 +1799,15 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))
-		eprint("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)
-		eprint("usage: dwm [-v]\n");
+		die("usage: dwm [-v]\n");
+
+	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+		fputs("warning: no locale support\n", stderr);
 
-	setlocale(LC_CTYPE, "");
-	if(!(dpy = XOpenDisplay(0)))
-		eprint("dwm: cannot open display\n");
+	if(!(dpy = XOpenDisplay(NULL)))
+		die("dwm: cannot open display\n");
 
 	checkotherwm();
 	setup();