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

diff --git a/dwm.c b/dwm.c
index b6659ae..ff9e66a 100644
--- a/dwm.c
+++ b/dwm.c
@@ -17,38 +17,41 @@
  * 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.  For each client dwm
- * creates a small title window, which is resized whenever the (_NET_)WM_NAME
- * properties are updated or the client is moved/resized.
+ * global tags array to indicate the tags of a client.  
  *
- * Keys and tagging rules are organized as arrays and defined in the config.h
- * file. These arrays are kept static in event.o and tag.o respectively,
- * because no other part of dwm needs access to them.  The current layout is
- * represented by the lt pointer.
+ * Keys and tagging rules are organized as arrays and defined in config.h.
  *
  * To understand everything else, start reading main().
  */
 #include <errno.h>
 #include <locale.h>
-#include <regex.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
+#include <sys/types.h>
 #include <sys/wait.h>
+#include <regex.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+#include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
+//#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+//#endif
 
 /* macros */
 #define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
 #define CLEANMASK(mask)		(mask & ~(numlockmask | LockMask))
+#define LENGTH(x)		(sizeof x / sizeof x[0])
+#define MAXTAGLEN		16
 #define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 
+
 /* enums */
 enum { BarTop, BarBot, BarOff };			/* bar position */
 enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
@@ -61,17 +64,17 @@ typedef struct Client Client;
 struct Client {
 	char name[256];
 	int x, y, w, h;
-	int rx, ry, rw, rh; /* revert geometry */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int minax, maxax, minay, maxay;
-	long flags; 
+	long flags;
 	unsigned int border, oldborder;
-	Bool isbanned, isfixed, ismax, isfloating;
+	Bool isbanned, isfixed, isfloating, isurgent;
 	Bool *tags;
 	Client *next;
 	Client *prev;
 	Client *snext;
 	Window win;
+	int monitor;
 };
 
 typedef struct {
@@ -96,15 +99,17 @@ typedef struct {
 	const char *arg;
 } Key;
 
+typedef struct Monitor Monitor;
 typedef struct {
 	const char *symbol;
-	void (*arrange)(void);
+	void (*arrange)(Monitor *);
 } Layout;
 
 typedef struct {
 	const char *prop;
 	const char *tags;
 	Bool isfloating;
+	int monitor;
 } Rule;
 
 typedef struct {
@@ -112,137 +117,154 @@ typedef struct {
 	regex_t *tagregex;
 } Regs;
 
-/* functions */
-
-static void applyrules(Client *c);
-static void arrange(void);
-static void attach(Client *c);
-static void attachstack(Client *c);
-static void ban(Client *c);
-static void buttonpress(XEvent *e);
-static void cleanup(void);
-static void compileregs(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 drawbar(void);
-static void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
-static void drawtext(const char *text, unsigned long col[ColLast]);
-static void *emallocz(unsigned int size);
-static void enternotify(XEvent *e);
-static void eprint(const char *errstr, ...);
-static void expose(XEvent *e);
-static void floating(void); /* default floating layout */
-static void focus(Client *c);
-static void focusnext(const char *arg);
-static void focusprev(const char *arg);
-static Client *getclient(Window w);
-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 unsigned int idxoftag(const char *tag);
-static void initbar(void);
-static unsigned long initcolor(const char *colstr);
-static void initfont(const char *fontstr);
-static void initlayouts(void);
-static void initstyle(void);
-static Bool isarrange(void (*func)());
-static Bool isfloating(void);
-static Bool isoccupied(unsigned int t);
-static Bool isprotodel(Client *c);
-static Bool isvisible(Client *c);
-static void keypress(XEvent *e);
-static void killclient(const char *arg);
-static void leavenotify(XEvent *e);
-static void manage(Window w, XWindowAttributes *wa);
-static void mappingnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void movemouse(Client *c);
-static Client *nexttiled(Client *c);
-static void propertynotify(XEvent *e);
-static void quit(const char *arg);
-static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
-static void resizemouse(Client *c);
-static void restack(void);
-static void scan(void);
-static void setclientstate(Client *c, long state);
-static void setlayout(const char *arg);
-static void setmwfact(const char *arg);
-static void setup(void);
-static void spawn(const char *arg);
-static void tag(const char *arg);
-static unsigned int textnw(const char *text, unsigned int len);
-static unsigned int textw(const char *text);
-static void tile(void);
-static void togglebar(const char *arg);
-static void togglefloating(const char *arg);
-static void togglemax(const char *arg);
-static void toggletag(const char *arg);
-static void toggleview(const char *arg);
-static void unban(Client *c);
-static void unmanage(Client *c);
-static void unmapnotify(XEvent *e);
-static void updatebarpos(void);
-static void updatesizehints(Client *c);
-static void updatetitle(Client *c);
-static void view(const char *arg);
-static int xerror(Display *dpy, XErrorEvent *ee);
-static int xerrordummy(Display *dsply, XErrorEvent *ee);
-static int xerrorstart(Display *dsply, XErrorEvent *ee);
-static void zoom(const char *arg);
+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);
+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(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 *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);
+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(unsigned int monitor, unsigned int t);
+Bool isprotodel(Client *c);
+Bool isurgent(unsigned int monitor, unsigned int t);
+Bool isvisible(Client *c, int monitor);
+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);
+void propertynotify(XEvent *e);
+void quit(const char *arg);
+void reapply(const char *arg);
+void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+void resizemouse(Client *c);
+void restack(void);
+void run(void);
+void scan(void);
+void setclientstate(Client *c, long state);
+void 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);
+int monitorat(void);
+void movetomonitor(const char *arg);
+void selectmonitor(const char *arg);
 
 /* variables */
