applied resizecol fix by Jukka

[dwm.git] / view.c

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

-Bool isvertical = VERTICALSTACK;

 StackPos stackpos = STACKPOS;
 
 void
 StackPos stackpos = STACKPOS;
 
 void


@@ -119,20 +118,11 @@ dotile(Arg *arg) {
                stackh = sh - bh;
        }
 
                stackh = sh - bh;
        }
 

-       if(isvertical) {
-               tw = stackw;
-               if(n > 1)
-                       th = stackh / (n - 1);
-               else
-                       th = stackh;
-       }
-       else {
+       tw = stackw;
+       if(n > 1)
+               th = stackh / (n - 1);
+       else

                th = stackh;
                th = stackh;

-               if(n > 1)
-                       tw = stackw / (n - 1);
-               else
-                       tw = stackw;
-       }

 
        for(i = 0, c = clients; c; c = c->next) {
                if(isvisible(c)) {
 
        for(i = 0, c = clients; c; c = c->next) {
                if(isvisible(c)) {


@@ -169,56 +159,32 @@ dotile(Arg *arg) {
                                        break;
                                }
                        }
                                        break;
                                }
                        }

-                       else if((isvertical && th > bh) || (!isvertical && tw > MINW)) {
+                       else if(th > bh) {

                                /* tile window */
                                c->w = tw - 2 * BORDERPX;
                                c->h = th - 2 * BORDERPX;
                                switch(stackpos) {
                                case StackLeft:
                                /* tile window */
                                c->w = tw - 2 * BORDERPX;
                                c->h = th - 2 * BORDERPX;
                                switch(stackpos) {
                                case StackLeft:

-                                       if(isvertical) {
-                                               c->x = sx;
-                                               c->y = sy + (i - 1) * th + bh;
-                                               if(i + 1 == n)
-                                                       c->h = sh - c->y - 2 * BORDERPX;
-                                       }
-                                       else {
-                                               c->x = sx + (i - 1) * tw;
-                                               c->y = sy + bh;
-                                               if(i + 1 == n)
-                                                       c->w = sx + stackw - c->x - 2 * BORDERPX;
-                                       }
+                                       c->x = sx;
+                                       c->y = sy + (i - 1) * th + bh;
+                                       if(i + 1 == n)
+                                               c->h = sh - c->y - 2 * BORDERPX;

                                        break;
                                case StackBottom:
                                        break;
                                case StackBottom:

-                                       if(isvertical) {
-                                               c->x = sx;
-                                               c->y = sy + master + (i - 1) * th + bh;
-                                               if(i + 1 == n)
-                                                       c->h = sh - c->y - 2 * BORDERPX;
-                                       }
-                                       else {
-                                               c->x = sx + (i - 1) * tw;
-                                               c->y = sy + bh + master;
-                                               if(i + 1 == n)
-                                                       c->w = sw - c->x - 2 * BORDERPX;
-                                       }
+                                       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:
                                        break;
                                case StackRight:

-                                       if(isvertical) {
-                                               c->x = sx + master;
-                                               c->y = sy + (i - 1) * th + bh;
-                                               if(i + 1 == n)
-                                                       c->h = sh - c->y - 2 * BORDERPX;
-                                       }
-                                       else {
-                                               c->x = sx + master + (i - 1) * tw;
-                                               c->y = sy + bh;
-                                               if(i + 1 == n)
-                                                       c->w = sx + stackw - c->x - 2 * BORDERPX;
-                                       }
+                                       c->x = sx + master;
+                                       c->y = sy + (i - 1) * th + bh;
+                                       if(i + 1 == n)
+                                               c->h = sh - c->y - 2 * BORDERPX;

                                        break;
                                }
                        }
                                        break;
                                }
                        }

-                       else { /* fallback if th < bh resp. tw < MINW */
+                       else { /* fallback if th < bh */

                                c->w = stackw - 2 * BORDERPX;
                                c->h = stackh - 2 * BORDERPX;
                                switch(stackpos) {
                                c->w = stackw - 2 * BORDERPX;
                                c->h = stackh - 2 * BORDERPX;
                                switch(stackpos) {


@@ -228,7 +194,7 @@ dotile(Arg *arg) {
                                        break;
                                case StackBottom:
                                        c->x = sx;
                                        break;
                                case StackBottom:
                                        c->x = sx;

-                                       c->y = sy + master;
+                                       c->y = sy + master + bh;

                                        break;
                                case StackRight:
                                        c->x = sx + master;
                                        break;
                                case StackRight:
                                        c->x = sx + master;


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

+       int s;

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


@@ -302,13 +269,14 @@ 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 > sw - MINW || master + arg->i < MINW)
+               if(master + arg->i > s - MINW || master + arg->i < MINW)

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

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

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


@@ -328,11 +296,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));


@@ -359,14 +334,6 @@ toggleview(Arg *arg) {
        arrange(NULL);
 }
 
        arrange(NULL);
 }
 

-void
-togglestackdir(Arg *arg) {
-       if(arrange == dofloat)
-               return;
-       isvertical = !isvertical;
-       arrange(NULL);
-}
-

 void
 togglestackpos(Arg *arg) {
        if(arrange == dofloat)
 void
 togglestackpos(Arg *arg) {
        if(arrange == dofloat)


@@ -375,13 +342,8 @@ togglestackpos(Arg *arg) {
                stackpos = STACKPOS;
        else
                stackpos = StackBottom;
                stackpos = STACKPOS;
        else
                stackpos = StackBottom;

-       updatemaster();
-       arrange(NULL);
-}
-
-void
-updatemaster(void) {

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

+       arrange(NULL);

 }
 
 void
 }
 
 void