X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/d99ec6148258bd7933f3359ba05080e95f9ecb71..874837f653433315bd2733823a0a1efe6f76b373:/dwm.c?ds=inline

diff --git a/dwm.c b/dwm.c
index 60d6ea6..7f2a638 100644
--- a/dwm.c
+++ b/dwm.c
@@ -33,34 +33,37 @@
 #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 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 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); \
+}
 
 /* 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 { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* typedefs */
-typedef struct View View;
 typedef struct Client Client;
 struct Client {
 	char name[256];
@@ -68,10 +71,9 @@ struct Client {
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int minax, maxax, minay, maxay;
 	long flags;
-	unsigned int border, oldborder;
+	unsigned int bw, oldbw;
 	Bool isbanned, isfixed, isfloating, isurgent;
 	Bool *tags;
-	View *view;
 	Client *next;
 	Client *prev;
 	Client *snext;
@@ -93,6 +95,11 @@ typedef struct {
 	} font;
 } DC; /* draw context */
 
+typedef struct {
+	const char *symbol;
+	void (*apply)(void);
+} Geom;
+
 typedef struct {
 	unsigned long mod;
 	KeySym keysym;
@@ -102,25 +109,19 @@ typedef struct {
 
 typedef struct {
 	const char *symbol;
-	void (*arrange)(View *);
-} Layout;
+	void (*arrange)(void);
+	Bool isfloating;
+} Layout; 
 
 typedef struct {
-	const char *prop;
+	const char *class;
+	const char *instance;
+	const char *title;
 	const char *tag;
 	Bool isfloating;
 } Rule;
 
-struct View {
-	unsigned int id;
-	int x, y, w, h, wax, way, wah, waw;
-	double mwfact;
-	Layout *layout;
-	Window barwin;
-};
-
 /* function declarations */
-void addtag(Client *c, const char *t);
 void applyrules(Client *c);
 void arrange(void);
 void attach(Client *c);
@@ -132,24 +133,24 @@ 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(View *v);
+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 enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);
-void floating(View *v); /* default floating layout */
+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);
 unsigned long getcolor(const char *colstr);
-View *getviewbar(Window barwin);
 long getstate(Window w);
 Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 void grabbuttons(Client *c, Bool focused);
