yet another small fix and simplification of dotile

[dwm.git] / view.c

diff --git a/view.c b/view.c
index b2ee32f..b2f2614 100644 (file)
--- a/view.c
+++ b/view.c
@@ -65,8 +65,6 @@ togglemax(Client *c)
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;

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

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


@@ -97,110 +95,56 @@ 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 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++;
 
        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;

 
 

-       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;
-       }
+       th = stackh;
+       if(n > 1)
+               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;
                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 */
                        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 += master;
-                               c->y = sy + bh;
-                               if(isvertical) {
-                                       c->w = master - 2 * BORDERPX;
-                                       c->h = sh - 2 * BORDERPX - bh;
-                               }
-                               else {
-                                       c->w = sw;
-                                       c->h = master - 2 * BORDERPX;
-                               }
+                               c->w = mpx - 2 * BORDERPX;
+                               c->h = sh - bh - 2 * BORDERPX;

                        }
                        }

-                       else if((isvertical && th > bh) || (!isvertical && tw > MINW)) {
-                               /* tile window */
-                               c->x = sx;
-                               if(isvertical)
+                       else {  /* tile window */
+                               c->x += mpx;
+                               c->w = stackw - 2 * BORDERPX;
+                               if(th > bh) {

                                        c->y = sy + (i - 1) * th + bh;
                                        c->y = sy + (i - 1) * th + bh;

-                               else
-                                       c->y = sy + bh;
-                               if(stackpos == StackRight)
-                                       c->x += master;
-                               else if(stackpos == StackBottom)
-                                       c->y += master;
-                               c->w = tw - 2 * BORDERPX;
-                               c->h = th - 2 * BORDERPX;
-                               if(i + 1 == n) { /* fixes for last tile to take up rest space */
-                                       if(isvertical)
+                                       if(i + 1 == n)

                                                c->h = sh - c->y - 2 * BORDERPX;
                                                c->h = sh - c->y - 2 * BORDERPX;

-                                       else {
-                                               if(stackpos == StackLeft)
-                                                       c->w = master - c->x - 2 * BORDERPX;
-                                               else
-                                                       c->w = sw - c->x - 2 * BORDERPX;
-                                       }
+                                       else
+                                               c->h = th - 2 * BORDERPX;

                                }
                                }

-                       }
-                       else { /* fallback if th < bh resp. tw < MINW */
-                               c->x = sx;
-                               c->y = sy + bh;
-                               if(stackpos == StackRight)
-                                       c->x += master;
-                               else 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);
                        }
                        resize(c, False, TopLeft);

-                       i++;

                }
                else
                        ban(c);
                }
                else
                        ban(c);

-       }

        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
                focus(c);
        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
                focus(c);


@@ -262,12 +206,12 @@ resizecol(Arg *arg) {
                return;
 
        if(sel == getnext(clients)) {
                return;
 
        if(sel == getnext(clients)) {

-               if(master + arg->i > sw - MINW || master + arg->i < MINW)
+               if(master + arg->i > 950 || master + arg->i < 50)

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

-               if(master - arg->i > sw - MINW || master - arg->i < MINW)
+               if(master - arg->i > 950 || master - arg->i < 50)

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


@@ -287,11 +231,18 @@ restack(void) {
                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->twin);
        }
                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)) {
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {

+                       if(c == sel)
+                               continue;

                        XLowerWindow(dpy, c->twin);
                        XLowerWindow(dpy, c->win);
                }
                        XLowerWindow(dpy, c->twin);
                        XLowerWindow(dpy, c->win);
                }

+       }

        drawall();
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
        drawall();
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));


@@ -339,6 +290,8 @@ viewall(Arg *arg) {
        arrange(NULL);
 }
 
        arrange(NULL);
 }
 

+
+

 void
 zoom(Arg *arg) {
        unsigned int n;
 void
 zoom(Arg *arg) {
        unsigned int n;