X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=ff9e66ab5983bd3704b9a84f683b91470ed8ee1b;hb=822101dd5bceadb12351dd5f9084d7745b10ec92;hp=a4deccfdaef5be3b08f9a23cfe58266adbbae7ec;hpb=3fd39feb4153cf73f26223918bc8145ee98a9a92;p=dwm.git

diff --git a/dwm.c b/dwm.c
index a4deccf..235940e 100644
--- a/dwm.c
+++ b/dwm.c
@@ -17,9 +17,7 @@
  * set the override_redirect flag.  Clients are organized in a global
  * doubly-linked client list, the focus history is remembered through a global
  * stack list. Each client contains an array of Bools of the same size as the
- * global tags array to indicate the tags of a client.  For each client dwm
- * creates a small title window, which is resized whenever the (_NET_)WM_NAME
- * properties are updated or the client is moved/resized.
+ * global tags array to indicate the tags of a client.
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *
@@ -35,24 +33,29 @@
 #include <sys/select.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <regex.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
 
 /* macros */
-#define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
-#define CLEANMASK(mask)		(mask & ~(numlockmask | LockMask))
-#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
+#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)
 
 /* enums */
-enum { BarTop, BarBot, BarOff };			/* bar position */
-enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
-enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
+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 */
 
 /* typedefs */
@@ -60,12 +63,11 @@ typedef struct Client Client;
 struct Client {
 	char name[256];
 	int x, y, w, h;
-	int rx, ry, rw, rh; /* revert geometry */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int minax, maxax, minay, maxay;
 	long flags;
-	unsigned int border, oldborder;
-	Bool isbanned, isfixed, ismax, isfloating, wasfloating;
+	unsigned int bw, oldbw;
+	Bool isbanned, isfixed, isfloating, isurgent;
 	Bool *tags;
 	Client *next;
 	Client *prev;
@@ -98,19 +100,17 @@ typedef struct {
 typedef struct {
 	const char *symbol;
 	void (*arrange)(void);
+	void (*updategeom)(void);
 } Layout;
 
 typedef struct {
-	const char *prop;
-	const char *tags;
+	const char *class;
+	const char *instance;
+	const char *title;
+	const char *tag;
 	Bool isfloating;
 } Rule;
 
-typedef struct {
-	regex_t *propregex;
-	regex_t *tagregex;
-} Regs;
-
 /* function declarations */
 void applyrules(Client *c);
 void arrange(void);
@@ -120,7 +120,6 @@ void ban(Client *c);
 void buttonpress(XEvent *e);
 void checkotherwm(void);
 void cleanup(void);
-void compileregs(void);
 void configure(Client *c);
 void configurenotify(XEvent *e);
 void configurerequest(XEvent *e);
@@ -128,14 +127,14 @@ void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(void);
-void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
-void drawtext(const char *text, unsigned long col[ColLast]);
+void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
 void *emallocz(unsigned int size);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);
-void floating(void); /* default floating layout */
 void focus(Client *c);
+void focusin(XEvent *e);
 void focusnext(const char *arg);
 void focusprev(const char *arg);
 Client *getclient(Window w);
@@ -143,20 +142,20 @@ unsigned long getcolor(const char *colstr);
 long getstate(Window w);
 Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 void grabbuttons(Client *c, Bool focused);
-unsigned int idxoftag(const char *tag);
+void grabkeys(void);
+unsigned int idxoftag(const char *t);
 void initfont(const char *fontstr);
-Bool isarrange(void (*func)());
 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
+Bool isurgent(unsigned int t);
 Bool isvisible(Client *c);
 void keypress(XEvent *e);
 void killclient(const char *arg);
-void leavenotify(XEvent *e);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
 void movemouse(Client *c);
-Client *nexttiled(Client *c);
+Client *nextunfloating(Client *c);
 void propertynotify(XEvent *e);
 void quit(const char *arg);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
@@ -165,42 +164,42 @@ void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
-void setlayout(const char *arg);
-void setmwfact(const char *arg);
+void setmfact(const char *arg);
 void setup(void);
 void spawn(const char *arg);
 void tag(const char *arg);
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
 void tile(void);
+void tileresize(Client *c, int x, int y, int w, int h);
 void togglebar(const char *arg);
 void togglefloating(const char *arg);
-void togglemax(const char *arg);
+void togglelayout(const char *arg);
 void toggletag(const char *arg);
 void toggleview(const char *arg);
 void unban(Client *c);
 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
-void updatebarpos(void);
+void updatebar(void);
+void updategeom(void);
 void updatesizehints(Client *c);
+void updatetilegeom(void);
 void updatetitle(Client *c);
+void updatewmhints(Client *c);
 void view(const char *arg);
-void viewprevtag(const char *arg);	/* views previous selected tags */
+void viewprevtag(const char *arg);
 int xerror(Display *dpy, XErrorEvent *ee);
-int xerrordummy(Display *dsply, XErrorEvent *ee);
-int xerrorstart(Display *dsply, XErrorEvent *ee);
+int xerrordummy(Display *dpy, XErrorEvent *ee);
+int xerrorstart(Display *dpy, XErrorEvent *ee);
 void zoom(const char *arg);
 
 /* variables */
 char stext[256];
-double mwfact;
-int screen, sx, sy, sw, sh, wax, way, waw, wah;
+int screen, sx, sy, sw, sh;
+int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int mx, my, mw, mh, tx, ty, tw, th;
+int seltags = 0;
 int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos;
-unsigned int blw = 0;
-unsigned int ltidx = 0; /* default */
-unsigned int nlayouts = 0;
-unsigned int nrules = 0;
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
@@ -208,8 +207,8 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[ConfigureNotify] = configurenotify,
 	[DestroyNotify] = destroynotify,
 	[EnterNotify] = enternotify,
-	[LeaveNotify] = leavenotify,
 	[Expose] = expose,
+	[FocusIn] = focusin,
 	[KeyPress] = keypress,
 	[MappingNotify] = mappingnotify,
 	[MapRequest] = maprequest,
@@ -219,49 +218,50 @@ void (*handler[LASTEvent]) (XEvent *) = {
 Atom wmatom[WMLast], netatom[NetLast];
 Bool otherwm, readin;
 Bool running = True;
-Bool selscreen = True;
+Bool *tagset[2];
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
-Window barwin, root;
-Regs *regs = NULL;
+Layout layouts[];
+Layout *lt = layouts;
+Window root, barwin;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
+#define TAGSZ (LENGTH(tags) * sizeof(Bool))
 
 /* function implementations */
+
 void
 applyrules(Client *c) {
-	static char buf[512];
-	unsigned int i, j;
-	regmatch_t tmp;
+	unsigned int i;
 	Bool matched = False;
+	Rule *r;
 	XClassHint ch = { 0 };
 
 	/* rule matching */
 	XGetClassHint(dpy, c->win, &ch);
-	snprintf(buf, sizeof buf, "%s:%s:%s",
-			ch.res_class ? ch.res_class : "",
-			ch.res_name ? ch.res_name : "", c->name);
-	for(i = 0; i < nrules; i++)
-		if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
-			c->isfloating = rules[i].isfloating;
-			for(j = 0; regs[i].tagregex && j < NTAGS; j++) {
-				if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
-					matched = True;
-					c->tags[j] = True;
-				}
+	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;
+			if(r->tag) {
+				c->tags[idxoftag(r->tag)] = True;
+				matched = True;
 			}
 		}
+	}
 	if(ch.res_class)
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
 	if(!matched)
-		memcpy(c->tags, seltags, sizeof seltags);
+		memcpy(c->tags, tagset[seltags], TAGSZ);
 }
 
 void
