X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/0c71b16b9282562ee59f73f215c6ba827df25927..499315c22ceda5370ba51026b2e958cbd4ad4608:/dwm.c?ds=sidebyside

diff --git a/dwm.c b/dwm.c
index 37e833e..507084c 100644
--- a/dwm.c
+++ b/dwm.c
@@ -39,26 +39,24 @@
 #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)
 
 /* enums */
-enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
-enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
+enum { BarTop, BarBot, BarOff, BarLast };               /* bar appearance */
+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 */
@@ -93,11 +91,6 @@ typedef struct {
 	} font;
 } DC; /* draw context */
 
-typedef struct {
-	const char *symbol;
-	void (*apply)(void);
-} Geom;
-
 typedef struct {
 	unsigned long mod;
 	KeySym keysym;
@@ -108,8 +101,8 @@ typedef struct {
 typedef struct {
 	const char *symbol;
 	void (*arrange)(void);
-	Bool isfloating;
-} Layout; 
+	void (*updategeom)(void);
+} Layout;
 
 typedef struct {
 	const char *class;
@@ -131,7 +124,6 @@ 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);
@@ -142,7 +134,6 @@ 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);
@@ -164,54 +155,47 @@ void killclient(const char *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);
+Client *nextunfloating(Client *c);
 void propertynotify(XEvent *e);
 void quit(const char *arg);
-void reapply(const char *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 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 togglebar(const char *arg);
 void togglefloating(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 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 *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);
 void zoom(const char *arg);
 
 /* variables */
-char stext[256], buf[256];
+char stext[256];
 int screen, sx, sy, sw, sh;
+int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int 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;
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
@@ -230,22 +214,20 @@ void (*handler[LASTEvent]) (XEvent *) = {
 Atom wmatom[WMLast], netatom[NetLast];
 Bool otherwm, readin;
 Bool running = True;
-Bool *prevtags;
-Bool *seltags;
+Bool *tagset[2];
 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 */
 
@@ -260,10 +242,9 @@ 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;
@@ -276,7 +257,7 @@ applyrules(Client *c) {
 	if(ch.res_name)
 		XFree(ch.res_name);
 	if(!matched)
-		memcpy(c->tags, seltags, TAGSZ);
+		memcpy(c->tags, tagset[seltags], TAGSZ);
 }
 
 void
@@ -284,13 +265,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);
 
 	focus(NULL);
-	lt->arrange();
+	if(lt->arrange)
+		lt->arrange();
 	restack();
 }
 
@@ -323,14 +308,10 @@ buttonpress(XEvent *e) {
 	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) {
+			if(ev->x < x) {
 				if(ev->button == Button1) {
 					if(ev->state & MODKEY)
 						tag(tags[i]);
@@ -347,7 +328,7 @@ buttonpress(XEvent *e) {
 			}
 		}
 		if((ev->x < x + blw) && ev->button == Button1) 
-			setlayout(NULL);
+			togglelayout(NULL);
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
@@ -358,10 +339,8 @@ buttonpress(XEvent *e) {
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
-			if((floating != lt->arrange) && c->isfloating)
+			if(lt->arrange && c->isfloating)
 				togglefloating(NULL);
-			else
-				zoom(NULL);
 		}
 		else if(ev->button == Button3 && !c->isfixed) {
 			restack();
@@ -433,7 +412,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 +427,7 @@ 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(c->isfixed || c->isfloating || !lt->arrange) {
 			if(ev->value_mask & CWX)
 				c->x = sx + ev->x;
 			if(ev->value_mask & CWY)
@@ -481,15 +462,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 +486,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,15 +496,10 @@ 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(i = 0; i < LENGTH(tags); i++) {
 		dc.w = textw(tags[i]);
-		if(seltags[i]) {
+		if(tagset[seltags][i]) {
 			drawtext(tags[i], dc.sel, isurgent(i));
 			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
 		}
@@ -595,23 +562,23 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 	int x, y, w, h;
 	unsigned int 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;
+	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] = '.';
@@ -620,8 +587,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 		if(len > 3)
 			buf[len - 3] = '.';
 	}
-	if(w > dc.w)
-		return; /* too long */
 	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);
@@ -669,15 +634,6 @@ expose(XEvent *e) {
 		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);
-}
-
 void
 focus(Client *c) {
 	if(!c || (c && !isvisible(c)))
@@ -805,43 +761,24 @@ 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;
+	unsigned int buttons[]   = { Button1, Button2, Button3 };
+	unsigned int 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)  {
+grabkeys(void) {
 	unsigned int i, j;
 	KeyCode code;
 	XModifierKeymap *modmap;
@@ -899,10 +836,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++;
 		}
 	}
@@ -959,7 +894,7 @@ isvisible(Client *c) {
 	unsigned int i;
 
 	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i] && seltags[i])
+		if(c->tags[i] && tagset[seltags][i])
 			return True;
 	return False;
 }
@@ -1027,11 +962,9 @@ manage(Window w, XWindowAttributes *wa) {
 			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;
+		c->x = MAX(c->x, wx);
+		c->y = MAX(c->y, wy);
+		c->bw = borderpx;
 	}
 
 	wc.border_width = c->bw;
