X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/e0d6451086eba0642cff83c2a8e05ff84be60488..c2737b7b9317743e3430c71bc0a9afcc6b0f70f7:/dwm.c?ds=sidebyside

diff --git a/dwm.c b/dwm.c
index 259327d..11f2293 100644
--- a/dwm.c
+++ b/dwm.c
@@ -68,7 +68,7 @@ struct Client {
 	int minax, maxax, minay, maxay;
 	long flags;
 	unsigned int border, oldborder;
-	Bool isbanned, isfixed, isfloating;
+	Bool isbanned, isfixed, isfloating, isurgent;
 	Bool *tags;
 	Client *next;
 	Client *prev;
@@ -117,12 +117,9 @@ typedef struct {
 } Regs;
 
 typedef struct {
-	int id;
+	int monitor;
 	Window barwin;
-//TODO: Window root;
-//TODO: int screen;
 	int sx, sy, sw, sh, wax, way, wah, waw;
-	DC dc;
 	Bool *seltags;
 	Bool *prevtags;
 	Layout *layout;
@@ -146,8 +143,8 @@ void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(void);
-void drawsquare(Monitor *, Bool filled, Bool empty, unsigned long col[ColLast]);
-void drawtext(Monitor *, const char *text, unsigned long col[ColLast]);
+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, ...);
@@ -164,18 +161,18 @@ 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(Monitor*, const char *fontstr);
-Bool isoccupied(Monitor *m, unsigned int t);
+void initfont(const char *fontstr);
+Bool isoccupied(unsigned int monitor, unsigned int t);
 Bool isprotodel(Client *c);
-Bool isvisible(Client *c, Monitor *m);
+Bool isurgent(unsigned int monitor, unsigned int t);
+Bool isvisible(Client *c, int monitor);
 void keypress(XEvent *e);
 void killclient(const char *arg);
-void leavenotify(XEvent *e);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
 void movemouse(Client *c);
-Client *nexttiled(Client *c, Monitor *m);
+Client *nexttiled(Client *c, int monitor);
 void propertynotify(XEvent *e);
 void quit(const char *arg);
 void reapply(const char *arg);
@@ -190,8 +187,8 @@ void setmwfact(const char *arg);
 void setup(void);
 void spawn(const char *arg);
 void tag(const char *arg);
-unsigned int textnw(Monitor*, const char *text, unsigned int len);
-unsigned int textw(Monitor*, const char *text);
+unsigned int textnw(const char *text, unsigned int len);
+unsigned int textw(const char *text);
 void tile(void);
 void togglebar(const char *arg);
 void togglefloating(const char *arg);
@@ -200,24 +197,25 @@ void toggleview(const char *arg);
 void unban(Client *c);
 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
-void updatebarpos(Monitor *s);
+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(int, int);
+int monitorat(void);
 void movetomonitor(const char *arg);
 void selectmonitor(const char *arg);
 
 /* variables */
 char stext[256];
-int mcount, screen;
-//double mwfact;
-//int screen, sx, sy, sw, sh, wax, way, waw, wah;
+int mcount = 1;
+int selmonitor = 0;
+int screen;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int bh, bpos;
 unsigned int blw = 0;
@@ -231,30 +229,26 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[Expose] = expose,
 	[FocusIn] = focusin,
 	[KeyPress] = keypress,
-	[LeaveNotify] = leavenotify,
 	[MappingNotify] = mappingnotify,
 	[MapRequest] = maprequest,
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
+Bool isxinerama = False;
 Bool domwfact = True;
 Bool dozoom = True;
 Bool otherwm, readin;
 Bool running = True;
-//Bool selscreen = True;
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
-Window root;
-//Layout *layout = NULL;
-//Window barwin, root;
 Regs *regs = NULL;
 Monitor *monitors;
-int selmonitor = 0;
+Window root;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
@@ -296,9 +290,9 @@ applyrules(Client *c) {
 	if(ch.res_name)
 		XFree(ch.res_name);
 	if(!matched_tag)
-		memcpy(c->tags, monitors[monitorat(-1, -1)].seltags, sizeof initags);
+		memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
 	if (!matched_monitor)
-		c->monitor = monitorat(-1, -1);
+		c->monitor = monitorat();
 }
 
 void
@@ -306,7 +300,7 @@ arrange(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(isvisible(c, &monitors[c->monitor]))
+		if(isvisible(c, c->monitor))
 			unban(c);
 		else
 			ban(c);
@@ -344,12 +338,12 @@ buttonpress(XEvent *e) {
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
-	Monitor s = monitors[monitorat(-1, -1)];
+	Monitor *m = &monitors[monitorat()];
 
-	if(ev->window == s.barwin) {
+	if(ev->window == m->barwin) {
 		x = 0;
 		for(i = 0; i < LENGTH(tags); i++) {
-			x += textw(&s, tags[i]);
+			x += textw(tags[i]);
 			if(ev->x < x) {
 				if(ev->button == Button1) {
 					if(ev->state & MODKEY)
@@ -374,23 +368,17 @@ buttonpress(XEvent *e) {
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1) {
-			if((s.layout->arrange == floating) || c->isfloating)
-				restack();
-			else
-				togglefloating(NULL);
+			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
-			if((floating != s.layout->arrange) && c->isfloating)
+			if((floating != m->layout->arrange) && c->isfloating)
 				togglefloating(NULL);
 			else
 				zoom(NULL);
 		}
 		else if(ev->button == Button3 && !c->isfixed) {
-			if((floating == s.layout->arrange) || c->isfloating)
-				restack();
-			else
-				togglefloating(NULL);
+			restack();
 			resizemouse(c);
 		}
 	}
@@ -402,7 +390,7 @@ checkotherwm(void) {
 	XSetErrorHandler(xerrorstart);
 
 	/* this causes an error if some other window manager is running */
-	XSelectInput(dpy, root, SubstructureRedirectMask);
+	XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
 	XSync(dpy, False);
 	if(otherwm)
 		eprint("dwm: another window manager is already running\n");
@@ -420,22 +408,21 @@ cleanup(void) {
 		unban(stack);
 		unmanage(stack);
 	}
-	for(i = 0; i < mcount; i++) {
-		Monitor *m = &monitors[i];
-		if(m->dc.font.set)
-			XFreeFontSet(dpy, m->dc.font.set);
-		else
-			XFreeFont(dpy, m->dc.font.xfont);
-		XUngrabKey(dpy, AnyKey, AnyModifier, root);
-		XFreePixmap(dpy, m->dc.drawable);
-		XFreeGC(dpy, m->dc.gc);
-		XDestroyWindow(dpy, m->barwin);
-		XFreeCursor(dpy, cursor[CurNormal]);
-		XFreeCursor(dpy, cursor[CurResize]);
-		XFreeCursor(dpy, cursor[CurMove]);
-		XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-		XSync(dpy, False);
-	}
+	if(dc.font.set)
+		XFreeFontSet(dpy, dc.font.set);
+	else
+		XFreeFont(dpy, dc.font.xfont);
+
+	XUngrabKey(dpy, AnyKey, AnyModifier, root);
+	XFreePixmap(dpy, dc.drawable);
+	XFreeGC(dpy, dc.gc);
+	XFreeCursor(dpy, cursor[CurNormal]);
+	XFreeCursor(dpy, cursor[CurResize]);
+	XFreeCursor(dpy, cursor[CurMove]);
+	for(i = 0; i < mcount; i++)
+		XDestroyWindow(dpy, monitors[i].barwin);
+	XSync(dpy, False);
+	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 }
 
 void
@@ -488,10 +475,11 @@ configurenotify(XEvent *e) {
 	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;
 		XFreePixmap(dpy, dc.drawable);
-		dc.drawable = XCreatePixmap(dpy, root, m->sw, bh, DefaultDepth(dpy, screen));
+		dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
 		XResizeWindow(dpy, m->barwin, m->sw, bh);
 		updatebarpos(m);
 		arrange();
@@ -524,7 +512,7 @@ configurerequest(XEvent *e) {
 			if((ev->value_mask & (CWX | CWY))
 			&& !(ev->value_mask & (CWWidth | CWHeight)))
 				configure(c);
-			if(isvisible(c, &monitors[monitorat(-1,-1)]))
+			if(isvisible(c, monitorat()))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
@@ -573,77 +561,86 @@ detachstack(Client *c) {
 
 void
 drawbar(void) {
-	int i, x, s;
+	int i, j, x;
+	Client *c;
 
-	for(s = 0; s < mcount; ++s) {
-		Monitor *m = &monitors[s];
-		m->dc.x = 0;
-		for(i = 0; i < LENGTH(tags); i++) {
-			m->dc.w = textw(m, tags[i]);
-			if(m->seltags[i]) {
-				drawtext(m, tags[i], m->dc.sel);
-				drawsquare(m, sel && sel->tags[i] && sel->monitor == m->id, isoccupied(m, i), m->dc.sel);
+	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[i], m->dc.norm);
-				drawsquare(m, sel && sel->tags[i] && sel->monitor == m->id, isoccupied(m, i), m->dc.norm);
+				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);
 			}
-			m->dc.x += m->dc.w;
+			dc.x += dc.w;
 		}
-		m->dc.w = blw;
-		drawtext(m, m->layout->symbol, m->dc.norm);
-		x = m->dc.x + m->dc.w;
-		m->dc.w = textw(m, stext);
-		m->dc.x = m->sw - m->dc.w;
-		if(m->dc.x < x) {
-			m->dc.x = x;
-			m->dc.w = m->sw - x;
+		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);
 		}
-		drawtext(m, stext, m->dc.norm);
-		if((m->dc.w = m->dc.x - x) > bh) {
-			m->dc.x = x;
-			if(sel && sel->monitor == m->id) {
-				drawtext(m, sel->name, m->dc.sel);
-				drawsquare(m, False, sel->isfloating, m->dc.sel);
+		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, m->dc.norm);
+				drawtext(m, NULL, dc.norm, False);
 		}
-		XCopyArea(dpy, m->dc.drawable, m->barwin, m->dc.gc, 0, 0, m->sw, bh, 0, 0);
+		XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->sw, bh, 0, 0);
 		XSync(dpy, False);
 	}
 }
 
 void
-drawsquare(Monitor *m, Bool filled, Bool empty, unsigned long col[ColLast]) {
+drawsquare(Monitor *m, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 	int x;
 	XGCValues gcv;
-	XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
+	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-	gcv.foreground = col[ColFG];
-	XChangeGC(dpy, m->dc.gc, GCForeground, &gcv);
-	x = (m->dc.font.ascent + m->dc.font.descent + 2) / 4;
-	r.x = m->dc.x + 1;
-	r.y = m->dc.y + 1;
+	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;
+	r.y = dc.y + 1;
 	if(filled) {
 		r.width = r.height = x + 1;
-		XFillRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+		XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
 	else if(empty) {
 		r.width = r.height = x;
-		XDrawRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+		XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
 }
 
 void
-drawtext(Monitor *m, const char *text, unsigned long col[ColLast]) {
+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 = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
+	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-	XSetForeground(dpy, m->dc.gc, col[ColBG]);
-	XFillRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+	XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
+	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	if(!text)
 		return;
 	w = 0;
@@ -652,11 +649,11 @@ drawtext(Monitor *m, const char *text, unsigned long col[ColLast]) {
 		len = sizeof buf - 1;
 	memcpy(buf, text, len);
 	buf[len] = 0;
-	h = m->dc.font.ascent + m->dc.font.descent;
-	y = m->dc.y + (m->dc.h / 2) - (h / 2) + m->dc.font.ascent;
-	x = m->dc.x + (h / 2);
+	h = dc.font.ascent + dc.font.descent;
+	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
+	x = dc.x + (h / 2);
 	/* shorten text if necessary */
-	while(len && (w = textnw(m, buf, len)) > m->dc.w - h)
+	while(len && (w = textnw(buf, len)) > dc.w - h)
 		buf[--len] = 0;
 	if(len < olen) {
 		if(len > 1)
@@ -666,13 +663,13 @@ drawtext(Monitor *m, const char *text, unsigned long col[ColLast]) {
 		if(len > 3)
 			buf[len - 3] = '.';
 	}
-	if(w > m->dc.w)
+	if(w > dc.w)
 		return; /* too long */
-	XSetForeground(dpy, m->dc.gc, col[ColFG]);
-	if(m->dc.font.set)
-		XmbDrawString(dpy, m->dc.drawable, m->dc.font.set, m->dc.gc, x, y, buf, len);
+	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, m->dc.drawable, m->dc.gc, x, y, buf, len);
+		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
 void *
@@ -689,12 +686,15 @@ 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) {
-		selmonitor = True;
+	else {
+		selmonitor = monitorat();
+		fprintf(stderr, "updating selmonitor %d\n", selmonitor);
 		focus(NULL);
 	}
 }
@@ -725,18 +725,22 @@ floating(void) { /* default floating layout */
 
 	domwfact = dozoom = False;
 	for(c = clients; c; c = c->next)
-		if(isvisible(c, &monitors[selmonitor]))
+		if(isvisible(c, selmonitor))
 			resize(c, c->x, c->y, c->w, c->h, True);
 }
 
 void
 focus(Client *c) {
-	Monitor *m = &monitors[monitorat(-1, -1)];
-	if(!c || (c && !isvisible(c, m)))
-		for(c = stack; c && !isvisible(c, m); 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, monitors[sel->monitor].dc.norm[ColBorder]);
+		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
 	}
 	if(c) {
 		detachstack(c);
@@ -746,13 +750,13 @@ focus(Client *c) {
 	sel = c;
 	drawbar();
 	if(c) {
-		XSetWindowBorder(dpy, c->win, monitors[c->monitor].dc.sel[ColBorder]);
+		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-		selmonitor = monitorat(c->x, c->y);
+		selmonitor = c->monitor;
 	}
 	else {
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-		selmonitor = monitorat(-1, -1);
+		drawbar();
 	}
 }
 
@@ -767,13 +771,12 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 void
 focusnext(const char *arg) {
 	Client *c;
-	Monitor *m = &monitors[selmonitor];
 
 	if(!sel)
 		return;
-	for(c = sel->next; c && !isvisible(c, m); c = c->next);
+	for(c = sel->next; c && !isvisible(c, selmonitor); c = c->next);
 	if(!c)
-		for(c = clients; c && !isvisible(c, m); c = c->next);
+		for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
 	if(c) {
 		focus(c);
 		restack();
@@ -783,14 +786,13 @@ focusnext(const char *arg) {
 void
 focusprev(const char *arg) {
 	Client *c;
-	Monitor *m = &monitors[selmonitor];
 
 	if(!sel)
 		return;
-	for(c = sel->prev; c && !isvisible(c, m); 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, m); c = c->prev);
+		for(; c && !isvisible(c, selmonitor); c = c->prev);
 	}
 	if(c) {
 		focus(c);
@@ -899,8 +901,18 @@ grabbuttons(Client *c, Bool focused) {
 
 void
 grabkeys(void)  {
-	unsigned int i;
+	unsigned int i, j;
 	KeyCode code;
+	XModifierKeymap *modmap;
+
+	/* 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);
 
 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
 	for(i = 0; i < LENGTH(keys); i++) {
@@ -925,53 +937,53 @@ idxoftag(const char *tag) {
 }
 
 void
-initfont(Monitor *m, const char *fontstr) {
+initfont(const char *fontstr) {
 	char *def, **missing;
 	int i, n;
 
 	missing = NULL;
-	if(m->dc.font.set)
-		XFreeFontSet(dpy, m->dc.font.set);
-	m->dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+	if(dc.font.set)
+		XFreeFontSet(dpy, dc.font.set);
+	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
 	if(missing) {
 		while(n--)
 			fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
 		XFreeStringList(missing);
 	}
-	if(m->dc.font.set) {
+	if(dc.font.set) {
 		XFontSetExtents *font_extents;
 		XFontStruct **xfonts;
 		char **font_names;
-		m->dc.font.ascent = m->dc.font.descent = 0;
-		font_extents = XExtentsOfFontSet(m->dc.font.set);
-		n = XFontsOfFontSet(m->dc.font.set, &xfonts, &font_names);
-		for(i = 0, m->dc.font.ascent = 0, m->dc.font.descent = 0; i < n; i++) {
-			if(m->dc.font.ascent < (*xfonts)->ascent)
-				m->dc.font.ascent = (*xfonts)->ascent;
-			if(m->dc.font.descent < (*xfonts)->descent)
-				m->dc.font.descent = (*xfonts)->descent;
+		dc.font.ascent = dc.font.descent = 0;
+		font_extents = XExtentsOfFontSet(dc.font.set);
+		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+			if(dc.font.ascent < (*xfonts)->ascent)
+				dc.font.ascent = (*xfonts)->ascent;
+			if(dc.font.descent < (*xfonts)->descent)
+				dc.font.descent = (*xfonts)->descent;
 			xfonts++;
 		}
 	}
 	else {
-		if(m->dc.font.xfont)
-			XFreeFont(dpy, m->dc.font.xfont);
-		m->dc.font.xfont = NULL;
-		if(!(m->dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-		&& !(m->dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+		if(dc.font.xfont)
+			XFreeFont(dpy, dc.font.xfont);
+		dc.font.xfont = NULL;
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
+		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
 			eprint("error, cannot load font: '%s'\n", fontstr);
-		m->dc.font.ascent = m->dc.font.xfont->ascent;
-		m->dc.font.descent = m->dc.font.xfont->descent;
+		dc.font.ascent = dc.font.xfont->ascent;
+		dc.font.descent = dc.font.xfont->descent;
 	}
-	m->dc.font.height = m->dc.font.ascent + m->dc.font.descent;
+	dc.font.height = dc.font.ascent + dc.font.descent;
 }
 
 Bool
-isoccupied(Monitor *m, unsigned int t) {
+isoccupied(unsigned int monitor, unsigned int t) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(c->tags[t] && c->monitor == m->id)
+		if(c->tags[t] && c->monitor == monitor)
 			return True;
 	return False;
 }
@@ -992,11 +1004,23 @@ isprotodel(Client *c) {
 }
 
 Bool
-isvisible(Client *c, Monitor *m) {
+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;
 
+	if(c->monitor != monitor)
+		return False;
 	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i] && monitors[c->monitor].seltags[i] && m->id == c->monitor)
+		if(c->tags[i] && monitors[c->monitor].seltags[i])
 			return True;
 	return False;
 }
@@ -1037,21 +1061,12 @@ killclient(const char *arg) {
 		XKillClient(dpy, sel->win);
 }
 
-void
-leavenotify(XEvent *e) {
-	XCrossingEvent *ev = &e->xcrossing;
-
-	if((ev->window == root) && !ev->same_screen) {
-		selmonitor = False;
-		focus(NULL);
-	}
-}
-
 void
 manage(Window w, XWindowAttributes *wa) {
 	Client *c, *t = NULL;
-	Window trans;
+	Monitor *m;
 	Status rettrans;
+	Window trans;
 	XWindowChanges wc;
 
 	c = emallocz(sizeof(Client));
@@ -1059,19 +1074,15 @@ manage(Window w, XWindowAttributes *wa) {
 	c->win = w;
 
 	applyrules(c);
-	Monitor *m = &monitors[c->monitor];
 
-	c->x = wa->x+m->sx;
-	c->y = wa->y+m->sy;
+	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 (monitorat(c->x, c->y) != c->monitor) {
-		c->x = m->sx;
-		c->y = m->sy;
-	}
-
 	if(c->w == m->sw && c->h == m->sh) {
 		c->x = m->sx;
 		c->y = m->sy;
@@ -1090,7 +1101,7 @@ manage(Window w, XWindowAttributes *wa) {
 	}
 	wc.border_width = c->border;
 	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
-	XSetWindowBorder(dpy, w, m->dc.norm[ColBorder]);
+	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);
@@ -1133,6 +1144,22 @@ 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;
@@ -1161,7 +1188,7 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			nx = ocx + (ev.xmotion.x - x1);
 			ny = ocy + (ev.xmotion.y - y1);
-			Monitor *m = &monitors[monitorat(nx, ny)];
+			Monitor *m = &monitors[monitorat()];
 			if(abs(m->wax - nx) < SNAP)
 				nx = m->wax;
 			else if(abs((m->wax + m->waw) - (nx + c->w + 2 * c->border)) < SNAP)
@@ -1170,16 +1197,19 @@ movemouse(Client *c) {
 				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;
-			resize(c, nx, ny, c->w, c->h, False);
-			memcpy(c->tags, monitors[monitorat(nx, ny)].seltags, sizeof initags);
+			if((monitors[selmonitor].layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+				togglefloating(NULL);
+			if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+				resize(c, nx, ny, c->w, c->h, False);
+			memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
 			break;
 		}
 	}
 }
 
 Client *
-nexttiled(Client *c, Monitor *m) {
-	for(; c && (c->isfloating || !isvisible(c, m)); c = c->next);
+nexttiled(Client *c, int monitor) {
+	for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
 	return c;
 }
 
@@ -1202,6 +1232,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);
@@ -1231,8 +1265,8 @@ reapply(const char *arg) {
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	XWindowChanges wc;
-	Monitor scr = monitors[monitorat(x, y)];
-	c->monitor = scr.id;
+	//Monitor scr = monitors[monitorat()];
+//	c->monitor = monitorat();
 
 	if(sizehints) {
 		/* set minimum possible */
@@ -1329,7 +1363,10 @@ 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((monitors[selmonitor].layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+				togglefloating(NULL);
+			if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+				resize(c, c->x, c->y, nw, nh, True);
 			break;
 		}
 	}
@@ -1337,10 +1374,10 @@ resizemouse(Client *c) {
 
 void
 restack(void) {
+	unsigned int i;
 	Client *c;
 	XEvent ev;
 	XWindowChanges wc;
-	int s;
 
 	drawbar();
 	if(!sel)
@@ -1354,8 +1391,8 @@ restack(void) {
 			XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
 			wc.sibling = sel->win;
 		}
-		for(s = 0; s < mcount; s++) {
-			for(c = nexttiled(clients, &monitors[s]); c; c = nexttiled(c->next, &monitors[s])) {
+		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);
@@ -1437,7 +1474,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);
@@ -1446,7 +1483,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);
 		}
 	}
@@ -1465,7 +1502,7 @@ setclientstate(Client *c, long state) {
 void
 setlayout(const char *arg) {
 	unsigned int i;
-	Monitor *m = &monitors[monitorat(-1, -1)];
+	Monitor *m = &monitors[monitorat()];
 
 	if(!arg) {
 		m->layout++;
@@ -1490,7 +1527,7 @@ void
 setmwfact(const char *arg) {
 	double delta;
 
-	Monitor *m = &monitors[monitorat(-1, -1)];
+	Monitor *m = &monitors[monitorat()];
 
 	if(!domwfact)
 		return;
@@ -1512,11 +1549,9 @@ setmwfact(const char *arg) {
 
 void
 setup(void) {
-	unsigned int i, j, k;
-	XModifierKeymap *modmap;
+	unsigned int i;
+	Monitor *m;
 	XSetWindowAttributes wa;
-	int s = 1;
-	GC g;
 	XineramaScreenInfo *info = NULL;
 
 	/* init atoms */
@@ -1526,106 +1561,107 @@ 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 screens/monitors first
+	mcount = 1;
+	if((isxinerama = XineramaIsActive(dpy)))
+		info = XineramaQueryScreens(dpy, &mcount);
+	monitors = emallocz(mcount * sizeof(Monitor));
 
-	/* 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);
-
-	/* 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);
-
-	/* grab keys */
-	grabkeys();
-
-	/* init tags */
-	compileregs();
+	screen = DefaultScreen(dpy);
+	root = RootWindow(dpy, screen);
 
-	if (XineramaIsActive(dpy)) {
-		info = XineramaQueryScreens(dpy, &s);
+	/* 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];
 
-	monitors = emallocz(s*sizeof(Monitor));
-	mcount = s;
+		m->monitor = i;
 
-	for(i = 0; i < s; i++) {
-		/* init geometry */
-		if (mcount != 1) {
-			monitors[i].sx = info[i].x_org;
-			monitors[i].sy = info[i].y_org;
-			monitors[i].sw = info[i].width;
-			monitors[i].sh = info[i].height;
+		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 {
-			monitors[i].sx = 0;
-			monitors[i].sy = 0;
-			monitors[i].sw = DisplayWidth(dpy, screen);
-			monitors[i].sh = DisplayHeight(dpy, screen);
+			m->sx = 0;
+			m->sy = 0;
+			m->sw = DisplayWidth(dpy, screen);
+			m->sh = DisplayHeight(dpy, screen);
 		}
 
-		monitors[i].id = i;
-		monitors[i].seltags = emallocz(sizeof initags);
-		monitors[i].prevtags = emallocz(sizeof initags);
+		m->seltags = emallocz(sizeof initags);
+		m->prevtags = emallocz(sizeof initags);
 
-		memcpy(monitors[i].seltags, initags, sizeof initags);
-		memcpy(monitors[i].prevtags, initags, sizeof initags);
-
-		/* init appearance */
-		monitors[i].dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
-		monitors[i].dc.norm[ColBG] = getcolor(NORMBGCOLOR);
-		monitors[i].dc.norm[ColFG] = getcolor(NORMFGCOLOR);
-		monitors[i].dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
-		monitors[i].dc.sel[ColBG] = getcolor(SELBGCOLOR);
-		monitors[i].dc.sel[ColFG] = getcolor(SELFGCOLOR);
-		initfont(&(monitors[i]), FONT);
-		monitors[i].dc.h = bh = monitors[i].dc.font.height + 2;
+		memcpy(m->seltags, initags, sizeof initags);
+		memcpy(m->prevtags, initags, sizeof initags);
 
 		/* init layouts */
-		monitors[i].mwfact = MWFACT;
-		monitors[i].layout = &layouts[0];
-		for(blw = k = 0; k < LENGTH(layouts); k++) {
-			j = textw(&monitors[i], layouts[k].symbol);
-			if(j > blw)
-				blw = j;
-		}
+		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 */
-		monitors[i].barwin = XCreateWindow(dpy, root, monitors[i].sx, monitors[i].sy, monitors[i].sw, bh, 0,
+		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, monitors[i].barwin, cursor[CurNormal]);
-		updatebarpos(&monitors[i]);
-		XMapRaised(dpy, monitors[i].barwin);
+		XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
+		updatebarpos(m);
+		XMapRaised(dpy, m->barwin);
 		strcpy(stext, "dwm-"VERSION);
-		monitors[i].dc.drawable = XCreatePixmap(dpy, root, monitors[i].sw, bh, DefaultDepth(dpy, screen));
-		g = XCreateGC(dpy, root, 0, 0);
-		monitors[i].dc.gc = XCreateGC(dpy, root, 0, 0);
-		XSetLineAttributes(dpy, monitors[i].dc.gc, 1, LineSolid, CapButt, JoinMiter);
-		if(!monitors[i].dc.font.set)
-			XSetFont(dpy, monitors[i].dc.gc, monitors[i].dc.font.xfont->fid);
+
+		/* 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();
+
+	selmonitor = monitorat();
+	fprintf(stderr, "selmonitor == %d\n", selmonitor);
 }
 
 void
@@ -1665,60 +1701,61 @@ tag(const char *arg) {
 }
 
 unsigned int
-textnw(Monitor *m, const char *text, unsigned int len) {
+textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
-	if(m->dc.font.set) {
-		XmbTextExtents(m->dc.font.set, text, len, NULL, &r);
+	if(dc.font.set) {
+		XmbTextExtents(dc.font.set, text, len, NULL, &r);
 		return r.width;
 	}
-	return XTextWidth(m->dc.font.xfont, text, len);
+	return XTextWidth(dc.font.xfont, text, len);
 }
 
 unsigned int
-textw(Monitor *m, const char *text) {
-	return textnw(m, text, strlen(text)) + m->dc.font.height;
+textw(const char *text) {
+	return textnw(text, strlen(text)) + dc.font.height;
 }
 
 void
 tile(void) {
-	unsigned int i, n, nx, ny, nw, nh, mw, th;
-	int s;
+	unsigned int i, j, n, nx, ny, nw, nh, mw, th;
 	Client *c, *mc;
 
 	domwfact = dozoom = True;
 
-	nw = 0; /* gcc stupidity requires this */
+	nx = ny = nw = 0; /* gcc stupidity requires this */
 
-	for (s = 0; s < mcount; s++) {
-		Monitor *m = &monitors[s];
+	for (i = 0; i < mcount; i++) {
+		Monitor *m = &monitors[i];
 
-		for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next, m))
+		for(n = 0, c = nexttiled(clients, i); c; c = nexttiled(c->next, i))
 			n++;
 
-		for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
-			/* window geoms */
-			mw = (n == 1) ? m->waw : m->mwfact * m->waw;
-			th = (n > 1) ? m->wah / (n - 1) : 0;
-			if(n > 1 && th < bh)
-				th = m->wah;
-			if(i == 0) { /* master */
+		/* window geoms */
+		mw = (n == 1) ? m->waw : m->mwfact * m->waw;
+		th = (n > 1) ? m->wah / (n - 1) : 0;
+		if(n > 1 && th < bh)
+			th = m->wah;
+
+		for(j = 0, c = mc = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
+			if(j == 0) { /* master */
 				nx = m->wax;
 				ny = m->way;
 				nw = mw - 2 * c->border;
 				nh = m->wah - 2 * c->border;
 			}
 			else {  /* tile window */
-				if(i == 1) {
+				if(j == 1) {
 					ny = m->way;
 					nx += mc->w + 2 * mc->border;
 					nw = m->waw - mw - 2 * c->border;
 				}
-				if(i + 1 == n) /* remainder */
+				if(j + 1 == n) /* remainder */
 					nh = (m->way + m->wah) - ny - 2 * c->border;
 				else
 					nh = th - 2 * c->border;
 			}
+			fprintf(stderr, "tile(%d, %d, %d, %d)\n", nx, ny, nw, nh);
 			resize(c, nx, ny, nw, nh, RESIZEHINTS);
 			if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
 				/* client doesn't accept size constraints */
@@ -1726,9 +1763,10 @@ tile(void) {
 			if(n > 1 && th != m->wah)
 				ny = c->y + c->h + 2 * c->border;
 
-			i++;
+			j++;
 		}
 	}
+	fprintf(stderr, "done\n");
 }
 void
 togglebar(const char *arg) {
@@ -1736,7 +1774,7 @@ togglebar(const char *arg) {
 		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
 	else
 		bpos = BarOff;
-	updatebarpos(&monitors[monitorat(-1,-1)]);
+	updatebarpos(&monitors[monitorat()]);
 	arrange();
 }
 
@@ -1768,7 +1806,7 @@ void
 toggleview(const char *arg) {
 	unsigned int i, j;
 
-	Monitor *m = &monitors[monitorat(-1, -1)];
+	Monitor *m = &monitors[monitorat()];
 
 	i = idxoftag(arg);
 	m->seltags[i] = !m->seltags[i];
@@ -1819,25 +1857,25 @@ unmapnotify(XEvent *e) {
 }
 
 void
-updatebarpos(Monitor *s) {
+updatebarpos(Monitor *m) {
 	XEvent ev;
 
-	s->wax = s->sx;
-	s->way = s->sy;
-	s->wah = s->sh;
-	s->waw = s->sw;
+	m->wax = m->sx;
+	m->way = m->sy;
+	m->wah = m->sh;
+	m->waw = m->sw;
 	switch(bpos) {
 	default:
-		s->wah -= bh;
-		s->way += bh;
-		XMoveWindow(dpy, s->barwin, s->sx, s->sy);
+		m->wah -= bh;
+		m->way += bh;
+		XMoveWindow(dpy, m->barwin, m->sx, m->sy);
 		break;
 	case BarBot:
-		s->wah -= bh;
-		XMoveWindow(dpy, s->barwin, s->sx, s->sy + s->wah);
+		m->wah -= bh;
+		XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
 		break;
 	case BarOff:
-		XMoveWindow(dpy, s->barwin, s->sx, s->sy - bh);
+		XMoveWindow(dpy, m->barwin, m->sx, m->sy - bh);
 		break;
 	}
 	XSync(dpy, False);
@@ -1902,6 +1940,16 @@ updatetitle(Client *c) {
 		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.  */
@@ -1937,21 +1985,24 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 void
 view(const char *arg) {
 	unsigned int i;
+	Bool tmp[LENGTH(tags)];
+	Monitor *m = &monitors[monitorat()];
 
-	Monitor *m = &monitors[monitorat(-1, -1)];
-
-	memcpy(m->prevtags, m->seltags, sizeof initags);
 	for(i = 0; i < LENGTH(tags); i++)
-		m->seltags[i] = (NULL == arg);
-	m->seltags[idxoftag(arg)] = True;
-	arrange();
+		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(-1, -1)];
+	Monitor *m = &monitors[monitorat()];
 
 	memcpy(tmp, m->seltags, sizeof initags);
 	memcpy(m->seltags, m->prevtags, sizeof initags);
@@ -1965,8 +2016,8 @@ zoom(const char *arg) {
 
 	if(!sel || !dozoom || sel->isfloating)
 		return;
-	if((c = sel) == nexttiled(clients, &monitors[c->monitor]))
-		if(!(c = nexttiled(c->next, &monitors[c->monitor])))
+	if((c = sel) == nexttiled(clients, c->monitor))
+		if(!(c = nexttiled(c->next, c->monitor)))
 			return;
 	detach(c);
 	attach(c);
@@ -1974,28 +2025,6 @@ zoom(const char *arg) {
 	arrange();
 }
 
-int
-monitorat(int x, int y) {
-	int i;
-
-	if(!XineramaIsActive(dpy))
-		return 0;
-
-	if (x < 0 || y < 0) {
-		Window win;
-		unsigned int mask;
-		XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
-	}
-
-	for(i = 0; i < mcount; i++)
-		if((x < 0 || (x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw))
-				&& (y < 0 || (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)))
-		{
-			return i;
-		}
-	return 0;
-}
-
 void
 movetomonitor(const char *arg) {
 	if (sel) {
@@ -2009,7 +2038,7 @@ movetomonitor(const char *arg) {
 
 void
 selectmonitor(const char *arg) {
-	Monitor *m = &monitors[arg ? atoi(arg) : (monitorat(-1, -1)+1) % mcount];
+	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);
@@ -2020,15 +2049,13 @@ int
 main(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))
 		eprint("dwm-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, "
-		       "Jukka Salmi, Premysl Hruby, Szabolcs Nagy\n");
+		       "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
 	else if(argc != 1)
 		eprint("usage: dwm [-v]\n");
 
 	setlocale(LC_CTYPE, "");
 	if(!(dpy = XOpenDisplay(0)))
 		eprint("dwm: cannot open display\n");
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
 
 	checkotherwm();
 	setup();