@@ -269,12 +269,17 @@ arrange(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(isvisible(c))
+		if(isvisible(c)) {
 			unban(c);
+			if(!lt->arrange || c->isfloating)
+				resize(c, c->x, c->y, c->w, c->h, True);
+		}
 		else
 			ban(c);
-	layouts[ltidx].arrange();
+
 	focus(NULL);
+	if(lt->arrange)
+		lt->arrange();
 	restack();
 }
 
@@ -306,9 +311,9 @@ buttonpress(XEvent *e) {
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
-	if(barwin == ev->window) {
+	if(ev->window == barwin) {
 		x = 0;
-		for(i = 0; i < NTAGS; i++) {
+		for(i = 0; i < LENGTH(tags); i++) {
 			x += textw(tags[i]);
 			if(ev->x < x) {
 				if(ev->button == Button1) {
@@ -326,31 +331,23 @@ buttonpress(XEvent *e) {
 				return;
 			}
 		}
-		if((ev->x < x + blw) && ev->button == Button1)
-			setlayout(NULL);
+		if((ev->x < x + blw) && ev->button == Button1) 
+			togglelayout(NULL);
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1) {
-			if(isarrange(floating) || c->isfloating)
-				restack();
-			else
-				togglefloating(NULL);
+			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
-			if((ISTILE) && !c->isfixed && c->isfloating)
+			if(lt->arrange && c->isfloating)
 				togglefloating(NULL);
-			else
-				zoom(NULL);
 		}
 		else if(ev->button == Button3 && !c->isfixed) {
-			if(isarrange(floating) || c->isfloating)
-				restack();
-			else
-				togglefloating(NULL);
+			restack();
 			resizemouse(c);
 		}
 	}
@@ -362,7 +359,7 @@ checkotherwm(void) {
 	XSetErrorHandler(xerrorstart);
 
 	/* this causes an error if some other window manager is running */
-	XSelectInput(dpy, root, SubstructureRedirectMask);
+	XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
 	XSync(dpy, False);
 	if(otherwm)
 		eprint("dwm: another window manager is already running\n");
@@ -386,39 +383,12 @@ cleanup(void) {
 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
 	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);
+	XDestroyWindow(dpy, barwin);
 	XSync(dpy, False);
-}
-
-void
-compileregs(void) {
-	unsigned int i;
-	regex_t *reg;
-
-	if(regs)
-		return;
-	nrules = sizeof rules / sizeof rules[0];
-	regs = emallocz(nrules * sizeof(Regs));
-	for(i = 0; i < nrules; i++) {
-		if(rules[i].prop) {
-			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rules[i].prop, REG_EXTENDED))
-				free(reg);
-			else
-				regs[i].propregex = reg;
-		}
-		if(rules[i].tags) {
-			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rules[i].tags, REG_EXTENDED))
-				free(reg);
-			else
-				regs[i].tagregex = reg;
-		}
-	}
+	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 
 void
@@ -433,7 +403,7 @@ configure(Client *c) {
 	ce.y = c->y;
 	ce.width = c->w;
 	ce.height = c->h;
-	ce.border_width = c->border;
+	ce.border_width = c->bw;
 	ce.above = None;
 	ce.override_redirect = False;
 	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
@@ -446,10 +416,8 @@ configurenotify(XEvent *e) {
 	if(ev->window == root && (ev->width != sw || ev->height != sh)) {
 		sw = ev->width;
 		sh = ev->height;
-		XFreePixmap(dpy, dc.drawable);
-		dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
-		XResizeWindow(dpy, barwin, sw, bh);
-		updatebarpos();
+		updategeom();
+		updatebar();
 		arrange();
 	}
 }
@@ -461,24 +429,23 @@ configurerequest(XEvent *e) {
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
-		c->ismax = False;
 		if(ev->value_mask & CWBorderWidth)
-			c->border = ev->border_width;
-		if(c->isfixed || c->isfloating || isarrange(floating)) {
+			c->bw = ev->border_width;
+		if(c->isfixed || c->isfloating || !lt->arrange) {
 			if(ev->value_mask & CWX)
-				c->x = ev->x;
+				c->x = sx + ev->x;
 			if(ev->value_mask & CWY)
-				c->y = ev->y;
+				c->y = sy + ev->y;
 			if(ev->value_mask & CWWidth)
 				c->w = ev->width;
 			if(ev->value_mask & CWHeight)
 				c->h = ev->height;
-			if((c->x + c->w) > sw && c->isfloating)
-				c->x = sw / 2 - c->w / 2; /* center in x direction */
-			if((c->y + c->h) > sh && c->isfloating)
-				c->y = sh / 2 - c->h / 2; /* center in y direction */
-			if((ev->value_mask & (CWX | CWY))
-			&& !(ev->value_mask & (CWWidth | CWHeight)))
+			if((c->x - sx + c->w) > sw && c->isfloating)
+				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)))
 				configure(c);
 			if(isvisible(c))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
@@ -523,57 +490,63 @@ void
 detachstack(Client *c) {
 	Client **tc;
 
-	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+	for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext);
 	*tc = c->snext;
 }
 
 void
 drawbar(void) {
 	int i, x;
+	Client *c;
 
-	dc.x = dc.y = 0;
-	for(i = 0; i < NTAGS; i++) {
+	dc.x = 0;
+	for(c = stack; c && !isvisible(c); c = c->snext);
+	for(i = 0; i < LENGTH(tags); i++) {
 		dc.w = textw(tags[i]);
-		if(seltags[i]) {
-			drawtext(tags[i], dc.sel);
-			drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
+		if(tagset[seltags][i]) {
+			drawtext(tags[i], dc.sel, isurgent(i));
+			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
 		}
 		else {
-			drawtext(tags[i], dc.norm);
-			drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
+			drawtext(tags[i], dc.norm, isurgent(i));
+			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
 		}
 		dc.x += dc.w;
 	}
-	dc.w = blw;
-	drawtext(layouts[ltidx].symbol, dc.norm);
-	x = dc.x + dc.w;
+	if(blw > 0) {
+		dc.w = blw;
+		drawtext(lt->symbol, dc.norm, False);
+		x = dc.x + dc.w;
+	}
+	else
+		x = dc.x;
 	dc.w = textw(stext);
-	dc.x = sw - dc.w;
+	dc.x = bw - dc.w;
 	if(dc.x < x) {
 		dc.x = x;
-		dc.w = sw - x;
+		dc.w = bw - x;
 	}
-	drawtext(stext, dc.norm);
+	drawtext(stext, dc.norm, False);
 	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
-		if(sel) {
-			drawtext(sel->name, dc.sel);
-			drawsquare(sel->ismax, sel->isfloating, dc.sel);
+		if(c) {
+			drawtext(c->name, dc.sel, False);
+			drawsquare(False, c->isfloating, False, dc.sel);
 		}
 		else
-			drawtext(NULL, dc.norm);
+			drawtext(NULL, dc.norm, False);
 	}
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
 	XSync(dpy, False);
 }
 
 void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+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 };
 
-	gcv.foreground = col[ColFG];
+	gcv.foreground = col[invert ? ColBG : ColFG];
 	XChangeGC(dpy, dc.gc, GCForeground, &gcv);
 	x = (dc.font.ascent + dc.font.descent + 2) / 4;
 	r.x = dc.x + 1;
@@ -589,28 +562,27 @@ drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
 }
 
 void
-drawtext(const char *text, unsigned long col[ColLast]) {
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 	int x, y, w, h;
-	static char buf[256];
 	unsigned int len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+	char buf[256];
 
-	XSetForeground(dpy, dc.gc, col[ColBG]);
+	XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	if(!text)
 		return;
-	w = 0;
-	olen = len = strlen(text);
-	if(len >= sizeof buf)
-		len = sizeof buf - 1;
+	olen = strlen(text);
+	len = MIN(olen, sizeof buf);
 	memcpy(buf, text, len);
-	buf[len] = 0;
+	w = 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;
+	for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
+	if(!len)
+		return;
 	if(len < olen) {
 		if(len > 1)
 			buf[len - 1] = '.';
@@ -619,9 +591,7 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 		if(len > 3)
 			buf[len - 3] = '.';
 	}
-	if(w > dc.w)
-		return; /* too long */
-	XSetForeground(dpy, dc.gc, col[ColFG]);
+	XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
 	if(dc.font.set)
 		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
 	else
@@ -642,14 +612,12 @@ enternotify(XEvent *e) {
 	Client *c;
 	XCrossingEvent *ev = &e->xcrossing;
 
-	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
+	if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
 		return;
 	if((c = getclient(ev->window)))
 		focus(c);
-	else if(ev->window == root) {
-		selscreen = True;
+	else
 		focus(NULL);
-	}
 }
 
 void
@@ -666,24 +634,13 @@ void
 expose(XEvent *e) {
 	XExposeEvent *ev = &e->xexpose;
 
-	if(0 == ev->count) {
-		if(barwin == ev->window)
-			drawbar();
-	}
-}
-
-void
-floating(void) { /* default floating layout */
-	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(isvisible(c))
-			resize(c, c->x, c->y, c->w, c->h, True);
+	if(ev->count == 0 && (ev->window == barwin))
+		drawbar();
 }
 
 void
 focus(Client *c) {
-	if((!c && selscreen) || (c && !isvisible(c)))
+	if(!c || (c && !isvisible(c)))
 		for(c = stack; c && !isvisible(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
@@ -695,15 +652,21 @@ focus(Client *c) {
 		grabbuttons(c, True);
 	}
 	sel = c;
-	drawbar();
-	if(!selscreen)
-		return;
 	if(c) {
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	drawbar();
+}
+
+void
+focusin(XEvent *e) { /* there are some broken focus acquiring clients */
+	XFocusChangeEvent *ev = &e->xfocus;
+
+	if(sel && ev->window != sel->win)
+		XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
 }
 
 void
@@ -780,7 +743,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 	int n;
 	XTextProperty name;
 
-	if(!text || 0 == size)
+	if(!text || size == 0)
 		return False;
 	text[0] = '\0';
 	XGetTextProperty(dpy, w, &name, atom);
@@ -790,8 +753,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 		strncpy(text, (char *)name.value, size - 1);
 	else {
 		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-		&& n > 0 && *list)
-		{
+		&& n > 0 && *list) {
 			strncpy(text, *list, size - 1);
 			XFreeStringList(list);
 		}
@@ -803,47 +765,57 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
+	int i, j;
+	unsigned int buttons[]   = { Button1, Button2, Button3 };
+	unsigned int 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);
+}
+
+void
+grabkeys(void) {
+	unsigned int 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);
+		}
+	XFreeModifiermap(modmap);
 
-	if(focused) {
-		XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-
-		XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-
-		XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
+	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);
 	}
-	else
-		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
 }
 
 unsigned int
