aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranselm@garbe.us <unknown>2012-01-12 07:36:05 +0100
committeranselm@garbe.us <unknown>2012-01-12 07:36:05 +0100
commit873bcb97a90727be29fe28774fc6b5546660b447 (patch)
treeb83ce8d76ffbdbd37b6d536e305278581d6679da
parent907db0a85165f720a7b7d5972736393e4d8ac1b9 (diff)
downloaddwm-873bcb97a90727be29fe28774fc6b5546660b447.tar.gz
dwm-873bcb97a90727be29fe28774fc6b5546660b447.tar.bz2
dwm-873bcb97a90727be29fe28774fc6b5546660b447.zip
applied Eckehard Berns barwin leak fix and his suggestion to deal with restack() -- the latter aspect needs further investigation.
-rw-r--r--LICENSE2
-rw-r--r--dwm.c6
2 files changed, 4 insertions, 4 deletions
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())