another fix, call lt->arrange() in togglebar only

[dwm.git] / layout.c

diff --git a/layout.c b/layout.c
index 3746a88..26e9de6 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -15,7 +15,7 @@ static unsigned int nmaster = NMASTER;
 
 static void
 tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th, remain;
+       unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th, remainder;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
@@ -24,7 +24,7 @@ tile(void) {
        mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
        mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
        th = (n > nmaster) ? wah / (n - nmaster) : 0;
-       remain = (n > nmaster) ? wah - th * (n - nmaster) : 0;
+       remainder = (n > nmaster) ? wah - th * (n - nmaster) : 0;
        tw = waw - mw;
 
        for(i = 0, c = clients; c; c = c->next)
@@ -49,7 +49,7 @@ tile(void) {
                                        ny += (i - nmaster) * th;
                                        nh = th - 2 * c->border;
                                        if (i == n - 1)
-                                               nh += remain;
+                                               nh += remainder;
                                }
                                else /* fallback if th <= 2 * c->border */
                                        nh = wah - 2 * c->border;
@@ -61,10 +61,8 @@ tile(void) {
                        c->isbanned = True;
                        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
                }
-       if(!sel || !isvisible(sel)) {
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
-       }
+       if(!sel || !isvisible(sel)) 
+               focustopvisible();
        restack();
 }
 
@@ -88,10 +86,8 @@ floating(void) {
                        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
                }
        }
-       if(!sel || !isvisible(sel)) {
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
-       }
+       if(!sel || !isvisible(sel))
+               focustopvisible();
        restack();
 }
 
@@ -221,6 +217,13 @@ setlayout(const char *arg) {
 }
 
 void
+togglebar(const char *arg) {
+       bpos = (bpos == BarOff) ? BARPOS : BarOff;
+       updatebarpos();
+       lt->arrange();
+}
+
+void
 togglemax(const char *arg) {
        XEvent ev;
 
@@ -241,13 +244,10 @@ togglemax(const char *arg) {
 
 void
 zoom(const char *arg) {
-       unsigned int n;
        Client *c;
 
        if(!sel || lt->arrange != tile || sel->isfloating)
                return;
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;