yet another simplification of dotile()

[dwm.git] / view.c

diff --git a/view.c b/view.c
index d37933a..1bce54a 100644 (file)
--- a/view.c
+++ b/view.c
@@ -4,6 +4,8 @@
  */
 #include "dwm.h"
 
+#define MINDIM                 100
+
 /* static */
 
 static Client *
@@ -131,75 +133,52 @@ dotile(Arg *arg) {
                                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 */
+                               if(stackpos == StackLeft)
+                                       c->x += stackw;
                                switch(stackpos) {
                                case StackLeft:
-                                       c->x = sx + stackw;
-                                       c->y = sy + bh;
+                               case StackRight:
                                        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(th > bh) {
-                               /* tile window */
-                               c->w = tw - 2 * BORDERPX;
-                               c->h = th - 2 * BORDERPX;
-                               switch(stackpos) {
-                               case StackLeft:
-                                       c->x = sx;
-                                       c->y = sy + (i - 1) * th + bh;
-                                       if(i + 1 == n)
-                                               c->h = sh - c->y - 2 * BORDERPX;
-                                       break;
-                               case StackBottom:
-                                       c->x = sx;
-                                       c->y = sy + master + (i - 1) * th + bh;
-                                       if(i + 1 == n)
-                                               c->h = sh - c->y - 2 * BORDERPX;
-                                       break;
-                               case StackRight:
-                                       c->x = sx + master;
-                                       c->y = sy + (i - 1) * th + bh;
-                                       if(i + 1 == n)
-                                               c->h = sh - c->y - 2 * BORDERPX;
-                                       break;
+                       else {  /* tile window */
+                               if(stackpos == StackRight)
+                                       c->x += master;
+                               if(th > bh) {
+                                       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;
+                                       }
+                                       c->w = tw - 2 * BORDERPX;
+                                       c->h = th - 2 * BORDERPX;
                                }
-                       }
-                       else { /* fallback if th < bh */
-                               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 + bh;
-                                       break;
-                               case StackRight:
-                                       c->x = sx + master;
-                                       c->y = sy + bh;
-                                       break;
+                               else { /* fallback if th < bh */
+                                       if(stackpos == StackBottom)
+                                               c->y += master;
+                                       c->w = stackw - 2 * BORDERPX;
+                                       c->h = stackh - 2 * BORDERPX;
                                }
                        }
                        resize(c, False, TopLeft);
@@ -271,12 +250,12 @@ resizecol(Arg *arg) {
 
        s = stackpos == StackBottom ? sh - bh : sw;
        if(sel == getnext(clients)) {
-               if(master + arg->i > s - MINW || master + arg->i < MINW)
+               if(master + arg->i > s - MINDIM || master + arg->i < MINDIM)
                        return;
                master += arg->i;
        }
        else {
-               if(master - arg->i > s - MINW || master - arg->i < MINW)
+               if(master - arg->i > s - MINDIM || master - arg->i < MINDIM)
                        return;
                master -= arg->i;
        }