X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=05fbf58479a373583f26c6c2eeeb955b64e88c1e;hp=1080d2d53e5ab68fa73211e18626536b80b25925;hb=32f36ab2d58b7bcbadc0b1c9c88654cdf906c71d;hpb=6cf73e706ac8748e2e1734faad532ca3918e56c2

diff --git a/dwm.c b/dwm.c
index 1080d2d..05fbf58 100644
--- a/dwm.c
+++ b/dwm.c
@@ -16,8 +16,8 @@
  * 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
- * 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.
+ * stack list. Each client contains a bit array to indicate the tags of a
+ * client.
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *
@@ -39,39 +39,39 @@
 #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 LENGTH(x)		(sizeof x / sizeof x[0])
-#define MAXTAGLEN		16
-#define MOUSEMASK		(BUTTONMASK|PointerMotionMask)
-#define DEFGEOM(GEONAME,BX,BY,BW,WX,WY,WW,WH,MX,MY,MW,MH,TX,TY,TW,TH,MOX,MOY,MOW,MOH) \
-void GEONAME(void) { \
-	bx = (BX); by = (BY); bw = (BW); \
-	wx = (WX); wy = (WY); ww = (WW); wh = (WH); \
-	mx = (MX); my = (MY); mw = (MW); mh = (MH); \
-	tx = (TX); ty = (TY); tw = (TW); th = (TH); \
-	mox = (MOX); moy = (MOY); mow = (MOW); moh = (MOH); \
-}
+#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)
 
 /* enums */
