yet another small fix and simplification of dotile

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 44c0b30..b2f2614 100644 (file)
--- a/view.c
+++ b/view.c
@@ -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 - 2;
+               c->rw = c->w; c->w = sw - 2 * BORDERPX;
+               c->rh = c->h; c->h = sh - bh - 2 * BORDERPX;
        }
        else {
                c->x = c->rx;
@@ -97,60 +97,54 @@ dofloat(Arg *arg) {
 
 void
 dotile(Arg *arg) {
-       int h, i, n, w;
+       unsigned int i, n, mpx, stackw, stackh, th;
        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++;
 
+       mpx = (sw * master) / 1000;
+       stackw = sw - mpx;
+       stackh = sh - bh;
+
+       th = stackh;
        if(n > 1)
-               h = (sh - bh) / (n - 1);
-       else
-               h = sh - bh;
+               th /= (n - 1);
 
-       for(i = 0, c = clients; c; c = c->next) {
+       for(i = 0, c = clients; c; c = c->next, i++)
                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
                                continue;
                        }
-                       if(c->ismax)
-                               togglemax(c);
-                       if(n == 1) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = sw - 2;
-                               c->h = sh - 2 - bh;
-                       }
-                       else if(i == 0) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = mw - 2;
-                               c->h = sh - 2 - bh;
+                       c->ismax = False;
+                       c->x = sx;
+                       c->y = sy + bh;
+                       if(n == 1) { /* only 1 window */
+                               c->w = sw - 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;
-                               if(i + 1 == n)
-                                       c->h = sh - c->y - 2;
-                               else
-                                       c->h = h - 2;
+                       else if(i == 0) { /* master window */
+                               c->w = mpx - 2 * BORDERPX;
+                               c->h = sh - bh - 2 * BORDERPX;
                        }
-                       else { /* fallback if h < bh */
-                               c->x = sx + mw;
-                               c->y = sy + bh;
-                               c->w = w - 2;
-                               c->h = sh - 2 - bh;
+                       else {  /* tile window */
+                               c->x += mpx;
+                               c->w = stackw - 2 * BORDERPX;
+                               if(th > bh) {
+                                       c->y = sy + (i - 1) * th + bh;
+                                       if(i + 1 == n)
+                                               c->h = sh - c->y - 2 * BORDERPX;
+                                       else
+                                               c->h = th - 2 * BORDERPX;
+                               }
+                               else /* fallback if th < bh */
+                                       c->h = stackh - 2 * BORDERPX;
                        }
                        resize(c, False, TopLeft);
-                       i++;
                }
                else
                        ban(c);
-       }
        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
                focus(c);
@@ -212,14 +206,14 @@ resizecol(Arg *arg) {
                return;
 
        if(sel == getnext(clients)) {
-               if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+               if(master + arg->i > 950 || master + arg->i < 50)
                        return;
-               mw += arg->i;
+               master += arg->i;
        }
        else {
-               if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+               if(master - arg->i > 950 || master - arg->i < 50)
                        return;
-               mw -= arg->i;
+               master -= arg->i;
        }
        arrange(NULL);
 }
@@ -237,11 +231,18 @@ restack(void) {
                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->twin);
        }
-       if(arrange != dofloat)
+       if(arrange != dofloat) {
+               if(!sel->isfloat) {
+                       XLowerWindow(dpy, sel->twin);
+                       XLowerWindow(dpy, sel->win);
+               }
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+                       if(c == sel)
+                               continue;
                        XLowerWindow(dpy, c->twin);
                        XLowerWindow(dpy, c->win);
                }
+       }
        drawall();
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@ -289,6 +290,8 @@ viewall(Arg *arg) {
        arrange(NULL);
 }
 
+
+
 void
 zoom(Arg *arg) {
        unsigned int n;