small fix of a corner case

[dwm.git] / view.c

diff --git a/view.c b/view.c
index fce7309..0910077 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)


@@ -18,8 +18,14 @@ minclient() {
        return min;
 }
 
        return min;
 }
 

+static Client *
+nexttiled(Client *c) {
+       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+       return c;
+}
+

 static void
 static void

-reorder() {
+reorder(void) {

        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;


@@ -36,15 +42,31 @@ reorder() {
        clients = newclients;
 }
 
        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;
 }
 
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;

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

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


@@ -75,20 +97,42 @@ dofloat(Arg *arg) {
        restack();
 }
 
        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) {
 void
 dotile(Arg *arg) {

-       int h, i, n, w;
+       int i, n, stackw, stackh, tw, th;

        Client *c;
 
        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)) {
 
        for(i = 0, c = clients; c; c = c->next) {
                if(isvisible(c)) {


@@ -96,32 +140,101 @@ dotile(Arg *arg) {
                                resize(c, True, TopLeft);
                                continue;
                        }
                                resize(c, True, TopLeft);
                                continue;
                        }

-                       if(n == 1) {
+                       c->ismax = False;
+                       if(n == 1) { /* only 1 window */

                                c->x = sx;
                                c->y = sy + bh;
                                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;
+                       else if(i == 0) { /* master window */
+                               switch(stackpos) {
+                               case StackLeft:
+                                       c->x = sx + stackw;
+                                       c->y = sy + bh;
+                                       c->w = master - 2 * BORDERPX;
+                                       c->h = sh - bh - 2 * BORDERPX;
+                                       break;
+                               case StackBottom:
+                                       c->x = sx;
+                                       c->y = sy + bh;
+                                       c->w = sw - 2 * BORDERPX;
+                                       c->h = master - 2 * BORDERPX;
+                                       break;
+                               case StackRight:
+                                       c->x = sx;
+                                       c->y = sy + bh;
+                                       c->w = master - 2 * BORDERPX;
+                                       c->h = sh - bh - 2 * BORDERPX;
+                                       break;
+                               }

                        }
                        }

-                       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((isvertical && th > bh) || (!isvertical && tw > MINW)) {
+                               /* tile window */
+                               c->w = tw - 2 * BORDERPX;
+                               c->h = th - 2 * BORDERPX;
+                               switch(stackpos) {
+                               case StackLeft:
+                                       if(isvertical) {
+                                               c->x = sx;
+                                               c->y = sy + (i - 1) * th + bh;
+                                               if(i + 1 == n)
+                                                       c->h = sh - c->y - 2 * BORDERPX;
+                                       }
+                                       else {
+                                               c->x = sx + (i - 1) * tw;
+                                               c->y = sy + bh;
+                                               if(i + 1 == n)
+                                                       c->w = sx + stackw - c->x - 2 * BORDERPX;
+                                       }
+                                       break;
+                               case StackBottom:
+                                       if(isvertical) {
+                                               c->x = sx;
+                                               c->y = sy + master + (i - 1) * th + bh;
+                                               if(i + 1 == n)
+                                                       c->h = sh - c->y - 2 * BORDERPX;
+                                       }
+                                       else {
+                                               c->x = sx + (i - 1) * tw;
+                                               c->y = sy + bh + master;
+                                               if(i + 1 == n)
+                                                       c->w = sw - c->x - 2 * BORDERPX;
+                                       }
+                                       break;
+                               case StackRight:
+                                       if(isvertical) {
+                                               c->x = sx + master;
+                                               c->y = sy + (i - 1) * th + bh;
+                                               if(i + 1 == n)
+                                                       c->h = sh - c->y - 2 * BORDERPX;
+                                       }
+                                       else {
+                                               c->x = sx + master + (i - 1) * tw;
+                                               c->y = sy + bh;
+                                               if(i + 1 == n)
+                                                       c->w = sw - c->x - 2 * BORDERPX;
+                                       }
+                                       break;
+                               }

                        }
                        }

-                       else { /* fallback if h < bh */
-                               c->x = sx + mw;
-                               c->y = sy + bh;
-                               c->w = w - 2;
-                               c->h = sh - 2 - bh;
+                       else { /* fallback if th < bh resp. tw < MINW */
+                               c->w = stackw - 2 * BORDERPX;
+                               c->h = stackh - 2 * BORDERPX;
+                               switch(stackpos) {
+                               case StackLeft:
+                                       c->x = sx;
+                                       c->y = sy + bh;
+                                       break;
+                               case StackBottom:
+                                       c->x = sx;
+                                       c->y = sy + master;
+                                       break;
+                               case StackRight:
+                                       c->x = sx + master;
+                                       c->y = sy + bh;
+                                       break;
+                               }

                        }
                        resize(c, False, TopLeft);
                        i++;
                        }
                        resize(c, False, TopLeft);
                        i++;


@@ -186,27 +299,27 @@ resizecol(Arg *arg) {
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
        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)) {
                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;
                        return;

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

        }
        else {
        }
        else {

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

                        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;

-       
+

        if(!sel) {
                drawstatus();
                return;
        if(!sel) {
                drawstatus();
                return;


@@ -246,6 +359,31 @@ toggleview(Arg *arg) {
        arrange(NULL);
 }
 
        arrange(NULL);
 }
 

+void
+togglestackdir(Arg *arg) {
+       if(arrange == dofloat)
+               return;
+       isvertical = !isvertical;
+       arrange(NULL);
+}
+
+void
+togglestackpos(Arg *arg) {
+       if(arrange == dofloat)
+               return;
+       if(stackpos == StackBottom)
+               stackpos = STACKPOS;
+       else
+               stackpos = StackBottom;
+       updatemaster();
+       arrange(NULL);
+}
+
+void
+updatemaster(void) {
+       master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
+}
+

 void
 view(Arg *arg) {
        unsigned int i;
 void
 view(Arg *arg) {
        unsigned int i;


@@ -267,30 +405,25 @@ viewall(Arg *arg) {
        arrange(NULL);
 }
 
        arrange(NULL);
 }
 

+
+

 void
 zoom(Arg *arg) {
 void
 zoom(Arg *arg) {

-       int tmp;

        unsigned int n;
        Client *c;
        unsigned int n;
        Client *c;

-       XEvent ev;

 
        if(!sel)
                return;
 
        if(sel->isfloat || (arrange == dofloat)) {
 
        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++;
                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))
                return;
 
        if((c = sel) == nexttiled(clients))