simplified dotile()

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 90080fb..93a8c66 100644 (file)
--- a/view.c
+++ b/view.c
@@ -4,6 +4,8 @@
  */
 #include "dwm.h"
 
+#define MINDIM                 100
+
 /* static */
 
 static Client *
@@ -65,7 +67,6 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
-Bool isvertical = VERTICALSTACK;
 StackPos stackpos = STACKPOS;
 
 void
@@ -99,38 +100,32 @@ dofloat(Arg *arg) {
 
 /* 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
+ *     SSMMM   MMMMM   MMMSS
+ *     SSMMM   SSSSS   MMMSS
  */
 void
 dotile(Arg *arg) {
-       int h, i, n, w;
+       int i, n, stackw, stackh, tw, th;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
 
-       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;
-               }
+       if(stackpos == StackBottom) {
+               stackw = sw;
+               stackh = sh - bh - master;
        }
-       else { /* horizontal stack */
-
+       else {
+               stackw = sw - master;
+               stackh = sh - bh;
        }
 
+       tw = stackw;
+       if(n > 1)
+               th = stackh / (n - 1);
+       else
+               th = stackh;
+
        for(i = 0, c = clients; c; c = c->next) {
                if(isvisible(c)) {
                        if(c->isfloat) {
@@ -138,32 +133,58 @@ dotile(Arg *arg) {
                                continue;
                        }
                        c->ismax = False;
-                       if(n == 1) {
+                       if(n == 1) { /* only 1 window */
                                c->x = sx;
                                c->y = sy + 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 += stackw;
                                c->y = sy + bh;
-                               c->w = master - 2 * BORDERPX;
-                               c->h = sh - 2 * BORDERPX - bh;
+                               switch(stackpos) {
+                               case StackLeft:
+                               case StackRight:
+                                       c->w = master - 2 * BORDERPX;
+                                       c->h = sh - bh - 2 * BORDERPX;
+                                       break;
+                               case StackBottom:
+                                       c->w = sw - 2 * BORDERPX;
+                                       c->h = master - 2 * BORDERPX;
+                                       break;
+                               }
                        }
-                       else if(h > bh) {
-                               c->x = sx + master;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2 * BORDERPX;
-                               if(i + 1 == n)
-                                       c->h = sh - c->y - 2 * BORDERPX;
-                               else
-                                       c->h = h - 2 * BORDERPX;
+                       else if(th > bh) { /* tile window */
+                               c->x = sx;
+                               if(stackpos == StackRight)
+                                       c->x += master;
+                               c->w = tw - 2 * BORDERPX;
+                               c->h = th - 2 * BORDERPX;
+                               switch(stackpos) {
+                               case StackLeft:
+                               case StackRight:
+                                       c->y = sy + (i - 1) * th + bh;
+                                       if(i + 1 == n)
+                                               c->h = sh - c->y - 2 * BORDERPX;
+                                       break;
+                               case StackBottom:
+                                       c->y = sy + master + (i - 1) * th + bh;
+                                       if(i + 1 == n)
+                                               c->h = sh - c->y - 2 * BORDERPX;
+                                       break;
+                               }
                        }
-                       else { /* fallback if h < bh */
-                               c->x = sx + master;
+                       else { /* fallback if th < bh */
+                               c->x = sx;
+                               if(stackpos == StackRight)
+                                       c->x += master;
                                c->y = sy + bh;
-                               c->w = w - 2 * BORDERPX;
-                               c->h = sh - 2 * BORDERPX - bh;
+                               if(stackpos == StackBottom)
+                                       c->y += master;
+                               c->w = stackw - 2 * BORDERPX;
+                               c->h = stackh - 2 * BORDERPX;
                        }
                        resize(c, False, TopLeft);
                        i++;
@@ -222,6 +243,7 @@ isvisible(Client *c) {
 
 void
 resizecol(Arg *arg) {
+       int s;
        unsigned int n;
        Client *c;
 
@@ -231,13 +253,14 @@ resizecol(Arg *arg) {
        if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
                return;
 
+       s = stackpos == StackBottom ? sh - bh : sw;
        if(sel == getnext(clients)) {
-               if(master + arg->i > sw - 100 || master + arg->i < 100)
+               if(master + arg->i > s - MINDIM || master + arg->i < MINDIM)
                        return;
                master += arg->i;
        }
        else {
-               if(master - arg->i > sw - 100 || master - arg->i < 100)
+               if(master - arg->i > s - MINDIM || master - arg->i < MINDIM)
                        return;
                master -= arg->i;
        }
@@ -257,11 +280,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 +319,18 @@ toggleview(Arg *arg) {
 }
 
 void
+togglestackpos(Arg *arg) {
+       if(arrange == dofloat)
+               return;
+       if(stackpos == StackBottom)
+               stackpos = STACKPOS;
+       else
+               stackpos = StackBottom;
+       master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
+       arrange(NULL);
+}
+
+void
 view(Arg *arg) {
        unsigned int i;
 
@@ -309,6 +351,8 @@ viewall(Arg *arg) {
        arrange(NULL);
 }
 
+
+
 void
 zoom(Arg *arg) {
        unsigned int n;