prelim of dotile()

[dwm.git] / view.c

diff --git a/view.c b/view.c
index fd53dc8..b2ee32f 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;
@@ -65,6 +65,8 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
+Bool isvertical = VERTICALSTACK;
+StackPos stackpos = STACKPOS;
 
 void
 detach(Client *c) {
@@ -95,20 +97,42 @@ dofloat(Arg *arg) {
        restack();
 }
 
+/* This algorithm is based on a (M)aster area and a (S)tacking area.
+ * It supports following arrangements:
+ *     SSMMM   MMMMM   MMMSS
+ *     SSMMM   SSSSS   MMMSS
+ */
 void
 dotile(Arg *arg) {
-       int h, i, n, w;
+       int i, n, stackw, stackh, tw, 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++;
 
-       if(n > 1)
-               h = (sh - bh) / (n - 1);
-       else
-               h = sh - bh;
+       if(stackpos == StackBottom) {
+               stackw = sw;
+               stackh = sh - bh - master;
+       }
+       else {
+               stackw = sw - master;
+               stackh = sh - bh;
+       }
+
+       if(isvertical) {
+               tw = stackw;
+               if(n > 1)
+                       th = stackh / (n - 1);
+               else
+                       th = stackh;
+       }
+       else {
+               th = stackh;
+               if(n > 1)
+                       tw = stackw / (n - 1);
+               else
+                       tw = stackw;
+       }
 
        for(i = 0, c = clients; c; c = c->next) {
                if(isvisible(c)) {
@@ -116,34 +140,60 @@ dotile(Arg *arg) {
                                resize(c, True, TopLeft);
                                continue;
                        }
-                       if(c->ismax)
-                               togglemax(c);
-                       if(n == 1) {
+                       c->ismax = False;
+                       if(n == 1) { /* only 1 window */
                                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) {
+                       else if(i == 0) { /* master window */
                                c->x = sx;
+                               if(stackpos == StackLeft)
+                                       c->x += master;
                                c->y = sy + bh;
-                               c->w = mw - 2;
-                               c->h = sh - 2 - bh;
+                               if(isvertical) {
+                                       c->w = master - 2 * BORDERPX;
+                                       c->h = sh - 2 * BORDERPX - bh;
+                               }
+                               else {
+                                       c->w = sw;
+                                       c->h = master - 2 * BORDERPX;
+                               }
                        }
-                       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 if((isvertical && th > bh) || (!isvertical && tw > MINW)) {
+                               /* tile window */
+                               c->x = sx;
+                               if(isvertical)
+                                       c->y = sy + (i - 1) * th + bh;
                                else
-                                       c->h = h - 2;
+                                       c->y = sy + bh;
+                               if(stackpos == StackRight)
+                                       c->x += master;
+                               else if(stackpos == StackBottom)
+                                       c->y += master;
+                               c->w = tw - 2 * BORDERPX;
+                               c->h = th - 2 * BORDERPX;
+                               if(i + 1 == n) { /* fixes for last tile to take up rest space */
+                                       if(isvertical)
+                                               c->h = sh - c->y - 2 * BORDERPX;
+                                       else {
+                                               if(stackpos == StackLeft)
+                                                       c->w = master - c->x - 2 * BORDERPX;
+                                               else
+                                                       c->w = sw - c->x - 2 * BORDERPX;
+                                       }
+                               }
                        }
-                       else { /* fallback if h < bh */
-                               c->x = sx + mw;
+                       else { /* fallback if th < bh resp. tw < MINW */
+                               c->x = sx;
                                c->y = sy + bh;
-                               c->w = w - 2;
-                               c->h = sh - 2 - bh;
+                               if(stackpos == StackRight)
+                                       c->x += master;
+                               else if(stackpos == StackBottom)
+                                       c->y += master;
+                               c->w = stackw - 2 * BORDERPX;
+                               c->h = stackh - 2 * BORDERPX;
                        }
                        resize(c, False, TopLeft);
                        i++;
@@ -208,24 +258,24 @@ 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)) {
-               if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+               if(master + arg->i > sw - MINW || master + arg->i < MINW)
                        return;
-               mw += arg->i;
+               master += arg->i;
        }
        else {
-               if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+               if(master - arg->i > sw - MINW || master - arg->i < MINW)
                        return;
-               mw -= arg->i;
+               master -= arg->i;
        }
        arrange(NULL);
 }
 
 void
-restack() {
+restack(void) {
        Client *c;
        XEvent ev;
 
@@ -305,7 +355,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))