-static char stext[256];
-static double mwfact;
-static int screen, sx, sy, sw, sh, wax, way, waw, wah;
-static int (*xerrorxlib)(Display *, XErrorEvent *);
-static unsigned int bh, bpos, ntags;
-static unsigned int blw = 0;
-static unsigned int ltidx = 0; /* default */
-static unsigned int nlayouts = 0;
-static unsigned int nrules = 0;
-static unsigned int numlockmask = 0;
-static void (*handler[LASTEvent]) (XEvent *) = {
+char stext[256];
+int mcount = 1;
+int selmonitor = 0;
+int screen;
+int (*xerrorxlib)(Display *, XErrorEvent *);
+unsigned int bh, bpos;
+unsigned int blw = 0;
+unsigned int numlockmask = 0;
+void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
 	[ConfigureNotify] = configurenotify,
 	[DestroyNotify] = destroynotify,
 	[EnterNotify] = enternotify,
-	[LeaveNotify] = leavenotify,
 	[Expose] = expose,
+	[FocusIn] = focusin,
 	[KeyPress] = keypress,
 	[MappingNotify] = mappingnotify,
 	[MapRequest] = maprequest,
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
 };
-static Atom wmatom[WMLast], netatom[NetLast];
-static Bool otherwm, readin;
-static Bool running = True;
-static Bool *seltags;
-static Bool selscreen = True;
-static Client *clients = NULL;
-static Client *sel = NULL;
-static Client *stack = NULL;
-static Cursor cursor[CurLast];
-static Display *dpy;
-static DC dc = {0};
-static Window barwin, root;
-static Regs *regs = NULL;
+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;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-/* implementation */
-static void
+//Bool prevtags[LENGTH(tags)];
+
+/* function implementations */
+void
 applyrules(Client *c) {
 	static char buf[512];
 	unsigned int i, j;
 	regmatch_t tmp;
-	Bool matched = False;
+	Bool matched_tag = False;
+	Bool matched_monitor = False;
 	XClassHint ch = { 0 };
 
 	/* rule matching */
@@ -250,12 +272,17 @@ applyrules(Client *c) {
 	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 < nrules; i++)
+	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 < ntags; j++) {
+			for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) {
 				if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
-					matched = True;
+					matched_tag = True;
 					c->tags[j] = True;
 				}
 			}
@@ -264,26 +291,28 @@ applyrules(Client *c) {
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
-	if(!matched)
-		for(i = 0; i < ntags; i++)
-			c->tags[i] = seltags[i];
+	if(!matched_tag)
+		memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
+	if (!matched_monitor)
+		c->monitor = monitorat();
 }
 
-static void
+void
 arrange(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(isvisible(c))
+		if(isvisible(c, c->monitor))
 			unban(c);
 		else
 			ban(c);
-	layouts[ltidx].arrange();
+
+	monitors[selmonitor].layout->arrange(&monitors[selmonitor]);
 	focus(NULL);
 	restack();
 }
 
