first step to a more flexible dotile() algorithm

[dwm.git] / view.c

diff --git a/view.c b/view.c
index ab1924a..90080fb 100644 (file)
--- a/view.c
+++ b/view.c
@@ -7,7 +7,7 @@
 /* static */
 
 static Client *
 /* static */
 
 static Client *

-minclient() {
+minclient(void) {

        Client *c, *min;
 
        if((clients && clients->isfloat) || arrange == dofloat)
        Client *c, *min;
 
        if((clients && clients->isfloat) || arrange == dofloat)


@@ -25,7 +25,7 @@ nexttiled(Client *c) {
 }
 
 static void
 }
 
 static void

-reorder() {
+reorder(void) {

        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
        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;
        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;
        }
        else {
                c->x = c->rx;


@@ -65,6 +65,8 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;

+Bool isvertical = VERTICALSTACK;
+StackPos stackpos = STACKPOS;

 
 void
 detach(Client *c) {
 
 void
 detach(Client *c) {


@@ -95,20 +97,39 @@ dofloat(Arg *arg) {
        restack();
 }
 
        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;
 
 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)) {
 
        for(i = 0, c = clients; c; c = c->next) {
                if(isvisible(c)) {


@@ -116,34 +137,33 @@ dotile(Arg *arg) {
                                resize(c, True, TopLeft);
                                continue;
                        }
                                resize(c, True, TopLeft);
                                continue;
                        }

-                       if(c->ismax)
-                               togglemax(c);
+                       c->ismax = False;

                        if(n == 1) {
                                c->x = sx;
                                c->y = sy + bh;
                        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;
                        }
                        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) {
                        }
                        else if(h > bh) {

-                               c->x = sx + mw;
+                               c->x = sx + master;

                                c->y = sy + (i - 1) * h + bh;
                                c->y = sy + (i - 1) * h + bh;

-                               c->w = w - 2;
+                               c->w = w - 2 * BORDERPX;

                                if(i + 1 == n)
                                if(i + 1 == n)

-                                       c->h = sh - c->y - 2;
+                                       c->h = sh - c->y - 2 * BORDERPX;

                                else
                                else

-                                       c->h = h - 2;
+                                       c->h = h - 2 * BORDERPX;

                        }
                        else { /* fallback if h < bh */
                        }
                        else { /* fallback if h < bh */

-                               c->x = sx + mw;
+                               c->x = sx + master;

                                c->y = sy + bh;
                                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++;
                        }
                        resize(c, False, TopLeft);
                        i++;


@@ -212,20 +232,20 @@ resizecol(Arg *arg) {
                return;
 
        if(sel == getnext(clients)) {
                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;
                        return;

-               mw += arg->i;
+               master += arg->i;

        }
        else {
        }
        else {

-               if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+               if(master - arg->i > sw - 100 || master - arg->i < 100)

                        return;
                        return;

-               mw -= arg->i;
+               master -= arg->i;

        }
        arrange(NULL);
 }
 
 void
        }
        arrange(NULL);
 }
 
 void

-restack() {
+restack(void) {

        Client *c;
        XEvent ev;
 
        Client *c;
        XEvent ev;