applied Jukkas patch

[dwm.git] / view.c

diff --git a/view.c b/view.c
index c5e942d..dab8128 100644 (file)
--- a/view.c
+++ b/view.c
@@ -7,7 +7,7 @@
 /* static */
 
 static Client *
-minclient() {
+minclient(void) {
        Client *c, *min;
 
        if((clients && clients->isfloat) || arrange == dofloat)
@@ -25,7 +25,7 @@ nexttiled(Client *c) {
 }
 
 static void
-reorder() {
+reorder(void) {
        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
@@ -49,8 +49,8 @@ togglemax(Client *c)
        if((c->ismax = !c->ismax)) {
                c->rx = c->x; c->x = sx;
                c->ry = c->y; c->y = bh;
-               c->rw = c->w; c->w = sw;
-               c->rh = c->h; c->h = sh - bh;
+               c->rw = c->w; c->w = sw - 2 * BORDERPX;
+               c->rh = c->h; c->h = sh - bh - 2 * BORDERPX;
        }
        else {
                c->x = c->rx;
@@ -101,9 +101,8 @@ dotile(Arg *arg) {
        Client *c;
 
        w = sw - mw;
-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
-                       n++;
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;
 
        if(n > 1)
                h = (sh - bh) / (n - 1);
@@ -112,38 +111,37 @@ dotile(Arg *arg) {
 
        for(i = 0, c = clients; c; c = c->next) {
                if(isvisible(c)) {
-                       if(c->ismax)
-                               togglemax(c);
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
                                continue;
                        }
+                       c->ismax = False;
                        if(n == 1) {
                                c->x = sx;
                                c->y = sy + bh;
-                               c->w = sw - 2;
-                               c->h = sh - 2 - bh;
+                               c->w = sw - 2 * BORDERPX;
+                               c->h = sh - 2 * BORDERPX - bh;
                        }
                        else if(i == 0) {
                                c->x = sx;
                                c->y = sy + bh;
-                               c->w = mw - 2;
-                               c->h = sh - 2 - bh;
+                               c->w = mw - 2 * BORDERPX;
+                               c->h = sh - 2 * BORDERPX - bh;
                        }
                        else if(h > bh) {
                                c->x = sx + mw;
                                c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2;
+                               c->w = w - 2 * BORDERPX;
                                if(i + 1 == n)
-                                       c->h = sh - c->y - 2;
+                                       c->h = sh - c->y - 2 * BORDERPX;
                                else
-                                       c->h = h - 2;
+                                       c->h = h - 2 * BORDERPX;
                        }
                        else { /* fallback if h < bh */
                                c->x = sx + mw;
                                c->y = sy + bh;
-                               c->w = w - 2;
-                               c->h = sh - 2 - bh;
+                               c->w = w - 2 * BORDERPX;
+                               c->h = sh - 2 * BORDERPX - bh;
                        }
                        resize(c, False, TopLeft);
                        i++;
@@ -208,7 +206,7 @@ resizecol(Arg *arg) {
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
-       if(!sel || sel->isfloat || n < 2 || (arrange != dotile))
+       if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
                return;
 
        if(sel == getnext(clients)) {
@@ -225,7 +223,7 @@ resizecol(Arg *arg) {
 }
 
 void
-restack() {
+restack(void) {
        Client *c;
        XEvent ev;
 
@@ -305,7 +303,7 @@ zoom(Arg *arg) {
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
-       if(n < 2 || (arrange != dotile))
+       if(n < 2 || (arrange == dofloat))
                return;
 
        if((c = sel) == nexttiled(clients))