-idxoftag(const char *tag) {
+idxoftag(const char *t) {
 	unsigned int i;
 
-	for(i = 0; (i < NTAGS) && (tags[i] != tag); i++);
-	return (i < NTAGS) ? i : 0;
+	for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
+	return (i < LENGTH(tags)) ? i : 0;
 }
 
 void
@@ -868,10 +840,8 @@ initfont(const char *fontstr) {
 		font_extents = XExtentsOfFontSet(dc.font.set);
 		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
 		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-			if(dc.font.ascent < (*xfonts)->ascent)
-				dc.font.ascent = (*xfonts)->ascent;
-			if(dc.font.descent < (*xfonts)->descent)
-				dc.font.descent = (*xfonts)->descent;
+			dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+			dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
 			xfonts++;
 		}
 	}
@@ -889,12 +859,6 @@ initfont(const char *fontstr) {
 }
 
 Bool
-isarrange(void (*func)())
-{
-	return func == layouts[ltidx].arrange;
-}
-
-Bool
 isoccupied(unsigned int t) {
 	Client *c;
 
@@ -920,42 +884,34 @@ isprotodel(Client *c) {
 }
 
 Bool
+isurgent(unsigned int t) {
+	Client *c;
+
+	for(c = clients; c; c = c->next)
+		if(c->isurgent && c->tags[t])
+			return True;
+	return False;
+}
+
+Bool
 isvisible(Client *c) {
 	unsigned int i;
 
-	for(i = 0; i < NTAGS; i++)
-		if(c->tags[i] && seltags[i])
+	for(i = 0; i < LENGTH(tags); i++)
+		if(c->tags[i] && tagset[seltags][i])
 			return True;
 	return False;
 }
 
 void
 keypress(XEvent *e) {
-	KEYS
-	unsigned int len = sizeof keys / sizeof keys[0];
 	unsigned int i;
-	KeyCode code;
 	KeySym keysym;
 	XKeyEvent *ev;
 
-	if(!e) { /* grabkeys */
-		XUngrabKey(dpy, AnyKey, AnyModifier, root);
-		for(i = 0; i < len; 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);
-		}
-		return;
-	}
 	ev = &e->xkey;
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-	for(i = 0; i < len; i++)
+	for(i = 0; i < LENGTH(keys); i++)
 		if(keysym == keys[i].keysym
 		&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
 		{
@@ -984,60 +940,51 @@ killclient(const char *arg) {
 }
 
 void
-leavenotify(XEvent *e) {
-	XCrossingEvent *ev = &e->xcrossing;
-
-	if((ev->window == root) && !ev->same_screen) {
-		selscreen = False;
-		focus(NULL);
-	}
-}
-
-void
 manage(Window w, XWindowAttributes *wa) {
 	Client *c, *t = NULL;
-	Window trans;
 	Status rettrans;
+	Window trans;
 	XWindowChanges wc;
 
 	c = emallocz(sizeof(Client));
-	c->tags = emallocz(sizeof seltags);
+	c->tags = emallocz(TAGSZ);
 	c->win = w;
+
+	/* geometry */
 	c->x = wa->x;
 	c->y = wa->y;
 	c->w = wa->width;
 	c->h = wa->height;
-	c->oldborder = wa->border_width;
+	c->oldbw = wa->border_width;
 	if(c->w == sw && c->h == sh) {
 		c->x = sx;
 		c->y = sy;
-		c->border = wa->border_width;
+		c->bw = wa->border_width;
 	}
 	else {
-		if(c->x + c->w + 2 * c->border > wax + waw)
-			c->x = wax + waw - c->w - 2 * c->border;
-		if(c->y + c->h + 2 * c->border > way + wah)
-			c->y = way + wah - c->h - 2 * c->border;
-		if(c->x < wax)
-			c->x = wax;
-		if(c->y < way)
-			c->y = way;
-		c->border = BORDERPX;
+		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;
+		c->x = MAX(c->x, sx);
+		c->y = MAX(c->y, by == 0 ? bh : sy);
+		c->bw = borderpx;
 	}
-	wc.border_width = c->border;
+
+	wc.border_width = c->bw;
 	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
 	XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
 	configure(c); /* propagates border_width, if size doesn't change */
 	updatesizehints(c);
-	XSelectInput(dpy, w,
-		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+	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(t)
-		memcpy(c->tags, t->tags, sizeof seltags);
-	applyrules(c);
+		memcpy(c->tags, t->tags, TAGSZ);
+	else
+		applyrules(c);
 	if(!c->isfloating)
 		c->isfloating = (rettrans == Success) || c->isfixed;
 	attach(c);
@@ -1055,7 +1002,7 @@ mappingnotify(XEvent *e) {
 
 	XRefreshKeyboardMapping(ev);
 	if(ev->request == MappingKeyboard)
-		keypress(NULL);
+		grabkeys();
 }
 
 void
@@ -1081,12 +1028,11 @@ movemouse(Client *c) {
 	ocx = nx = c->x;
 	ocy = ny = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-			None, cursor[CurMove], CurrentTime) != GrabSuccess)
+	None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
-	c->ismax = False;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
-		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
 		switch (ev.type) {
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
@@ -1100,22 +1046,28 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			nx = ocx + (ev.xmotion.x - x1);
 			ny = ocy + (ev.xmotion.y - y1);
-			if(abs(wax + nx) < SNAP)
-				nx = wax;
-			else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
-				nx = wax + waw - c->w - 2 * c->border;
-			if(abs(way - ny) < SNAP)
-				ny = way;
-			else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
-				ny = way + wah - c->h - 2 * c->border;
-			resize(c, nx, ny, c->w, c->h, False);
+			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))
+					togglefloating(NULL);
+			}
+			if(!lt->arrange || c->isfloating)
+				resize(c, nx, ny, c->w, c->h, False);
 			break;
 		}
 	}
 }
 
 Client *
