Added singularborders patch

3 files changed, 71 insertions, 8 deletions

diff --git a/.repos/dwm/config.h b/.repos/dwm/config.h
index 4848be2..a29e174 100644
--- a/.repos/dwm/config.h
+++ b/.repos/dwm/config.h
@@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const unsigned int borderpx  = 0;        /* border pixel of windows */
+static const unsigned int borderpx  = 1;        /* border pixel of windows */
 static const unsigned int snap      = 16;       /* snap pixel */
 static const int showbar            = 0;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
@@ -27,8 +27,8 @@ static const char col_base0F[]	    = "#be5046";
 
 static const char *colors[][3]	    = {
 	/*               fg          bg          border   */
-	[SchemeNorm] = { col_base05, col_base00, col_base02 },
-	[SchemeSel]  = { col_base05, col_base02, col_base00 },
+	[SchemeNorm] = { col_base05, col_base00, col_base00 },
+	[SchemeSel]  = { col_base05, col_base02, col_base02 },
 };
 
 /* scratchpad */
diff --git a/.repos/dwm/dwm.c b/.repos/dwm/dwm.c
index 7c182a8..accc70b 100644
--- a/.repos/dwm/dwm.c
+++ b/.repos/dwm/dwm.c
@@ -811,6 +811,8 @@ expose(XEvent *e)
 void
 focus(Client *c)
 {
+	XWindowChanges wc;
+
 	if (!c || !ISVISIBLE(c))
 		for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
 	if (selmon->sel && selmon->sel != c)
@@ -824,6 +826,11 @@ focus(Client *c)
 		attachstack(c);
 		grabbuttons(c, 1);
 		XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
+		if(!c->isfloating) {
+			wc.sibling = selmon->barwin;
+			wc.stack_mode = Below;
+			XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+		}
 		setfocus(c);
 	} else {
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
@@ -1148,7 +1155,7 @@ monocle(Monitor *m)
 	if (n > 0) /* override layout symbol */
 		snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
 	for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
-		resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
+		resize(c, m->wx - c->bw, m->wy, m->ww, m->wh, False);
 }
 
 void
@@ -1763,12 +1770,15 @@ tile(Monitor *m)
 	for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
 		if (i < m->nmaster) {
 			h = (m->wh - my) / (MIN(n, m->nmaster) - i);
-			resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
-			my += HEIGHT(c);
+			if (n == 1)
+				resize(c, m->wx - c->bw, m->wy, m->ww, m->wh, False);
+			else
+				resize(c, m->wx - c->bw, m->wy + my, mw - c->bw, h - c->bw, False);
+			my += HEIGHT(c) - c->bw;
 		} else {
 			h = (m->wh - ty) / (n - i);
-			resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
-			ty += HEIGHT(c);
+			resize(c, m->wx + mw - c->bw, m->wy + ty, m->ww - mw, h - c->bw, False);
+			ty += HEIGHT(c) - c->bw;
 		}
 }
 
diff --git a/.repos/dwm/patches/singularborders.diff b/.repos/dwm/patches/singularborders.diff
new file mode 100644
index 0000000..eb94653
--- /dev/null
+++ b/.repos/dwm/patches/singularborders.diff
@@ -0,0 +1,53 @@
+--- dwm.c.orig	2013-03-23 15:13:21.709978427 +0100
++++ dwm.c	2013-03-23 15:13:13.366645236 +0100
+@@ -842,6 +842,8 @@
+ 
+ void
+ focus(Client *c) {
++	XWindowChanges wc;
++
+ 	if(!c || !ISVISIBLE(c))
+ 		for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+ 	/* was if(selmon->sel) */
+@@ -856,6 +858,11 @@
+ 		attachstack(c);
+ 		grabbuttons(c, True);
+ 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
++		if(!c->isfloating) {
++			wc.sibling = selmon->barwin;
++			wc.stack_mode = Below;
++			XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
++		}
+ 		setfocus(c);
+ 	}
+ 	else
+@@ -1200,7 +1207,7 @@
+ 	if(n > 0) /* override layout symbol */
+ 		snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
+ 	for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
+-		resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);
++		resize(c, m->wx - c->bw, m->wy, m->ww, m->wh, False);
+ }
+ 
+ void
+@@ -1717,13 +1724,16 @@
+ 	for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+ 		if(i < m->nmaster) {
+ 			h = (m->wh - my) / (MIN(n, m->nmaster) - i);
+-			resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False);
+-			my += HEIGHT(c);
++			if(n == 1)
++				resize(c, m->wx - c->bw, m->wy, m->ww, m->wh, False);
++			else
++				resize(c, m->wx - c->bw, m->wy + my, mw - c->bw, h - c->bw, False);
++			my += HEIGHT(c) - c->bw;
+ 		}
+ 		else {
+ 			h = (m->wh - ty) / (n - i);
+-			resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False);
+-			ty += HEIGHT(c);
++			resize(c, m->wx + mw - c->bw, m->wy + ty, m->ww - mw, h - c->bw, False);
++			ty += HEIGHT(c) - c->bw;
+ 		}
+ }
+