applied Eckehard Berns barwin leak fix and his suggestion to deal with restack()...

diff --git a/LICENSE b/LICENSE
index e8e793a..2e53d0a 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT/X Consortium License
 
 MIT/X Consortium License
 

-© 2006-2011 Anselm R Garbe <[email protected]>
+© 2006-2012 Anselm R Garbe <[email protected]>

 © 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
 © 2010-2011 Connor Lane Smith <[email protected]>
 © 2006-2009 Jukka Salmi <jukka at salmi dot ch>
 © 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
 © 2010-2011 Connor Lane Smith <[email protected]>
 © 2006-2009 Jukka Salmi <jukka at salmi dot ch>

diff --git a/dwm.c b/dwm.c
index 1d78655..0f946a6 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -1420,8 +1420,6 @@ restack(Monitor *m) {
        drawbar(m);
        if(!m->sel)
                return;
        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;
        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) {
                .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);
                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]))
 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())
        else if(argc != 1)
                die("usage: dwm [-v]\n");
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())