From: anselm@garbe.us <unknown>
Date: Thu, 12 Jan 2012 06:36:05 +0000 (+0100)
Subject: applied Eckehard Berns barwin leak fix and his suggestion to deal with restack()... 
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=873bcb97a90727be29fe28774fc6b5546660b447;p=dwm.git

applied Eckehard Berns barwin leak fix and his suggestion to deal with restack() -- the latter aspect needs further investigation.
---

diff --git a/LICENSE b/LICENSE
index e8e793a..2e53d0a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT/X Consortium License
 
-© 2006-2011 Anselm R Garbe <anselm@garbe.us>
+© 2006-2012 Anselm R Garbe <anselm@garbe.us>
 © 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
 © 2010-2011 Connor Lane Smith <cls@lubutu.com>
 © 2006-2009 Jukka Salmi <jukka at salmi dot ch>
diff --git a/dwm.c b/dwm.c
index 1d78655..0f946a6 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1420,8 +1420,6 @@ restack(Monitor *m) {
 	drawbar(m);
 	if(!m->sel)
 		return;
-	if(m->sel->isfloating || !m->lt[m->sellt]->arrange)
-		XRaiseWindow(dpy, m->sel->win);
 	if(m->lt[m->sellt]->arrange) {
 		wc.stack_mode = Below;
 		wc.sibling = m->barwin;
@@ -1827,6 +1825,8 @@ updatebars(void) {
 		.event_mask = ButtonPressMask|ExposureMask
 	};
 	for(m = mons; m; m = m->next) {
+		if (m->barwin)
+			continue;
 		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
 		                          CopyFromParent, DefaultVisual(dpy, screen),
 		                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
@@ -2129,7 +2129,7 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))
-		die("dwm-"VERSION", © 2006-2011 dwm engineers, see LICENSE for details\n");
+		die("dwm-"VERSION", © 2006-2012 dwm engineers, see LICENSE for details\n");
 	else if(argc != 1)
 		die("usage: dwm [-v]\n");
 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())