yet another small fix and simplification of dotile

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 93a8c66..b2f2614 100644 (file)
--- a/view.c
+++ b/view.c
@@ -4,8 +4,6 @@
  */
 #include "dwm.h"
 
-#define MINDIM                 100
-
 /* static */
 
 static Client *
@@ -67,7 +65,6 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
-StackPos stackpos = STACKPOS;
 
 void
 detach(Client *c) {
@@ -98,100 +95,56 @@ 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 i, n, stackw, stackh, tw, th;
+       unsigned int i, n, mpx, stackw, stackh, th;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
 
-       if(stackpos == StackBottom) {
-               stackw = sw;
-               stackh = sh - bh - master;
-       }
-       else {
-               stackw = sw - master;
-               stackh = sh - bh;
-       }
+       mpx = (sw * master) / 1000;
+       stackw = sw - mpx;
+       stackh = sh - bh;
 
-       tw = stackw;
+       th = stackh;
        if(n > 1)
-               th = stackh / (n - 1);
-       else
-               th = stackh;
+               th /= (n - 1);
 
-       for(i = 0, c = clients; c; c = c->next) {
+       for(i = 0, c = clients; c; c = c->next, i++)
                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
                                continue;
                        }
                        c->ismax = False;
+                       c->x = sx;
+                       c->y = sy + bh;
                        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) { /* master window */
-                               c->x = sx;
-                               if(stackpos == StackLeft)
-                                       c->x += stackw;
-                               c->y = sy + 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;
-                               }
+                               c->w = mpx - 2 * BORDERPX;
+                               c->h = sh - bh - 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:
+                       else {  /* tile window */
+                               c->x += mpx;
+                               c->w = stackw - 2 * BORDERPX;
+                               if(th > bh) {
                                        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
+                                               c->h = th - 2 * BORDERPX;
                                }
-                       }
-                       else { /* fallback if th < bh */
-                               c->x = sx;
-                               if(stackpos == StackRight)
-                                       c->x += master;
-                               c->y = sy + bh;
-                               if(stackpos == StackBottom)
-                                       c->y += master;
-                               c->w = stackw - 2 * BORDERPX;
-                               c->h = stackh - 2 * BORDERPX;
+                               else /* fallback if th < bh */
+                                       c->h = stackh - 2 * BORDERPX;
                        }
                        resize(c, False, TopLeft);
-                       i++;
                }
                else
                        ban(c);
-       }
        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
                focus(c);
@@ -243,7 +196,6 @@ isvisible(Client *c) {
 
 void
 resizecol(Arg *arg) {
-       int s;
        unsigned int n;
        Client *c;
 
@@ -253,14 +205,13 @@ 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 > s - MINDIM || master + arg->i < MINDIM)
+               if(master + arg->i > 950 || master + arg->i < 50)
                        return;
                master += arg->i;
        }
        else {
-               if(master - arg->i > s - MINDIM || master - arg->i < MINDIM)
+               if(master - arg->i > 950 || master - arg->i < 50)
                        return;
                master -= arg->i;
        }
@@ -319,18 +270,6 @@ 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;