aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnselm R. Garbe <garbeam@gmail.com>2007-09-30 12:47:08 +0200
committerAnselm R. Garbe <garbeam@gmail.com>2007-09-30 12:47:08 +0200
commitbedbe59aaac1651643e9084fd5cdeb0883ea40e4 (patch)
tree4d7ec6cc649b744c2d99c908b01e9cf7313218c6
parent3f3086f8b87aed5bf443c8fbcbe32e052fc9c17d (diff)
applied Peter Hartlich's border collapse patch
-rw-r--r--config.def.h14
-rw-r--r--dwm.c8
2 files changed, 12 insertions, 10 deletions
diff --git a/config.def.h b/config.def.h
index 9271462..e76e18d 100644
--- a/config.def.h
+++ b/config.def.h
@@ -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 --git a/dwm.c b/dwm.c
index 50f4ea0..5aa71b7 100644
--- a/dwm.c
+++ b/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;
}
}