-nexttiled(Client *c) {
+nextunfloating(Client *c) {
 	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
 	return c;
 }
@@ -1130,15 +1082,19 @@ propertynotify(XEvent *e) {
 		return; /* ignore */
 	if((c = getclient(ev->window))) {
 		switch (ev->atom) {
-			default: break;
-			case XA_WM_TRANSIENT_FOR:
-				XGetTransientForHint(dpy, c->win, &trans);
-				if(!c->isfloating && (c->isfloating = (NULL != getclient(trans))))
-					arrange();
-				break;
-			case XA_WM_NORMAL_HINTS:
-				updatesizehints(c);
-				break;
+		default: break;
+		case XA_WM_TRANSIENT_FOR:
+			XGetTransientForHint(dpy, c->win, &trans);
+			if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+				arrange();
+			break;
+		case XA_WM_NORMAL_HINTS:
+			updatesizehints(c);
+			break;
+		case XA_WM_HINTS:
+			updatewmhints(c);
+			drawbar();
+			break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 			updatetitle(c);
@@ -1159,20 +1115,19 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 
 	if(sizehints) {
 		/* set minimum possible */
-		if (w < 1)
-			w = 1;
-		if (h < 1)
-			h = 1;
+		w = MAX(1, w);
+		h = MAX(1, h);
 
 		/* temporarily remove base dimensions */
 		w -= c->basew;
 		h -= c->baseh;
 
 		/* adjust for aspect limits */
-		if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
-			if (w * c->maxay > h * c->maxax)
+		if(c->minax != c->maxax && c->minay != c->maxay 
+		&& c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 0) {
+			if(w * c->maxay > h * c->maxax)
 				w = h * c->maxax / c->maxay;
-			else if (w * c->minay < h * c->minax)
+			else if(w * c->minay < h * c->minax)
 				h = w * c->minay / c->minax;
 		}
 
@@ -1186,33 +1141,33 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 		w += c->basew;
 		h += c->baseh;
 
-		if(c->minw > 0 && w < c->minw)
-			w = c->minw;
-		if(c->minh > 0 && h < c->minh)
-			h = c->minh;
-		if(c->maxw > 0 && w > c->maxw)
-			w = c->maxw;
-		if(c->maxh > 0 && h > c->maxh)
-			h = c->maxh;
+		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;
-	/* offscreen appearance fixes */
-	if(x > sw)
-		x = sw - w - 2 * c->border;
-	if(y > sh)
-		y = sh - h - 2 * c->border;
-	if(x + w + 2 * c->border < sx)
+	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->border < sy)
+	if(y + h + 2 * c->bw < sy)
 		y = sy;
 	if(c->x != x || c->y != y || c->w != w || c->h != h) {
 		c->x = wc.x = x;
 		c->y = wc.y = y;
 		c->w = wc.width = w;
 		c->h = wc.height = h;
-		wc.border_width = c->border;
-		XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+		wc.border_width = c->bw;
+		XConfigureWindow(dpy, c->win,
+				CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
 		configure(c);
 		XSync(dpy, False);
 	}
@@ -1227,16 +1182,15 @@ 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->border - 1, c->h + c->border - 1);
+	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);
+		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
 		switch(ev.type) {
 		case ButtonRelease:
 			XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
-					c->w + c->border - 1, c->h + c->border - 1);
+					c->w + c->bw - 1, c->h + c->bw - 1);
 			XUngrabPointer(dpy, CurrentTime);
 			while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 			return;
@@ -1247,11 +1201,17 @@ resizemouse(Client *c) {
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
-			if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
-				nw = 1;
-			if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
-				nh = 1;
-			resize(c, c->x, c->y, nw, nh, True);
+			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
+				   && (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);
 			break;
 		}
 	}
@@ -1266,21 +1226,16 @@ restack(void) {
 	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || isarrange(floating))
+	if(sel->isfloating || !lt->arrange)
 		XRaiseWindow(dpy, sel->win);
-	if(!isarrange(floating)) {
+	if(lt->arrange) {
 		wc.stack_mode = Below;
 		wc.sibling = barwin;
-		if(!sel->isfloating) {
-			XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
-			wc.sibling = sel->win;
-		}
-		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
-			if(c == sel)
-				continue;
-			XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
-			wc.sibling = c->win;
-		}
+		for(c = stack; c; c = c->snext)
+			if(!c->isfloating && isvisible(c)) {
+				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+				wc.sibling = c->win;
+			}
 	}
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@ -1289,14 +1244,19 @@ restack(void) {
 void
 run(void) {
 	char *p;
-	int r, xfd;
+	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 */
 	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)
@@ -1308,10 +1268,9 @@ run(void) {
 			eprint("select failed\n");
 		}
 		if(FD_ISSET(STDIN_FILENO, &rd)) {
-			switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
+			switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
 			case -1:
-				strncpy(stext, strerror(errno), sizeof stext - 1);
-				stext[sizeof stext - 1] = '\0';
+				strncpy(stext, strerror(errno), len);
 				readin = False;
 				break;
 			case 0:
@@ -1319,10 +1278,18 @@ run(void) {
 				readin = False;
 				break;
 			default:
-				for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
-				for(; p >= stext && *p != '\n'; --p);
-				if(p > stext)
-					strncpy(stext, p + 1, sizeof stext);
+				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();
 		}
@@ -1370,57 +1337,39 @@ setclientstate(Client *c, long state) {
 }
 
 void
-setlayout(const char *arg) {
-	unsigned int i;
+setmfact(const char *arg) {
+	double d;
 
-	if(!arg) {
-		if(++ltidx == nlayouts)
-			ltidx = 0;;
-	}
+	if(!arg || lt->arrange != tile)
+		return;
 	else {
-		for(i = 0; i < nlayouts; i++)
-			if(!strcmp(arg, layouts[i].symbol))
-				break;
-		if(i == nlayouts)
+		d = strtod(arg, NULL);
+		if(arg[0] == '-' || arg[0] == '+')
+			d += mfact;
+		if(d < 0.1 || d > 0.9)
 			return;
-		ltidx = i;
-	}
-	if(sel)
-		arrange();
-	else
-		drawbar();
-}
-
-void
-setmwfact(const char *arg) {
-	double delta;
-
-	if(!(ISTILE))
-		return;
-	/* arg handling, manipulate mwfact */
-	if(NULL == arg)
-		mwfact = MWFACT;
-	else if(1 == sscanf(arg, "%lf", &delta)) {
-		if(arg[0] == '+' || arg[0] == '-')
-			mwfact += delta;
-		else
-			mwfact = delta;
-		if(mwfact < 0.1)
-			mwfact = 0.1;
-		else if(mwfact > 0.9)
-			mwfact = 0.9;
+		mfact = d;
 	}
+	updatetilegeom();
 	arrange();
 }
 
 void
 setup(void) {
-	int d;
-	unsigned int i, j, mask;
-	Window w;
-	XModifierKeymap *modmap;
+	unsigned int i, w;
 	XSetWindowAttributes wa;
 
+	/* init screen */
+	screen = DefaultScreen(dpy);
+	root = RootWindow(dpy, screen);
+	initfont(FONT);
+	sx = 0;
+	sy = 0;
+	sw = DisplayWidth(dpy, screen);
+	sh = DisplayHeight(dpy, screen);
+	bh = dc.font.height + 2;
+	updategeom();
+
 	/* init atoms */
 	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
 	wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
@@ -1428,42 +1377,12 @@ setup(void) {
 	wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
 	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
 	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);
+	wa.cursor = cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
-	/* init geometry */
-	sx = sy = 0;
-	sw = DisplayWidth(dpy, screen);
-	sh = DisplayHeight(dpy, screen);
-
-	/* 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);
-		}
-	XFreeModifiermap(modmap);
-
-	/* select for events */
-	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
-		| EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
-	wa.cursor = cursor[CurNormal];
-	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-	XSelectInput(dpy, root, wa.event_mask);
-
-	/* grab keys */
-	keypress(NULL);
-
-	/* init tags */
-	compileregs();
-
 	/* init appearance */
 	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
 	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
@@ -1472,37 +1391,49 @@ setup(void) {
 	dc.sel[ColBG] = getcolor(SELBGCOLOR);
 	dc.sel[ColFG] = getcolor(SELFGCOLOR);
 	initfont(FONT);
-	dc.h = bh = dc.font.height + 2;
-
-	/* init layouts */
-	mwfact = MWFACT;
-	nlayouts = sizeof layouts / sizeof layouts[0];
-	for(blw = i = 0; i < nlayouts; i++) {
-		j = textw(layouts[i].symbol);
-		if(j > blw)
-			blw = j;
-	}
+	dc.h = bh;
+	dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
+	dc.gc = XCreateGC(dpy, root, 0, 0);
+	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+	if(!dc.font.set)
+		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+
+	/* init tags */
+	tagset[0] = emallocz(TAGSZ);
+	tagset[1] = emallocz(TAGSZ);
+	tagset[0][0] = tagset[1][0] = True;
 
 	/* init bar */
-	bpos = BARPOS;
+	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;
-	barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0,
-			DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
-			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+	wa.event_mask = ButtonPressMask|ExposureMask;
+
+	barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+			CopyFromParent, DefaultVisual(dpy, screen),
+			CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
-	updatebarpos();
 	XMapRaised(dpy, barwin);
 	strcpy(stext, "dwm-"VERSION);
-	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);
-	if(!dc.font.set)
-		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+	drawbar();
+
+	/* EWMH support per view */
+	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+			PropModeReplace, (unsigned char *) netatom, NetLast);
 
-	/* multihead support */
-	selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
+	/* select for events */
+	wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+			|EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+	XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+	XSelectInput(dpy, root, wa.event_mask);
+
+
+	/* grab keys */
+	grabkeys();
 }
 
 void
@@ -1515,8 +1446,8 @@ spawn(const char *arg) {
 		return;
 	/* The double-fork construct avoids zombie processes and keeps the code
 	 * clean from stupid signal handlers. */
-	if(0 == fork()) {
-		if(0 == fork()) {
+	if(fork() == 0) {
+		if(fork() == 0) {
 			if(dpy)
 				close(ConnectionNumber(dpy));
 			setsid();
@@ -1535,8 +1466,8 @@ tag(const char *arg) {
 
 	if(!sel)
 		return;
-	for(i = 0; i < NTAGS; i++)
-		sel->tags[i] = (NULL == arg);
+	for(i = 0; i < LENGTH(tags); i++)
+		sel->tags[i] = (arg == NULL);
 	sel->tags[idxoftag(arg)] = True;
 	arrange();
 }
@@ -1559,54 +1490,56 @@ textw(const char *text) {
 
 void
 tile(void) {
-	unsigned int i, n, nx, ny, nw, nh, mw, th;
-	Client *c, *mc;
-
-	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-		n++;
-
-	/* window geoms */
-	mw = (n == 1) ? waw : mwfact * waw;
-	th = (n > 1) ? wah / (n - 1) : 0;
-	if(n > 1 && th < bh)
-		th = wah;
-
-	nx = wax;
-	ny = way;
-	nw = 0; /* gcc stupidity requires this */
-	for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) {
-		c->ismax = False;
-		if(0 == i) { /* master */
-			nw = mw - 2 * c->border;
-			nh = wah - 2 * c->border;
-		}
-		else {  /* tile window */
-			if(i == 1) {
-				ny = way;
-				nx += mc->w + 2 * mc->border;
-				nw = waw - nx - 2 * c->border;
-			}
-			if(i + 1 == n) /* remainder */
-				nh = (way + wah) - ny - 2 * c->border;
-			else
-				nh = th - 2 * c->border;
-		}
-		resize(c, nx, ny, nw, nh, True);
-		if((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw))
-			/* client doesn't accept size constraints */
-			resize(c, nx, ny, nw, nh, False);
-		if(n > 1 && th != wah)
-			ny = c->y + c->h + 2 * c->border;
+	int x, y, h, w;
+	unsigned int i, n;
+	Client *c;
+
+	for(n = 0, c = nextunfloating(clients); c; c = nextunfloating(c->next), n++);
+	if(n == 0)
+		return;
+
+	/* master */
+	c = nextunfloating(clients);
+
+	if(n == 1)
+		tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+	else
+		tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
+
+	if(--n == 0)
+		return;
+
+	/* tile stack */
+	x = (tx > c->x + c->w) ? c->x + c->w + 2 * c->bw : tw;
+	y = ty;
+	w = (tx > c->x + c->w) ? wx + ww - x : tw;
+	h = th / n;
+	if(h < bh)
+		h = th;
+
+	for(i = 0, c = nextunfloating(c->next); c; c = nextunfloating(c->next), i++) {
+		if(i + 1 == n) /* remainder */
+			tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);
+		else
+			tileresize(c, x, y, w - 2 * c->bw, h - 2 * c->bw);
+		if(h != th)
+			y = c->y + c->h + 2 * c->bw;
 	}
 }
 
 void
+tileresize(Client *c, int x, int y, int w, int h) {
+	resize(c, x, y, w, h, resizehints);
+	if(resizehints && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
+		/* client doesn't accept size constraints */
+		resize(c, x, y, w, h, False);
+}
+
+void
 togglebar(const char *arg) {
-	if(bpos == BarOff)
-		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
-	else
-		bpos = BarOff;
-	updatebarpos();
+	showbar = !showbar;
+	updategeom();
+	updatebar();
 	arrange();
 }
 
@@ -1621,31 +1554,25 @@ togglefloating(const char *arg) {
 }
 
 void
-togglemax(const char *arg) {
-	XEvent ev;
+togglelayout(const char *arg) {
+	unsigned int i;
 
-	if(!sel || sel->isfixed)
-		return;
-	if((sel->ismax = !sel->ismax)) {
-		if(isarrange(floating) || sel->isfloating)
-			sel->wasfloating = True;
-		else {
-			togglefloating(NULL);
-			sel->wasfloating = False;
-		}
-		sel->rx = sel->x;
-		sel->ry = sel->y;
-		sel->rw = sel->w;
-		sel->rh = sel->h;
-		resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
+	if(!arg) {
+		if(++lt == &layouts[LENGTH(layouts)])
+			lt = &layouts[0];
 	}
 	else {
-		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
-		if(!sel->wasfloating)
-			togglefloating(NULL);
+		for(i = 0; i < LENGTH(layouts); i++)
+			if(!strcmp(arg, layouts[i].symbol))
+				break;
+		if(i == LENGTH(layouts))
+			return;
+		lt = &layouts[i];
 	}
-	drawbar();
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+	if(sel)
+		arrange();
+	else
+		drawbar();
 }
 
 void
@@ -1656,8 +1583,8 @@ toggletag(const char *arg) {
 		return;
 	i = idxoftag(arg);
 	sel->tags[i] = !sel->tags[i];
-	for(j = 0; j < NTAGS && !sel->tags[j]; j++);
-	if(j == NTAGS)
+	for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
+	if(j == LENGTH(tags))
 		sel->tags[i] = True; /* at least one tag must be enabled */
 	arrange();
 }
@@ -1667,10 +1594,10 @@ toggleview(const char *arg) {
 	unsigned int i, j;
 
 	i = idxoftag(arg);
-	seltags[i] = !seltags[i];
-	for(j = 0; j < NTAGS && !seltags[j]; j++);
-	if(j == NTAGS)
-		seltags[i] = True; /* at least one tag must be viewed */
+	tagset[seltags][i] = !tagset[seltags][i];
+	for(j = 0; j < LENGTH(tags) && !tagset[seltags][j]; j++);
+	if(j == LENGTH(tags))
+		tagset[seltags][i] = True; /* at least one tag must be viewed */
 	arrange();
 }
 
@@ -1686,7 +1613,7 @@ void
 unmanage(Client *c) {
 	XWindowChanges wc;
 
-	wc.border_width = c->oldborder;
+	wc.border_width = c->oldbw;
 	/* The server grab construct avoids race conditions. */
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
@@ -1715,29 +1642,46 @@ unmapnotify(XEvent *e) {
 }
 
 void
-updatebarpos(void) {
-	XEvent ev;
+updatebar(void) {
+	if(dc.drawable != 0)
+		XFreePixmap(dpy, dc.drawable);
+	dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
+	XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+}
 
-	wax = sx;
-	way = sy;
-	wah = sh;
-	waw = sw;
-	switch(bpos) {
-	default:
-		wah -= bh;
-		way += bh;
-		XMoveWindow(dpy, barwin, sx, sy);
-		break;
-	case BarBot:
-		wah -= bh;
-		XMoveWindow(dpy, barwin, sx, sy + wah);
-		break;
-	case BarOff:
-		XMoveWindow(dpy, barwin, sx, sy - bh);
-		break;
+void
+updategeom(void) {
+	int i;
+#ifdef XINERAMA
+	XineramaScreenInfo *info = NULL;
+
+	/* window area geometry */
+	if(XineramaIsActive(dpy)) {
+		info = XineramaQueryScreens(dpy, &i);
+		wx = info[0].x_org;
+		wy = showbar && topbar ? info[0].y_org + bh : info[0].y_org;
+		ww = info[0].width;
+		wh = showbar ? info[0].height - bh : info[0].height;
+		XFree(info);
 	}
-	XSync(dpy, False);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+	else
+#endif
+	{
+		wx = sx;
+		wy = showbar && topbar ? sy + bh : sy;
+		ww = sw;
+		wh = showbar ? sh - bh : sh;
+	}
+
+	/* bar geometry*/
+	bx = wx;
+	by = showbar ? (topbar ? 0 : wy + wh) : -bh;
+	bw = ww;
+
+	/* update layout geometries */
+	for(i = 0; i < LENGTH(layouts); i++)
+		if(layouts[i].updategeom)
+			layouts[i].updategeom();
 }
 
 void
@@ -1793,11 +1737,53 @@ updatesizehints(Client *c) {
 }
 
 void
+updatetilegeom(void) {
+	/* master area geometry */
+	mx = wx;
+	my = wy;
+	mw = mfact * ww;
+	mh = wh;
+
+	/* tile area geometry */
+	tx = mx + mw;
+	ty = wy;
+	tw = ww - mw;
+	th = wh;
+}
+
+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);
 }
 
+void
+updatewmhints(Client *c) {
+	XWMHints *wmh;
+
+	if((wmh = XGetWMHints(dpy, c->win))) {
+		if(c == sel)
+			sel->isurgent = False;
+		else
+			c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+		XFree(wmh);
+	}
+}
+
+void
+view(const char *arg) {
+	seltags ^= 1; /* toggle sel tagset */
+	memset(tagset[seltags], (NULL == arg), TAGSZ);
+	tagset[seltags][idxoftag(arg)] = True;
+	arrange();
+}
+
+void
+viewprevtag(const char *arg) {
+	seltags ^= 1; /* toggle sel tagset */
+	arrange();
+}
+
 /* 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.  */
@@ -1809,79 +1795,56 @@ xerror(Display *dpy, XErrorEvent *ee) {
 	|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
 	|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
 	|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
+	|| (ee->request_code == X_GrabButton && ee->error_code == BadAccess)
 	|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
 	|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
 		return 0;
 	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-		ee->request_code, ee->error_code);
+			ee->request_code, ee->error_code);
 	return xerrorxlib(dpy, ee); /* may call exit */
 }
 
 int
-xerrordummy(Display *dsply, XErrorEvent *ee) {
+xerrordummy(Display *dpy, XErrorEvent *ee) {
 	return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
 int
-xerrorstart(Display *dsply, XErrorEvent *ee) {
+xerrorstart(Display *dpy, XErrorEvent *ee) {
 	otherwm = True;
 	return -1;
 }
 
 void
-view(const char *arg) {
-	unsigned int i;
-
-	memcpy(prevtags, seltags, sizeof seltags);
-	for(i = 0; i < NTAGS; i++)
-		seltags[i] = (NULL == arg);
-	seltags[idxoftag(arg)] = True;
-	arrange();
-}
-
-void
-viewprevtag(const char *arg) {
-	static Bool tmptags[sizeof tags / sizeof tags[0]];
-
-	memcpy(tmptags, seltags, sizeof seltags);
-	memcpy(seltags, prevtags, sizeof seltags);
-	memcpy(prevtags, tmptags, sizeof seltags);
-	arrange();
-}
-
-void
 zoom(const char *arg) {
-	Client *c;
+	Client *c = sel;
 
-	if(!sel || !(ISTILE) || sel->isfloating)
-		return;
-	if((c = sel) == nexttiled(clients))
-		if(!(c = nexttiled(c->next)))
+	if(c == nextunfloating(clients))
+		if(!c || !(c = nextunfloating(c->next)))
 			return;
-	detach(c);
-	attach(c);
-	focus(c);
+	if(lt->arrange == tile && !sel->isfloating) {
+		detach(c);
+		attach(c);
+		focus(c);
+	}
 	arrange();
 }
 
 int
 main(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))
-		eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
+		eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
 	else if(argc != 1)
 		eprint("usage: dwm [-v]\n");
 
 	setlocale(LC_CTYPE, "");
 	if(!(dpy = XOpenDisplay(0)))
 		eprint("dwm: cannot open display\n");
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
 
 	checkotherwm();
 	setup();
-	drawbar();
 	scan();
 	run();
 	cleanup();