X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=5cbb59b8a178b88d64c27afd0cd669213c21cbe8;hb=63d719023161c807242c01a2fe81a1097ca37447;hp=0e47626afd34140f9ab4d3ae973780edb51bfce6;hpb=fd01413fae6dea101ed07e6ee7c0d26be5e92d03;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 0e47626..5cbb59b 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.
  *
@@ -33,49 +33,64 @@
 #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
+#ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
-//#endif
+#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 BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask))
+#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define ISVISIBLE(x)            (x->tags & tagset[seltags])
+#define LENGTH(x)               (sizeof x / sizeof x[0])
+#define MAX(a, b)               ((a) > (b) ? (a) : (b))
+#define MIN(a, b)               ((a) < (b) ? (a) : (b))
+#define 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 { BarTop, BarBot, BarOff };			/* bar position */
-enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
-enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
+enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
+enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
+enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+       ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
+
+typedef union {
+	int i;
+	unsigned int ui;
+	float f;
+	void *v;
+} Arg;
+
+typedef struct {
+	unsigned int click;
+	unsigned int mask;
+	unsigned int button;
+	void (*func)(const Arg *arg);
+	const Arg arg;
+} Button;
 
-/* typedefs */
-typedef struct Monitor Monitor;
 typedef struct Client Client;
 struct Client {
 	char name[256];
+	float mina, maxa;
 	int x, y, w, h;
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
-	int minax, maxax, minay, maxay;
-	long flags;
-	unsigned int border, oldborder;
-	Bool isbanned, isfixed, isfloating, isurgent;
-	Bool *tags;
+	int bw, oldbw;
+	unsigned int tags;
+	Bool isfixed, isfloating, isurgent;
 	Client *next;
-	Client *prev;
 	Client *snext;
 	Window win;
-	Monitor *monitor;
 };
 
 typedef struct {
@@ -94,135 +109,105 @@ typedef struct {
 } DC; /* draw context */
 
 typedef struct {
-	unsigned long mod;
+	unsigned int mod;
 	KeySym keysym;
-	void (*func)(const char *arg);
-	const char *arg;
+	void (*func)(const Arg *);
+	const Arg arg;
 } Key;
 
 typedef struct {
 	const char *symbol;
-	void (*arrange)(Monitor *);
+	void (*arrange)(void);
 } Layout;
 
 typedef struct {
-	const char *prop;
-	const char *tags;
+	const char *class;
+	const char *instance;
+	const char *title;
+	unsigned int tags;
 	Bool isfloating;
-	int monitor;
 } Rule;
 
-typedef struct {
-	regex_t *propregex;
-	regex_t *tagregex;
-} Regs;
-
-struct Monitor {
-	int sx, sy, sw, sh, wax, way, wah, waw;
-	double mwfact;
-	Bool *seltags;
-	Bool *prevtags;
-	Layout *layout;
-	Window barwin;
-};
-
-
 /* function declarations */
-void applyrules(Client *c);
-void arrange(Monitor *m);
-void attach(Client *c);
-void attachstack(Client *c);
-void ban(Client *c);
-void buttonpress(XEvent *e);
-void checkotherwm(void);
-void cleanup(void);
-void compileregs(void);
-void configure(Client *c);
-void configurenotify(XEvent *e);
-void configurerequest(XEvent *e);
-void destroynotify(XEvent *e);
-void detach(Client *c);
-void detachstack(Client *c);
-void drawbar(Monitor *m);
-void drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-void drawtext(Monitor *m, 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(Monitor *m); /* 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);
-Monitor *getmonitor(Window barwin);
-long getstate(Window w);
-Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
-void grabbuttons(Client *c, Bool focused);
-void grabkeys(void);
-unsigned int idxoftag(const char *tag);
-void initfont(const char *fontstr);
-Bool isoccupied(Monitor *monitor, unsigned int t);
-Bool isprotodel(Client *c);
-Bool isurgent(Monitor *monitor, unsigned int t);
-Bool isvisible(Client *c, Monitor *m);
-void keypress(XEvent *e);
-void killclient(const char *arg);
-void manage(Window w, XWindowAttributes *wa);
-void mappingnotify(XEvent *e);
-void maprequest(XEvent *e);
-Monitor *monitorat(void);
-void movemouse(Client *c);
-Client *nexttiled(Client *c, Monitor *monitor);
-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(Monitor *m);
-void run(void);
-void scan(void);
-void setclientstate(Client *c, long state);
-void setlayout(const char *arg);
-void setmwfact(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(Monitor *m);
-void togglebar(const char *arg);
-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(Monitor *m);
-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 */
-int xerror(Display *dpy, XErrorEvent *ee);
-int xerrordummy(Display *dsply, XErrorEvent *ee);
-int xerrorstart(Display *dsply, XErrorEvent *ee);
-void zoom(const char *arg);
-void movetomonitor(const char *arg);
-void selectmonitor(const char *arg);
+static void applyrules(Client *c);
+static void arrange(void);
+static void attach(Client *c);
+static void attachstack(Client *c);
+static void buttonpress(XEvent *e);
+static void checkotherwm(void);
+static void cleanup(void);
+static void clearurgent(void);
+static void configure(Client *c);
+static void configurenotify(XEvent *e);
+static void configurerequest(XEvent *e);
+static void destroynotify(XEvent *e);
+static void detach(Client *c);
+static void detachstack(Client *c);
+static void die(const char *errstr, ...);
+static void drawbar(void);
+static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
+static void enternotify(XEvent *e);
+static void expose(XEvent *e);
+static void focus(Client *c);
+static void focusin(XEvent *e);
+static void focusstack(const Arg *arg);
+static Client *getclient(Window w);
+static unsigned long getcolor(const char *colstr);
+static long getstate(Window w);
+static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+static void grabbuttons(Client *c, Bool focused);
+static void grabkeys(void);
+static void initfont(const char *fontstr);
+static Bool isprotodel(Client *c);
+static void keypress(XEvent *e);
+static void killclient(const Arg *arg);
+static void manage(Window w, XWindowAttributes *wa);
+static void mappingnotify(XEvent *e);
+static void maprequest(XEvent *e);
+static void monocle(void);
+static void movemouse(const Arg *arg);
+static Client *nexttiled(Client *c);
+static void propertynotify(XEvent *e);
+static void quit(const Arg *arg);
+static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static void resizemouse(const Arg *arg);
+static void restack(void);
+static void run(void);
+static void scan(void);
+static void setclientstate(Client *c, long state);
+static void setlayout(const Arg *arg);
+static void setmfact(const Arg *arg);
+static void setup(void);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static int textnw(const char *text, unsigned int len);
+static void tile(void);
+static void togglebar(const Arg *arg);
+static void togglefloating(const Arg *arg);
+static void toggletag(const Arg *arg);
+static void toggleview(const Arg *arg);
+static void unmanage(Client *c);
+static void unmapnotify(XEvent *e);
+static void updatebar(void);
+static void updategeom(void);
+static void updatesizehints(Client *c);
+static void updatetitle(Client *c);
+static void updatewmhints(Client *c);
+static void view(const Arg *arg);
+static int xerror(Display *dpy, XErrorEvent *ee);
+static int xerrordummy(Display *dpy, XErrorEvent *ee);
+static int xerrorstart(Display *dpy, XErrorEvent *ee);
+static void zoom(const Arg *arg);
 
 /* variables */
-char stext[256];
-int mcount = 1;
-Monitor *selmonitor;
-int screen;
-int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos;
-unsigned int blw = 0;
-unsigned int numlockmask = 0;
-void (*handler[LASTEvent]) (XEvent *) = {
+static char stext[256];
+static int screen, sx, sy, sw, sh;
+static int by, bh, blw, wx, wy, ww, wh;
+static unsigned int seltags = 0, sellt = 0;
+static int (*xerrorxlib)(Display *, XErrorEvent *);
+static unsigned int numlockmask = 0;
+static void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
 	[ConfigureNotify] = configurenotify,
@@ -236,91 +221,72 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
 };
-Atom wmatom[WMLast], netatom[NetLast];
-Bool isxinerama = False;
-Bool domwfact = True;
-Bool dozoom = True;
-Bool otherwm, readin;
-Bool running = True;
-Client *clients = NULL;
-Client *sel = NULL;
-Client *stack = NULL;
-Cursor cursor[CurLast];
-Display *dpy;
-DC dc = {0};
-Regs *regs = NULL;
-Monitor *monitors;
-Window root;
-
+static Atom wmatom[WMLast], netatom[NetLast];
+static Bool otherwm;
+static Bool running = True;
+static unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
+static Client *clients = NULL;
+static Client *sel = NULL;
+static Client *stack = NULL;
+static Cursor cursor[CurLast];
+static Display *dpy;
+static DC dc = {0};
+static Layout *lt[] = { NULL, NULL };
+static Window root, barwin;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-//Bool prevtags[LENGTH(tags)];
+/* compile-time check if all tags fit into an unsigned int bit array. */
+struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
 
 /* function implementations */
 void
 applyrules(Client *c) {
-	static char buf[512];
-	unsigned int i, j;
-	regmatch_t tmp;
-	Bool matched_tag = False;
-	Bool matched_monitor = False;
+	unsigned int i;
+	Rule *r;
 	XClassHint ch = { 0 };
 
 	/* rule matching */
 	XGetClassHint(dpy, c->win, &ch);
-	snprintf(buf, sizeof buf, "%s:%s:%s",
-			ch.res_class ? ch.res_class : "",
-			ch.res_name ? ch.res_name : "", c->name);
-	for(i = 0; i < LENGTH(rules); i++)
-		if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
-			if (rules[i].monitor >= 0 && rules[i].monitor < mcount) {
-				matched_monitor = True;
-				c->monitor = &monitors[rules[i].monitor];
-			}
-
-			c->isfloating = rules[i].isfloating;
-			for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) {
-				if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
-					matched_tag = True;
-					c->tags[j] = True;
-				}
-			}
+	for(i = 0; i < LENGTH(rules); i++) {
+		r = &rules[i];
+		if((!r->title || strstr(c->name, r->title))
+		&& (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+		&& (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+			c->isfloating = r->isfloating;
+			c->tags |= r->tags & TAGMASK;
 		}
+	}
 	if(ch.res_class)
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
-	if(!matched_tag)
-		memcpy(c->tags, monitorat()->seltags, sizeof initags);
-	if (!matched_monitor)
-		c->monitor = monitorat();
+	if(!c->tags)
+		c->tags = tagset[seltags];
 }
 
 void
-arrange(Monitor *m) {
-	unsigned int i;
+arrange(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(isvisible(c, c->monitor))
-			unban(c);
-		else
-			ban(c);
+		if(ISVISIBLE(c)) {
+			XMoveWindow(dpy, c->win, c->x, c->y);
+			if(!lt[sellt]->arrange || c->isfloating)
+				resize(c, c->x, c->y, c->w, c->h, True);
+		}
+		else {
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+		}
 
-	if(m)
-		m->layout->arrange(m);
-	else
-		for(i = 0; i < mcount; i++)
-			monitors[i].layout->arrange(&monitors[i]);
 	focus(NULL);
-	restack(m);
+	if(lt[sellt]->arrange)
+		lt[sellt]->arrange();
+	restack();
 }
 
 void
 attach(Client *c) {
-	if(clients)
-		clients->prev = c;
 	c->next = clients;
 	clients = c;
 }
@@ -332,63 +298,36 @@ attachstack(Client *c) {
 }
 
 void
-ban(Client *c) {
-	if(c->isbanned)
-		return;
-	XMoveWindow(dpy, c->win, c->x + 3 * c->monitor->sw, c->y);
-	c->isbanned = True;
-}
-
-void
 buttonpress(XEvent *e) {
-	unsigned int i, x;
+	unsigned int i, x, click;
+	Arg arg = {0};
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
-	Monitor *m = monitorat();
-
-	if(ev->window == m->barwin) {
-		x = 0;
-		for(i = 0; i < LENGTH(tags); i++) {
-			x += textw(tags[i]);
-			if(ev->x < x) {
-				if(ev->button == Button1) {
-					if(ev->state & MODKEY)
-						tag(tags[i]);
-					else
-						view(tags[i]);
-				}
-				else if(ev->button == Button3) {
-					if(ev->state & MODKEY)
-						toggletag(tags[i]);
-					else
-						toggleview(tags[i]);
-				}
-				return;
-			}
+	click = ClkRootWin;
+	if(ev->window == barwin) {
+		i = x = 0;
+		do x += TEXTW(tags[i]); while(ev->x >= x && ++i < LENGTH(tags));
+		if(i < LENGTH(tags)) {
+			click = ClkTagBar;
+			arg.ui = 1 << i;
 		}
-		if((ev->x < x + blw) && ev->button == Button1)
-			setlayout(NULL);
+		else if(ev->x < x + blw)
+			click = ClkLtSymbol;
+		else if(ev->x > wx + ww - TEXTW(stext))
+			click = ClkStatusText;
+		else
+			click = ClkWinTitle;
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		if(CLEANMASK(ev->state) != MODKEY)
-			return;
-		if(ev->button == Button1) {
-			restack(c->monitor);
-			movemouse(c);
-		}
-		else if(ev->button == Button2) {
-			if((floating != m->layout->arrange) && c->isfloating)
-				togglefloating(NULL);
-			else
-				zoom(NULL);
-		}
-		else if(ev->button == Button3 && !c->isfixed) {
-			restack(c->monitor);
-			resizemouse(c);
-		}
+		click = ClkClientWin;
 	}
+
+	for(i = 0; i < LENGTH(buttons); i++)
+		if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
+		   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+			buttons[i].func(click == ClkTagBar ? &arg : &buttons[i].arg);
 }
 
 void
@@ -400,8 +339,7 @@ checkotherwm(void) {
 	XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
 	XSync(dpy, False);
 	if(otherwm)
-		eprint("dwm: another window manager is already running\n");
-	XSync(dpy, False);
+		die("dwm: another window manager is already running\n");
 	XSetErrorHandler(NULL);
 	xerrorxlib = XSetErrorHandler(xerror);
 	XSync(dpy, False);
@@ -409,53 +347,44 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
-	unsigned int i;
+	Arg a = {.i = ~0};
+	Layout foo = { "", NULL };
+
 	close(STDIN_FILENO);
-	while(stack) {
-		unban(stack);
+	view(&a);
+	lt[sellt] = &foo;
+	while(stack)
 		unmanage(stack);
-	}
 	if(dc.font.set)
 		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 < mcount; i++)
-		XDestroyWindow(dpy, monitors[i].barwin);
+	XDestroyWindow(dpy, barwin);
 	XSync(dpy, False);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 
 void
-compileregs(void) {
-	unsigned int i;
-	regex_t *reg;
+clearurgent(void) {
+	XWMHints *wmh;
+	Client *c;
 
-	if(regs)
-		return;
-	regs = emallocz(LENGTH(rules) * sizeof(Regs));
-	for(i = 0; i < LENGTH(rules); i++) {
-		if(rules[i].prop) {
-			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rules[i].prop, REG_EXTENDED))
-				free(reg);
-			else
-				regs[i].propregex = reg;
-		}
-		if(rules[i].tags) {
-			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rules[i].tags, REG_EXTENDED))
-				free(reg);
-			else
-				regs[i].tagregex = reg;
+	for(c = clients; c; c = c->next)
+		if(ISVISIBLE(c) && c->isurgent) {
+			c->isurgent = False;
+			if (!(wmh = XGetWMHints(dpy, c->win)))
+				continue;
+
+			wmh->flags &= ~XUrgencyHint;
+			XSetWMHints(dpy, c->win, wmh);
+			XFree(wmh);
 		}
-	}
 }
 
 void
@@ -470,7 +399,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);
@@ -479,17 +408,13 @@ configure(Client *c) {
 void
 configurenotify(XEvent *e) {
 	XConfigureEvent *ev = &e->xconfigure;
-	Monitor *m = selmonitor;
 
-	if(ev->window == root && (ev->width != m->sw || ev->height != m->sh)) {
-		/* TODO -- update Xinerama dimensions here */
-		m->sw = ev->width;
-		m->sh = ev->height;
-		XFreePixmap(dpy, dc.drawable);
-		dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
-		XResizeWindow(dpy, m->barwin, m->sw, bh);
-		updatebarpos(m);
-		arrange(m);
+	if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+		sw = ev->width;
+		sh = ev->height;
+		updategeom();
+		updatebar();
+		arrange();
 	}
 }
 
@@ -500,26 +425,24 @@ configurerequest(XEvent *e) {
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
-		Monitor *m = c->monitor;
 		if(ev->value_mask & CWBorderWidth)
-			c->border = ev->border_width;
-		if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
+			c->bw = ev->border_width;
+		else if(c->isfloating || !lt[sellt]->arrange) {
 			if(ev->value_mask & CWX)
-				c->x = m->sx+ev->x;
+				c->x = sx + ev->x;
 			if(ev->value_mask & CWY)
-				c->y = m->sy+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 - m->sx + c->w) > m->sw && c->isfloating)
-				c->x = m->sx + (m->sw / 2 - c->w / 2); /* center in x direction */
-			if((c->y - m->sy + c->h) > m->sh && c->isfloating)
-				c->y = m->sy + (m->sh / 2 - c->h / 2); /* center in y direction */
-			if((ev->value_mask & (CWX | CWY))
-			&& !(ev->value_mask & (CWWidth | CWHeight)))
+			if((c->x - sx + c->w) > sw && c->isfloating)
+				c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
+			if((c->y - sy + c->h) > sh && c->isfloating)
+				c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
+			if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
 				configure(c);
-			if(isvisible(c, monitorat()))
+			if(ISVISIBLE(c))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
@@ -549,73 +472,80 @@ destroynotify(XEvent *e) {
 
 void
 detach(Client *c) {
-	if(c->prev)
-		c->prev->next = c->next;
-	if(c->next)
-		c->next->prev = c->prev;
-	if(c == clients)
-		clients = c->next;
-	c->next = c->prev = NULL;
+	Client **tc;
+
+	for(tc = &clients; *tc && *tc != c; tc = &(*tc)->next);
+	*tc = c->next;
 }
 
 void
 detachstack(Client *c) {
 	Client **tc;
 
-	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+	for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext);
 	*tc = c->snext;
 }
 
 void
-drawbar(Monitor *m) {
-	int j, x;
+die(const char *errstr, ...) {
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+void
+drawbar(void) {
+	int x;
+	unsigned int i, occ = 0, urg = 0;
+	unsigned long *col;
 	Client *c;
 
+	for(c = clients; c; c = c->next) {
+		occ |= c->tags;
+		if(c->isurgent)
+			urg |= c->tags;
+	}
+
 	dc.x = 0;
-	for(c = stack; c && !isvisible(c, m); c = c->snext);
-	for(j = 0; j < LENGTH(tags); j++) {
-		dc.w = textw(tags[j]);
-		if(m->seltags[j]) {
-			drawtext(m, tags[j], dc.sel, isurgent(m, j));
-			drawsquare(m, c && c->tags[j] && c->monitor == m,
-					isoccupied(m, j), isurgent(m, j), dc.sel);
-		}
-		else {
-			drawtext(m, tags[j], dc.norm, isurgent(m, j));
-			drawsquare(m, c && c->tags[j] && c->monitor == m,
-					isoccupied(m, j), isurgent(m, j), dc.norm);
-		}
+	for(i = 0; i < LENGTH(tags); i++) {
+		dc.w = TEXTW(tags[i]);
+		col = tagset[seltags] & 1 << i ? dc.sel : dc.norm;
+		drawtext(tags[i], col, urg & 1 << i);
+		drawsquare(sel && sel->tags & 1 << i, occ & 1 << i, urg & 1 << i, col);
 		dc.x += dc.w;
 	}
-	dc.w = blw;
-	drawtext(m, m->layout->symbol, dc.norm, False);
-	x = dc.x + dc.w;
-	if(m == selmonitor) {
-		dc.w = textw(stext);
-		dc.x = m->sw - dc.w;
-		if(dc.x < x) {
-			dc.x = x;
-			dc.w = m->sw - x;
-		}
-		drawtext(m, stext, dc.norm, False);
+	if(blw > 0) {
+		dc.w = blw;
+		drawtext(lt[sellt]->symbol, dc.norm, False);
+		x = dc.x + dc.w;
 	}
 	else
-		dc.x = m->sw;
+		x = dc.x;
+	dc.w = TEXTW(stext);
+	dc.x = ww - dc.w;
+	if(dc.x < x) {
+		dc.x = x;
+		dc.w = ww - x;
+	}
+	drawtext(stext, dc.norm, False);
 	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
-		if(c) {
-			drawtext(m, c->name, dc.sel, False);
-			drawsquare(m, False, c->isfloating, False, dc.sel);
+		if(sel) {
+			drawtext(sel->name, dc.sel, False);
+			drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);
 		}
 		else
-			drawtext(m, NULL, dc.norm, False);
+			drawtext(NULL, dc.norm, False);
 	}
-	XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->sw, bh, 0, 0);
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
 	XSync(dpy, False);
 }
 
 void
-drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 	int x;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
@@ -636,38 +566,27 @@ drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[C
 }
 
 void
-drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert) {
-	int x, y, w, h;
-	static char buf[256];
-	unsigned int len, olen;
+drawtext(const char *text, unsigned long 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 && i > 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);
@@ -675,68 +594,31 @@ drawtext(Monitor *m, 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;
 	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 {
-		selmonitor = monitorat();
-		fprintf(stderr, "updating selmonitor %d\n", selmonitor - monitors);
+	else
 		focus(NULL);
-	}
-}
-
-void
-eprint(const char *errstr, ...) {
-	va_list ap;
-
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(EXIT_FAILURE);
 }
 
 void
 expose(XEvent *e) {
-	Monitor *m;
 	XExposeEvent *ev = &e->xexpose;
 
-	if(ev->count == 0 && (m = getmonitor(ev->window)))
-		drawbar(m);
-}
-
-void
-floating(Monitor *m) { /* default floating layout */
-	Client *c;
-
-	domwfact = dozoom = False;
-	for(c = clients; c; c = c->next)
-		if(isvisible(c, m))
-			resize(c, c->x, c->y, c->w, c->h, True);
+	if(ev->count == 0 && (ev->window == barwin))
+		drawbar();
 }
 
 void
 focus(Client *c) {
-	if(c)
-		selmonitor = c->monitor;
-	if(!c || (c && !isvisible(c, selmonitor)))
-		for(c = stack; c && !isvisible(c, c->monitor); c = c->snext);
+	if(!c || !ISVISIBLE(c))
+		for(c = stack; c && !ISVISIBLE(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -745,16 +627,13 @@ 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);
-		selmonitor = c->monitor;
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-	drawbar(selmonitor);
+	sel = c;
+	drawbar();
 }
 
 void
@@ -766,34 +645,28 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 }
 
 void
-focusnext(const char *arg) {
-	Client *c;
+focusstack(const Arg *arg) {
+	Client *c = NULL, *i;
 
 	if(!sel)
 		return;
-	for(c = sel->next; c && !isvisible(c, selmonitor); c = c->next);
-	if(!c)
-		for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
-	if(c) {
-		focus(c);
-		restack(c->monitor);
+	if (arg->i > 0) {
+		for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
+		if(!c)
+			for(c = clients; c && !ISVISIBLE(c); c = c->next);
 	}
-}
-
-void
-focusprev(const char *arg) {
-	Client *c;
-
-	if(!sel)
-		return;
-	for(c = sel->prev; c && !isvisible(c, selmonitor); c = c->prev);
-	if(!c) {
-		for(c = clients; c && c->next; c = c->next);
-		for(; c && !isvisible(c, selmonitor); c = c->prev);
+	else {
+		for(i = clients; i != sel; i = i->next)
+			if(ISVISIBLE(i))
+				c = i;
+		if(!c)
+			for(; i; i = i->next)
+				if(ISVISIBLE(i))
+					c = i;
 	}
 	if(c) {
 		focus(c);
-		restack(c->monitor);
+		restack();
 	}
 }
 
@@ -811,20 +684,10 @@ getcolor(const char *colstr) {
 	XColor color;
 
 	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-		eprint("error, cannot allocate color '%s'\n", colstr);
+		die("error, cannot allocate color '%s'\n", colstr);
 	return color.pixel;
 }
 
-Monitor *
-getmonitor(Window barwin) {
-	unsigned int i;
-
-	for(i = 0; i < mcount; i++)
-		if(monitors[i].barwin == barwin)
-			return &monitors[i];
-	return NULL;
-}
-
 long
 getstate(Window w) {
 	int format, status;
@@ -871,44 +734,24 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
-	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+	unsigned int i, j;
+	unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
 
+	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	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);
-	}
-	else
-		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
-				GrabModeAsync, GrabModeSync, None, None);
+		for(i = 0; i < LENGTH(buttons); i++)
+			if(buttons[i].click == ClkClientWin)
+				for(j = 0; j < LENGTH(modifiers); j++)
+					XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+	} else
+		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+		            BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
 }
 
 void
-grabkeys(void)  {
+grabkeys(void) {
 	unsigned int i, j;
+	unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
 	KeyCode code;
 	XModifierKeymap *modmap;
 
@@ -924,25 +767,12 @@ grabkeys(void)  {
 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
 	for(i = 0; i < LENGTH(keys); i++) {
 		code = XKeysymToKeycode(dpy, keys[i].keysym);
-		XGrabKey(dpy, code, keys[i].mod, root, True,
-				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
-				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
-				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
-				GrabModeAsync, GrabModeAsync);
+		for(j = 0; j < LENGTH(modifiers); j++)
+			XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
+			         GrabModeAsync, GrabModeAsync);
 	}
 }
 
-unsigned int
-idxoftag(const char *tag) {
-	unsigned int i;
-
-	for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++);
-	return (i < LENGTH(tags)) ? i : 0;
-}
-
 void
 initfont(const char *fontstr) {
 	char *def, **missing;
@@ -965,10 +795,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++;
 		}
 	}
@@ -978,7 +806,7 @@ initfont(const char *fontstr) {
 		dc.font.xfont = NULL;
 		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
 		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
-			eprint("error, cannot load font: '%s'\n", fontstr);
+			die("error, cannot load font: '%s'\n", fontstr);
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
 	}
@@ -986,16 +814,6 @@ initfont(const char *fontstr) {
 }
 
 Bool
-isoccupied(Monitor *monitor, unsigned int t) {
-	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(c->tags[t] && c->monitor == monitor)
-			return True;
-	return False;
-}
-
-Bool
 isprotodel(Client *c) {
 	int i, n;
 	Atom *protocols;
@@ -1010,28 +828,6 @@ isprotodel(Client *c) {
 	return ret;
 }
 
-Bool
-isurgent(Monitor *monitor, unsigned int t) {
-	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(c->monitor == monitor && c->isurgent && c->tags[t])
-			return True;
-	return False;
-}
-
-Bool
-isvisible(Client *c, Monitor *m) {
-	unsigned int i;
-
-	if(c->monitor != m)
-		return False;
-	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i] && c->monitor->seltags[i])
-			return True;
-	return False;
-}
-
 void
 keypress(XEvent *e) {
 	unsigned int i;
@@ -1042,15 +838,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 Arg *arg) {
 	XEvent ev;
 
 	if(!sel)
@@ -1071,62 +865,60 @@ killclient(const char *arg) {
 void
 manage(Window w, XWindowAttributes *wa) {
 	Client *c, *t = NULL;
-	Monitor *m;
 	Status rettrans;
 	Window trans;
 	XWindowChanges wc;
 
-	c = emallocz(sizeof(Client));
-	c->tags = emallocz(sizeof initags);
+	if(!(c = calloc(1, sizeof(Client))))
+		die("fatal: could not calloc() %u bytes\n", sizeof(Client));
 	c->win = w;
 
-	applyrules(c);
-
-	m = c->monitor;
-
-	c->x = wa->x + m->sx;
-	c->y = wa->y + m->sy;
+	/* 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 == m->sw && c->h == m->sh) {
-		c->x = m->sx;
-		c->y = m->sy;
-		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 = 0;
 	}
 	else {
-		if(c->x + c->w + 2 * c->border > m->wax + m->waw)
-			c->x = m->wax + m->waw - c->w - 2 * c->border;
-		if(c->y + c->h + 2 * c->border > m->way + m->wah)
-			c->y = m->way + m->wah - c->h - 2 * c->border;
-		if(c->x < m->wax)
-			c->x = m->wax;
-		if(c->y < m->way)
-			c->y = m->way;
-		c->border = BORDERPX;
+		if(c->x + c->w + 2 * c->bw > sx + sw)
+			c->x = sx + sw - c->w - 2 * c->bw;
+		if(c->y + c->h + 2 * c->bw > sy + sh)
+			c->y = sy + sh - c->h - 2 * c->bw;
+		c->x = MAX(c->x, sx);
+		/* only fix client y-offset, if the client center might cover the bar */
+		c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
+		c->bw = borderpx;
 	}
-	wc.border_width = c->border;
+
+	wc.border_width = c->bw;
 	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
 	XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
 	configure(c); /* propagates border_width, if size doesn't change */
 	updatesizehints(c);
-	XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask);
+	XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
 	grabbuttons(c, False);
 	updatetitle(c);
 	if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
 		for(t = clients; t && t->win != trans; t = t->next);
 	if(t)
-		memcpy(c->tags, t->tags, sizeof initags);
+		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);
+	XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
 	XMapWindow(dpy, c->win);
 	setclientstate(c, NormalState);
-	arrange(m);
+	arrange();
 }
 
 void
@@ -1151,39 +943,33 @@ maprequest(XEvent *e) {
 		manage(ev->window, &wa);
 }
 
-Monitor *
-monitorat() {
-	int i, x, y;
-	Window win;
-	unsigned int mask;
+void
+monocle(void) {
+	Client *c;
 
-	XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
-	for(i = 0; i < mcount; i++) {
-		if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
-		&& (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
-			return &monitors[i];
-		}
-	}
-	return NULL;
+	for(c = nexttiled(clients); c; c = nexttiled(c->next))
+		resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
 }
 
 void
-movemouse(Client *c) {
-	int x1, y1, ocx, ocy, di, nx, ny;
+movemouse(const Arg *arg) {
+	int x, y, ocx, ocy, di, nx, ny;
 	unsigned int dui;
-	Monitor *m;
+	Client *c;
 	Window dummy;
 	XEvent ev;
 
+	if(!(c = sel))
+		return;
+	restack();
 	ocx = nx = c->x;
 	ocy = ny = c->y;
-	m = c->monitor;
 	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);
+	XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
 	for(;;) {
-		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
 		switch (ev.type) {
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
@@ -1195,19 +981,22 @@ movemouse(Client *c) {
 			break;
 		case MotionNotify:
 			XSync(dpy, False);
-			nx = ocx + (ev.xmotion.x - x1);
-			ny = ocy + (ev.xmotion.y - y1);
-			if(abs(m->wax - nx) < SNAP)
-				nx = m->wax;
-			else if(abs((m->wax + m->waw) - (nx + c->w + 2 * c->border)) < SNAP)
-				nx = m->wax + m->waw - c->w - 2 * c->border;
-			if(abs(m->way - ny) < SNAP)
-				ny = m->way;
-			else if(abs((m->way + m->wah) - (ny + c->h + 2 * c->border)) < SNAP)
-				ny = m->way + m->wah - c->h - 2 * c->border;
-			if(!c->isfloating && (m->layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
-				togglefloating(NULL);
-			if((m->layout->arrange == floating) || c->isfloating)
+			nx = ocx + (ev.xmotion.x - x);
+			ny = ocy + (ev.xmotion.y - y);
+			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[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+					togglefloating(NULL);
+			}
+			if(!lt[sellt]->arrange || c->isfloating)
 				resize(c, nx, ny, c->w, c->h, False);
 			break;
 		}
@@ -1215,8 +1004,8 @@ movemouse(Client *c) {
 }
 
 Client *
-nexttiled(Client *c, Monitor *monitor) {
-	for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
+nexttiled(Client *c) {
+	for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
 	return c;
 }
 
@@ -1234,64 +1023,48 @@ propertynotify(XEvent *e) {
 		case XA_WM_TRANSIENT_FOR:
 			XGetTransientForHint(dpy, c->win, &trans);
 			if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
-				arrange(c->monitor);
+				arrange();
 			break;
 		case XA_WM_NORMAL_HINTS:
 			updatesizehints(c);
 			break;
 		case XA_WM_HINTS:
 			updatewmhints(c);
-			drawbar(c->monitor);
+			drawbar();
 			break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 			updatetitle(c);
 			if(c == sel)
-				drawbar(c->monitor);
+				drawbar();
 		}
 	}
 }
 
 void
-quit(const char *arg) {
+quit(const Arg *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(NULL);
-}
-
-void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-	Monitor *m;
 	XWindowChanges wc;
 
-	m = c->monitor;
 	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)
-				w = h * c->maxax / c->maxay;
-			else if (w * c->minay < h * c->minax)
-				h = w * c->minay / c->minax;
+		if(c->mina > 0 && c->maxa > 0) {
+			if(c->maxa < (float) w/h)
+				w = h * c->maxa;
+			else if(c->mina > (float) h/w)
+				h = w * c->mina;
 		}
 
 		/* adjust for increment value */
@@ -1304,58 +1077,64 @@ 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 > m->sw)
-		x = m->sw - w - 2 * c->border;
-	if(y > m->sh)
-		y = m->sh - h - 2 * c->border;
-	if(x + w + 2 * c->border < m->sx)
-		x = m->sx;
-	if(y + h + 2 * c->border < m->sy)
-		y = m->sy;
-	fprintf(stderr, "resize %d %d %d %d (%d %d %d %d)\n", x, y , w, h, m->sx, m->sy, m->sw, m->sh);
+	if(x > sx + sw)
+		x = sw - w - 2 * c->bw;
+	if(y > sy + sh)
+		y = sh - h - 2 * c->bw;
+	if(x + w + 2 * c->bw < sx)
+		x = sx;
+	if(y + h + 2 * c->bw < sy)
+		y = sy;
+	if(h < bh)
+		h = bh;
+	if(w < bh)
+		w = bh;
 	if(c->x != x || c->y != y || c->w != w || c->h != h) {
 		c->x = wc.x = x;
 		c->y = wc.y = y;
 		c->w = wc.width = w;
 		c->h = wc.height = h;
-		wc.border_width = c->border;
-		XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+		wc.border_width = c->bw;
+		XConfigureWindow(dpy, c->win,
+				CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
 		configure(c);
 		XSync(dpy, False);
 	}
 }
 
 void
-resizemouse(Client *c) {
+resizemouse(const Arg *arg) {
 	int ocx, ocy;
 	int nw, nh;
-	Monitor *m;
+	Client *c;
 	XEvent ev;
 
+	if(!(c = sel))
+		return;
+	restack();
 	ocx = c->x;
 	ocy = c->y;
-	m = c->monitor;
 	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->border - 1, c->h + c->border - 1);
+	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
 	for(;;) {
-		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
+		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
 		switch(ev.type) {
 		case ButtonRelease:
 			XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
-					c->w + c->border - 1, c->h + c->border - 1);
+					c->w + c->bw - 1, c->h + c->bw - 1);
 			XUngrabPointer(dpy, CurrentTime);
 			while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 			return;
@@ -1366,13 +1145,16 @@ 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 && (m->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
-				togglefloating(NULL);
-			if((m->layout->arrange == floating) || 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[sellt]->arrange
+				   && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+					togglefloating(NULL);
+			}
+			if(!lt[sellt]->arrange || c->isfloating)
 				resize(c, c->x, c->y, nw, nh, True);
 			break;
 		}
@@ -1380,29 +1162,24 @@ resizemouse(Client *c) {
 }
 
 void
-restack(Monitor *m) {
+restack(void) {
 	Client *c;
 	XEvent ev;
 	XWindowChanges wc;
 
-	drawbar(m);
+	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || (m->layout->arrange == floating))
+	if(sel->isfloating || !lt[sellt]->arrange)
 		XRaiseWindow(dpy, sel->win);
-	if(m->layout->arrange != floating) {
+	if(lt[sellt]->arrange) {
 		wc.stack_mode = Below;
-		wc.sibling = m->barwin;
-		if(!sel->isfloating) {
-			XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
-			wc.sibling = sel->win;
-		}
-		for(c = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
-			if(c == sel)
-				continue;
-			XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
-			wc.sibling = c->win;
-		}
+		wc.sibling = barwin;
+		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));
@@ -1411,7 +1188,7 @@ restack(Monitor *m) {
 void
 run(void) {
 	char *p;
-	char buf[sizeof stext];
+	char sbuf[sizeof stext];
 	fd_set rd;
 	int r, xfd;
 	unsigned int len, offset;
@@ -1420,10 +1197,9 @@ run(void) {
 	/* main event loop, also reads status text from stdin */
 	XSync(dpy, False);
 	xfd = ConnectionNumber(dpy);
-	readin = True;
 	offset = 0;
 	len = sizeof stext - 1;
-	buf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
+	sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
 	while(running) {
 		FD_ZERO(&rd);
 		if(readin)
@@ -1432,10 +1208,10 @@ run(void) {
 		if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
 			if(errno == EINTR)
 				continue;
-			eprint("select failed\n");
+			die("select failed\n");
 		}
 		if(FD_ISSET(STDIN_FILENO, &rd)) {
-			switch((r = read(STDIN_FILENO, buf + offset, len - offset))) {
+			switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
 			case -1:
 				strncpy(stext, strerror(errno), len);
 				readin = False;
@@ -1445,20 +1221,20 @@ run(void) {
 				readin = False;
 				break;
 			default:
-				for(p = buf + offset; r > 0; p++, r--, offset++)
+				for(p = sbuf + offset; r > 0; p++, r--, offset++)
 					if(*p == '\n' || *p == '\0') {
 						*p = '\0';
-						strncpy(stext, buf, len);
-						p += r - 1; /* p is buf + offset + r - 1 */
+						strncpy(stext, sbuf, len);
+						p += r - 1; /* p is sbuf + offset + r - 1 */
 						for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
 						offset = r;
 						if(r)
-							memmove(buf, p - r + 1, r);
+							memmove(sbuf, p - r + 1, r);
 						break;
 					}
 				break;
 			}
-			drawbar(selmonitor);
+			drawbar();
 		}
 		while(XPending(dpy)) {
 			XNextEvent(dpy, &ev);
@@ -1478,7 +1254,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);
@@ -1487,7 +1263,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);
 		}
 	}
@@ -1504,59 +1280,49 @@ setclientstate(Client *c, long state) {
 }
 
 void
-setlayout(const char *arg) {
-	unsigned int i;
-	Monitor *m = monitorat();
-
-	if(!arg) {
-		m->layout++;
-		if(m->layout == &layouts[LENGTH(layouts)])
-			m->layout = &layouts[0];
-	}
-	else {
-		for(i = 0; i < LENGTH(layouts); i++)
-			if(!strcmp(arg, layouts[i].symbol))
-				break;
-		if(i == LENGTH(layouts))
-			return;
-		m->layout = &layouts[i];
-	}
+setlayout(const Arg *arg) {
+	if(!arg || !arg->v || arg->v != lt[sellt])
+		sellt ^= 1;
+	if(arg && arg->v)
+		lt[sellt] = (Layout *)arg->v;
 	if(sel)
-		arrange(m);
+		arrange();
 	else
-		drawbar(m);
+		drawbar();
 }
 
+/* arg > 1.0 will set mfact absolutly */
 void
-setmwfact(const char *arg) {
-	double delta;
-
-	Monitor *m = monitorat();
+setmfact(const Arg *arg) {
+	float f;
 
-	if(!domwfact)
+	if(!arg || !lt[sellt]->arrange)
 		return;
-	/* arg handling, manipulate mwfact */
-	if(arg == NULL)
-		m->mwfact = MWFACT;
-	else if(sscanf(arg, "%lf", &delta) == 1) {
-		if(arg[0] == '+' || arg[0] == '-')
-			m->mwfact += delta;
-		else
-			m->mwfact = delta;
-		if(m->mwfact < 0.1)
-			m->mwfact = 0.1;
-		else if(m->mwfact > 0.9)
-			m->mwfact = 0.9;
-	}
-	arrange(m);
+	f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
+	if(f < 0.1 || f > 0.9)
+		return;
+	mfact = f;
+	arrange();
 }
 
 void
 setup(void) {
 	unsigned int i;
-	Monitor *m;
+	int w;
 	XSetWindowAttributes wa;
-	XineramaScreenInfo *info = NULL;
+
+	/* init screen */
+	screen = DefaultScreen(dpy);
+	root = RootWindow(dpy, screen);
+	initfont(font);
+	sx = 0;
+	sy = 0;
+	sw = DisplayWidth(dpy, screen);
+	sh = DisplayHeight(dpy, screen);
+	bh = dc.h = dc.font.height + 2;
+	lt[0] = &layouts[0];
+	lt[1] = &layouts[1 % LENGTH(layouts)];
+	updategeom();
 
 	/* init atoms */
 	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1571,110 +1337,54 @@ setup(void) {
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
-	// init screens/monitors first
-	if((isxinerama = XineramaIsActive(dpy)))
-		info = XineramaQueryScreens(dpy, &mcount);
-	selmonitor = monitors = emallocz(mcount * sizeof(Monitor));
-
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
-
 	/* init appearance */
-	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
-	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
-	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
-	dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
-	dc.sel[ColBG] = getcolor(SELBGCOLOR);
-	dc.sel[ColFG] = getcolor(SELFGCOLOR);
-	initfont(FONT);
-	dc.h = bh = dc.font.height + 2;
+	dc.norm[ColBorder] = getcolor(normbordercolor);
+	dc.norm[ColBG] = getcolor(normbgcolor);
+	dc.norm[ColFG] = getcolor(normfgcolor);
+	dc.sel[ColBorder] = getcolor(selbordercolor);
+	dc.sel[ColBG] = getcolor(selbgcolor);
+	dc.sel[ColFG] = getcolor(selfgcolor);
 	dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
 	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 bar */
+	for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+		w = TEXTW(layouts[i].symbol);
+		blw = MAX(blw, w);
 	}
-	for(i = 0; i < mcount; i++) {
-		/* init geometry */
-		m = &monitors[i];
-
-		if(mcount != 1 && isxinerama) {
-			m->sx = info[i].x_org;
-			m->sy = info[i].y_org;
-			m->sw = info[i].width;
-			m->sh = info[i].height;
-			fprintf(stderr, "monitor[%d]: %d,%d,%d,%d\n", i, m->sx, m->sy, m->sw, m->sh);
-		}
-		else {
-			m->sx = 0;
-			m->sy = 0;
-			m->sw = DisplayWidth(dpy, screen);
-			m->sh = DisplayHeight(dpy, screen);
-		}
 
-		m->seltags = emallocz(sizeof initags);
-		m->prevtags = emallocz(sizeof initags);
-
-		memcpy(m->seltags, initags, sizeof initags);
-		memcpy(m->prevtags, initags, sizeof initags);
-
-		/* init layouts */
-		m->mwfact = MWFACT;
-		m->layout = &layouts[0];
-
-		// TODO: bpos per screen?
-		bpos = BARPOS;
-		wa.override_redirect = 1;
-		wa.background_pixmap = ParentRelative;
-		wa.event_mask = ButtonPressMask | ExposureMask;
-
-		/* init bars */
-		m->barwin = XCreateWindow(dpy, root, m->sx, m->sy, m->sw, bh, 0,
-				DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
-				CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-		XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
-		updatebarpos(m);
-		XMapRaised(dpy, m->barwin);
-		strcpy(stext, "dwm-"VERSION);
-
-		/* EWMH support per monitor */
-		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(m);
-	}
-	if(info)
-		XFree(info);
+	wa.override_redirect = 1;
+	wa.background_pixmap = ParentRelative;
+	wa.event_mask = ButtonPressMask|ExposureMask;
 
-	/* grab keys */
-	grabkeys();
+	barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
+			CopyFromParent, DefaultVisual(dpy, screen),
+			CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+	XDefineCursor(dpy, barwin, cursor[CurNormal]);
+	XMapRaised(dpy, barwin);
+	strcpy(stext, "dwm-"VERSION);
+	drawbar();
 
-	/* init tags */
-	compileregs();
+	/* EWMH support per view */
+	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+			PropModeReplace, (unsigned char *) netatom, NetLast);
 
-	selmonitor = monitorat();
-	fprintf(stderr, "selmonitor == %d\n", selmonitor - monitors);
+	/* select for events */
+	wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
+			|EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+	XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+	XSelectInput(dpy, root, wa.event_mask);
+
+
+	/* grab keys */
+	grabkeys();
 }
 
 void
-spawn(const char *arg) {
-	static char *shell = NULL;
-
-	if(!shell && !(shell = getenv("SHELL")))
-		shell = "/bin/sh";
-	if(!arg)
-		return;
+spawn(const Arg *arg) {
 	/* The double-fork construct avoids zombie processes and keeps the code
 	 * clean from stupid signal handlers. */
 	if(fork() == 0) {
@@ -1682,8 +1392,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);
+			execvp(((char **)arg->v)[0], (char **)arg->v);
+			fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
 			perror(" failed");
 		}
 		exit(0);
@@ -1692,18 +1402,14 @@ 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(sel->monitor);
+tag(const Arg *arg) {
+	if(sel && arg->ui & TAGMASK) {
+		sel->tags = arg->ui & TAGMASK;
+		arrange();
+	}
 }
 
-unsigned int
+int
 textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
@@ -1714,119 +1420,84 @@ 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
-tile(Monitor *m) {
-	unsigned int i, n, nx, ny, nw, nh, mw, th;
-	Client *c, *mc;
-
-	domwfact = dozoom = True;
-	nx = m->wax;
-	ny = m->way;
-	nw = 0;
-	for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next, m))
-		n++;
-
-	/* window geoms */
-	mw = (n == 1) ? m->waw : m->mwfact * m->waw;
-	th = (n > 1) ? m->wah / (n - 1) : 0;
-	if(n > 1 && th < bh)
-		th = m->wah;
-
-	for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
-		if(i == 0) { /* master */
-			nx = m->wax;
-			ny = m->way;
-			nw = mw - 2 * c->border;
-			nh = m->wah - 2 * c->border;
-		}
-		else {  /* tile window */
-			if(i == 1) {
-				ny = m->way;
-				nx += mc->w + 2 * mc->border;
-				nw = m->waw - mw - 2 * c->border;
-			}
-			if(i + 1 == n) /* remainder */
-				nh = (m->way + m->wah) - ny - 2 * c->border;
-			else
-				nh = th - 2 * c->border;
-		}
-		fprintf(stderr, "tile %d %d %d %d\n", nx, ny, nw, nh);
-		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 != m->wah)
-			ny = c->y + c->h + 2 * c->border;
-		i++;
+tile(void) {
+	int x, y, h, w, mw;
+	unsigned int i, n;
+	Client *c;
+
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+	if(n == 0)
+		return;
+
+	/* master */
+	c = nexttiled(clients);
+	mw = mfact * ww;
+	resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+
+	if(--n == 0)
+		return;
+
+	/* tile stack */
+	x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw;
+	y = wy;
+	w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
+	h = wh / n;
+	if(h < bh)
+		h = wh;
+
+	for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+		resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
+		       ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
+		if(h != wh)
+			y = c->y + c->h + 2 * c->bw;
 	}
 }
 
 void
-togglebar(const char *arg) {
-	if(bpos == BarOff)
-		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
-	else
-		bpos = BarOff;
-	updatebarpos(monitorat());
-	arrange(monitorat());
+togglebar(const Arg *arg) {
+	showbar = !showbar;
+	updategeom();
+	updatebar();
+	arrange();
 }
 
 void
-togglefloating(const char *arg) {
+togglefloating(const Arg *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(sel->monitor);
+	arrange();
 }
 
 void
-toggletag(const char *arg) {
-	unsigned int i, j;
+toggletag(const Arg *arg) {
+	unsigned int mask = sel->tags ^ (arg->ui & TAGMASK);
 
-	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(sel->monitor);
+	if(sel && mask) {
+		sel->tags = mask;
+		arrange();
+	}
 }
 
 void
-toggleview(const char *arg) {
-	unsigned int i, j;
-	Monitor *m = monitorat();
-
-	i = idxoftag(arg);
-	m->seltags[i] = !m->seltags[i];
-	for(j = 0; j < LENGTH(tags) && !m->seltags[j]; j++);
-	if(j == LENGTH(tags))
-		m->seltags[i] = True; /* at least one tag must be viewed */
-	arrange(m);
-}
+toggleview(const Arg *arg) {
+	unsigned int mask = tagset[seltags] ^ (arg->ui & TAGMASK);
 
-void
-unban(Client *c) {
-	if(!c->isbanned)
-		return;
-	XMoveWindow(dpy, c->win, c->x, c->y);
-	c->isbanned = False;
+	if(mask) {
+		tagset[seltags] = mask;
+		clearurgent();
+		arrange();
+	}
 }
 
 void
 unmanage(Client *c) {
-	Monitor *m = c->monitor;
 	XWindowChanges wc;
 
-	wc.border_width = c->oldborder;
+	wc.border_width = c->oldbw;
 	/* The server grab construct avoids race conditions. */
 	XGrabServer(dpy);
 	XSetErrorHandler(xerrordummy);
@@ -1837,12 +1508,11 @@ unmanage(Client *c) {
 		focus(NULL);
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	setclientstate(c, WithdrawnState);
-	free(c->tags);
 	free(c);
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
-	arrange(m);
+	arrange();
 }
 
 void
@@ -1855,29 +1525,47 @@ unmapnotify(XEvent *e) {
 }
 
 void
-updatebarpos(Monitor *m) {
-	XEvent ev;
+updatebar(void) {
+	if(dc.drawable != 0)
+		XFreePixmap(dpy, dc.drawable);
+	dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
+	XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
+}
+
+void
+updategeom(void) {
+#ifdef XINERAMA
+	int n, i = 0;
+	XineramaScreenInfo *info = NULL;
 
-	m->wax = m->sx;
-	m->way = m->sy;
-	m->wah = m->sh;
-	m->waw = m->sw;
-	switch(bpos) {
-	default:
-		m->wah -= bh;
-		m->way += bh;
-		XMoveWindow(dpy, m->barwin, m->sx, m->sy);
-		break;
-	case BarBot:
-		m->wah -= bh;
-		XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
-		break;
-	case BarOff:
-		XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
-		break;
+	/* window area geometry */
+	if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { 
+		if(n > 1) {
+			int di, x, y;
+			unsigned int dui;
+			Window dummy;
+			if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
+				for(i = 0; i < n; i++)
+					if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+						break;
+		}
+		wx = info[i].x_org;
+		wy = showbar && topbar ?  info[i].y_org + bh : info[i].y_org;
+		ww = info[i].width;
+		wh = showbar ? info[i].height - bh : info[i].height;
+		XFree(info);
 	}
-	XSync(dpy, False);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+	else
+#endif
+	{
+		wx = sx;
+		wy = showbar && topbar ? sy + bh : sy;
+		ww = sw;
+		wh = showbar ? sh - bh : sh;
+	}
+
+	/* bar position */
+	by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
 }
 
 void
@@ -1885,49 +1573,45 @@ 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) {
-		c->minax = size.min_aspect.x;
-		c->maxax = size.max_aspect.x;
-		c->minay = size.min_aspect.y;
-		c->maxay = size.max_aspect.y;
+	if(size.flags & PAspect) {
+		c->mina = (float)size.min_aspect.y / (float)size.min_aspect.x;
+		c->maxa = (float)size.max_aspect.x / (float)size.max_aspect.y;
 	}
 	else
-		c->minax = c->maxax = c->minay = c->maxay = 0;
+		c->maxa = c->mina = 0.0;
 	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
 			&& c->maxw == c->minw && c->maxh == c->minh);
 }
@@ -1943,11 +1627,28 @@ updatewmhints(Client *c) {
 	XWMHints *wmh;
 
 	if((wmh = XGetWMHints(dpy, c->win))) {
-		c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+		if(ISVISIBLE(c) && wmh->flags & XUrgencyHint) {
+			wmh->flags &= ~XUrgencyHint;
+			XSetWMHints(dpy, c->win, wmh);
+		}
+		else
+			c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+
 		XFree(wmh);
 	}
 }
 
+void
+view(const Arg *arg) {
+	if(arg && (arg->i & TAGMASK) == tagset[seltags])
+		return;
+	seltags ^= 1; /* toggle sel tagset */
+	if(arg && (arg->ui & TAGMASK))
+		tagset[seltags] = arg->i & TAGMASK;
+	clearurgent();
+	arrange();
+}
+
 /* There's no way to check accesses to destroyed windows, thus those cases are
  * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
  * default error handler, which may call exit.  */
@@ -1959,117 +1660,55 @@ xerror(Display *dpy, XErrorEvent *ee) {
 	|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
 	|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
 	|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
+	|| (ee->request_code == X_GrabButton && ee->error_code == BadAccess)
 	|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
 	|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
 		return 0;
 	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-		ee->request_code, ee->error_code);
+			ee->request_code, ee->error_code);
 	return xerrorxlib(dpy, ee); /* may call exit */
 }
 
 int
-xerrordummy(Display *dsply, XErrorEvent *ee) {
+xerrordummy(Display *dpy, XErrorEvent *ee) {
 	return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
 int
-xerrorstart(Display *dsply, XErrorEvent *ee) {
+xerrorstart(Display *dpy, XErrorEvent *ee) {
 	otherwm = True;
 	return -1;
 }
 
 void
-view(const char *arg) {
-	unsigned int i;
-	Bool tmp[LENGTH(tags)];
-	Monitor *m = monitorat();
-
-	for(i = 0; i < LENGTH(tags); i++)
-		tmp[i] = (NULL == arg);
-	tmp[idxoftag(arg)] = True;
-	if(memcmp(m->seltags, tmp, sizeof initags) != 0) {
-		memcpy(m->prevtags, m->seltags, sizeof initags);
-		memcpy(m->seltags, tmp, sizeof initags);
-		arrange(m);
-	}
-}
-
-void
-viewprevtag(const char *arg) {
-	static Bool tmp[LENGTH(tags)];
-
-	Monitor *m = monitorat();
-
-	memcpy(tmp, m->seltags, sizeof initags);
-	memcpy(m->seltags, m->prevtags, sizeof initags);
-	memcpy(m->prevtags, tmp, sizeof initags);
-	arrange(m);
-}
-
-void
-zoom(const char *arg) {
+zoom(const Arg *arg) {
 	Client *c = sel;
 
-	if(!sel || !dozoom || sel->isfloating)
+	if(!lt[sellt]->arrange || lt[sellt]->arrange == monocle || (sel && sel->isfloating))
 		return;
-	if(c == nexttiled(clients, c->monitor))
-		if(!(c = nexttiled(c->next, c->monitor)))
+	if(c == nexttiled(clients))
+		if(!c || !(c = nexttiled(c->next)))
 			return;
 	detach(c);
 	attach(c);
 	focus(c);
-	arrange(c->monitor);
-}
-
-void
-movetomonitor(const char *arg) {
-	int i;
-
-	if (sel)
-		return;
-	if(arg)
-		i = atoi(arg);
-	else {
-		for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
-		i++;
-	}
-	sel->monitor = &monitors[i % mcount];
-
-	memcpy(sel->tags, sel->monitor->seltags, sizeof initags);
-	resize(sel, sel->monitor->wax, sel->monitor->way, sel->w, sel->h, True);
-	arrange(sel->monitor);
-}
-
-void
-selectmonitor(const char *arg) {
-	int i;
-	Monitor *m;
-
-	if(arg)
-		i = atoi(arg);
-	else {
-		for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
-		i++;
-	}
-	m = &monitors[i % mcount];
-	XWarpPointer(dpy, None, root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
-	focus(NULL);
+	arrange();
 }
 
-
 int
 main(int argc, char *argv[]) {
-	fprintf(stderr, "%u\n", sizeof("jsjsjsjsjssjsj"));
 	if(argc == 2 && !strcmp("-v", argv[1]))
-		eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+		die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
 	else if(argc != 1)
-		eprint("usage: dwm [-v]\n");
+		die("usage: dwm [-v]\n");
+
+	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+		fprintf(stderr, "warning: no locale support\n");
 
-	setlocale(LC_CTYPE, "");
 	if(!(dpy = XOpenDisplay(0)))
-		eprint("dwm: cannot open display\n");
+		die("dwm: cannot open display\n");
 
 	checkotherwm();
 	setup();