-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 */
+typedef unsigned int uint;
+typedef unsigned long ulong;
 typedef struct Client Client;
 struct Client {
 	char name[256];
 	int x, y, w, h;
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int minax, maxax, minay, maxay;
-	long flags;
-	unsigned int bw, oldbw;
-	Bool isbanned, isfixed, isfloating, isurgent;
-	Bool *tags;
+	int bw, oldbw;
+	Bool isbanned, isfixed, isfloating, ismoved, isurgent;
+	uint tags;
 	Client *next;
 	Client *prev;
 	Client *snext;
@@ -80,8 +80,8 @@ struct Client {
 
 typedef struct {
 	int x, y, w, h;
-	unsigned long norm[ColLast];
-	unsigned long sel[ColLast];
+	ulong norm[ColLast];
+	ulong sel[ColLast];
 	Drawable drawable;
 	GC gc;
 	struct {
@@ -94,28 +94,22 @@ typedef struct {
 } DC; /* draw context */
 
 typedef struct {
-	const char *symbol;
-	void (*apply)(void);
-} Geom;
-
-typedef struct {
-	unsigned long mod;
+	uint mod;
 	KeySym keysym;
-	void (*func)(const char *arg);
-	const char *arg;
+	void (*func)(const void *arg);
+	const void *arg;
 } Key;
 
 typedef struct {
 	const char *symbol;
 	void (*arrange)(void);
-	Bool isfloating;
-} Layout; 
+} Layout;
 
 typedef struct {
 	const char *class;
 	const char *instance;
 	const char *title;
-	const char *tag;
+	uint tags;
 	Bool isfloating;
 } Rule;
 
@@ -124,95 +118,82 @@ void applyrules(Client *c);
 void arrange(void);
 void attach(Client *c);
 void attachstack(Client *c);
-void ban(Client *c);
 void buttonpress(XEvent *e);
 void checkotherwm(void);
 void cleanup(void);
 void configure(Client *c);
 void configurenotify(XEvent *e);
 void configurerequest(XEvent *e);
-unsigned int counttiled(void);
 void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(void);
-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 drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
+void drawtext(const char *text, ulong col[ColLast], Bool invert);
 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);
+void focusnext(const void *arg);
+void focusprev(const void *arg);
 Client *getclient(Window w);
-unsigned long getcolor(const char *colstr);
+ulong getcolor(const char *colstr);
 long getstate(Window w);
-Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+Bool gettextprop(Window w, Atom atom, char *text, uint size);
 void grabbuttons(Client *c, Bool focused);
 void grabkeys(void);
-unsigned int idxoftag(const char *t);
 void initfont(const char *fontstr);
-Bool isoccupied(unsigned int t);
+Bool isoccupied(uint t);
 Bool isprotodel(Client *c);
-Bool isurgent(unsigned int t);
-Bool isvisible(Client *c);
+Bool isurgent(uint t);
 void keypress(XEvent *e);
-void killclient(const char *arg);
+void killclient(const void *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
-void monocle(void);
 void movemouse(Client *c);
 Client *nexttiled(Client *c);
 void propertynotify(XEvent *e);
-void quit(const char *arg);
-void reapply(const char *arg);
+void quit(const void *arg);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);
 void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
-void setgeom(const char *arg);
-void setlayout(const char *arg);
-void setmfact(const char *arg);
+void setmfact(const void *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 tileh(void);
-void tilehstack(unsigned int n);
-Client *tilemaster(unsigned int n);
-void tileresize(Client *c, int x, int y, int w, int h);
-void tilev(void);
-void tilevstack(unsigned int n);
-void togglefloating(const char *arg);
-void toggletag(const char *arg);
-void toggleview(const char *arg);
-void unban(Client *c);
+void spawn(const void *arg);
+void tag(const void *arg);
+uint textnw(const char *text, uint len);
+void tile(void);
+void togglebar(const void *arg);
+void togglefloating(const void *arg);
+void togglelayout(const void *arg);
+void togglemax(const void *arg);
+void toggletag(const void *arg);
+void toggleview(const void *arg);
 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
-void updatebarpos(void);
+void updatebar(void);
+void updategeom(void);
 void updatesizehints(Client *c);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
-void view(const char *arg);
-void viewprevtag(const char *arg);	/* views previous selected tags */
+void view(const void *arg);
 int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(const char *arg);
+void zoom(const void *arg);
 
 /* variables */
-char stext[256], buf[256];
+char stext[256];
 int screen, sx, sy, sw, sh;
+int by, bh, blw, wx, wy, ww, wh;
+uint seltags = 0;
 int (*xerrorxlib)(Display *, XErrorEvent *);
-int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;
-unsigned int numlockmask = 0;
+uint numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
@@ -228,31 +209,30 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
+Bool ismax = False;
 Bool otherwm, readin;
 Bool running = True;
-Bool *prevtags;
-Bool *seltags;
+uint tagset[] = {1, 1}; /* after start, first tag is selected */
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
-Geom *geom = NULL;
-Layout *lt = 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))
-static Bool tmp[LENGTH(tags)];
 
-/* function implementations */
+/* compile-time check if all tags fit into an uint bit array. */
+struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
 
+/* function implementations */
 void
 applyrules(Client *c) {
-	unsigned int i;
-	Bool matched = False;
+	uint i;
 	Rule *r;
 	XClassHint ch = { 0 };
 
@@ -260,23 +240,19 @@ applyrules(Client *c) {
 	XGetClassHint(dpy, c->win, &ch);
 	for(i = 0; i < LENGTH(rules); i++) {
 		r = &rules[i];
-		if((r->title && strstr(c->name, r->title))
-		|| (ch.res_class && r->class && strstr(ch.res_class, r->class))
-		|| (ch.res_name && r->instance && strstr(ch.res_name, r->instance)))
-		{
+		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;
-			}
+			c->tags |= r->tags & TAGMASK;
 		}
 	}
 	if(ch.res_class)
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
-	if(!matched)
-		memcpy(c->tags, seltags, TAGSZ);
+	if(!c->tags)
+		c->tags = tagset[seltags];
 }
 
 void
@@ -284,13 +260,23 @@ arrange(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(isvisible(c))
-			unban(c);
-		else
-			ban(c);
+		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;
+		}
+		else if(!c->isbanned) {
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+			c->isbanned = c->ismoved = True;
+		}
 
 	focus(NULL);
-	lt->arrange();
+	if(lt->arrange && !ismax)
+		lt->arrange();
 	restack();
 }
 
@@ -309,64 +295,49 @@ attachstack(Client *c) {
 }
 
 void
