applied Peter Hartlich's border collapse patch

config.def.h

@@ -3,13 +3,13 @@
 /* appearance */
 #define BARPOS			BarTop /* BarBot, BarOff */
 #define BORDERPX		1
-#define FONT			"-*-proggyclean-*-*-*-*-*-*-*-*-*-*-*-*"
+#define FONT			"-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*"
-#define NORMBORDERCOLOR         "#cccccc"
+#define NORMBORDERCOLOR		"#cccccc"
-#define NORMBGCOLOR             "#dddddd"
+#define NORMBGCOLOR		"#cccccc"
-#define NORMFGCOLOR             "#333333"
+#define NORMFGCOLOR		"#000000"
-#define SELBORDERCOLOR          "#0066cc"
+#define SELBORDERCOLOR		"#0066ff"
-#define SELBGCOLOR              "#0066cc"
+#define SELBGCOLOR		"#0066ff"
-#define SELFGCOLOR              "#ffffff"
+#define SELFGCOLOR		"#ffffff"
 
 /* tagging */
 const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "www", NULL };

dwm.c

@@ -646,8 +646,10 @@ enternotify(XEvent *e) {
 
 	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 @@ tile(void) {
 		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 @@ tile(void) {
 		}
 		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;
 	}
 }