@@ -1081,15 +1014,6 @@ maprequest(XEvent *e) {
 		manage(ev->window, &wa);
 }
 
-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;
@@ -1100,7 +1024,7 @@ 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;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
@@ -1118,17 +1042,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;
 		}
@@ -1136,7 +1063,7 @@ movemouse(Client *c) {
 }
 
 Client *
-nexttiled(Client *c) {
+nextunfloating(Client *c) {
 	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
 	return c;
 }
@@ -1178,38 +1105,25 @@ quit(const char *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;
 		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;
 		}
 
@@ -1223,14 +1137,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;
@@ -1264,7 +1178,7 @@ 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;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
 	for(;;) {
@@ -1283,13 +1197,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;
 		}
@@ -1305,21 +1222,16 @@ restack(void) {
 	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || lt->isfloating)
+	if(sel->isfloating || !lt->arrange)
 		XRaiseWindow(dpy, sel->win);
-	if(!lt->isfloating) {
+	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));
@@ -1395,7 +1307,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);
@@ -1404,7 +1316,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);
 		}
 	}
@@ -1420,69 +1332,6 @@ setclientstate(Client *c, long state) {
 			PropModeReplace, (unsigned char *)data, 2);
 }
 
-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;
-
-	if(!arg || lt->isfloating)
-		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);
-}
-
 void
 setup(void) {
 	unsigned int i, w;
@@ -1492,15 +1341,12 @@ setup(void) {
 	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);
@@ -1531,23 +1377,14 @@ setup(void) {
 		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];
+	tagset[0] = emallocz(TAGSZ);
+	tagset[1] = emallocz(TAGSZ);
+	tagset[0][0] = tagset[1][0] = True;
 
 	/* 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;
+		blw = MAX(blw, w);
 	}
 
 	wa.override_redirect = 1;
@@ -1555,8 +1392,8 @@ setup(void) {
 	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);
+			CopyFromParent, DefaultVisual(dpy, screen),
+			CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
 	XMapRaised(dpy, barwin);
 	strcpy(stext, "dwm-"VERSION);
@@ -1608,7 +1445,7 @@ tag(const char *arg) {
 	if(!sel)
 		return;
 	for(i = 0; i < LENGTH(tags); i++)
-		sel->tags[i] = (NULL == arg);
+		sel->tags[i] = (arg == NULL);
 	sel->tags[idxoftag(arg)] = True;
 	arrange();
 }
@@ -1630,76 +1467,11 @@ textw(const char *text) {
 }
 
 void
-tileh(void) {
-	int x, w;
-	unsigned int i, n = counttiled();
-	Client *c;
-
-	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;
-
-	if(n == 0)
-		return;
-	c = tilemaster(n);
-	if(--n == 0)
-		return;
-
-	y = ty;
-	h = th / n;
-	if(h < bh)
-		h = th;
-
-	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)
-			y = c->y + c->h + 2 * c->bw;
-	}
+togglebar(const char *arg) {
+	showbar = !showbar;
+	updategeom();
+	updatebar();
+	arrange();
 }
 
 void
@@ -1712,6 +1484,28 @@ togglefloating(const char *arg) {
 	arrange();
 }
 
+void
+togglelayout(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
 toggletag(const char *arg) {
 	unsigned int i, j;
@@ -1731,10 +1525,10 @@ toggleview(const char *arg) {
 	unsigned int i, j;
 
 	i = idxoftag(arg);
-	seltags[i] = !seltags[i];
-	for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
+	tagset[seltags][i] = !tagset[seltags][i];
+	for(j = 0; j < LENGTH(tags) && !tagset[seltags][j]; j++);
 	if(j == LENGTH(tags))
-		seltags[i] = True; /* at least one tag must be viewed */
+		tagset[seltags][i] = True; /* at least one tag must be viewed */
 	arrange();
 }
 
@@ -1779,14 +1573,48 @@ 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);
 }
 
+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);
+	}
+	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
 updatesizehints(Client *c) {
 	long msize;
@@ -1858,28 +1686,17 @@ 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();
-	}
+	seltags ^= 1; /* toggle sel tagset */
+	memset(tagset[seltags], (NULL == arg), TAGSZ);
+	tagset[seltags][idxoftag(arg)] = True;
+	arrange();
 }
 
 void
 viewprevtag(const char *arg) {
-
-	memcpy(tmp, seltags, TAGSZ);
-	memcpy(seltags, prevtags, TAGSZ);
-	memcpy(prevtags, tmp, TAGSZ);
+	seltags ^= 1; /* toggle sel tagset */
 	arrange();
 }
 
@@ -1894,11 +1711,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 */
 }
 
@@ -1915,21 +1733,6 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
 	return -1;
 }
 
-void
-zoom(const char *arg) {
-	Client *c = sel;
-
-	if(!sel || lt->isfloating || sel->isfloating)
-		return;
-	if(c == nexttiled(clients))
-		if(!(c = nexttiled(c->next)))
-			return;
-	detach(c);
-	attach(c);
-	focus(c);
-	arrange();
-}
-
 int
 main(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))