X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=018f929c7f6caf1bde03532ed97919ab940e1653;hp=ff9e66ab5983bd3704b9a84f683b91470ed8ee1b;hb=f7c097e8029c7d0dc00db52fc04a2b8192fc2bc9;hpb=2e8e5509d9cad9229d2d79a1de75038d94032cfb

diff --git a/dwm.c b/dwm.c
index ff9e66a..018f929 100644
--- a/dwm.c
+++ b/dwm.c
@@ -17,7 +17,7 @@
  * set the override_redirect flag.  Clients are organized in a global
  * doubly-linked client list, the focus history is remembered through a global
  * stack list. Each client contains an array of Bools of the same size as the
- * global tags array to indicate the tags of a client.  
+ * global tags array to indicate the tags of a client.
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *
@@ -40,16 +40,16 @@
 #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 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 MOUSEMASK		(BUTTONMASK|PointerMotionMask)
 
 
 /* enums */
@@ -74,7 +74,6 @@ struct Client {
 	Client *prev;
 	Client *snext;
 	Window win;
-	int monitor;
 };
 
 typedef struct {
@@ -99,35 +98,17 @@ typedef struct {
 	const char *arg;
 } Key;
 
-typedef struct Monitor Monitor;
 typedef struct {
 	const char *symbol;
-	void (*arrange)(Monitor *);
+	void (*arrange)(void);
 } Layout;
 
 typedef struct {
 	const char *prop;
-	const char *tags;
+	const char *tag;
 	Bool isfloating;
-	int monitor;
 } Rule;
 
-typedef struct {
-	regex_t *propregex;
-	regex_t *tagregex;
-} Regs;
-
-struct Monitor {
-	unsigned int id;
-	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(void);
@@ -137,7 +118,6 @@ void ban(Client *c);
 void buttonpress(XEvent *e);
 void checkotherwm(void);
 void cleanup(void);
-void compileregs(void);
 void configure(Client *c);
 void configurenotify(XEvent *e);
 void configurerequest(XEvent *e);
@@ -145,13 +125,13 @@ void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(void);
-void drawsquare(Monitor *, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-void drawtext(Monitor *, const char *text, unsigned long col[ColLast], Bool invert);
+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(Monitor *m); /* default floating layout */
+void floating(void); /* default floating layout */
 void focus(Client *c);
 void focusin(XEvent *e);
 void focusnext(const char *arg);
@@ -162,19 +142,19 @@ 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);
+unsigned int idxoftag(const char *t);
 void initfont(const char *fontstr);
-Bool isoccupied(unsigned int monitor, unsigned int t);
+Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
-Bool isurgent(unsigned int monitor, unsigned int t);
-Bool isvisible(Client *c, int monitor);
+Bool isurgent(unsigned int t);
+Bool isvisible(Client *c);
 void keypress(XEvent *e);
 void killclient(const char *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
 void movemouse(Client *c);
-Client *nexttiled(Client *c, int monitor);
+Client *nexttiled(Client *c);
 void propertynotify(XEvent *e);
 void quit(const char *arg);
 void reapply(const char *arg);
@@ -191,7 +171,7 @@ 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 tile(void);
 void togglebar(const char *arg);
 void togglefloating(const char *arg);
 void toggletag(const char *arg);
@@ -199,25 +179,22 @@ void toggleview(const char *arg);
 void unban(Client *c);
 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
-void updatebarpos(Monitor *m);
+void updatebarpos(void);
 void updatesizehints(Client *c);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
 void view(const char *arg);
 void viewprevtag(const char *arg);	/* views previous selected tags */
 int xerror(Display *dpy, XErrorEvent *ee);
-int xerrordummy(Display *dsply, XErrorEvent *ee);
-int xerrorstart(Display *dsply, XErrorEvent *ee);
+int xerrordummy(Display *dpy, XErrorEvent *ee);
+int xerrorstart(Display *dpy, XErrorEvent *ee);
 void zoom(const char *arg);
-int monitorat(void);
-void movetomonitor(const char *arg);
-void selectmonitor(const char *arg);
+void selectview(const char *arg);
 
 /* variables */
-char stext[256];
-int mcount = 1;
-int selmonitor = 0;
-int screen;
+char stext[256], buf[256];
+double mwfact;
+int screen, sx, sy, sw, sh, wax, way, waw, wah, xscreens;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int bh, bpos;
 unsigned int blw = 0;
@@ -237,64 +214,59 @@ 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;
+Bool *seltags;
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
-Regs *regs = NULL;
-Monitor *monitors;
-Window root;
+Layout *lt;
+Window root, barwin;
+#ifdef XINERAMA
+XineramaScreenInfo *info = NULL;
+#endif
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
-
-//Bool prevtags[LENGTH(tags)];
+#define TAGSZ (LENGTH(tags) * sizeof(Bool))
+static Bool tmp[LENGTH(tags)];
 
 /* 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;
+	Bool matched = False;
+	Rule *r;
 	XClassHint ch = { 0 };
 
 	/* rule matching */
 	XGetClassHint(dpy, c->win, &ch);
-	snprintf(buf, sizeof buf, "%s:%s:%s",
-			ch.res_class ? ch.res_class : "",
-			ch.res_name ? ch.res_name : "", c->name);
-	for(i = 0; i < 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 = 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(strstr(c->name, r->prop)
+		|| (ch.res_class && strstr(ch.res_class, r->prop))
+		|| (ch.res_name && strstr(ch.res_name, r->prop)))
+		{
+			c->isfloating = r->isfloating;
+			if(r->tag) {
+				c->tags[idxoftag(r->tag)] = True;
+				matched = True;
 			}
 		}
+	}
 	if(ch.res_class)
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
-	if(!matched_tag)
-		memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
-	if (!matched_monitor)
-		c->monitor = monitorat();
+	if(!matched)
+		memcpy(c->tags, seltags, TAGSZ);
 }
 
 void
@@ -302,13 +274,13 @@ arrange(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(isvisible(c, c->monitor))
+		if(isvisible(c))
 			unban(c);
 		else
 			ban(c);
 
-	monitors[selmonitor].layout->arrange(&monitors[selmonitor]);
 	focus(NULL);
+	lt->arrange();
 	restack();
 }
 
@@ -330,7 +302,7 @@ void
 ban(Client *c) {
 	if(c->isbanned)
 		return;
-	XMoveWindow(dpy, c->win, c->x + 3 * monitors[c->monitor].sw, c->y);
+	XMoveWindow(dpy, c->win, c->x + 3 * sw, c->y);
 	c->isbanned = True;
 }
 
@@ -340,9 +312,7 @@ buttonpress(XEvent *e) {
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
-	Monitor *m = &monitors[monitorat()];
-
-	if(ev->window == m->barwin) {
+	if(ev->window == barwin) {
 		x = 0;
 		for(i = 0; i < LENGTH(tags); i++) {
 			x += textw(tags[i]);
@@ -374,7 +344,7 @@ buttonpress(XEvent *e) {
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
-			if((floating != m->layout->arrange) && c->isfloating)
+			if((floating != lt->arrange) && c->isfloating)
 				togglefloating(NULL);
 			else
 				zoom(NULL);
@@ -404,7 +374,7 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
-	unsigned int i;
+
 	close(STDIN_FILENO);
 	while(stack) {
 		unban(stack);
@@ -421,39 +391,16 @@ cleanup(void) {
 	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);
+#if XINERAMA
+	if(info)
+		XFree(info);
+#endif
 	XSync(dpy, False);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 
 void
-compileregs(void) {
-	unsigned int i;
-	regex_t *reg;
-
-	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;
-		}
-	}
-}
-
-void
 configure(Client *c) {
 	XConfigureEvent ce;
 
@@ -474,16 +421,15 @@ configure(Client *c) {
 void
 configurenotify(XEvent *e) {
 	XConfigureEvent *ev = &e->xconfigure;
-	Monitor *m = &monitors[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;
+	if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+		/* TODO -- use Xinerama dimensions here ? */
+		sw = ev->width;
+		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);
+		XResizeWindow(dpy, barwin, sw, bh);
+		updatebarpos();
 		arrange();
 	}
 }
@@ -494,27 +440,27 @@ configurerequest(XEvent *e) {
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 
+	/* TODO -- consider Xinerama if necessary when centering */
 	if((c = getclient(ev->window))) {
-		Monitor *m = &monitors[c->monitor];
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
+		if(c->isfixed || c->isfloating || (floating == lt->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
@@ -533,6 +479,16 @@ configurerequest(XEvent *e) {
 	XSync(dpy, False);
 }
 
+Bool
+conflicts(Client *c, unsigned int tidx) {
+	unsigned int i;
+
+	for(i = 0; i < LENGTH(tags); i++)
+		if(c->tags[i])
+			return True; /* conflict */
+	return False;
+}
+
 void
 destroynotify(XEvent *e) {
 	Client *c;
@@ -563,58 +519,48 @@ detachstack(Client *c) {
 
 void
 drawbar(void) {
-	int i, j, x;
+	int i, x;
 	Client *c;
 
-	for(i = 0; i < mcount; i++) {
-		Monitor *m = &monitors[i];
-		dc.x = 0;
-		for(c = stack; c && !isvisible(c, i); c = c->snext);
-		fprintf(stderr, "m%d %s\n", i, c ? c->name : "NIL");
-		for(j = 0; j < LENGTH(tags); j++) {
-			dc.w = textw(tags[j]);
-			if(m->seltags[j]) {
-				drawtext(m, tags[j], dc.sel, isurgent(i, j));
-				drawsquare(m, c && c->tags[j] && c->monitor == i,
-						isoccupied(i, j), isurgent(i, j), dc.sel);
-			}
-			else {
-				drawtext(m, tags[j], dc.norm, isurgent(i, j));
-				drawsquare(m, c && c->tags[j] && c->monitor == i,
-						isoccupied(i, j), isurgent(i, j), dc.norm);
-			}
-			dc.x += dc.w;
+	dc.x = 0;
+	for(c = stack; c && !isvisible(c); c = c->snext);
+	for(i = 0; i < LENGTH(tags); i++) {
+		dc.w = textw(tags[i]);
+		if(seltags[i]) {
+			drawtext(tags[i], dc.sel, isurgent(i));
+			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
 		}
-		dc.w = blw;
-		drawtext(m, m->layout->symbol, dc.norm, False);
-		x = dc.x + dc.w;
-		if(i == 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);
+		else {
+			drawtext(tags[i], dc.norm, isurgent(i));
+			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
 		}
-		else
-			dc.x = m->sw;
-		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);
-			}
-			else
-				drawtext(m, NULL, dc.norm, False);
+		dc.x += dc.w;
+	}
+	dc.w = blw;
+	drawtext(lt->symbol, dc.norm, False);
+	x = dc.x + dc.w;
+	dc.w = textw(stext);
+	dc.x = sw - dc.w;
+	if(dc.x < x) {
+		dc.x = x;
+		dc.w = sw - x;
+	}
+	drawtext(stext, dc.norm, False);
+	if((dc.w = dc.x - x) > bh) {
+		dc.x = x;
+		if(c) {
+			drawtext(c->name, dc.sel, False);
+			drawsquare(False, c->isfloating, False, dc.sel);
 		}
-		XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->sw, bh, 0, 0);
-		XSync(dpy, False);
+		else
+			drawtext(NULL, dc.norm, False);
 	}
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, 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 };
@@ -635,9 +581,8 @@ 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) {
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 	int x, y, w, h;
-	static char buf[256];
 	unsigned int len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
@@ -688,17 +633,12 @@ 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);
+	else
 		focus(NULL);
-	}
 }
 
 void
@@ -715,31 +655,24 @@ void
 expose(XEvent *e) {
 	XExposeEvent *ev = &e->xexpose;
 
-	if(ev->count == 0) {
-		if(ev->window == monitors[selmonitor].barwin)
-			drawbar();
-	}
+	if(ev->count == 0 && (ev->window == barwin))
+		drawbar();
 }
 
 void
-floating(Monitor *m) { /* default floating layout */
+floating(void) { /* default floating layout */
 	Client *c;
 
 	domwfact = dozoom = False;
 	for(c = clients; c; c = c->next)
-		if(isvisible(c, m->id))
+		if(isvisible(c))
 			resize(c, c->x, c->y, c->w, c->h, True);
 }
 
 void
 focus(Client *c) {
-	Monitor *m;
-
-	if(c)
-		selmonitor = c->monitor;
-	m = &monitors[selmonitor];
-	if(!c || (c && !isvisible(c, selmonitor)))
-		for(c = stack; c && !isvisible(c, c->monitor); c = c->snext);
+	if(!c || (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]);
@@ -750,16 +683,13 @@ focus(Client *c) {
 		grabbuttons(c, True);
 	}
 	sel = c;
-	drawbar();
 	if(c) {
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-		selmonitor = c->monitor;
 	}
-	else {
+	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-		drawbar();
-	}
+	drawbar();
 }
 
 void
@@ -776,9 +706,9 @@ focusnext(const char *arg) {
 
 	if(!sel)
 		return;
-	for(c = sel->next; c && !isvisible(c, selmonitor); c = c->next);
+	for(c = sel->next; c && !isvisible(c); c = c->next);
 	if(!c)
-		for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
+		for(c = clients; c && !isvisible(c); c = c->next);
 	if(c) {
 		focus(c);
 		restack();
@@ -791,10 +721,10 @@ focusprev(const char *arg) {
 
 	if(!sel)
 		return;
-	for(c = sel->prev; c && !isvisible(c, selmonitor); c = c->prev);
+	for(c = sel->prev; c && !isvisible(c); c = c->prev);
 	if(!c) {
 		for(c = clients; c && c->next; c = c->next);
-		for(; c && !isvisible(c, selmonitor); c = c->prev);
+		for(; c && !isvisible(c); c = c->prev);
 	}
 	if(c) {
 		focus(c);
@@ -871,29 +801,29 @@ grabbuttons(Client *c, Bool focused) {
 	if(focused) {
 		XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+		XGrabButton(dpy, Button1, MODKEY|LockMask, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+		XGrabButton(dpy, Button1, MODKEY|numlockmask, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+		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,
+		XGrabButton(dpy, Button2, MODKEY|LockMask, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+		XGrabButton(dpy, Button2, MODKEY|numlockmask, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+		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,
+		XGrabButton(dpy, Button3, MODKEY|LockMask, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+		XGrabButton(dpy, Button3, MODKEY|numlockmask, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
-		XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+		XGrabButton(dpy, Button3, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK,
 				GrabModeAsync, GrabModeSync, None, None);
 	}
 	else
@@ -921,20 +851,20 @@ grabkeys(void)  {
 		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,
+		XGrabKey(dpy, code, keys[i].mod|LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
+		XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,
 				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
+		XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
 	}
 }
 
 unsigned int
-idxoftag(const char *tag) {
+idxoftag(const char *t) {
 	unsigned int i;
 
-	for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++);
+	for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++);
 	return (i < LENGTH(tags)) ? i : 0;
 }
 
@@ -981,11 +911,11 @@ initfont(const char *fontstr) {
 }
 
 Bool
-isoccupied(unsigned int monitor, unsigned int t) {
+isoccupied(unsigned int t) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(c->tags[t] && c->monitor == monitor)
+		if(c->tags[t])
 			return True;
 	return False;
 }
@@ -1006,23 +936,21 @@ isprotodel(Client *c) {
 }
 
 Bool
-isurgent(unsigned int monitor, unsigned int t) {
+isurgent(unsigned int t) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(c->monitor == monitor && c->isurgent && c->tags[t])
+		if(c->isurgent && c->tags[t])
 			return True;
 	return False;
 }
 
 Bool
-isvisible(Client *c, int monitor) {
+isvisible(Client *c) {
 	unsigned int i;
 
-	if(c->monitor != monitor)
-		return False;
 	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i] && monitors[c->monitor].seltags[i])
+		if(c->tags[i] && seltags[i])
 			return True;
 	return False;
 }
@@ -1066,39 +994,36 @@ 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);
+	c->tags = emallocz(TAGSZ);
 	c->win = w;
 
 	applyrules(c);
 
-	m = &monitors[c->monitor];
-
-	c->x = wa->x + m->sx;
-	c->y = wa->y + m->sy;
+	c->x = wa->x + sx;
+	c->y = wa->y + sy;
 	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;
+	if(c->w == sw && c->h == sh) {
+		c->x = sx;
+		c->y = sy;
 		c->border = wa->border_width;
 	}
 	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;
+		if(c->x + c->w + 2 * c->border > wax + waw)
+			c->x = wax + waw - c->w - 2 * c->border;
+		if(c->y + c->h + 2 * c->border > way + wah)
+			c->y = way + wah - c->h - 2 * c->border;
+		if(c->x < wax)
+			c->x = wax;
+		if(c->y < way)
+			c->y = way;
 		c->border = BORDERPX;
 	}
 	wc.border_width = c->border;
@@ -1106,13 +1031,13 @@ manage(Window w, XWindowAttributes *wa) {
 	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);
+		memcpy(c->tags, t->tags, TAGSZ);
 	if(!c->isfloating)
 		c->isfloating = (rettrans == Success) || c->isfixed;
 	attach(c);
@@ -1146,39 +1071,21 @@ maprequest(XEvent *e) {
 		manage(ev->window, &wa);
 }
 
-int
-monitorat() {
-	int i, x, y;
-	Window win;
-	unsigned int mask;
-
-	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 i;
-		}
-	}
-	return 0;
-}
-
 void
 movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di, nx, ny;
 	unsigned int dui;
-	Monitor *m;
 	Window dummy;
 	XEvent ev;
 
 	ocx = nx = c->x;
 	ocy = ny = c->y;
-	m = &monitors[c->monitor];
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 			None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
-		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
+		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
 		switch (ev.type) {
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
@@ -1192,17 +1099,17 @@ movemouse(Client *c) {
 			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((m->layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+			if(abs(wax - nx) < SNAP)
+				nx = wax;
+			else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
+				nx = wax + waw - c->w - 2 * c->border;
+			if(abs(way - ny) < SNAP)
+				ny = way;
+			else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
+				ny = way + wah - c->h - 2 * c->border;
+			if(!c->isfloating && (lt->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
 				togglefloating(NULL);
-			if((m->layout->arrange == floating) || c->isfloating)
+			if((lt->arrange == floating) || c->isfloating)
 				resize(c, nx, ny, c->w, c->h, False);
 			break;
 		}
@@ -1210,8 +1117,8 @@ movemouse(Client *c) {
 }
 
 Client *
-nexttiled(Client *c, int 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;
 }
 
@@ -1225,19 +1132,19 @@ propertynotify(XEvent *e) {
 		return; /* ignore */
 	if((c = getclient(ev->window))) {
 		switch (ev->atom) {
-			default: break;
-			case XA_WM_TRANSIENT_FOR:
-				XGetTransientForHint(dpy, c->win, &trans);
-				if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
-					arrange();
-				break;
-			case XA_WM_NORMAL_HINTS:
-				updatesizehints(c);
-				break;
-			case XA_WM_HINTS:
-				updatewmhints(c);
-				drawbar();
-				break;
+		default: break;
+		case XA_WM_TRANSIENT_FOR:
+			XGetTransientForHint(dpy, c->win, &trans);
+			if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+				arrange();
+			break;
+		case XA_WM_NORMAL_HINTS:
+			updatesizehints(c);
+			break;
+		case XA_WM_HINTS:
+			updatewmhints(c);
+			drawbar();
+			break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 			updatetitle(c);
@@ -1266,11 +1173,8 @@ reapply(const char *arg) {
 
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-	Monitor *m;
 	XWindowChanges wc;
 
-	m = &monitors[c->monitor];
-
 	if(sizehints) {
 		/* set minimum possible */
 		if (w < 1)
@@ -1311,21 +1215,22 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	}
 	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;
+	if(x > sx + sw)
+		x = sw - w - 2 * c->border;
+	if(y > sy + sh)
+		y = sh - h - 2 * c->border;
+	if(x + w + 2 * c->border < sx)
+		x = sx;
+	if(y + h + 2 * c->border < sy)
+		y = sy;
 	if(c->x != x || c->y != y || c->w != w || c->h != h) {
 		c->x = wc.x = x;
 		c->y = wc.y = y;
 		c->w = wc.width = w;
 		c->h = wc.height = h;
 		wc.border_width = c->border;
-		XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+		XConfigureWindow(dpy, c->win,
+				CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
 		configure(c);
 		XSync(dpy, False);
 	}
@@ -1335,18 +1240,16 @@ void
 resizemouse(Client *c) {
 	int ocx, ocy;
 	int nw, nh;
-	Monitor *m;
 	XEvent ev;
 
 	ocx = c->x;
 	ocy = c->y;
-	m = &monitors[c->monitor];
 	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);
 	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,
@@ -1365,9 +1268,9 @@ resizemouse(Client *c) {
 				nw = 1;
 			if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
 				nh = 1;
-			if((m->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+			if(!c->isfloating && (lt->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
 				togglefloating(NULL);
-			if((m->layout->arrange == floating) || c->isfloating)
+			if((lt->arrange == floating) || c->isfloating)
 				resize(c, c->x, c->y, nw, nh, True);
 			break;
 		}
@@ -1376,7 +1279,6 @@ resizemouse(Client *c) {
 
 void
 restack(void) {
-	unsigned int i;
 	Client *c;
 	XEvent ev;
 	XWindowChanges wc;
@@ -1384,22 +1286,20 @@ restack(void) {
 	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || (monitors[selmonitor].layout->arrange == floating))
+	if(sel->isfloating || (lt->arrange == floating))
 		XRaiseWindow(dpy, sel->win);
-	if(monitors[selmonitor].layout->arrange != floating) {
+	if(lt->arrange != floating) {
 		wc.stack_mode = Below;
-		wc.sibling = monitors[selmonitor].barwin;
+		wc.sibling = barwin;
 		if(!sel->isfloating) {
-			XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+			XConfigureWindow(dpy, sel->win, CWSibling|CWStackMode, &wc);
 			wc.sibling = sel->win;
 		}
-		for(i = 0; i < mcount; i++) {
-			for(c = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
-				if(c == sel)
-					continue;
-				XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
-				wc.sibling = c->win;
-			}
+		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+			if(c == sel)
+				continue;
+			XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+			wc.sibling = c->win;
 		}
 	}
 	XSync(dpy, False);
@@ -1409,7 +1309,7 @@ restack(void) {
 void
 run(void) {
 	char *p;
-	char buf[sizeof stext];
+	char sbuf[sizeof stext];
 	fd_set rd;
 	int r, xfd;
 	unsigned int len, offset;
@@ -1421,7 +1321,7 @@ run(void) {
 	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)
@@ -1433,7 +1333,7 @@ run(void) {
 			eprint("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;
@@ -1443,15 +1343,15 @@ 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;
@@ -1504,20 +1404,19 @@ setclientstate(Client *c, long state) {
 void
 setlayout(const char *arg) {
 	unsigned int i;
-	Monitor *m = &monitors[monitorat()];
 
 	if(!arg) {
-		m->layout++;
-		if(m->layout == &layouts[LENGTH(layouts)])
-			m->layout = &layouts[0];
+		lt++;
+		if(lt == &layouts[LENGTH(layouts)])
+			lt = &layouts[0];
 	}
 	else {
 		for(i = 0; i < LENGTH(layouts); i++)
-			if(!strcmp(arg, layouts[i].symbol))
+			if(arg == layouts[i].symbol)
 				break;
 		if(i == LENGTH(layouts))
 			return;
-		m->layout = &layouts[i];
+		lt = &layouts[i];
 	}
 	if(sel)
 		arrange();
@@ -1529,22 +1428,20 @@ void
 setmwfact(const char *arg) {
 	double delta;
 
-	Monitor *m = &monitors[monitorat()];
-
 	if(!domwfact)
 		return;
 	/* arg handling, manipulate mwfact */
 	if(arg == NULL)
-		m->mwfact = MWFACT;
+		mwfact = MWFACT;
 	else if(sscanf(arg, "%lf", &delta) == 1) {
 		if(arg[0] == '+' || arg[0] == '-')
-			m->mwfact += delta;
+			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;
+			mwfact = delta;
+		if(mwfact < 0.1)
+			mwfact = 0.1;
+		else if(mwfact > 0.9)
+			mwfact = 0.9;
 	}
 	arrange();
 }
@@ -1552,9 +1449,15 @@ setmwfact(const char *arg) {
 void
 setup(void) {
 	unsigned int i;
-	Monitor *m;
 	XSetWindowAttributes wa;
-	XineramaScreenInfo *info = NULL;
+
+	/* init screen */
+	screen = DefaultScreen(dpy);
+	root = RootWindow(dpy, screen);
+	sx = 0;
+	sy = 0;
+	sw = DisplayWidth(dpy, screen);
+	sh = DisplayHeight(dpy, screen);
 
 	/* init atoms */
 	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1569,14 +1472,10 @@ setup(void) {
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
-	// init screens/monitors first
-	mcount = 1;
-	if((isxinerama = XineramaIsActive(dpy)))
-		info = XineramaQueryScreens(dpy, &mcount);
-	monitors = emallocz(mcount * sizeof(Monitor));
-
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
+#ifdef XINERAMA
+	if(XineramaIsActive(dpy))
+		info = XineramaQueryScreens(dpy, &xscreens);
+#endif
 
 	/* init appearance */
 	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
@@ -1593,76 +1492,50 @@ setup(void) {
 	if(!dc.font.set)
 		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
+	/* init tags */
+	seltags = emallocz(TAGSZ);
+	prevtags = emallocz(TAGSZ);
+	seltags[0] = prevtags[0] = True;
+
+	/* init layouts */
+	mwfact = MWFACT;
+	lt = &layouts[0];
+
+	/* TODO: Xinerama hints ? */
+	/* init bar */
 	for(blw = i = 0; i < LENGTH(layouts); i++) {
 		i = textw(layouts[i].symbol);
 		if(i > blw)
 			blw = i;
 	}
-	for(i = 0; i < mcount; i++) {
-		/* init geometry */
-		m = &monitors[i];
-		m->id = 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);
-	}
-	if(info)
-		XFree(info);
+	bpos = BARPOS;
+	wa.override_redirect = 1;
+	wa.background_pixmap = ParentRelative;
+	wa.event_mask = ButtonPressMask|ExposureMask;
+
+	barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen),
+				CopyFromParent, DefaultVisual(dpy, screen),
+				CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+	XDefineCursor(dpy, barwin, cursor[CurNormal]);
+	updatebarpos();
+	XMapRaised(dpy, barwin);
+	strcpy(stext, "dwm-"VERSION);
+	drawbar();
 
-	/* grab keys */
-	grabkeys();
+	/* 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);
 
-	/* init tags */
-	compileregs();
 
-	selmonitor = monitorat();
-	fprintf(stderr, "selmonitor == %d\n", selmonitor);
+	/* grab keys */
+	grabkeys();
 }
 
 void
@@ -1718,38 +1591,36 @@ textw(const char *text) {
 }
 
 void
-tile(Monitor *m) {
+tile(void) {
 	unsigned int i, n, nx, ny, nw, nh, mw, th;
 	Client *c, *mc;
 
 	domwfact = dozoom = True;
-
-	nx = ny = nw = 0; /* gcc stupidity requires this */
-
-	for(n = 0, c = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id))
+	nx = wax;
+	ny = way;
+	nw = 0;
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
 
 	/* window geoms */
-	mw = (n == 1) ? m->waw : m->mwfact * m->waw;
-	th = (n > 1) ? m->wah / (n - 1) : 0;
+	mw = (n == 1) ? waw : mwfact * waw;
+	th = (n > 1) ? wah / (n - 1) : 0;
 	if(n > 1 && th < bh)
-		th = m->wah;
+		th = wah;
 
-	for(i = 0, c = mc = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) {
+	for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next)) {
 		if(i == 0) { /* master */
-			nx = m->wax;
-			ny = m->way;
 			nw = mw - 2 * c->border;
-			nh = m->wah - 2 * c->border;
+			nh = wah - 2 * c->border;
 		}
 		else {  /* tile window */
 			if(i == 1) {
-				ny = m->way;
+				ny = way;
 				nx += mc->w + 2 * mc->border;
-				nw = m->waw - mw - 2 * c->border;
+				nw = waw - mw - 2 * c->border;
 			}
 			if(i + 1 == n) /* remainder */
-				nh = (m->way + m->wah) - ny - 2 * c->border;
+				nh = (way + wah) - ny - 2 * c->border;
 			else
 				nh = th - 2 * c->border;
 		}
@@ -1757,19 +1628,19 @@ tile(Monitor *m) {
 		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)
+		if(n > 1 && th != wah)
 			ny = c->y + c->h + 2 * c->border;
-
 		i++;
 	}
 }
+
 void
 togglebar(const char *arg) {
 	if(bpos == BarOff)
 		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
 	else
 		bpos = BarOff;
-	updatebarpos(&monitors[monitorat()]);
+	updatebarpos();
 	arrange();
 }
 
@@ -1790,6 +1661,8 @@ toggletag(const char *arg) {
 	if(!sel)
 		return;
 	i = idxoftag(arg);
+	if(conflicts(sel, i))
+		return;
 	sel->tags[i] = !sel->tags[i];
 	for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
 	if(j == LENGTH(tags))
@@ -1801,13 +1674,11 @@ void
 toggleview(const char *arg) {
 	unsigned int i, j;
 
-	Monitor *m = &monitors[monitorat()];
-
 	i = idxoftag(arg);
-	m->seltags[i] = !m->seltags[i];
-	for(j = 0; j < LENGTH(tags) && !m->seltags[j]; j++);
+	seltags[i] = !seltags[i];
+	for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
 	if(j == LENGTH(tags))
-		m->seltags[i] = True; /* at least one tag must be viewed */
+		seltags[i] = True; /* at least one tag must be viewed */
 	arrange();
 }
 
@@ -1852,25 +1723,25 @@ unmapnotify(XEvent *e) {
 }
 
 void
-updatebarpos(Monitor *m) {
+updatebarpos(void) {
 	XEvent ev;
 
-	m->wax = m->sx;
-	m->way = m->sy;
-	m->wah = m->sh;
-	m->waw = m->sw;
+	wax = sx;
+	way = sy;
+	wah = sh;
+	waw = sw;
 	switch(bpos) {
 	default:
-		m->wah -= bh;
-		m->way += bh;
-		XMoveWindow(dpy, m->barwin, m->sx, m->sy);
+		wah -= bh;
+		way += bh;
+		XMoveWindow(dpy, barwin, sx, sy);
 		break;
 	case BarBot:
-		m->wah -= bh;
-		XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
+		wah -= bh;
+		XMoveWindow(dpy, barwin, sx, sy + wah);
 		break;
 	case BarOff:
-		XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
+		XMoveWindow(dpy, barwin, sx, sy - bh);
 		break;
 	}
 	XSync(dpy, False);
@@ -1945,6 +1816,31 @@ updatewmhints(Client *c) {
 	}
 }
 
+
+void
+view(const char *arg) {
+	unsigned int i;
+
+	for(i = 0; i < LENGTH(tags); i++)
+		tmp[i] = (NULL == arg);
+	tmp[idxoftag(arg)] = True;
+
+	if(memcmp(seltags, tmp, TAGSZ) != 0) {
+		memcpy(prevtags, seltags, TAGSZ);
+		memcpy(seltags, tmp, TAGSZ);
+		arrange();
+	}
+}
+
+void
+viewprevtag(const char *arg) {
+
+	memcpy(tmp, seltags, TAGSZ);
+	memcpy(seltags, prevtags, TAGSZ);
+	memcpy(prevtags, tmp, TAGSZ);
+	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.  */
@@ -1965,54 +1861,26 @@ xerror(Display *dpy, XErrorEvent *ee) {
 }
 
 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 = &monitors[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();
-	}
-}
-
-void
-viewprevtag(const char *arg) {
-	static Bool tmp[LENGTH(tags)];
-
-	Monitor *m = &monitors[monitorat()];
-
-	memcpy(tmp, m->seltags, sizeof initags);
-	memcpy(m->seltags, m->prevtags, sizeof initags);
-	memcpy(m->prevtags, tmp, sizeof initags);
-	arrange();
-}
-
-void
 zoom(const char *arg) {
 	Client *c = sel;
 
 	if(!sel || !dozoom || sel->isfloating)
 		return;
-	if(c == nexttiled(clients, c->monitor))
-		if(!(c = nexttiled(c->next, c->monitor)))
+	if(c == nexttiled(clients))
+		if(!(c = nexttiled(c->next)))
 			return;
 	detach(c);
 	attach(c);
@@ -2020,31 +1888,10 @@ zoom(const char *arg) {
 	arrange();
 }
 
-void
-movetomonitor(const char *arg) {
-	if (sel) {
-		sel->monitor = arg ? atoi(arg) : (sel->monitor+1) % mcount;
-
-		memcpy(sel->tags, monitors[sel->monitor].seltags, sizeof initags);
-		resize(sel, monitors[sel->monitor].wax, monitors[sel->monitor].way, sel->w, sel->h, True);
-		arrange();
-	}
-}
-
-void
-selectmonitor(const char *arg) {
-	Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount];
-
-	XWarpPointer(dpy, None, root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
-	focus(NULL);
-}
-
-
 int
 main(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))
-		eprint("dwm-"VERSION", © 2006-2008 Anselm R. Garbe, Sander van Dijk, "
-		       "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
+		eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
 	else if(argc != 1)
 		eprint("usage: dwm [-v]\n");
 
@@ -2054,7 +1901,6 @@ main(int argc, char *argv[]) {
 
 	checkotherwm();
 	setup();
-	drawbar();
 	scan();
 	run();
 	cleanup();