# HG changeset patch
# User Anselm R. Garbe <garbeam@gmail.com>
# Date 1191149228 -7200
# Node ID 585e3422edc889e591e06d7134a1fca0a044894e
# Parent  3027df4b2c0d6a894818f23643ae453b99e98591
applied Peter Hartlich's border collapse patch

diff -r 3027df4b2c0d -r 585e3422edc8 config.def.h
--- a/config.def.h	Thu Sep 27 20:08:21 2007 +0200
+++ b/config.def.h	Sun Sep 30 12:47:08 2007 +0200
@@ -3,13 +3,13 @@
 /* appearance */
 #define BARPOS			BarTop /* BarBot, BarOff */
 #define BORDERPX		1
-#define FONT			"-*-proggyclean-*-*-*-*-*-*-*-*-*-*-*-*"
-#define NORMBORDERCOLOR         "#cccccc"
-#define NORMBGCOLOR             "#dddddd"
-#define NORMFGCOLOR             "#333333"
-#define SELBORDERCOLOR          "#0066cc"
-#define SELBGCOLOR              "#0066cc"
-#define SELFGCOLOR              "#ffffff"
+#define FONT			"-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*"
+#define NORMBORDERCOLOR		"#cccccc"
+#define NORMBGCOLOR		"#cccccc"
+#define NORMFGCOLOR		"#000000"
+#define SELBORDERCOLOR		"#0066ff"
+#define SELBGCOLOR		"#0066ff"
+#define SELFGCOLOR		"#ffffff"
 
 /* tagging */
 const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "www", NULL };
diff -r 3027df4b2c0d -r 585e3422edc8 dwm.c
--- a/dwm.c	Thu Sep 27 20:08:21 2007 +0200
+++ b/dwm.c	Sun Sep 30 12:47:08 2007 +0200
@@ -646,8 +646,10 @@
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
-	if((c = getclient(ev->window)))
+	if((c = getclient(ev->window))) {
 		focus(c);
+		restack();
+	}
 	else if(ev->window == root) {
 		selscreen = True;
 		focus(NULL);
@@ -1592,7 +1594,7 @@
 		else {  /* tile window */
 			if(i == 1) {
 				ny = way;
-				nx += mc->w + 2 * mc->border;
+				nx += mc->w + mc->border;
 				nw = waw - nx - 2 * c->border;
 			}
 			if(i + 1 == n) /* remainder */
@@ -1602,7 +1604,7 @@
 		}
 		resize(c, nx, ny, nw, nh, RESIZEHINTS);
 		if(n > 1 && th != wah)
-			ny = c->y + c->h + 2 * c->border;
+			ny = c->y + c->h + c->border;
 	}
 }