@@ -165,34 +166,39 @@ void killclient(const char *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
-View *viewat(void);
+void monocle(void);
 void movemouse(Client *c);
-Client *nexttiled(Client *c, View *v);
+Client *nexttiled(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(View *v);
+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 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(View *v);
-void togglebar(const char *arg);
+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 unmanage(Client *c);
 void unmapnotify(XEvent *e);
-void updatebarpos(View *v);
+void updatebarpos(void);
 void updatesizehints(Client *c);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
@@ -202,15 +208,13 @@ int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);
 void zoom(const char *arg);
-void selectview(const char *arg);
 
 /* variables */
 char stext[256], buf[256];
-int nviews = 1;
-int screen;
+int screen, sx, sy, sw, sh;
 int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos;
-unsigned int blw = 0;
+int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;
+double mfact;
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
@@ -227,9 +231,6 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
-Bool isxinerama = False;
-Bool domwfact = True;
-Bool dozoom = True;
 Bool otherwm, readin;
 Bool running = True;
 Bool *prevtags;
@@ -240,24 +241,16 @@ Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
-View *views;
-View *selview;
-Window root;
+Window root, barwin;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
+#define TAGSZ (LENGTH(tags) * sizeof(Bool))
+Bool tmp[LENGTH(tags)];
+Layout *lt = layouts;
+Geom *geom = geoms;
 
 /* function implementations */
-void
-addtag(Client *c, const char *t) {
-	unsigned int i, tidx = idxoftag(t);
-
-	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i] && vtags[i] != vtags[tidx])
-			return; /* conflict */
-	c->tags[tidx] = True;
-	c->view = &views[vtags[tidx]];
-}
 
 void
 applyrules(Client *c) {
@@ -270,13 +263,12 @@ applyrules(Client *c) {
 	XGetClassHint(dpy, c->win, &ch);
 	for(i = 0; i < LENGTH(rules); i++) {
 		r = &rules[i];
-		if(strstr(c->name, r->prop)
-		|| (ch.res_class && strstr(ch.res_class, r->prop))
-		|| (ch.res_name && strstr(ch.res_name, r->prop)))
-		{
+		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) {
-				addtag(c, r->tag);
+				c->tags[idxoftag(r->tag)] = True;
 				matched = True;
 			}
 		}
@@ -285,15 +277,12 @@ applyrules(Client *c) {
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
-	if(!matched) {
-		memcpy(c->tags, seltags, sizeof initags);
-		c->view = selview;
-	}
+	if(!matched)
+		memcpy(c->tags, seltags, TAGSZ);
 }
 
 void
 arrange(void) {
-	unsigned int i;
 	Client *c;
 
 	for(c = clients; c; c = c->next)
@@ -302,11 +291,9 @@ arrange(void) {
 		else
 			ban(c);
 
-	for(i = 0; i < nviews; i++) {
-		views[i].layout->arrange(&views[i]);
-		restack(&views[i]);
-	}
 	focus(NULL);
+	lt->arrange();
+	restack();
 }
 
 void
@@ -327,7 +314,7 @@ void
 ban(Client *c) {
 	if(c->isbanned)
 		return;
-	XMoveWindow(dpy, c->win, c->x + 3 * c->view->w, c->y);
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	c->isbanned = True;
 }
 
@@ -337,13 +324,15 @@ buttonpress(XEvent *e) {
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
-	if(ev->window == selview->barwin) {
-		x = 0;
+	if(ev->window == barwin) {
+		if((ev->x < bgw) && ev->button == Button1) {
+			setgeom(NULL);
+			return;
+		}
+		x = bgw;
 		for(i = 0; i < LENGTH(tags); i++) {
-			if(&views[vtags[i]] != selview)
-				continue;
 			x += textw(tags[i]);
-			if(ev->x < x) {
+			if(ev->x >= bgw && ev->x < x) {
 				if(ev->button == Button1) {
 					if(ev->state & MODKEY)
 						tag(tags[i]);
@@ -359,7 +348,7 @@ buttonpress(XEvent *e) {
 				return;
 			}
 		}
-		if((ev->x < x + blw) && ev->button == Button1)
+		if((ev->x < x + blw) && ev->button == Button1) 
 			setlayout(NULL);
 	}
 	else if((c = getclient(ev->window))) {
@@ -367,17 +356,17 @@ buttonpress(XEvent *e) {
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1) {
-			restack(c->view);
+			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
-			if((floating != c->view->layout->arrange) && c->isfloating)
+			if((floating != lt->arrange) && c->isfloating)
 				togglefloating(NULL);
 			else
 				zoom(NULL);
 		}
 		else if(ev->button == Button3 && !c->isfixed) {
-			restack(c->view);
+			restack();
 			resizemouse(c);
 		}
 	}
@@ -401,7 +390,6 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
-	unsigned int i;
 	close(STDIN_FILENO);
 	while(stack) {
 		unban(stack);
@@ -411,15 +399,13 @@ cleanup(void) {
 		XFreeFontSet(dpy, dc.font.set);
 	else
 		XFreeFont(dpy, dc.font.xfont);
-
 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
 	XFreePixmap(dpy, dc.drawable);
 	XFreeGC(dpy, dc.gc);
 	XFreeCursor(dpy, cursor[CurNormal]);
 	XFreeCursor(dpy, cursor[CurResize]);
 	XFreeCursor(dpy, cursor[CurMove]);
-	for(i = 0; i < nviews; i++)
-		XDestroyWindow(dpy, views[i].barwin);
+	XDestroyWindow(dpy, barwin);
 	XSync(dpy, False);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
@@ -436,7 +422,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);
@@ -445,17 +431,11 @@ configure(Client *c) {
 void
 configurenotify(XEvent *e) {
 	XConfigureEvent *ev = &e->xconfigure;
-	View *v = selview;
 
-	if(ev->window == root && (ev->width != v->w || ev->height != v->h)) {
-		/* TODO -- update Xinerama dimensions here */
-		v->w = ev->width;
-		v->h = ev->height;
-		XFreePixmap(dpy, dc.drawable);
-		dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
-		XResizeWindow(dpy, v->barwin, v->w, bh);
-		updatebarpos(selview);
-		arrange();
+	if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+		sw = ev->width;
+		sh = ev->height;
+		setgeom(geom->symbol);
 	}
 }
 
@@ -466,22 +446,21 @@ configurerequest(XEvent *e) {
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
-		View *v = c->view;
 		if(ev->value_mask & CWBorderWidth)
-			c->border = ev->border_width;
-		if(c->isfixed || c->isfloating || (floating == v->layout->arrange)) {
+			c->bw = ev->border_width;
+		if(c->isfixed || c->isfloating || lt->isfloating) {
 			if(ev->value_mask & CWX)
-				c->x = v->x + ev->x;
+				c->x = sx + ev->x;
 			if(ev->value_mask & CWY)
-				c->y = v->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 - v->x + c->w) > v->w && c->isfloating)
-				c->x = v->x + (v->w / 2 - c->w / 2); /* center in x direction */
-			if((c->y - v->y + c->h) > v->h && c->isfloating)
-				c->y = v->y + (v->h / 2 - c->h / 2); /* center in y direction */
+			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);
@@ -504,6 +483,15 @@ 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;
@@ -533,15 +521,18 @@ detachstack(Client *c) {
 }
 
 void
-drawbar(View *v) {
+drawbar(void) {
 	int i, x;
 	Client *c;
 
 	dc.x = 0;
-	for(c = stack; c && (!isvisible(c) || c->view != v); c = c->snext);
+	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++) {
-		if(&views[vtags[i]] != v)
-			continue;
 		dc.w = textw(tags[i]);
 		if(seltags[i]) {
 			drawtext(tags[i], dc.sel, isurgent(i));
@@ -553,20 +544,20 @@ drawbar(View *v) {
 		}
 		dc.x += dc.w;
 	}
-	dc.w = blw;
-	drawtext(v->layout->symbol, dc.norm, False);
-	x = dc.x + dc.w;
-	if(v == selview) {
-		dc.w = textw(stext);
-		dc.x = v->w - dc.w;
-		if(dc.x < x) {
-			dc.x = x;
-			dc.w = v->w - x;
-		}
-		drawtext(stext, dc.norm, False);
+	if(blw > 0) {
+		dc.w = blw;
+		drawtext(lt->symbol, dc.norm, False);
+		x = dc.x + dc.w;
 	}
 	else
-		dc.x = v->w;
+		x = dc.x;
+	dc.w = textw(stext);
+	dc.x = bw - dc.w;
+	if(dc.x < x) {
+		dc.x = x;
+		dc.w = bw - x;
+	}
+	drawtext(stext, dc.norm, False);
 	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
 		if(c) {
@@ -576,7 +567,7 @@ drawbar(View *v) {
 		else
 			drawtext(NULL, dc.norm, False);
 	}
-	XCopyArea(dpy, dc.drawable, v->barwin, dc.gc, 0, 0, v->w, bh, 0, 0);
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
 	XSync(dpy, False);
 }
 
@@ -612,9 +603,8 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 	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 - 1);
 	memcpy(buf, text, len);
 	buf[len] = 0;
 	h = dc.font.ascent + dc.font.descent;
@@ -654,10 +644,8 @@ enternotify(XEvent *e) {
 	Client *c;
 	XCrossingEvent *ev = &e->xcrossing;
 
-	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) {
-		if(!isxinerama || ev->window != root)
-			return;
-	}
+	if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
+		return;
 	if((c = getclient(ev->window)))
 		focus(c);
 	else
@@ -676,18 +664,16 @@ eprint(const char *errstr, ...) {
 
 void
 expose(XEvent *e) {
-	View *v;
 	XExposeEvent *ev = &e->xexpose;
 
-	if(ev->count == 0 && ((v = getviewbar(ev->window))))
-		drawbar(v);
+	if(ev->count == 0 && (ev->window == barwin))
+		drawbar();
 }
 
 void
-floating(View *v) { /* default floating layout */
+floating(void) { /* default floating layout */
 	Client *c;
 
-	domwfact = dozoom = False;
 	for(c = clients; c; c = c->next)
 		if(isvisible(c))
 			resize(c, c->x, c->y, c->w, c->h, True);
@@ -695,15 +681,8 @@ floating(View *v) { /* default floating layout */
 
 void
 focus(Client *c) {
-	View *v = selview;
-	if(c)
-		selview = c->view;
-	else
-		selview = viewat();
-	if(selview != v)
-		drawbar(v);
 	if(!c || (c && !isvisible(c)))
-		for(c = stack; c && (!isvisible(c) || c->view != selview); c = c->snext);
+		for(c = stack; c && !isvisible(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -717,11 +696,10 @@ focus(Client *c) {
 	if(c) {
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-		selview = c->view;
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-	drawbar(selview);
+	drawbar();
 }
 
 void
@@ -743,7 +721,7 @@ focusnext(const char *arg) {
 		for(c = clients; c && !isvisible(c); c = c->next);
 	if(c) {
 		focus(c);
-		restack(c->view);
+		restack();
 	}
 }
 
@@ -760,7 +738,7 @@ focusprev(const char *arg) {
 	}
 	if(c) {
 		focus(c);
-		restack(c->view);
+		restack();
 	}
 }
 
@@ -782,16 +760,6 @@ getcolor(const char *colstr) {
 	return color.pixel;
 }
 
-View *
-getviewbar(Window barwin) {
-	unsigned int i;
-
-	for(i = 0; i < nviews; i++)
-		if(views[i].barwin == barwin)
-			return &views[i];
-	return NULL;
-}
-
 long
 getstate(Window w) {
 	int format, status;
@@ -838,39 +806,20 @@ 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
@@ -906,7 +855,7 @@ unsigned int
 idxoftag(const char *t) {
 	unsigned int i;
 
-	for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++);
+	for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
 	return (i < LENGTH(tags)) ? i : 0;
 }
 
@@ -932,10 +881,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++;
 		}
 	}
@@ -1036,42 +983,36 @@ killclient(const char *arg) {
 void
 manage(Window w, XWindowAttributes *wa) {
 	Client *c, *t = NULL;
-	View *v;
 	Status rettrans;
 	Window trans;
 	XWindowChanges wc;
 
 	c = emallocz(sizeof(Client));
-	c->tags = emallocz(sizeof initags);
+	c->tags = emallocz(TAGSZ);
 	c->win = w;
 
-	applyrules(c);
-
-	v = c->view;
-
-	c->x = wa->x + v->x;
-	c->y = wa->y + v->y;
+	/* geometry */
+	c->x = wa->x;
+	c->y = wa->y;
 	c->w = wa->width;
 	c->h = wa->height;
-	c->oldborder = wa->border_width;
-
-	if(c->w == v->w && c->h == v->h) {
-		c->x = v->x;
-		c->y = v->y;
-		c->border = wa->border_width;
+	c->oldbw = wa->border_width;
+	if(c->w == sw && c->h == sh) {
+		c->x = sx;
+		c->y = sy;
+		c->bw = wa->border_width;
 	}
 	else {
-		if(c->x + c->w + 2 * c->border > v->wax + v->waw)
-			c->x = v->wax + v->waw - c->w - 2 * c->border;
-		if(c->y + c->h + 2 * c->border > v->way + v->wah)
-			c->y = v->way + v->wah - c->h - 2 * c->border;
-		if(c->x < v->wax)
-			c->x = v->wax;
-		if(c->y < v->way)
-			c->y = v->way;
-		c->border = BORDERPX;
+		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;
+		c->x = MAX(c->x, wx);
+		c->y = MAX(c->y, wy);
+		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 */
@@ -1082,7 +1023,9 @@ 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, sizeof initags);
+		memcpy(c->tags, t->tags, TAGSZ);
+	else
+		applyrules(c);
 	if(!c->isfloating)
 		c->isfloating = (rettrans == Success) || c->isfixed;
 	attach(c);
@@ -1116,17 +1059,24 @@ maprequest(XEvent *e) {
 		manage(ev->window, &wa);
 }
 
+void
+monocle(void) {
+	Client *c;
+
+	for(c = clients; c; c = c->next)
+		if((lt->isfloating || !c->isfloating) &&  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;
-	View *v;
 	Window dummy;
 	XEvent ev;
 
 	ocx = nx = c->x;
 	ocy = ny = c->y;
-	v = c->view;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 			None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
@@ -1146,17 +1096,17 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			nx = ocx + (ev.xmotion.x - x1);
 			ny = ocy + (ev.xmotion.y - y1);
-			if(abs(v->wax - nx) < SNAP)
-				nx = v->wax;
-			else if(abs((v->wax + v->waw) - (nx + c->w + 2 * c->border)) < SNAP)
-				nx = v->wax + v->waw - c->w - 2 * c->border;
-			if(abs(v->way - ny) < SNAP)
-				ny = v->way;
-			else if(abs((v->way + v->wah) - (ny + c->h + 2 * c->border)) < SNAP)
-				ny = v->way + v->wah - c->h - 2 * c->border;
-			if(!c->isfloating && (v->layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+			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((v->layout->arrange == floating) || c->isfloating)
+			if((lt->isfloating) || c->isfloating)
 				resize(c, nx, ny, c->w, c->h, False);
 			break;
 		}
@@ -1164,8 +1114,8 @@ movemouse(Client *c) {
 }
 
 Client *
-nexttiled(Client *c, View *v) {
-	for(; c && (c->isfloating || c->view != v || !isvisible(c)); c = c->next);
+nexttiled(Client *c) {
+	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
 	return c;
 }
 
@@ -1190,13 +1140,13 @@ propertynotify(XEvent *e) {
 			break;
 		case XA_WM_HINTS:
 			updatewmhints(c);
-			drawbar(c->view);
+			drawbar();
 			break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 			updatetitle(c);
 			if(c == sel)
-				drawbar(selview);
+				drawbar();
 		}
 	}
 }
@@ -1220,26 +1170,24 @@ reapply(const char *arg) {
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-	View *v;
 	XWindowChanges wc;
 
-	v = c->view;
 	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;
 		}
 
@@ -1253,31 +1201,31 @@ 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;
-	if(x > v->x + v->w)
-		x = v->w - w - 2 * c->border;
-	if(y > v->y + v->h)
-		y = v->h - h - 2 * c->border;
-	if(x + w + 2 * c->border < v->x)
-		x = v->x;
-	if(y + h + 2 * c->border < v->y)
-		y = v->y;
+	if(x > sx + sw)
+		x = sw - w - 2 * c->bw;
+	if(y > sy + sh)
+		y = sh - h - 2 * c->bw;
+	if(x + w + 2 * c->bw < sx)
+		x = sx;
+	if(y + h + 2 * c->bw < sy)
+		y = sy;
 	if(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;
+		wc.border_width = c->bw;
 		XConfigureWindow(dpy, c->win,
 				CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
 		configure(c);
@@ -1289,22 +1237,20 @@ void
 resizemouse(Client *c) {
 	int ocx, ocy;
 	int nw, nh;
-	View *v;
 	XEvent ev;
 
 	ocx = c->x;
 	ocy = c->y;
-	v = c->view;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 			None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
-	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->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);
 		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;
@@ -1315,13 +1261,11 @@ 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;
-			if(!c->isfloating && (v->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+			nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+			nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+			if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
 				togglefloating(NULL);
-			if((v->layout->arrange == floating) || c->isfloating)
+			if((lt->isfloating) || c->isfloating)
 				resize(c, c->x, c->y, nw, nh, True);
 			break;
 		}
@@ -1329,24 +1273,24 @@ resizemouse(Client *c) {
 }
 
 void
-restack(View *v) {
+restack(void) {
 	Client *c;
 	XEvent ev;
 	XWindowChanges wc;
 
-	drawbar(v);
+	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || (v->layout->arrange == floating))
+	if(sel->isfloating || lt->isfloating)
 		XRaiseWindow(dpy, sel->win);
-	if(v->layout->arrange != floating) {
+	if(!lt->isfloating) {
 		wc.stack_mode = Below;
-		wc.sibling = v->barwin;
+		wc.sibling = barwin;
 		if(!sel->isfloating) {
 			XConfigureWindow(dpy, sel->win, CWSibling|CWStackMode, &wc);
 			wc.sibling = sel->win;
 		}
-		for(c = nexttiled(clients, v); c; c = nexttiled(c->next, v)) {
+		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
 			if(c == sel)
 				continue;
 			XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
@@ -1407,7 +1351,7 @@ run(void) {
 					}
 				break;
 			}
-			drawbar(selview);
+			drawbar();
 		}
 		while(XPending(dpy)) {
 			XNextEvent(dpy, &ev);
@@ -1452,15 +1396,34 @@ 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;
-	View *v = selview;
 
 	if(!arg) {
-		v->layout++;
-		if(v->layout == &layouts[LENGTH(layouts)])
-			v->layout = &layouts[0];
+		if(++lt == &layouts[LENGTH(layouts)])
+			lt = &layouts[0];
 	}
 	else {
 		for(i = 0; i < LENGTH(layouts); i++)
@@ -1468,43 +1431,51 @@ setlayout(const char *arg) {
 				break;
 		if(i == LENGTH(layouts))
 			return;
-		v->layout = &layouts[i];
+		lt = &layouts[i];
 	}
 	if(sel)
 		arrange();
 	else
-		drawbar(selview);
+		drawbar();
 }
 
 void
-setmwfact(const char *arg) {
-	double delta;
-	View *v = selview;
+setmfact(const char *arg) {
+	double d;
 
-	if(!domwfact)
+	if(lt->isfloating)
 		return;
-	/* arg handling, manipulate mwfact */
-	if(arg == NULL)
-		v->mwfact = MWFACT;
-	else if(sscanf(arg, "%lf", &delta) == 1) {
-		if(arg[0] == '+' || arg[0] == '-')
-			v->mwfact += delta;
-		else
-			v->mwfact = delta;
-		if(v->mwfact < 0.1)
-			v->mwfact = 0.1;
-		else if(v->mwfact > 0.9)
-			v->mwfact = 0.9;
+	if(!arg)
+		mfact = MFACT;
+	else {
+		d = strtod(arg, NULL);
+		if(arg[0] == '-' || arg[0] == '+')
+			d += mfact;
+		if(d < 0.1 || d > 0.9)
+			return;
+		mfact = d;
 	}
-	arrange();
+	setgeom(geom->symbol);
 }
 
 void
 setup(void) {
-	unsigned int i;
-	View *v;
+	unsigned int i, w;
 	XSetWindowAttributes wa;
-	XineramaScreenInfo *info = NULL;
+
+	/* 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;
+	mfact = MFACT;
+	geom->apply();
 
 	/* init atoms */
 	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1519,17 +1490,6 @@ setup(void) {
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
-	if((isxinerama = XineramaIsActive(dpy)))
-		info = XineramaQueryScreens(dpy, &nviews);
-#if defined(AIM_XINERAMA)
-isxinerama = True;
-nviews = 2; /* aim Xinerama */
-#endif
-	views = emallocz(nviews * sizeof(View));
-
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
-
 	/* init appearance */
 	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
 	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
@@ -1538,84 +1498,50 @@ nviews = 2; /* aim Xinerama */
 	dc.sel[ColBG] = getcolor(SELBGCOLOR);
 	dc.sel[ColFG] = getcolor(SELFGCOLOR);
 	initfont(FONT);
-	dc.h = bh = dc.font.height + 2;
+	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);
 
-	for(blw = i = 0; i < LENGTH(layouts); i++) {
-		i = textw(layouts[i].symbol);
-		if(i > blw)
-			blw = i;
+	/* init tags */
+	seltags = emallocz(TAGSZ);
+	prevtags = emallocz(TAGSZ);
+	seltags[0] = prevtags[0] = True;
+
+	/* init bar */
+	for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+		w = textw(layouts[i].symbol);
+		blw = MAX(blw, w);
+	}
+	for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) {
+		w = textw(geoms[i].symbol);
+		bgw = MAX(bgw, w);
 	}
 
-	seltags = emallocz(sizeof initags);
-	prevtags = emallocz(sizeof initags);
-	memcpy(seltags, initags, sizeof initags);
-	memcpy(prevtags, initags, sizeof initags);
-
-	for(i = 0; i < nviews; i++) {
-		/* init geometry */
-		v = &views[i];
-
-		if(nviews != 1 && isxinerama) {
-
-#if defined(AIM_XINERAMA)
-v->w = DisplayWidth(dpy, screen) / 2;
-v->x = (i == 0) ? 0 : v->w;
-v->y = 0;
-v->h = DisplayHeight(dpy, screen);
-#else
-			v->x = info[i].x_org;
-			v->y = info[i].y_org;
-			v->w = info[i].width;
-			v->h = info[i].height;
-#endif
-		}
-		else {
-			v->x = 0;
-			v->y = 0;
-			v->w = DisplayWidth(dpy, screen);
-			v->h = DisplayHeight(dpy, screen);
-		}
+	wa.override_redirect = 1;
+	wa.background_pixmap = ParentRelative;
+	wa.event_mask = ButtonPressMask|ExposureMask;
 
-		/* init layouts */
-		v->mwfact = MWFACT;
-		v->layout = &layouts[0];
+	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]);
+	XMapRaised(dpy, barwin);
+	strcpy(stext, "dwm-"VERSION);
+	drawbar();
 
-		// TODO: bpos per screen?
-		bpos = BARPOS;
-		wa.override_redirect = 1;
-		wa.background_pixmap = ParentRelative;
-		wa.event_mask = ButtonPressMask|ExposureMask;
+	/* EWMH support per view */
+	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+			PropModeReplace, (unsigned char *) netatom, NetLast);
 
-		/* init bars */
-		v->barwin = XCreateWindow(dpy, root, v->x, v->y, v->w, bh, 0,
-				DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
-				CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-		XDefineCursor(dpy, v->barwin, cursor[CurNormal]);
-		updatebarpos(v);
-		XMapRaised(dpy, v->barwin);
-		strcpy(stext, "dwm-"VERSION);
-
-		/* EWMH support per view */
-		XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-				PropModeReplace, (unsigned char *) netatom, NetLast);
-
-		/* select for events */
-		wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
-				|EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
-		XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
-		XSelectInput(dpy, root, wa.event_mask);
-
-		drawbar(v);
-	}
-	if(info)
-		XFree(info);
+	/* select for events */
+	wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+			|EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+	XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+	XSelectInput(dpy, root, wa.event_mask);
 
-	selview = viewat();
 
 	/* grab keys */
 	grabkeys();
@@ -1674,59 +1600,76 @@ textw(const char *text) {
 }
 
 void
-tile(View *v) {
-	unsigned int i, n, nx, ny, nw, nh, mw, th;
-	Client *c, *mc;
+tileh(void) {
+	int x, w;
+	unsigned int i, n = counttiled();
+	Client *c;
 
-	domwfact = dozoom = True;
-	nx = v->wax;
-	ny = v->way;
-	nw = 0;
-	for(n = 0, c = nexttiled(clients, v); c; c = nexttiled(c->next, v))
-		n++;
+	if(n == 0)
+		return;
+	c = tilemaster(n);
+	if(--n == 0)
+		return;
 
-	/* window geoms */
-	mw = (n == 1) ? v->waw : v->mwfact * v->waw;
-	th = (n > 1) ? v->wah / (n - 1) : 0;
-	if(n > 1 && th < bh)
-		th = v->wah;
+	x = tx;
+	w = tw / n;
+	if(w < bh)
+		w = tw;
 
-	for(i = 0, c = mc = nexttiled(clients, v); c; c = nexttiled(c->next, v)) {
-		if(i == 0) { /* master */
-			nx = v->wax;
-			ny = v->way;
-			nw = mw - 2 * c->border;
-			nh = v->wah - 2 * c->border;
-		}
-		else {  /* tile window */
-			if(i == 1) {
-				ny = v->way;
-				nx += mc->w + 2 * mc->border;
-				nw = v->waw - mw - 2 * c->border;
-			}
-			if(i + 1 == n) /* remainder */
-				nh = (v->way + v->wah) - ny - 2 * c->border;
-			else
-				nh = th - 2 * c->border;
-		}
-		resize(c, nx, ny, nw, nh, RESIZEHINTS);
-		if((RESIZEHINTS) && ((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 != v->wah)
-			ny = c->y + c->h + 2 * c->border;
-		i++;
+	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;
 	}
 }
 
-void
-togglebar(const char *arg) {
-	if(bpos == BarOff)
-		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+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
-		bpos = BarOff;
-	updatebarpos(selview);
-	arrange();
+		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;
+	}
 }
 
 void
@@ -1777,7 +1720,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);
@@ -1806,29 +1749,12 @@ unmapnotify(XEvent *e) {
 }
 
 void
-updatebarpos(View *v) {
-	XEvent ev;
+updatebarpos(void) {
 
-	v->wax = v->x;
-	v->way = v->y;
-	v->wah = v->h;
-	v->waw = v->w;
-	switch(bpos) {
-	default:
-		v->wah -= bh;
-		v->way += bh;
-		XMoveWindow(dpy, v->barwin, v->x, v->y);
-		break;
-	case BarBot:
-		v->wah -= bh;
-		XMoveWindow(dpy, v->barwin, v->x, v->y + v->wah);
-		break;
-	case BarOff:
-		XMoveWindow(dpy, v->barwin, v->x, v->y - bh);
-		break;
-	}
-	XSync(dpy, False);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+	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
@@ -1894,49 +1820,36 @@ updatewmhints(Client *c) {
 	XWMHints *wmh;
 
 	if((wmh = XGetWMHints(dpy, c->win))) {
-		c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+		if(c == sel)
+			sel->isurgent = False;
+		else
+			c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
 		XFree(wmh);
 	}
 }
 
+
 void
 view(const char *arg) {
 	unsigned int i;
-	Bool tmp[LENGTH(tags)];
 
 	for(i = 0; i < LENGTH(tags); i++)
 		tmp[i] = (NULL == arg);
 	tmp[idxoftag(arg)] = True;
 
-	if(memcmp(seltags, tmp, sizeof initags) != 0) {
-		memcpy(prevtags, seltags, sizeof initags);
-		memcpy(seltags, tmp, sizeof initags);
+	if(memcmp(seltags, tmp, TAGSZ) != 0) {
+		memcpy(prevtags, seltags, TAGSZ);
+		memcpy(seltags, tmp, TAGSZ);
 		arrange();
 	}
 }
 
-View *
-viewat() {
-	int i, x, y;
-	Window win;
-	unsigned int mask;
-
-	XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
-	for(i = 0; i < nviews; i++) {
-		if((x >= views[i].x && x < views[i].x + views[i].w)
-		&& (y >= views[i].y && y < views[i].y + views[i].h))
-			return &views[i];
-	}
-	return NULL;
-}
-
 void
 viewprevtag(const char *arg) {
-	static Bool tmp[LENGTH(tags)];
 
-	memcpy(tmp, seltags, sizeof initags);
-	memcpy(seltags, prevtags, sizeof initags);
-	memcpy(prevtags, tmp, sizeof initags);
+	memcpy(tmp, seltags, TAGSZ);
+	memcpy(seltags, prevtags, TAGSZ);
+	memcpy(prevtags, tmp, TAGSZ);
 	arrange();
 }
 
@@ -1976,10 +1889,10 @@ void
 zoom(const char *arg) {
 	Client *c = sel;
 
-	if(!sel || !dozoom || sel->isfloating)
+	if(!sel || lt->isfloating || sel->isfloating)
 		return;
-	if(c == nexttiled(clients, c->view))
-		if(!(c = nexttiled(c->next, c->view)))
+	if(c == nexttiled(clients))
+		if(!(c = nexttiled(c->next)))
 			return;
 	detach(c);
 	attach(c);
@@ -2007,3 +1920,4 @@ main(int argc, char *argv[]) {
 	XCloseDisplay(dpy);
 	return 0;
 }
+