simplified dotile(), removed misleading line

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 93a8c66..6ca82d1 100644 (file)
--- a/view.c
+++ b/view.c
@@ -4,8 +4,6 @@
  */
 #include "dwm.h"
 
  */
 #include "dwm.h"
 

-#define MINDIM                 100
-

 /* static */
 
 static Client *
 /* static */
 
 static Client *


@@ -105,18 +103,20 @@ dofloat(Arg *arg) {
  */
 void
 dotile(Arg *arg) {
  */
 void
 dotile(Arg *arg) {

-       int i, n, stackw, stackh, tw, th;
+       unsigned int i, n, md, stackw, stackh, tw, th;

        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
 
        if(stackpos == StackBottom) {
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
 
        if(stackpos == StackBottom) {

+               md = ((sh - bh) * master) / 100;

                stackw = sw;
                stackw = sw;

-               stackh = sh - bh - master;
+               stackh = sh - bh - md;

        }
        else {
        }
        else {

-               stackw = sw - master;
+               md = (sw * master) / 100;
+               stackw = sw - md;

                stackh = sh - bh;
        }
 
                stackh = sh - bh;
        }
 


@@ -133,58 +133,53 @@ dotile(Arg *arg) {
                                continue;
                        }
                        c->ismax = False;
                                continue;
                        }
                        c->ismax = False;

+                       c->x = sx;
+                       c->y = sy + bh;

                        if(n == 1) { /* only 1 window */
                        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->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;
                                if(stackpos == StackLeft)
                                        c->x += stackw;

-                               c->y = sy + bh;

                                switch(stackpos) {
                                case StackLeft:
                                case StackRight:
                                switch(stackpos) {
                                case StackLeft:
                                case StackRight:

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

                                        c->h = sh - bh - 2 * BORDERPX;
                                        break;
                                case StackBottom:
                                        c->w = sw - 2 * BORDERPX;
                                        c->h = sh - bh - 2 * BORDERPX;
                                        break;
                                case StackBottom:
                                        c->w = sw - 2 * BORDERPX;

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

                                        break;
                                }
                        }
                                        break;
                                }
                        }

-                       else if(th > bh) { /* tile window */
-                               c->x = sx;
+                       else {  /* tile window */

                                if(stackpos == StackRight)
                                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;
+                                       c->x += md;
+                               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 + md + (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 */
+                                       if(stackpos == StackBottom)
+                                               c->y += md;
+                                       c->w = stackw - 2 * BORDERPX;
+                                       c->h = stackh - 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;

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


@@ -243,7 +238,6 @@ isvisible(Client *c) {
 
 void
 resizecol(Arg *arg) {
 
 void
 resizecol(Arg *arg) {

-       int s;

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


@@ -253,14 +247,13 @@ resizecol(Arg *arg) {
        if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
                return;
 
        if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
                return;
 

-       s = stackpos == StackBottom ? sh - bh : sw;

        if(sel == getnext(clients)) {
        if(sel == getnext(clients)) {

-               if(master + arg->i > s - MINDIM || master + arg->i < MINDIM)
+               if(master + arg->i > 95 || master + arg->i < 5)

                        return;
                master += arg->i;
        }
        else {
                        return;
                master += arg->i;
        }
        else {

-               if(master - arg->i > s - MINDIM || master - arg->i < MINDIM)
+               if(master - arg->i > 95 || master - arg->i < 5)

                        return;
                master -= arg->i;
        }
                        return;
                master -= arg->i;
        }


@@ -326,7 +319,6 @@ togglestackpos(Arg *arg) {
                stackpos = STACKPOS;
        else
                stackpos = StackBottom;
                stackpos = STACKPOS;
        else
                stackpos = StackBottom;

-       master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;

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