X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=fcdab10e602aba8273bfe9c78eb4a8c2f9ccf1d1;hb=2bd46d1ce62e35d2785f43bb9f6f331d3309f66f;hp=0615978acfe841db8e4c77bd65dff24f857d9a67;hpb=31da0b7525f4a6f98fb5b3258da86d04387a0382;p=dwm.git diff --git a/dwm.c b/dwm.c index 0615978..fcdab10 100644 --- a/dwm.c +++ b/dwm.c @@ -274,9 +274,9 @@ arrange(void) { for(c = clients; c; c = c->next) if(c->tags & tagset[seltags]) { /* is visible */ + c->isbanned = False; if(!lt[sellt]->arrange || c->isfloating) resize(c, c->x, c->y, c->w, c->h, True); - c->isbanned = False; } else if(!c->isbanned) { XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); @@ -426,8 +426,7 @@ configurerequest(XEvent *e) { c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */ if((c->y - sy + c->h) > sh && c->isfloating) c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */ - if((ev->value_mask & (CWX|CWY)) - && !(ev->value_mask & (CWWidth|CWHeight))) + if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight))) configure(c); if(!c->isbanned) XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); @@ -482,19 +481,17 @@ detachstack(Client *c) { void drawbar(void) { int i, x; - Client *c; dc.x = 0; - for(c = stack; c && c->isbanned; c = c->snext); for(i = 0; i < LENGTH(tags); i++) { dc.w = TEXTW(tags[i]); if(tagset[seltags] & 1 << i) { drawtext(tags[i], dc.sel, isurgent(i)); - drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel); + drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel); } else { drawtext(tags[i], dc.norm, isurgent(i)); - drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm); + drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm); } dc.x += dc.w; } @@ -514,9 +511,9 @@ drawbar(void) { drawtext(stext, dc.norm, False); if((dc.w = dc.x - x) > bh) { dc.x = x; - if(c) { - drawtext(c->name, dc.sel, False); - drawsquare(c->isfixed, c->isfloating, False, dc.sel); + if(sel) { + drawtext(sel->name, dc.sel, False); + drawsquare(sel->isfixed, sel->isfloating, False, dc.sel); } else drawtext(NULL, dc.norm, False); @@ -1116,7 +1113,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { h = bh; if(w < bh) w = bh; - if(c->x != x || c->y != y || c->w != w || c->h != h) { + if(!c->isbanned || c->x != x || c->y != y || c->w != w || c->h != h) { c->x = wc.x = x; c->y = wc.y = y; c->w = wc.width = w;