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

diff --git a/dwm.c b/dwm.c
index a3439bc..0a1ade2 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,11 +117,8 @@ typedef struct {
 } Regs;
 
 typedef struct {
-	int screen;
-	Window root;
 	Window barwin;
 	int sx, sy, sw, sh, wax, way, wah, waw;
-	DC dc;
 	Bool *seltags;
 	Bool *prevtags;
 	Layout *layout;
@@ -145,8 +142,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, ...);
@@ -157,15 +154,16 @@ void focusin(XEvent *e);
 void focusnext(const char *arg);
 void focusprev(const char *arg);
 Client *getclient(Window w);
-unsigned long getcolor(const char *colstr, int screen);
+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(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 isurgent(unsigned int monitor, unsigned int t);
 Bool isvisible(Client *c, int monitor);
 void keypress(XEvent *e);
 void killclient(const char *arg);
@@ -188,8 +186,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);
@@ -201,6 +199,7 @@ 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);
@@ -214,6 +213,8 @@ void selectmonitor(const char *arg);
 /* variables */
 char stext[256];
 int mcount = 1;
+int selmonitor = 0;
+int screen;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int bh, bpos;
 unsigned int blw = 0;
@@ -246,7 +247,7 @@ Display *dpy;
 DC dc = {0};
 Regs *regs = NULL;
 Monitor *monitors;
-int selmonitor = 0;
+Window root;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
@@ -341,7 +342,7 @@ buttonpress(XEvent *e) {
 	if(ev->window == m->barwin) {
 		x = 0;
 		for(i = 0; i < LENGTH(tags); i++) {
-			x += textw(m, tags[i]);
+			x += textw(tags[i]);
 			if(ev->x < x) {
 				if(ev->button == Button1) {
 					if(ev->state & MODKEY)
@@ -366,10 +367,7 @@ buttonpress(XEvent *e) {
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1) {
-			if((m->layout->arrange == floating) || c->isfloating)
-				restack();
-			else
-				togglefloating(NULL);
+			restack();
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
@@ -379,10 +377,7 @@ buttonpress(XEvent *e) {
 				zoom(NULL);
 		}
 		else if(ev->button == Button3 && !c->isfixed) {
-			if((floating == m->layout->arrange) || c->isfloating)
-				restack();
-			else
-				togglefloating(NULL);
+			restack();
 			resizemouse(c);
 		}
 	}
@@ -412,22 +407,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, m->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
@@ -479,11 +473,12 @@ configurenotify(XEvent *e) {
 	XConfigureEvent *ev = &e->xconfigure;
 	Monitor *m = &monitors[selmonitor];
 
-	if(ev->window == m->root && (ev->width != m->sw || ev->height != m->sh)) {
+	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, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
+		dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
 		XResizeWindow(dpy, m->barwin, m->sw, bh);
 		updatebarpos(m);
 		arrange();
@@ -566,76 +561,85 @@ detachstack(Client *c) {
 void
 drawbar(void) {
 	int i, j, x;
+	Client *c;
 
 	for(i = 0; i < mcount; i++) {
 		Monitor *m = &monitors[i];
-		m->dc.x = 0;
+		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++) {
-			m->dc.w = textw(m, tags[j]);
+			dc.w = textw(tags[j]);
 			if(m->seltags[j]) {
-				drawtext(m, tags[j], m->dc.sel);
-				drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), m->dc.sel);
+				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], m->dc.norm);
-				drawsquare(m, sel && sel->tags[j] && sel->monitor == selmonitor, isoccupied(m, j), 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 == selmonitor) {
-				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;
@@ -644,11 +648,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)
@@ -658,13 +662,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 *
@@ -681,8 +685,10 @@ 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 {
@@ -733,7 +739,7 @@ focus(Client *c) {
 		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);
@@ -743,12 +749,13 @@ focus(Client *c) {
 	sel = c;
 	drawbar();
 	if(c) {
-		XSetWindowBorder(dpy, c->win, m->dc.sel[ColBorder]);
+		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 		selmonitor = c->monitor;
 	}
 	else {
-		XSetInputFocus(dpy, m->root, RevertToPointerRoot, CurrentTime);
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+		drawbar();
 	}
 }
 
@@ -801,7 +808,7 @@ getclient(Window w) {
 }
 
 unsigned long
-getcolor(const char *colstr, int screen) {
+getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
 
@@ -906,20 +913,17 @@ grabkeys(void)  {
 		}
 	XFreeModifiermap(modmap);
 
-	for(i = 0; i < mcount; i++) {
-		Monitor *m = &monitors[i];
-		XUngrabKey(dpy, AnyKey, AnyModifier, m->root);
-		for(j = 0; j < LENGTH(keys); j++) {
-			code = XKeysymToKeycode(dpy, keys[j].keysym);
-			XGrabKey(dpy, code, keys[j].mod, m->root, True,
-					GrabModeAsync, GrabModeAsync);
-			XGrabKey(dpy, code, keys[j].mod | LockMask, m->root, True,
-					GrabModeAsync, GrabModeAsync);
-			XGrabKey(dpy, code, keys[j].mod | numlockmask, m->root, True,
-					GrabModeAsync, GrabModeAsync);
-			XGrabKey(dpy, code, keys[j].mod | numlockmask | LockMask, m->root, True,
-					GrabModeAsync, GrabModeAsync);
-		}
+	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);
 	}
 }
 
@@ -932,53 +936,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 == selmonitor)
+		if(c->tags[t] && c->monitor == monitor)
 			return True;
 	return False;
 }
@@ -998,12 +1002,24 @@ isprotodel(Client *c) {
 	return ret;
 }
 
+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;
 
+	if(c->monitor != monitor)
+		return False;
 	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i] && monitors[c->monitor].seltags[i] && c->monitor == monitor)
+		if(c->tags[i] && monitors[c->monitor].seltags[i])
 			return True;
 	return False;
 }
@@ -1084,7 +1100,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,16 +1149,13 @@ monitorat() {
 	Window win;
 	unsigned int mask;
 
-	XQueryPointer(dpy, monitors[selmonitor].root, &win, &win, &x, &y, &i, &i, &mask);
+	XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
 	for(i = 0; i < mcount; i++) {
-		fprintf(stderr, "checking monitor[%d]: %d %d %d %d\n", i, monitors[i].sx, monitors[i].sy, monitors[i].sw, monitors[i].sh);
 		if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
 		&& (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
-			fprintf(stderr, "%d,%d -> %d\n", x, y, i);
 			return i;
 		}
 	}
-	fprintf(stderr, "?,? -> 0\n");
 	return 0;
 }
 
@@ -1150,15 +1163,17 @@ 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;
-	if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+	m = &monitors[c->monitor];
+	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 			None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
-	XQueryPointer(dpy, monitors[selmonitor].root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
 		XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
 		switch (ev.type) {
@@ -1174,7 +1189,6 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			nx = ocx + (ev.xmotion.x - x1);
 			ny = ocy + (ev.xmotion.y - y1);
-			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)
@@ -1183,8 +1197,10 @@ 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()].seltags, sizeof initags);
+			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;
 		}
 	}