-static void
+void
 attach(Client *c) {
 	if(clients)
 		clients->prev = c;
@@ -291,29 +320,31 @@ attach(Client *c) {
 	clients = c;
 }
 
-static void
+void
 attachstack(Client *c) {
 	c->snext = stack;
 	stack = c;
 }
 
-static void
+void
 ban(Client *c) {
 	if(c->isbanned)
 		return;
-	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+	XMoveWindow(dpy, c->win, c->x + 3 * monitors[c->monitor].sw, c->y);
 	c->isbanned = True;
 }
 
-static void
+void
 buttonpress(XEvent *e) {
 	unsigned int i, x;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
-	if(barwin == ev->window) {
+	Monitor *m = &monitors[monitorat()];
+
+	if(ev->window == m->barwin) {
 		x = 0;
-		for(i = 0; i < ntags; i++) {
+		for(i = 0; i < LENGTH(tags); i++) {
 			x += textw(tags[i]);
 			if(ev->x < x) {
 				if(ev->button == Button1) {
@@ -338,23 +369,42 @@ buttonpress(XEvent *e) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
-		if(ev->button == Button1 && (isfloating() || c->isfloating)) {
+		if(ev->button == Button1) {
 			restack();
 			movemouse(c);
 		}
-		else if(ev->button == Button2)
-			zoom(NULL);
-		else if(ev->button == Button3
-		&& (isfloating() || c->isfloating) && !c->isfixed)
-		{
+		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();
 			resizemouse(c);
 		}
 	}
 }
 
-static void
+void
+checkotherwm(void) {
+	otherwm = False;
+	XSetErrorHandler(xerrorstart);
+
+	/* this causes an error if some other window manager is running */
+	XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
+	XSync(dpy, False);
+	if(otherwm)
+		eprint("dwm: another window manager is already running\n");
+	XSync(dpy, False);
+	XSetErrorHandler(NULL);
+	xerrorxlib = XSetErrorHandler(xerror);
+	XSync(dpy, False);
+}
+
+void
 cleanup(void) {
+	unsigned int i;
 	close(STDIN_FILENO);
 	while(stack) {
 		unban(stack);
@@ -364,28 +414,28 @@ cleanup(void) {
 		XFreeFontSet(dpy, dc.font.set);
 	else
 		XFreeFont(dpy, dc.font.xfont);
+
 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
 	XFreePixmap(dpy, dc.drawable);
 	XFreeGC(dpy, dc.gc);
-	XDestroyWindow(dpy, barwin);
 	XFreeCursor(dpy, cursor[CurNormal]);
 	XFreeCursor(dpy, cursor[CurResize]);
 	XFreeCursor(dpy, cursor[CurMove]);
-	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+	for(i = 0; i < mcount; i++)
+		XDestroyWindow(dpy, monitors[i].barwin);
 	XSync(dpy, False);
-	free(seltags);
+	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 
-static void
+void
 compileregs(void) {
 	unsigned int i;
 	regex_t *reg;
 
 	if(regs)
 		return;
-	nrules = sizeof rules / sizeof rules[0];
-	regs = emallocz(nrules * sizeof(Regs));
-	for(i = 0; i < nrules; i++) {
+	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))
@@ -403,7 +453,7 @@ compileregs(void) {
 	}
 }
 
-static void
+void
 configure(Client *c) {
 	XConfigureEvent ce;
 
@@ -421,48 +471,50 @@ configure(Client *c) {
 	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 
-static void
+void
 configurenotify(XEvent *e) {
 	XConfigureEvent *ev = &e->xconfigure;
+	Monitor *m = &monitors[selmonitor];
 
-	if (ev->window == root && (ev->width != sw || ev->height != sh)) {
-		sw = ev->width;
-		sh = ev->height;
+	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, sw, bh, DefaultDepth(dpy, screen));
-		XResizeWindow(dpy, barwin, sw, bh);
-		updatebarpos();
+		dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
+		XResizeWindow(dpy, m->barwin, m->sw, bh);
+		updatebarpos(m);
 		arrange();
 	}
 }
 
-static void
+void
 configurerequest(XEvent *e) {
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 
 	if((c = getclient(ev->window))) {
-		c->ismax = False;
+		Monitor *m = &monitors[c->monitor];
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		if(c->isfixed || c->isfloating || isfloating()) {
+		if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
 			if(ev->value_mask & CWX)
-				c->x = ev->x;
+				c->x = m->sx+ev->x;
 			if(ev->value_mask & CWY)
-				c->y = ev->y;
+				c->y = m->sy+ev->y;
 			if(ev->value_mask & CWWidth)
 				c->w = ev->width;
 			if(ev->value_mask & CWHeight)
 				c->h = ev->height;
-			if((c->x + c->w) > sw && c->isfloating)
-				c->x = sw / 2 - c->w / 2; /* center in x direction */
-			if((c->y + c->h) > sh && c->isfloating)
-				c->y = sh / 2 - c->h / 2; /* center in y direction */
+			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)))
 				configure(c);
-			if(isvisible(c))
+			if(isvisible(c, monitorat()))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
@@ -481,7 +533,7 @@ configurerequest(XEvent *e) {
 	XSync(dpy, False);
 }
 
-static void
+void
 destroynotify(XEvent *e) {
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
@@ -490,7 +542,7 @@ destroynotify(XEvent *e) {
 		unmanage(c);
 }
 
-static void
+void
 detach(Client *c) {
 	if(c->prev)
 		c->prev->next = c->next;
@@ -501,7 +553,7 @@ detach(Client *c) {
 	c->next = c->prev = NULL;
 }
 
-static void
+void
 detachstack(Client *c) {
 	Client **tc;
 
@@ -509,53 +561,65 @@ detachstack(Client *c) {
 	*tc = c->snext;
 }
 
-static void
+void
 drawbar(void) {
-	int i, x;
-
-	dc.x = dc.y = 0;
-	for(i = 0; i < ntags; i++) {
-		dc.w = textw(tags[i]);
-		if(seltags[i]) {
-			drawtext(tags[i], dc.sel);
-			drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
-		}
-		else {
-			drawtext(tags[i], dc.norm);
-			drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
+	int i, j, 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 += dc.w;
-	}
-	dc.w = blw;
-	drawtext(layouts[ltidx].symbol, dc.norm);
-	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);
-	if((dc.w = dc.x - x) > bh) {
-		dc.x = x;
-		if(sel) {
-			drawtext(sel->name, dc.sel);
-			drawsquare(sel->ismax, sel->isfloating, 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(NULL, dc.norm);
+			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);
+		}
+		XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->sw, bh, 0, 0);
+		XSync(dpy, False);
 	}
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
-	XSync(dpy, False);
 }
 
-static void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+void
+drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 	int x;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-	gcv.foreground = col[ColFG];
+	gcv.foreground = col[invert ? ColBG : ColFG];
 	XChangeGC(dpy, dc.gc, GCForeground, &gcv);
 	x = (dc.font.ascent + dc.font.descent + 2) / 4;
 	r.x = dc.x + 1;
@@ -570,14 +634,14 @@ drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
 	}
 }
 
-static void
-drawtext(const char *text, unsigned long col[ColLast]) {
+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;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-	XSetForeground(dpy, dc.gc, col[ColBG]);
+	XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	if(!text)
 		return;
@@ -603,14 +667,14 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 	}
 	if(w > dc.w)
 		return; /* too long */
-	XSetForeground(dpy, dc.gc, col[ColFG]);
+	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);
 	else
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
-static void *
+void *
 emallocz(unsigned int size) {
 	void *res = calloc(1, size);
 
@@ -619,22 +683,25 @@ emallocz(unsigned int size) {
 	return res;
 }
 
-static void
+void
 enternotify(XEvent *e) {
 	Client *c;
 	XCrossingEvent *ev = &e->xcrossing;
 
-	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
-		return;
+	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) {
+		if(!isxinerama || ev->window != root)
+			return;
+	}
 	if((c = getclient(ev->window)))
 		focus(c);
-	else if(ev->window == root) {
-		selscreen = True;
+	else {
+		selmonitor = monitorat();
+		fprintf(stderr, "updating selmonitor %d\n", selmonitor);
 		focus(NULL);
 	}
 }
 
-static void
+void
 eprint(const char *errstr, ...) {
 	va_list ap;
 
@@ -644,29 +711,35 @@ eprint(const char *errstr, ...) {
 	exit(EXIT_FAILURE);
 }
 
-static void
+void
 expose(XEvent *e) {
 	XExposeEvent *ev = &e->xexpose;
 
 	if(ev->count == 0) {
-		if(barwin == ev->window)
+		if(ev->window == monitors[selmonitor].barwin)
 			drawbar();
 	}
 }
 
-static void
-floating(void) { /* default floating layout */
+void
+floating(Monitor *m) { /* default floating layout */
 	Client *c;
 
+	domwfact = dozoom = False;
 	for(c = clients; c; c = c->next)
-		if(isvisible(c))
+		if(isvisible(c, m->id))
 			resize(c, c->x, c->y, c->w, c->h, True);
 }
 
-static void
+void
 focus(Client *c) {
-	if((!c && selscreen) || (c && !isvisible(c)))
-		for(c = stack; c && !isvisible(c); c = c->snext);
+	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(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -678,41 +751,50 @@ focus(Client *c) {
 	}
 	sel = c;
 	drawbar();
-	if(!selscreen)
-		return;
 	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();
+	}
+}
+
+void
+focusin(XEvent *e) { /* there are some broken focus acquiring clients */
+	XFocusChangeEvent *ev = &e->xfocus;
+
+	if(sel && ev->window != sel->win)
+		XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
 }
 
-static void
+void
 focusnext(const char *arg) {
 	Client *c;
 
 	if(!sel)
 		return;
-	for(c = sel->next; c && !isvisible(c); c = c->next);
+	for(c = sel->next; c && !isvisible(c, selmonitor); c = c->next);
 	if(!c)
-		for(c = clients; c && !isvisible(c); c = c->next);
+		for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
 	if(c) {
 		focus(c);
 		restack();
 	}
 }
 
-static void
+void
 focusprev(const char *arg) {
 	Client *c;
 
 	if(!sel)
 		return;
-	for(c = sel->prev; c && !isvisible(c); c = c->prev);
+	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); c = c->prev);
+		for(; c && !isvisible(c, selmonitor); c = c->prev);
 	}
 	if(c) {
 		focus(c);
@@ -720,7 +802,7 @@ focusprev(const char *arg) {
 	}
 }
 
-static Client *
+Client *
 getclient(Window w) {
 	Client *c;
 
@@ -728,7 +810,17 @@ getclient(Window w) {
 	return c;
 }
 
-static long
+unsigned long
+getcolor(const char *colstr) {
+	Colormap cmap = DefaultColormap(dpy, screen);
+	XColor color;
+
+	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+		eprint("error, cannot allocate color '%s'\n", colstr);
+	return color.pixel;
+}
+
+long
 getstate(Window w) {
 	int format, status;
 	long result = -1;
@@ -746,7 +838,7 @@ getstate(Window w) {
 	return result;
 }
 
-static Bool
+Bool
 gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 	char **list = NULL;
 	int n;
@@ -762,8 +854,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 		strncpy(text, (char *)name.value, size - 1);
 	else {
 		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-		&& n > 0 && *list)
-		{
+		&& n > 0 && *list) {
 			strncpy(text, *list, size - 1);
 			XFreeStringList(list);
 		}
@@ -773,7 +864,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 	return True;
 }
 
-static void
+void
 grabbuttons(Client *c, Bool focused) {
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 
@@ -810,48 +901,44 @@ grabbuttons(Client *c, Bool focused) {
 				GrabModeAsync, GrabModeSync, None, None);
 }
 
-static unsigned int
-idxoftag(const char *tag) {
-	unsigned int i;
-
-	for(i = 0; i < ntags; i++)
-		if(tags[i] == tag)
-			return i;
-	return 0;
-}
+void
+grabkeys(void)  {
+	unsigned int i, j;
+	KeyCode code;
+	XModifierKeymap *modmap;
 
-static void
-initbar(void) {
-	XSetWindowAttributes wa;
+	/* init modifier map */
+	modmap = XGetModifierMapping(dpy);
+	for(i = 0; i < 8; i++)
+		for(j = 0; j < modmap->max_keypermod; j++) {
+			if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+				numlockmask = (1 << i);
+		}
+	XFreeModifiermap(modmap);
 
-	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);
-	dc.drawable = XCreatePixmap(dpy, root, sw, 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);
+	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);
+	}
 }
 
-static unsigned long
-initcolor(const char *colstr) {
-	Colormap cmap = DefaultColormap(dpy, screen);
-	XColor color;
+unsigned int
+idxoftag(const char *tag) {
+	unsigned int i;
 
-	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-		eprint("error, cannot allocate color '%s'\n", colstr);
-	return color.pixel;
+	for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++);
+	return (i < LENGTH(tags)) ? i : 0;
 }
 
-static void
+void
 initfont(const char *fontstr) {
 	char *def, **missing;
 	int i, n;
@@ -885,7 +972,7 @@ initfont(const char *fontstr) {
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
 		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-		|| !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
 			eprint("error, cannot load font: '%s'\n", fontstr);
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
@@ -893,52 +980,17 @@ initfont(const char *fontstr) {
 	dc.font.height = dc.font.ascent + dc.font.descent;
 }
 
-static void
-initlayouts(void) {
-	unsigned int i, w;
-
-	nlayouts = sizeof layouts / sizeof layouts[0];
-	for(blw = i = 0; i < nlayouts; i++) {
-		w = textw(layouts[i].symbol);
-		if(w > blw)
-			blw = w;
-	}
-}
-
-static void
-initstyle(void) {
-	dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
-	dc.norm[ColBG] = initcolor(NORMBGCOLOR);
-	dc.norm[ColFG] = initcolor(NORMFGCOLOR);
-	dc.sel[ColBorder] = initcolor(SELBORDERCOLOR);
-	dc.sel[ColBG] = initcolor(SELBGCOLOR);
-	dc.sel[ColFG] = initcolor(SELFGCOLOR);
-	initfont(FONT);
-	dc.h = bh = dc.font.height + 2;
-}
-
-static Bool
-isarrange(void (*func)())
-{
-	return func == layouts[ltidx].arrange;
-}
-
-static Bool
-isfloating(void) {
-	return layouts[ltidx].arrange == floating;
-}
-
-static Bool
-isoccupied(unsigned int t) {
+Bool
+isoccupied(unsigned int monitor, unsigned int t) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(c->tags[t])
+		if(c->tags[t] && c->monitor == monitor)
 			return True;
 	return False;
 }
 
-static Bool
+Bool
 isprotodel(Client *c) {
 	int i, n;
 	Atom *protocols;
@@ -953,43 +1005,37 @@ isprotodel(Client *c) {
 	return ret;
 }
 
-static Bool
-isvisible(Client *c) {
+Bool
+isurgent(unsigned int 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, int monitor) {
 	unsigned int i;
 
-	for(i = 0; i < ntags; i++)
-		if(c->tags[i] && seltags[i])
+	if(c->monitor != monitor)
+		return False;
+	for(i = 0; i < LENGTH(tags); i++)
+		if(c->tags[i] && monitors[c->monitor].seltags[i])
 			return True;
 	return False;
 }
 
-static void
+void
 keypress(XEvent *e) {
-	KEYS
-	unsigned int len = sizeof keys / sizeof keys[0];
 	unsigned int i;
-	KeyCode code;
 	KeySym keysym;
 	XKeyEvent *ev;
 
-	if(!e) { /* grabkeys */
-		XUngrabKey(dpy, AnyKey, AnyModifier, root);
-		for(i = 0; i < len; 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);
-		}
-		return;
-	}
 	ev = &e->xkey;
 	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-	for(i = 0; i < len; i++)
+	for(i = 0; i < LENGTH(keys); i++)
 		if(keysym == keys[i].keysym
 		&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
 		{
@@ -998,7 +1044,7 @@ keypress(XEvent *e) {
 		}
 }
 
-static void
+void
 killclient(const char *arg) {
 	XEvent ev;
 
@@ -1017,46 +1063,42 @@ killclient(const char *arg) {
 		XKillClient(dpy, sel->win);
 }
 
-static void
-leavenotify(XEvent *e) {
-	XCrossingEvent *ev = &e->xcrossing;
-
-	if((ev->window == root) && !ev->same_screen) {
-		selscreen = False;
-		focus(NULL);
-	}
-}
-
-static void
+void
 manage(Window w, XWindowAttributes *wa) {
-	unsigned int i;
 	Client *c, *t = NULL;
-	Window trans;
+	Monitor *m;
 	Status rettrans;
+	Window trans;
 	XWindowChanges wc;
 
 	c = emallocz(sizeof(Client));
-	c->tags = emallocz(ntags * sizeof(Bool));
+	c->tags = emallocz(sizeof initags);
 	c->win = w;
-	c->x = wa->x;
-	c->y = wa->y;
+
+	applyrules(c);
+
+	m = &monitors[c->monitor];
+
+	c->x = wa->x + m->sx;
+	c->y = wa->y + m->sy;
 	c->w = wa->width;
 	c->h = wa->height;
 	c->oldborder = wa->border_width;
-	if(c->w == sw && c->h == sh) {
-		c->x = sx;
-		c->y = sy;
+
+	if(c->w == m->sw && c->h == m->sh) {
+		c->x = m->sx;
+		c->y = m->sy;
 		c->border = wa->border_width;
 	}
 	else {
-		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;
+		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;
 	}
 	wc.border_width = c->border;
@@ -1064,16 +1106,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,
-		StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+	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)
-		for(i = 0; i < ntags; i++)
-			c->tags[i] = t->tags[i];
-	applyrules(c);
+		memcpy(c->tags, t->tags, sizeof initags);
 	if(!c->isfloating)
 		c->isfloating = (rettrans == Success) || c->isfixed;
 	attach(c);
@@ -1085,16 +1124,16 @@ manage(Window w, XWindowAttributes *wa) {
 	arrange();
 }
 
-static void
+void
 mappingnotify(XEvent *e) {
 	XMappingEvent *ev = &e->xmapping;
 
 	XRefreshKeyboardMapping(ev);
 	if(ev->request == MappingKeyboard)
-		keypress(NULL);
+		grabkeys();
 }
 
-static void
+void
 maprequest(XEvent *e) {
 	static XWindowAttributes wa;
 	XMapRequestEvent *ev = &e->xmaprequest;
@@ -1107,19 +1146,36 @@ maprequest(XEvent *e) {
 		manage(ev->window, &wa);
 }
 
-static void
+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;
-	c->ismax = False;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
 		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
@@ -1136,27 +1192,30 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			nx = ocx + (ev.xmotion.x - x1);
 			ny = ocy + (ev.xmotion.y - y1);
-			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;
-			resize(c, nx, ny, c->w, c->h, False);
+			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))
+				togglefloating(NULL);
+			if((m->layout->arrange == floating) || c->isfloating)
+				resize(c, nx, ny, c->w, c->h, False);
 			break;
 		}
 	}
 }
 
-static Client *
-nexttiled(Client *c) {
-	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+Client *
+nexttiled(Client *c, int monitor) {
+	for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
 	return c;
 }
 
-static void
+void
 propertynotify(XEvent *e) {
 	Client *c;
 	Window trans;
@@ -1175,6 +1234,10 @@ propertynotify(XEvent *e) {
 			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);
@@ -1184,62 +1247,78 @@ propertynotify(XEvent *e) {
 	}
 }
 
-static void
+void
 quit(const char *arg) {
 	readin = running = False;
 }
 
-static void
+void
+reapply(const char *arg) {
+	static Bool zerotags[LENGTH(tags)] = { 0 };
+	Client *c;
+
+	for(c = clients; c; c = c->next) {
+		memcpy(c->tags, zerotags, sizeof zerotags);
+		applyrules(c);
+	}
+	arrange();
+}
+
+void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-	double dx, dy, max, min, ratio;
-	XWindowChanges wc; 
+	Monitor *m;
+	XWindowChanges wc;
+
+	m = &monitors[c->monitor];
 
 	if(sizehints) {
-		if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
-			dx = (double)(w - c->basew);
-			dy = (double)(h - c->baseh);
-			min = (double)(c->minax) / (double)(c->minay);
-			max = (double)(c->maxax) / (double)(c->maxay);
-			ratio = dx / dy;
-			if(max > 0 && min > 0 && ratio > 0) {
-				if(ratio < min) {
-					dy = (dx * min + dy) / (min * min + 1);
-					dx = dy * min;
-					w = (int)dx + c->basew;
-					h = (int)dy + c->baseh;
-				}
-				else if(ratio > max) {
-					dy = (dx * min + dy) / (max * max + 1);
-					dx = dy * min;
-					w = (int)dx + c->basew;
-					h = (int)dy + c->baseh;
-				}
-			}
+		/* set minimum possible */
+		if (w < 1)
+			w = 1;
+		if (h < 1)
+			h = 1;
+
+		/* 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->minw && w < c->minw)
+
+		/* adjust for increment value */
+		if(c->incw)
+			w -= w % c->incw;
+		if(c->inch)
+			h -= h % c->inch;
+
+		/* restore base dimensions */
+		w += c->basew;
+		h += c->baseh;
+
+		if(c->minw > 0 && w < c->minw)
 			w = c->minw;
-		if(c->minh && h < c->minh)
+		if(c->minh > 0 && h < c->minh)
 			h = c->minh;
-		if(c->maxw && w > c->maxw)
+		if(c->maxw > 0 && w > c->maxw)
 			w = c->maxw;
-		if(c->maxh && h > c->maxh)
+		if(c->maxh > 0 && h > c->maxh)
 			h = c->maxh;
-		if(c->incw)
-			w -= (w - c->basew) % c->incw;
-		if(c->inch)
-			h -= (h - c->baseh) % c->inch;
 	}
 	if(w <= 0 || h <= 0)
 		return;
-	/* offscreen appearance fixes */
-	if(x > sw)
-		x = sw - w - 2 * c->border;
-	if(y > 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(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(c->x != x || c->y != y || c->w != w || c->h != h) {
 		c->x = wc.x = x;
 		c->y = wc.y = y;
@@ -1252,18 +1331,19 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	}
 }
 
-static void
+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;
-	c->ismax = False;
 	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);
@@ -1285,14 +1365,18 @@ resizemouse(Client *c) {
 				nw = 1;
 			if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
 				nh = 1;
-			resize(c, c->x, c->y, nw, nh, True);
+			if((m->layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+				togglefloating(NULL);
+			if((m->layout->arrange == floating) || c->isfloating)
+				resize(c, c->x, c->y, nw, nh, True);
 			break;
 		}
 	}
 }
 
-static void
+void
 restack(void) {
+	unsigned int i;
 	Client *c;
 	XEvent ev;
 	XWindowChanges wc;
@@ -1300,27 +1384,89 @@ restack(void) {
 	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || isfloating())
+	if(sel->isfloating || (monitors[selmonitor].layout->arrange == floating))
 		XRaiseWindow(dpy, sel->win);
-	if(!isfloating()) {
+	if(monitors[selmonitor].layout->arrange != floating) {
 		wc.stack_mode = Below;
-		wc.sibling = barwin;
+		wc.sibling = monitors[selmonitor].barwin;
 		if(!sel->isfloating) {
 			XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
 			wc.sibling = sel->win;
 		}
-		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
-			if(c == sel)
-				continue;
-			XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
-			wc.sibling = c->win;
+		for(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;
+			}
 		}
 	}
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
-static void
+void
+run(void) {
+	char *p;
+	char buf[sizeof stext];
+	fd_set rd;
+	int r, xfd;
+	unsigned int len, offset;
+	XEvent ev;
+
+	/* 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 */
+	while(running) {
+		FD_ZERO(&rd);
+		if(readin)
+			FD_SET(STDIN_FILENO, &rd);
+		FD_SET(xfd, &rd);
+		if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
+			if(errno == EINTR)
+				continue;
+			eprint("select failed\n");
+		}
+		if(FD_ISSET(STDIN_FILENO, &rd)) {
+			switch((r = read(STDIN_FILENO, buf + offset, len - offset))) {
+			case -1:
+				strncpy(stext, strerror(errno), len);
+				readin = False;
+				break;
+			case 0:
+				strncpy(stext, "EOF", 4);
+				readin = False;
+				break;
+			default:
+				for(p = buf + 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 */
+						for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
+						offset = r;
+						if(r)
+							memmove(buf, p - r + 1, r);
+						break;
+					}
+				break;
+			}
+			drawbar();
+		}
+		while(XPending(dpy)) {
+			XNextEvent(dpy, &ev);
+			if(handler[ev.type])
+				(handler[ev.type])(&ev); /* call handler */
+		}
+	}
+}
+
+void
 scan(void) {
 	unsigned int i, num;
 	Window *wins, d1, d2;
@@ -1330,7 +1476,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);
@@ -1339,7 +1485,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);
 		}
 	}
@@ -1347,7 +1493,7 @@ scan(void) {
 		XFree(wins);
 }
 
-static void
+void
 setclientstate(Client *c, long state) {
 	long data[] = {state, None};
 
@@ -1355,21 +1501,23 @@ setclientstate(Client *c, long state) {
 			PropModeReplace, (unsigned char *)data, 2);
 }
 
-static void
+void
 setlayout(const char *arg) {
 	unsigned int i;
+	Monitor *m = &monitors[monitorat()];
 
 	if(!arg) {
-		if(++ltidx == nlayouts)
-			ltidx = 0;;
+		m->layout++;
+		if(m->layout == &layouts[LENGTH(layouts)])
+			m->layout = &layouts[0];
 	}
 	else {
-		for(i = 0; i < nlayouts; i++)
+		for(i = 0; i < LENGTH(layouts); i++)
 			if(!strcmp(arg, layouts[i].symbol))
 				break;
-		if(i == nlayouts)
+		if(i == LENGTH(layouts))
 			return;
-		ltidx = i;
+		m->layout = &layouts[i];
 	}
 	if(sel)
 		arrange();
@@ -1377,35 +1525,36 @@ setlayout(const char *arg) {
 		drawbar();
 }
 
-static void
+void
 setmwfact(const char *arg) {
 	double delta;
 
-	if(!isarrange(tile))
+	Monitor *m = &monitors[monitorat()];
+
+	if(!domwfact)
 		return;
 	/* arg handling, manipulate mwfact */
 	if(arg == NULL)
-		mwfact = MWFACT;
-	else if(1 == sscanf(arg, "%lf", &delta)) {
-		if(arg[0] != '+' && arg[0] != '-')
-			mwfact = delta;
+		m->mwfact = MWFACT;
+	else if(sscanf(arg, "%lf", &delta) == 1) {
+		if(arg[0] == '+' || arg[0] == '-')
+			m->mwfact += delta;
 		else
-			mwfact += delta;
-		if(mwfact < 0.1)
-			mwfact = 0.1;
-		else if(mwfact > 0.9)
-			mwfact = 0.9;
+			m->mwfact = delta;
+		if(m->mwfact < 0.1)
+			m->mwfact = 0.1;
+		else if(m->mwfact > 0.9)
+			m->mwfact = 0.9;
 	}
 	arrange();
 }
 
-static void
+void
 setup(void) {
-	int i, j;
-	unsigned int mask;
-	Window w;
-	XModifierKeymap *modmap;
+	unsigned int i;
+	Monitor *m;
 	XSetWindowAttributes wa;
+	XineramaScreenInfo *info = NULL;
 
 	/* init atoms */
 	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1414,44 +1563,109 @@ setup(void) {
 	wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
 	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
 	netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-			PropModeReplace, (unsigned char *) netatom, NetLast);
+
 	/* init cursors */
-	cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
+	wa.cursor = cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
-	/* init modifier map */
-	modmap = XGetModifierMapping(dpy);
-	for (i = 0; i < 8; i++)
-		for (j = 0; j < modmap->max_keypermod; j++) {
-			if(modmap->modifiermap[i * modmap->max_keypermod + j]
-					== XKeysymToKeycode(dpy, XK_Num_Lock))
-				numlockmask = (1 << i);
+
+	// 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);
+
+	/* 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.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;
+	}
+	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);
 		}
-	XFreeModifiermap(modmap);
-	/* select for events */
-	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
-		| EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
-	wa.cursor = cursor[CurNormal];
-	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-	XSelectInput(dpy, root, wa.event_mask);
-	keypress(NULL); /* grabkeys */
+		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);
+
+	/* grab keys */
+	grabkeys();
+
+	/* init tags */
 	compileregs();
-	for(ntags = 0; tags[ntags]; ntags++);
-	seltags = emallocz(sizeof(Bool) * ntags);
-	seltags[0] = True;
-	/* geometry */
-	sx = sy = 0;
-	sw = DisplayWidth(dpy, screen);
-	sh = DisplayHeight(dpy, screen);
-	initstyle();
-	initlayouts();
-	initbar();
-	/* multihead support */
-	selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
-}
-
-static void
+
+	selmonitor = monitorat();
+	fprintf(stderr, "selmonitor == %d\n", selmonitor);
+}
+
+void
 spawn(const char *arg) {
 	static char *shell = NULL;
 
@@ -1475,21 +1689,19 @@ spawn(const char *arg) {
 	wait(0);
 }
 
-static void
+void
 tag(const char *arg) {
 	unsigned int i;
 
 	if(!sel)
 		return;
-	for(i = 0; i < ntags; i++)
-		sel->tags[i] = arg == NULL;
-	i = idxoftag(arg);
-	if(i >= 0 && i < ntags)
-		sel->tags[i] = True;
+	for(i = 0; i < LENGTH(tags); i++)
+		sel->tags[i] = (NULL == arg);
+	sel->tags[idxoftag(arg)] = True;
 	arrange();
 }
 
-static unsigned int
+unsigned int
 textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
@@ -1500,61 +1712,68 @@ textnw(const char *text, unsigned int len) {
 	return XTextWidth(dc.font.xfont, text, len);
 }
 
-static unsigned int
+unsigned int
 textw(const char *text) {
 	return textnw(text, strlen(text)) + dc.font.height;
 }
 
-static void
-tile(void) {
+void
+tile(Monitor *m) {
 	unsigned int i, n, nx, ny, nw, nh, mw, th;
-	Client *c;
+	Client *c, *mc;
+
+	domwfact = dozoom = True;
 
-	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+	nx = ny = nw = 0; /* gcc stupidity requires this */
+
+	for(n = 0, c = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id))
 		n++;
 
 	/* window geoms */
-	mw = (n == 1) ? waw : mwfact * waw;
-	th = (n > 1) ? wah / (n - 1) : 0;
+	mw = (n == 1) ? m->waw : m->mwfact * m->waw;
+	th = (n > 1) ? m->wah / (n - 1) : 0;
 	if(n > 1 && th < bh)
-		th = wah;
+		th = m->wah;
 
-	nx = wax;
-	ny = way;
-	for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) {
-		c->ismax = False;
+	for(i = 0, c = mc = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) {
 		if(i == 0) { /* master */
+			nx = m->wax;
+			ny = m->way;
 			nw = mw - 2 * c->border;
-			nh = wah - 2 * c->border;
+			nh = m->wah - 2 * c->border;
 		}
 		else {  /* tile window */
 			if(i == 1) {
-				ny = way;
-				nx += mw;
+				ny = m->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 = (way + wah) - ny - 2 * c->border;
+				nh = (m->way + m->wah) - ny - 2 * c->border;
 			else
 				nh = th - 2 * c->border;
 		}
 		resize(c, nx, ny, nw, nh, RESIZEHINTS);
-		if(n > 1 && th != wah)
-			ny += nh + 2 * c->border;
+		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++;
 	}
 }
-
-static void
+void
 togglebar(const char *arg) {
 	if(bpos == BarOff)
 		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
 	else
 		bpos = BarOff;
-	updatebarpos();
+	updatebarpos(&monitors[monitorat()]);
 	arrange();
 }
 
-static void
+void
 togglefloating(const char *arg) {
 	if(!sel)
 		return;
@@ -1564,26 +1783,7 @@ togglefloating(const char *arg) {
 	arrange();
 }
 
-static void
-togglemax(const char *arg) {
-	XEvent ev;
-
-	if(!sel || (!isfloating() && !sel->isfloating) || sel->isfixed)
-		return;
-	if((sel->ismax = !sel->ismax)) {
-		sel->rx = sel->x;
-		sel->ry = sel->y;
-		sel->rw = sel->w;
-		sel->rh = sel->h;
-		resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
-	}
-	else
-		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
-	drawbar();
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-static void
+void
 toggletag(const char *arg) {
 	unsigned int i, j;
 
@@ -1591,25 +1791,27 @@ toggletag(const char *arg) {
 		return;
 	i = idxoftag(arg);
 	sel->tags[i] = !sel->tags[i];
-	for(j = 0; j < ntags && !sel->tags[j]; j++);
-	if(j == ntags)
-		sel->tags[i] = True;
+	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();
 }
 
-static void
+void
 toggleview(const char *arg) {
 	unsigned int i, j;
 
+	Monitor *m = &monitors[monitorat()];
+
 	i = idxoftag(arg);
-	seltags[i] = !seltags[i];
-	for(j = 0; j < ntags && !seltags[j]; j++);
-	if(j == ntags)
-		seltags[i] = True; /* cannot toggle last view */
+	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();
 }
 
-static void
+void
 unban(Client *c) {
 	if(!c->isbanned)
 		return;
@@ -1617,7 +1819,7 @@ unban(Client *c) {
 	c->isbanned = False;
 }
 
-static void
+void
 unmanage(Client *c) {
 	XWindowChanges wc;
 
@@ -1640,7 +1842,7 @@ unmanage(Client *c) {
 	arrange();
 }
 
-static void
+void
 unmapnotify(XEvent *e) {
 	Client *c;
 	XUnmapEvent *ev = &e->xunmap;
@@ -1649,33 +1851,33 @@ unmapnotify(XEvent *e) {
 		unmanage(c);
 }
 
-static void
-updatebarpos(void) {
+void
+updatebarpos(Monitor *m) {
 	XEvent ev;
 
-	wax = sx;
-	way = sy;
-	wah = sh;
-	waw = sw;
+	m->wax = m->sx;
+	m->way = m->sy;
+	m->wah = m->sh;
+	m->waw = m->sw;
 	switch(bpos) {
 	default:
-		wah -= bh;
-		way += bh;
-		XMoveWindow(dpy, barwin, sx, sy);
+		m->wah -= bh;
+		m->way += bh;
+		XMoveWindow(dpy, m->barwin, m->sx, m->sy);
 		break;
 	case BarBot:
-		wah -= bh;
-		XMoveWindow(dpy, barwin, sx, sy + wah);
+		m->wah -= bh;
+		XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
 		break;
 	case BarOff:
-		XMoveWindow(dpy, barwin, sx, sy - bh);
+		XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
 		break;
 	}
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
-static void
+void
 updatesizehints(Client *c) {
 	long msize;
 	XSizeHints size;
@@ -1727,16 +1929,26 @@ updatesizehints(Client *c) {
 			&& c->maxw == c->minw && c->maxh == c->minh);
 }
 
-static void
+void
 updatetitle(Client *c) {
 	if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
 		gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 }
 
+void
+updatewmhints(Client *c) {
+	XWMHints *wmh;
+
+	if((wmh = XGetWMHints(dpy, c->win))) {
+		c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+		XFree(wmh);
+	}
+}
+
 /* 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.  */
-static int
+int
 xerror(Display *dpy, XErrorEvent *ee) {
 	if(ee->error_code == BadWindow
 	|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
@@ -1752,39 +1964,55 @@ xerror(Display *dpy, XErrorEvent *ee) {
 	return xerrorxlib(dpy, ee); /* may call exit */
 }
 
-static int
+int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
 	return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
-static int
+int
 xerrorstart(Display *dsply, XErrorEvent *ee) {
 	otherwm = True;
 	return -1;
 }
 
-static void
+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();
+	}
+}
 
-	for(i = 0; i < ntags; i++)
-		seltags[i] = arg == NULL;
-	i = idxoftag(arg);
-	if(i >= 0 && i < ntags)
-		seltags[i] = True;
+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();
 }
 
-static void
+void
 zoom(const char *arg) {
-	Client *c;
+	Client *c = sel;
 
-	if(!sel || !isarrange(tile) || sel->isfloating)
+	if(!sel || !dozoom || sel->isfloating)
 		return;
-	if((c = sel) == nexttiled(clients))
-		if(!(c = nexttiled(c->next)))
+	if(c == nexttiled(clients, c->monitor))
+		if(!(c = nexttiled(c->next, c->monitor)))
 			return;
 	detach(c);
 	attach(c);
@@ -1792,83 +2020,45 @@ 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[]) {
-	char *p;
-	int r, xfd;
-	fd_set rd;
-	XEvent ev;
-
 	if(argc == 2 && !strcmp("-v", argv[1]))
-		eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
+		eprint("dwm-"VERSION", © 2006-2008 Anselm R. Garbe, Sander van Dijk, "
+		       "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
 	else if(argc != 1)
 		eprint("usage: dwm [-v]\n");
 
-	/* macros from config.h can be used at function level only */
-	mwfact = MWFACT;
-	bpos = BARPOS;
-
 	setlocale(LC_CTYPE, "");
 	if(!(dpy = XOpenDisplay(0)))
 		eprint("dwm: cannot open display\n");
-	xfd = ConnectionNumber(dpy);
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
-	otherwm = False;
-	XSetErrorHandler(xerrorstart);
-	/* this causes an error if some other window manager is running */
-	XSelectInput(dpy, root, SubstructureRedirectMask);
-	XSync(dpy, False);
-	if(otherwm)
-		eprint("dwm: another window manager is already running\n");
 
-	XSync(dpy, False);
-	XSetErrorHandler(NULL);
-	xerrorxlib = XSetErrorHandler(xerror);
-	XSync(dpy, False);
+	checkotherwm();
 	setup();
 	drawbar();
 	scan();
-
-	/* main event loop, also reads status text from stdin */
-	XSync(dpy, False);
-	readin = True;
-	while(running) {
-		FD_ZERO(&rd);
-		if(readin)
-			FD_SET(STDIN_FILENO, &rd);
-		FD_SET(xfd, &rd);
-		if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
-			if(errno == EINTR)
-				continue;
-			eprint("select failed\n");
-		}
-		if(FD_ISSET(STDIN_FILENO, &rd)) {
-			switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
-			case -1:
-				strncpy(stext, strerror(errno), sizeof stext - 1);
-				stext[sizeof stext - 1] = '\0';
-				readin = False;
-				break;
-			case 0:
-				strncpy(stext, "EOF", 4);
-				readin = False;
-				break;
-			default:
-				for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
-				for(; p >= stext && *p != '\n'; --p);
-				if(p > stext)
-					strncpy(stext, p + 1, sizeof stext);
-			}
-			drawbar();
-		}
-		while(XPending(dpy)) {
-			XNextEvent(dpy, &ev);
-			if(handler[ev.type])
-				(handler[ev.type])(&ev); /* call handler */
-		}
-	}
+	run();
 	cleanup();
+
 	XCloseDisplay(dpy);
 	return 0;
 }