-ban(Client *c) {
-	if(c->isbanned)
-		return;
-	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-	c->isbanned = True;
-}
-
-void
 buttonpress(XEvent *e) {
-	unsigned int i, x;
+	uint i, x, mask;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
 	if(ev->window == barwin) {
-		if((ev->x < bgw) && ev->button == Button1) {
-			setgeom(NULL);
-			return;
-		}
-		x = bgw;
+		x = 0;
 		for(i = 0; i < LENGTH(tags); i++) {
-			x += textw(tags[i]);
-			if(ev->x >= bgw && ev->x < x) {
+			x += TEXTW(tags[i]);
+			if(ev->x < x) {
+				mask = 1 << i;
 				if(ev->button == Button1) {
 					if(ev->state & MODKEY)
-						tag(tags[i]);
+						tag(&mask);
 					else
-						view(tags[i]);
+						view(&mask);
 				}
 				else if(ev->button == Button3) {
 					if(ev->state & MODKEY)
-						toggletag(tags[i]);
+						toggletag(&mask);
 					else
-						toggleview(tags[i]);
+						toggleview(&mask);
 				}
 				return;
 			}
 		}
-		if((ev->x < x + blw) && ev->button == Button1) 
-			setlayout(NULL);
+		if(ev->x < x + blw) {
+			if(ev->button == Button1) 
+				togglelayout(NULL);
+			else if(ev->button == Button3) 
+				togglemax(NULL);
+		}
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		if(CLEANMASK(ev->state) != MODKEY)
+		if(CLEANMASK(ev->state) != MODKEY || (ismax && !c->isfixed))
 			return;
-		if(ev->button == Button1) {
-			restack();
+		if(ev->button == Button1)
 			movemouse(c);
-		}
-		else if(ev->button == Button2) {
-			if((floating != lt->arrange) && c->isfloating)
-				togglefloating(NULL);
-			else
-				zoom(NULL);
-		}
-		else if(ev->button == Button3 && !c->isfixed) {
-			restack();
+		else if(ev->button == Button2)
+			togglefloating(NULL);
+		else if(ev->button == Button3 && !c->isfixed)
 			resizemouse(c);
-		}
 	}
 }
 
@@ -380,7 +351,6 @@ checkotherwm(void) {
 	XSync(dpy, False);
 	if(otherwm)
 		eprint("dwm: another window manager is already running\n");
-	XSync(dpy, False);
 	XSetErrorHandler(NULL);
 	xerrorxlib = XSetErrorHandler(xerror);
 	XSync(dpy, False);
@@ -389,10 +359,9 @@ checkotherwm(void) {
 void
 cleanup(void) {
 	close(STDIN_FILENO);
-	while(stack) {
-		unban(stack);
+	view((uint[]){~0});
+	while(stack)
 		unmanage(stack);
-	}
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	else
@@ -433,7 +402,9 @@ configurenotify(XEvent *e) {
 	if(ev->window == root && (ev->width != sw || ev->height != sh)) {
 		sw = ev->width;
 		sh = ev->height;
-		setgeom(geom->symbol);
+		updategeom();
+		updatebar();
+		arrange();
 	}
 }
 
@@ -446,7 +417,9 @@ configurerequest(XEvent *e) {
 	if((c = getclient(ev->window))) {
 		if(ev->value_mask & CWBorderWidth)
 			c->bw = ev->border_width;
-		if(c->isfixed || c->isfloating || lt->isfloating) {
+		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) {
 			if(ev->value_mask & CWX)
 				c->x = sx + ev->x;
 			if(ev->value_mask & CWY)
@@ -462,7 +435,7 @@ configurerequest(XEvent *e) {
 			if((ev->value_mask & (CWX|CWY))
 			&& !(ev->value_mask & (CWWidth|CWHeight)))
 				configure(c);
-			if(isvisible(c))
+			if(!c->isbanned)
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
@@ -481,15 +454,6 @@ configurerequest(XEvent *e) {
 	XSync(dpy, False);
 }
 
-unsigned int
-counttiled(void) {
-	unsigned int n;
-	Client *c;
-
-	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
-	return n;
-}
-
 void
 destroynotify(XEvent *e) {
 	Client *c;
@@ -514,7 +478,7 @@ 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;
 }
 
@@ -524,53 +488,48 @@ drawbar(void) {
 	Client *c;
 
 	dc.x = 0;
-	if(bgw > 0) {
-		dc.w = bgw;
-		drawtext(geom->symbol, dc.norm, False);
-		dc.x += bgw;
-	}
-	for(c = stack; c && !isvisible(c); c = c->snext);
+	for(c = stack; c && c->isbanned; c = c->snext);
 	for(i = 0; i < LENGTH(tags); i++) {
-		dc.w = textw(tags[i]);
-		if(seltags[i]) {
+		dc.w = TEXTW(tags[i]);
+		if(tagset[seltags] & 1 << i) {
 			drawtext(tags[i], dc.sel, isurgent(i));
-			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
+			drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
 		}
 		else {
 			drawtext(tags[i], dc.norm, isurgent(i));
-			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
+			drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
 		}
 		dc.x += dc.w;
 	}
 	if(blw > 0) {
 		dc.w = blw;
-		drawtext(lt->symbol, dc.norm, False);
+		drawtext(lt->symbol, dc.norm, ismax);
 		x = dc.x + dc.w;
 	}
 	else
 		x = dc.x;
-	dc.w = textw(stext);
-	dc.x = bw - dc.w;
+	dc.w = TEXTW(stext);
+	dc.x = ww - dc.w;
 	if(dc.x < x) {
 		dc.x = x;
-		dc.w = bw - 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(False, c->isfloating, False, dc.sel);
+			drawsquare(c->isfixed, c->isfloating, False, dc.sel);
 		}
 		else
 			drawtext(NULL, dc.norm, False);
 	}
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
 	XSync(dpy, False);
 }
 
 void
-drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
 	int x;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
@@ -591,37 +550,27 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 }
 
 void
-drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
-	int x, y, w, h;
-	unsigned int len, olen;
+drawtext(const char *text, ulong col[ColLast], Bool invert) {
+	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;
-	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;
 	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;
-	if(len < olen) {
-		if(len > 1)
-			buf[len - 1] = '.';
-		if(len > 2)
-			buf[len - 2] = '.';
-		if(len > 3)
-			buf[len - 3] = '.';
-	}
-	if(w > dc.w)
-		return; /* too long */
+	for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
+	if(!len)
+		return;
+	if(len < olen)
+		for(i = len; i >= MAX(0, len - 3); buf[i--] = '.');
 	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);
@@ -629,15 +578,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
-void *
-emallocz(unsigned int size) {
-	void *res = calloc(1, size);
-
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", size);
-	return res;
-}
-
 void
 enternotify(XEvent *e) {
 	Client *c;
@@ -670,18 +610,9 @@ expose(XEvent *e) {
 }
 
 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);
-}
-
-void
 focus(Client *c) {
-	if(!c || (c && !isvisible(c)))
-		for(c = stack; c && !isvisible(c); c = c->snext);
+	if(!c || c->isbanned)
+		for(c = stack; c && c->isbanned; c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -690,14 +621,12 @@ focus(Client *c) {
 		detachstack(c);
 		attachstack(c);
 		grabbuttons(c, True);
-	}
-	sel = c;
-	if(c) {
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	sel = c;
 	drawbar();
 }
 
@@ -710,14 +639,14 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 }
 
 void
-focusnext(const char *arg) {
+focusnext(const void *arg) {
 	Client *c;
 
 	if(!sel)
 		return;
-	for(c = sel->next; c && !isvisible(c); c = c->next);
+	for(c = sel->next; c && c->isbanned; c = c->next);
 	if(!c)
-		for(c = clients; c && !isvisible(c); c = c->next);
+		for(c = clients; c && c->isbanned; c = c->next);
 	if(c) {
 		focus(c);
 		restack();
@@ -725,15 +654,15 @@ focusnext(const char *arg) {
 }
 
 void
-focusprev(const char *arg) {
+focusprev(const void *arg) {
 	Client *c;
 
 	if(!sel)
 		return;
-	for(c = sel->prev; c && !isvisible(c); c = c->prev);
+	for(c = sel->prev; c && c->isbanned; c = c->prev);
 	if(!c) {
 		for(c = clients; c && c->next; c = c->next);
-		for(; c && !isvisible(c); c = c->prev);
+		for(; c && c->isbanned; c = c->prev);
 	}
 	if(c) {
 		focus(c);
@@ -749,7 +678,7 @@ getclient(Window w) {
 	return c;
 }
 
-unsigned long
+ulong
 getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
@@ -764,7 +693,7 @@ getstate(Window w) {
 	int format, status;
 	long result = -1;
 	unsigned char *p = NULL;
-	unsigned long n, extra;
+	ulong n, extra;
 	Atom real;
 
 	status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
@@ -778,7 +707,7 @@ getstate(Window w) {
 }
 
 Bool
-gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+gettextprop(Window w, Atom atom, char *text, uint size) {
 	char **list = NULL;
 	int n;
 	XTextProperty name;
@@ -805,44 +734,25 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
-	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+	int i, j;
+	uint buttons[]   = { Button1, Button2, Button3 };
+	uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
+				MODKEY|numlockmask|LockMask} ;
 
-	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);
-	}
+	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);
+		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+			BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
 }
 
 void
-grabkeys(void)  {
-	unsigned int i, j;
+grabkeys(void) {
+	uint i, j;
 	KeyCode code;
 	XModifierKeymap *modmap;
 
@@ -869,14 +779,6 @@ grabkeys(void)  {
 	}
 }
 
-unsigned int
-idxoftag(const char *t) {
-	unsigned int i;
-
-	for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
-	return (i < LENGTH(tags)) ? i : 0;
-}
-
 void
 initfont(const char *fontstr) {
 	char *def, **missing;
@@ -899,10 +801,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++;
 		}
 	}
@@ -920,11 +820,11 @@ initfont(const char *fontstr) {
 }
 
 Bool
-isoccupied(unsigned int t) {
+isoccupied(uint t) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(c->tags[t])
+		if(c->tags & 1 << t)
 			return True;
 	return False;
 }
@@ -945,28 +845,18 @@ isprotodel(Client *c) {
 }
 
 Bool
-isurgent(unsigned int t) {
+isurgent(uint 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 < LENGTH(tags); i++)
-		if(c->tags[i] && seltags[i])
+		if(c->isurgent && c->tags & 1 << t)
 			return True;
 	return False;
 }
 
 void
 keypress(XEvent *e) {
-	unsigned int i;
+	uint i;
 	KeySym keysym;
 	XKeyEvent *ev;
 
@@ -974,15 +864,13 @@ keypress(XEvent *e) {
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
 	for(i = 0; i < LENGTH(keys); i++)
 		if(keysym == keys[i].keysym
-		&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
-		{
-			if(keys[i].func)
-				keys[i].func(keys[i].arg);
-		}
+		   && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+		   && keys[i].func)
+			keys[i].func(keys[i].arg);
 }
 
 void
-killclient(const char *arg) {
+killclient(const void *arg) {
 	XEvent ev;
 
 	if(!sel)
@@ -1007,8 +895,8 @@ manage(Window w, XWindowAttributes *wa) {
 	Window trans;
 	XWindowChanges wc;
 
-	c = emallocz(sizeof(Client));
-	c->tags = emallocz(TAGSZ);
+	if(!(c = calloc(1, sizeof(Client))))
+		eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
 	c->win = w;
 
 	/* geometry */
@@ -1023,15 +911,13 @@ manage(Window w, XWindowAttributes *wa) {
 		c->bw = wa->border_width;
 	}
 	else {
-		if(c->x + c->w + 2 * c->bw > wx + ww)
-			c->x = wx + ww - c->w - 2 * c->bw;
-		if(c->y + c->h + 2 * c->bw > wy + wh)
-			c->y = wy + wh - c->h - 2 * c->bw;
-		if(c->x < wx)
-			c->x = wx;
-		if(c->y < wy)
-			c->y = wy;
-		c->bw = 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->bw;
@@ -1045,15 +931,16 @@ manage(Window w, XWindowAttributes *wa) {
 	if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
 		for(t = clients; t && t->win != trans; t = t->next);
 	if(t)
-		memcpy(c->tags, t->tags, TAGSZ);
+		c->tags = t->tags;
 	else
 		applyrules(c);
 	if(!c->isfloating)
 		c->isfloating = (rettrans == Success) || 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 */
-	ban(c);
 	XMapWindow(dpy, c->win);
 	setclientstate(c, NormalState);
 	arrange();
@@ -1082,25 +969,17 @@ maprequest(XEvent *e) {
 }
 
 void
-monocle(void) {
-	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(isvisible(c))
-			resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
-}
-
-void
 movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di, nx, ny;
-	unsigned int dui;
+	uint dui;
 	Window dummy;
 	XEvent ev;
 
+	restack();
 	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;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
@@ -1118,17 +997,20 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			nx = ocx + (ev.xmotion.x - x1);
 			ny = ocy + (ev.xmotion.y - y1);
-			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->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
-				togglefloating(NULL);
-			if((lt->isfloating) || c->isfloating)
+			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;
 		}
@@ -1137,7 +1019,7 @@ movemouse(Client *c) {
 
 Client *
 nexttiled(Client *c) {
-	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+	for(; c && (c->isfloating || c->isbanned); c = c->next);
 	return c;
 }
 
@@ -1174,32 +1056,18 @@ propertynotify(XEvent *e) {
 }
 
 void
-quit(const char *arg) {
+quit(const void *arg) {
 	readin = running = False;
 }
 
 void
-reapply(const char *arg) {
-	static Bool zerotags[LENGTH(tags)] = { 0 };
-	Client *c;
-
-	for(c = clients; c; c = c->next) {
-		memcpy(c->tags, zerotags, sizeof zerotags);
-		applyrules(c);
-	}
-	arrange();
-}
-
-void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	XWindowChanges wc;
 
 	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;
@@ -1207,11 +1075,10 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 
 		/* adjust for aspect limits */
 		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)
+		&& 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;
 		}
 
@@ -1225,14 +1092,14 @@ 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;
@@ -1244,7 +1111,12 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 		x = sx;
 	if(y + h + 2 * c->bw < sy)
 		y = sy;
-	if(c->x != x || c->y != y || c->w != w || c->h != h) {
+	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;
 		c->x = wc.x = x;
 		c->y = wc.y = y;
 		c->w = wc.width = w;
@@ -1263,10 +1135,11 @@ resizemouse(Client *c) {
 	int nw, nh;
 	XEvent ev;
 
+	restack();
 	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;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
 	for(;;) {
@@ -1285,13 +1158,16 @@ resizemouse(Client *c) {
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
-			if((nw = ev.xmotion.x - ocx - 2 * c->bw + 1) <= 0)
-				nw = 1;
-			if((nh = ev.xmotion.y - ocy - 2 * c->bw + 1) <= 0)
-				nh = 1;
-			if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
-				togglefloating(NULL);
-			if((lt->isfloating) || c->isfloating)
+			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;
 		}
@@ -1307,21 +1183,16 @@ restack(void) {
 	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || lt->isfloating)
+	if(ismax || sel->isfloating || !lt->arrange)
 		XRaiseWindow(dpy, sel->win);
-	if(!lt->isfloating) {
+	if(!ismax && 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 && !c->isbanned) {
+				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+				wc.sibling = c->win;
+			}
 	}
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@ -1333,7 +1204,7 @@ run(void) {
 	char sbuf[sizeof stext];
 	fd_set rd;
 	int r, xfd;
-	unsigned int len, offset;
+	uint len, offset;
 	XEvent ev;
 
 	/* main event loop, also reads status text from stdin */
@@ -1389,7 +1260,7 @@ run(void) {
 
 void
 scan(void) {
-	unsigned int i, num;
+	uint i, num;
 	Window *wins, d1, d2;
 	XWindowAttributes wa;
 
@@ -1397,7 +1268,7 @@ scan(void) {
 	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
 		for(i = 0; i < num; i++) {
 			if(!XGetWindowAttributes(dpy, wins[i], &wa)
-					|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+			|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
 				continue;
 			if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
 				manage(wins[i], &wa);
@@ -1406,7 +1277,7 @@ scan(void) {
 			if(!XGetWindowAttributes(dpy, wins[i], &wa))
 				continue;
 			if(XGetTransientForHint(dpy, wins[i], &d1)
-					&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+			&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
 				manage(wins[i], &wa);
 		}
 	}
@@ -1422,87 +1293,35 @@ setclientstate(Client *c, long state) {
 			PropModeReplace, (unsigned char *)data, 2);
 }
 
+/* arg > 1.0 will set mfact absolutly */
 void
-setgeom(const char *arg) {
-	unsigned int i;
-
-	if(!arg) {
-		if(++geom == &geoms[LENGTH(geoms)])
-			geom = &geoms[0];
-	}
-	else {
-		for(i = 0; i < LENGTH(geoms); i++)
-			if(!strcmp(geoms[i].symbol, arg))
-				break;
-		if(i == LENGTH(geoms))
-			return;
-		geom = &geoms[i];
-	}
-	geom->apply();
-	updatebarpos();
-	arrange();
-}
-
-void
-setlayout(const char *arg) {
-	unsigned int i;
-
-	if(!arg) {
-		if(++lt == &layouts[LENGTH(layouts)])
-			lt = &layouts[0];
-	}
-	else {
-		for(i = 0; i < LENGTH(layouts); i++)
-			if(!strcmp(arg, layouts[i].symbol))
-				break;
-		if(i == LENGTH(layouts))
-			return;
-		lt = &layouts[i];
-	}
-	if(sel)
-		arrange();
-	else
-		drawbar();
-}
-
-void
-setmfact(const char *arg) {
-	double delta;
+setmfact(const void *arg) {
+	double d = *((double*) arg);
 
-	if(!arg || lt->isfloating)
+	if(!d || !lt->arrange)
 		return;
-	delta = strtod(arg, NULL);
-	if(arg[0] == '-' || arg[0] == '+') {
-		if(mfact + delta < 0.1 || mfact + delta > 0.9)
-			return;
-		mfact += delta;
-	}
-	else {
-		if(delta < 0.1 || delta > 0.9)
-			return;
-		mfact = delta;
-	}
-	setgeom(geom->symbol);
+	d = d < 1.0 ? d + mfact : d - 1.0;
+	if(d < 0.1 || d > 0.9)
+		return;
+	mfact = d;
+	arrange();
 }
 
 void
 setup(void) {
-	unsigned int i, w;
+	uint i, w;
 	XSetWindowAttributes wa;
 
 	/* init screen */
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
 	initfont(FONT);
-
-	/* apply default geometry */
 	sx = 0;
 	sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	bh = dc.font.height + 2;
-	geom = &geoms[0];
-	geom->apply();
+	updategeom();
 
 	/* init atoms */
 	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1532,33 +1351,19 @@ setup(void) {
 	if(!dc.font.set)
 		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
-	/* init tags */
-	seltags = emallocz(TAGSZ);
-	prevtags = emallocz(TAGSZ);
-	seltags[0] = prevtags[0] = True;
-
-	/* init layouts */
-	lt = &layouts[0];
-
 	/* init bar */
 	for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
-		w = textw(layouts[i].symbol);
-		if(w > blw)
-			blw = w;
-	}
-	for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) {
-		w = textw(geoms[i].symbol);
-		if(w > bgw)
-			bgw = w;
+		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, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
-				CopyFromParent, DefaultVisual(dpy, screen),
-				CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+	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);
@@ -1580,13 +1385,11 @@ setup(void) {
 }
 
 void
-spawn(const char *arg) {
+spawn(const void *arg) {
 	static char *shell = NULL;
 
 	if(!shell && !(shell = getenv("SHELL")))
 		shell = "/bin/sh";
-	if(!arg)
-		return;
 	/* The double-fork construct avoids zombie processes and keeps the code
 	 * clean from stupid signal handlers. */
 	if(fork() == 0) {
@@ -1594,8 +1397,8 @@ spawn(const char *arg) {
 			if(dpy)
 				close(ConnectionNumber(dpy));
 			setsid();
-			execl(shell, shell, "-c", arg, (char *)NULL);
-			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
+			execl(shell, shell, "-c", (char *)arg, (char *)NULL);
+			fprintf(stderr, "dwm: execl '%s -c %s'", shell, (char *)arg);
 			perror(" failed");
 		}
 		exit(0);
@@ -1604,19 +1407,15 @@ spawn(const char *arg) {
 }
 
 void
-tag(const char *arg) {
-	unsigned int i;
-
-	if(!sel)
-		return;
-	for(i = 0; i < LENGTH(tags); i++)
-		sel->tags[i] = (NULL == arg);
-	sel->tags[idxoftag(arg)] = True;
-	arrange();
+tag(const void *arg) {
+	if(sel && *(int *)arg & TAGMASK) {
+		sel->tags = *(int *)arg & TAGMASK;
+		arrange();
+	}
 }
 
-unsigned int
-textnw(const char *text, unsigned int len) {
+uint
+textnw(const char *text, uint len) {
 	XRectangle r;
 
 	if(dc.font.set) {
@@ -1626,126 +1425,100 @@ textnw(const char *text, unsigned int len) {
 	return XTextWidth(dc.font.xfont, text, len);
 }
 
-unsigned int
-textw(const char *text) {
-	return textnw(text, strlen(text)) + dc.font.height;
-}
-
 void
-tileh(void) {
-	int x, w;
-	unsigned int i, n = counttiled();
+tile(void) {
+	int x, y, h, w, mw;
+	uint i, n;
 	Client *c;
 
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
 	if(n == 0)
 		return;
-	c = tilemaster(n);
-	if(--n == 0)
-		return;
-
-	x = tx;
-	w = tw / n;
-	if(w < bh)
-		w = tw;
-
-	for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
-		if(i + 1 == n) /* remainder */
-			tileresize(c, x, ty, (tx + tw) - x - 2 * c->bw, th - 2 * c->bw);
-		else
-			tileresize(c, x, ty, w - 2 * c->bw, th - 2 * c->bw);
-		if(w != tw)
-			x = c->x + c->w + 2 * c->bw;
-	}
-}
 
-Client *
-tilemaster(unsigned int n) {
-	Client *c = nexttiled(clients);
-
-	if(n == 1)
-		tileresize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw);
-	else
-		tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
-	return c;
-}
-
-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
-tilev(void) {
-	int y, h;
-	unsigned int i, n = counttiled();
-	Client *c;
+	/* master */
+	c = nexttiled(clients);
+	mw = mfact * ww;
+	resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
-	if(n == 0)
-		return;
-	c = tilemaster(n);
 	if(--n == 0)
 		return;
 
-	y = ty;
-	h = th / n;
+	/* 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;
 	if(h < bh)
-		h = th;
+		h = wh;
 
 	for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
-		if(i + 1 == n) /* remainder */
-			tileresize(c, tx, y, tw - 2 * c->bw, (ty + th) - y - 2 * c->bw);
-		else
-			tileresize(c, tx, y, tw - 2 * c->bw, h - 2 * c->bw);
-		if(h != th)
+		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;
 	}
 }
 
 void
-togglefloating(const char *arg) {
+togglebar(const void *arg) {
+	showbar = !showbar;
+	updategeom();
+	updatebar();
+	arrange();
+}
+
+void
+togglefloating(const void *arg) {
 	if(!sel)
 		return;
-	sel->isfloating = !sel->isfloating;
+	sel->isfloating = !sel->isfloating || sel->isfixed;
 	if(sel->isfloating)
 		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
 	arrange();
 }
 
 void
-toggletag(const char *arg) {
-	unsigned int i, j;
+togglelayout(const void *arg) {
+	uint i;
 
-	if(!sel)
-		return;
-	i = idxoftag(arg);
-	sel->tags[i] = !sel->tags[i];
-	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();
+	if(!arg) {
+		if(++lt == &layouts[LENGTH(layouts)])
+			lt = &layouts[0];
+	}
+	else {
+		for(i = 0; i < LENGTH(layouts); i++)
+			if(!strcmp((char *)arg, layouts[i].symbol))
+				break;
+		if(i == LENGTH(layouts))
+			return;
+		lt = &layouts[i];
+	}
+	if(sel)
+		arrange();
+	else
+		drawbar();
 }
 
 void
-toggleview(const char *arg) {
-	unsigned int i, j;
-
-	i = idxoftag(arg);
-	seltags[i] = !seltags[i];
-	for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
-	if(j == LENGTH(tags))
-		seltags[i] = True; /* at least one tag must be viewed */
+togglemax(const void *arg) {
+	ismax = !ismax;
 	arrange();
 }
 
 void
-unban(Client *c) {
-	if(!c->isbanned)
-		return;
-	XMoveWindow(dpy, c->win, c->x, c->y);
-	c->isbanned = False;
+toggletag(const void *arg) {
+	if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
+		sel->tags ^= (*(int *)arg) & TAGMASK;
+		arrange();
+	}
+}
+
+void
+toggleview(const void *arg) {
+	if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
+		tagset[seltags] ^= (*(int *)arg) & TAGMASK;
+		arrange();
+	}
 }
 
 void
@@ -1763,7 +1536,6 @@ unmanage(Client *c) {
 		focus(NULL);
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	setclientstate(c, WithdrawnState);
-	free(c->tags);
 	free(c);
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
@@ -1781,12 +1553,39 @@ unmapnotify(XEvent *e) {
 }
 
 void
-updatebarpos(void) {
-
+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);
+	dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
+	XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
+}
+
+void
+updategeom(void) {
+#ifdef XINERAMA
+	int i;
+	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);
+	}
+	else
+#endif
+	{
+		wx = sx;
+		wy = showbar && topbar ? sy + bh : sy;
+		ww = sw;
+		wh = showbar ? sh - bh : sh;
+	}
+
+	/* bar position */
+	by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
 }
 
 void
@@ -1794,42 +1593,40 @@ updatesizehints(Client *c) {
 	long msize;
 	XSizeHints size;
 
-	if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
-		size.flags = PSize;
-	c->flags = size.flags;
-	if(c->flags & PBaseSize) {
+	XGetWMNormalHints(dpy, c->win, &size, &msize);
+	if(size.flags & PBaseSize) {
 		c->basew = size.base_width;
 		c->baseh = size.base_height;
 	}
-	else if(c->flags & PMinSize) {
+	else if(size.flags & PMinSize) {
 		c->basew = size.min_width;
 		c->baseh = size.min_height;
 	}
 	else
 		c->basew = c->baseh = 0;
-	if(c->flags & PResizeInc) {
+	if(size.flags & PResizeInc) {
 		c->incw = size.width_inc;
 		c->inch = size.height_inc;
 	}
 	else
 		c->incw = c->inch = 0;
-	if(c->flags & PMaxSize) {
+	if(size.flags & PMaxSize) {
 		c->maxw = size.max_width;
 		c->maxh = size.max_height;
 	}
 	else
 		c->maxw = c->maxh = 0;
-	if(c->flags & PMinSize) {
+	if(size.flags & PMinSize) {
 		c->minw = size.min_width;
 		c->minh = size.min_height;
 	}
-	else if(c->flags & PBaseSize) {
+	else if(size.flags & PBaseSize) {
 		c->minw = size.base_width;
 		c->minh = size.base_height;
 	}
 	else
 		c->minw = c->minh = 0;
-	if(c->flags & PAspect) {
+	if(size.flags & PAspect) {
 		c->minax = size.min_aspect.x;
 		c->maxax = size.max_aspect.x;
 		c->minay = size.min_aspect.y;
@@ -1860,28 +1657,11 @@ updatewmhints(Client *c) {
 	}
 }
 
-
 void
-view(const char *arg) {
-	unsigned int i;
-
-	for(i = 0; i < LENGTH(tags); i++)
-		tmp[i] = (NULL == arg);
-	tmp[idxoftag(arg)] = True;
-
-	if(memcmp(seltags, tmp, TAGSZ) != 0) {
-		memcpy(prevtags, seltags, TAGSZ);
-		memcpy(seltags, tmp, TAGSZ);
-		arrange();
-	}
-}
-
-void
-viewprevtag(const char *arg) {
-
-	memcpy(tmp, seltags, TAGSZ);
-	memcpy(seltags, prevtags, TAGSZ);
-	memcpy(prevtags, tmp, TAGSZ);
+view(const void *arg) {
+	seltags ^= 1; /* toggle sel tagset */
+	if(arg && (*(int *)arg & TAGMASK))
+		tagset[seltags] = *(int *)arg & TAGMASK;
 	arrange();
 }
 
@@ -1896,11 +1676,12 @@ 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 */
 }
 
@@ -1918,13 +1699,13 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
 }
 
 void
-zoom(const char *arg) {
+zoom(const void *arg) {
 	Client *c = sel;
 
-	if(!sel || lt->isfloating || sel->isfloating)
+	if(ismax || !lt->arrange || (sel && sel->isfloating))
 		return;
 	if(c == nexttiled(clients))
-		if(!(c = nexttiled(c->next)))
+		if(!c || !(c = nexttiled(c->next)))
 			return;
 	detach(c);
 	attach(c);