first step to a more flexible dotile() algorithm

[dwm.git] / view.c

diff --git a/view.c b/view.c
index fce7309..90080fb 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)
@@ -18,8 +18,14 @@ minclient() {
        return min;
 }
 
+static Client *
+nexttiled(Client *c) {
+       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+       return c;
+}
+
 static void
-reorder() {
+reorder(void) {
        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
@@ -36,15 +42,31 @@ reorder() {
        clients = newclients;
 }
 
-static Client *
-nexttiled(Client *c) {
-       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
-       return c;
+static void
+togglemax(Client *c)
+{
+       XEvent ev;
+       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 - 2 * BORDERPX;
+               c->rh = c->h; c->h = sh - bh - 2 * BORDERPX;
+       }
+       else {
+               c->x = c->rx;
+               c->y = c->ry;
+               c->w = c->rw;
+               c->h = c->rh;
+       }
+       resize(c, True, TopLeft);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
+Bool isvertical = VERTICALSTACK;
+StackPos stackpos = STACKPOS;
 
 void
 detach(Client *c) {
@@ -75,20 +97,39 @@ dofloat(Arg *arg) {
        restack();
 }
 
+/* This algorithm is based on a (M)aster area and a (S)tacking area.
+ * It supports following arrangements:
+ *     MMMS            MMMM            SMMM
+ *     MMMS            MMMM            SMMM
+ *     MMMS            SSSS            SMMM
+ */
 void
 dotile(Arg *arg) {
        int h, i, n, w;
        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(isvertical) {
+               if(stackpos == StackBottom) {
+                       w = sw;
+                       if(n > 1)
+                               h = (sh - bh) / (n - 1);
+                       else
+                               h = sh - bh;
+               }
+               else {
+                       w = sw - master;
+                       if(n > 1)
+                               h = (sh - bh) / (n - 1);
+                       else
+                               h = sh - bh;
+               }
+       }
+       else { /* horizontal stack */
+
+       }
 
        for(i = 0, c = clients; c; c = c->next) {
                if(isvisible(c)) {
@@ -96,32 +137,33 @@ dotile(Arg *arg) {
                                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 = master - 2 * BORDERPX;
+                               c->h = sh - 2 * BORDERPX - bh;
                        }
                        else if(h > bh) {
-                               c->x = sx + mw;
+                               c->x = sx + master;
                                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->x = sx + master;
                                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++;
@@ -186,27 +228,27 @@ 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 - 100 || master + arg->i < 100)
                        return;
-               mw += arg->i;
+               master += arg->i;
        }
        else {
-               if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+               if(master - arg->i > sw - 100 || master - arg->i < 100)
                        return;
-               mw -= arg->i;
+               master -= arg->i;
        }
        arrange(NULL);
 }
 
 void
-restack() {
+restack(void) {
        Client *c;
        XEvent ev;
-       
+
        if(!sel) {
                drawstatus();
                return;
@@ -269,28 +311,21 @@ viewall(Arg *arg) {
 
 void
 zoom(Arg *arg) {
-       int tmp;
        unsigned int n;
        Client *c;
-       XEvent ev;
 
        if(!sel)
                return;
 
        if(sel->isfloat || (arrange == dofloat)) {
-               tmp = sel->x; sel->x = sel->rx; sel->rx = tmp;
-               tmp = sel->y; sel->y = sel->ry; sel->ry = tmp;
-               tmp = sel->w; sel->w = sel->rw; sel->rw = tmp;
-               tmp = sel->h; sel->h = sel->rh; sel->rh = tmp;
-               resize(sel, True, TopLeft);
-               while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+               togglemax(sel);
                return;
        }
 
        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))