@@ -1215,6 +1231,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);
@@ -1314,11 +1334,13 @@ void
 resizemouse(Client *c) {
 	int ocx, ocy;
 	int nw, nh;
+	Monitor *m;
 	XEvent ev;
 
 	ocx = c->x;
 	ocy = c->y;
-	if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+	m = &monitors[c->monitor];
+	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 			None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
@@ -1342,7 +1364,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((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;
 		}
 	}
@@ -1442,32 +1467,29 @@ run(void) {
 
 void
 scan(void) {
-	unsigned int i, j, num;
+	unsigned int i, num;
 	Window *wins, d1, d2;
 	XWindowAttributes wa;
 
-	for(i = 0; i < mcount; i++) {
-		Monitor *m = &monitors[i];
-		wins = NULL;
-		if(XQueryTree(dpy, m->root, &d1, &d2, &wins, &num)) {
-			for(j = 0; j < num; j++) {
-				if(!XGetWindowAttributes(dpy, wins[j], &wa)
-				|| wa.override_redirect || XGetTransientForHint(dpy, wins[j], &d1))
-					continue;
-				if(wa.map_state == IsViewable || getstate(wins[j]) == IconicState)
-					manage(wins[j], &wa);
-			}
-			for(j = 0; j < num; j++) { /* now the transients */
-				if(!XGetWindowAttributes(dpy, wins[j], &wa))
-					continue;
-				if(XGetTransientForHint(dpy, wins[j], &d1)
-				&& (wa.map_state == IsViewable || getstate(wins[j]) == IconicState))
-					manage(wins[j], &wa);
-			}
+	wins = NULL;
+	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))
+				continue;
+			if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
+				manage(wins[i], &wa);
+		}
+		for(i = 0; i < num; i++) { /* now the transients */
+			if(!XGetWindowAttributes(dpy, wins[i], &wa))
+				continue;
+			if(XGetTransientForHint(dpy, wins[i], &d1)
+					&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+				manage(wins[i], &wa);
 		}
-		if(wins)
-			XFree(wins);
 	}
+	if(wins)
+		XFree(wins);
 }
 
 void
@@ -1528,7 +1550,7 @@ setmwfact(const char *arg) {
 
 void
 setup(void) {
-	unsigned int i, j, k;
+	unsigned int i;
 	Monitor *m;
 	XSetWindowAttributes wa;
 	XineramaScreenInfo *info = NULL;
@@ -1552,13 +1574,33 @@ setup(void) {
 		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->screen = isxinerama ? 0 : i;
-		m->root = RootWindow(dpy, m->screen);
-
 		if (mcount != 1 && isxinerama) {
 			m->sx = info[i].x_org;
 			m->sy = info[i].y_org;
@@ -1569,8 +1611,8 @@ setup(void) {
 		else {
 			m->sx = 0;
 			m->sy = 0;
-			m->sw = DisplayWidth(dpy, m->screen);
-			m->sh = DisplayHeight(dpy, m->screen);
+			m->sw = DisplayWidth(dpy, screen);
+			m->sh = DisplayHeight(dpy, screen);
 		}
 
 		m->seltags = emallocz(sizeof initags);
@@ -1579,24 +1621,9 @@ setup(void) {
 		memcpy(m->seltags, initags, sizeof initags);
 		memcpy(m->prevtags, initags, sizeof initags);
 
-		/* init appearance */
-		m->dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR, m->screen);
-		m->dc.norm[ColBG] = getcolor(NORMBGCOLOR, m->screen);
-		m->dc.norm[ColFG] = getcolor(NORMFGCOLOR, m->screen);
-		m->dc.sel[ColBorder] = getcolor(SELBORDERCOLOR, m->screen);
-		m->dc.sel[ColBG] = getcolor(SELBGCOLOR, m->screen);
-		m->dc.sel[ColFG] = getcolor(SELFGCOLOR, m->screen);
-		initfont(m, FONT);
-		m->dc.h = bh = m->dc.font.height + 2;
-
 		/* init layouts */
 		m->mwfact = MWFACT;
 		m->layout = &layouts[0];
-		for(blw = k = 0; k < LENGTH(layouts); k++) {
-			j = textw(m, layouts[k].symbol);
-			if(j > blw)
-				blw = j;
-		}
 
 		// TODO: bpos per screen?
 		bpos = BARPOS;
@@ -1605,28 +1632,23 @@ setup(void) {
 		wa.event_mask = ButtonPressMask | ExposureMask;
 
 		/* init bars */
-		m->barwin = XCreateWindow(dpy, m->root, m->sx, m->sy, m->sw, bh, 0,
-				DefaultDepth(dpy, m->screen), CopyFromParent, DefaultVisual(dpy, m->screen),
+		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);
-		m->dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
-		m->dc.gc = XCreateGC(dpy, m->root, 0, 0);
-		XSetLineAttributes(dpy, m->dc.gc, 1, LineSolid, CapButt, JoinMiter);
-		if(!m->dc.font.set)
-			XSetFont(dpy, m->dc.gc, m->dc.font.xfont->fid);
 
 		/* EWMH support per monitor */
-		XChangeProperty(dpy, m->root, netatom[NetSupported], XA_ATOM, 32,
+		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, m->root, CWEventMask | CWCursor, &wa);
-		XSelectInput(dpy, m->root, wa.event_mask);
+		XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+		XSelectInput(dpy, root, wa.event_mask);
 	}
 	if(info)
 		XFree(info);
@@ -1678,19 +1700,19 @@ 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
@@ -1708,12 +1730,13 @@ tile(void) {
 		for(n = 0, c = nexttiled(clients, i); c; c = nexttiled(c->next, i))
 			n++;
 
+		/* window geoms */
+		mw = (n == 1) ? m->waw : m->mwfact * m->waw;
+		th = (n > 1) ? m->wah / (n - 1) : 0;
+		if(n > 1 && th < bh)
+			th = m->wah;
+
 		for(j = 0, c = mc = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
-			/* 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(j == 0) { /* master */
 				nx = m->wax;
 				ny = m->way;
@@ -1916,6 +1939,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.  */
@@ -1951,14 +1984,17 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 void
 view(const char *arg) {
 	unsigned int i;
-
+	Bool tmp[LENGTH(tags)];
 	Monitor *m = &monitors[monitorat()];
 
-	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
@@ -2003,7 +2039,7 @@ void
 selectmonitor(const char *arg) {
 	Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount];
 
-	XWarpPointer(dpy, None, m->root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
+	XWarpPointer(dpy, None, root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
 	focus(NULL);
 }