yet another consistency fix of dwm

[dwm.git] / view.c

diff --git a/view.c b/view.c
index bc1f4e2..ded304e 100644 (file)
--- a/view.c
+++ b/view.c
@@ -31,7 +31,7 @@ togglemax(Client *c) {
                c->w = c->rw;
                c->h = c->rh;
        }
                c->w = c->rw;
                c->h = c->rh;
        }

-       resize(c, True, TopLeft);
+       resize(c, True);

        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 


@@ -56,7 +56,7 @@ dofloat(void) {
 
        for(c = clients; c; c = c->next) {
                if(isvisible(c)) {
 
        for(c = clients; c; c = c->next) {
                if(isvisible(c)) {

-                       resize(c, True, TopLeft);
+                       resize(c, True);

                }
                else
                        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
                }
                else
                        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);


@@ -84,7 +84,7 @@ dotile(void) {
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
                        if(c->isfloat) {
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
                        if(c->isfloat) {

-                               resize(c, True, TopLeft);
+                               resize(c, True);

                                continue;
                        }
                        c->ismax = False;
                                continue;
                        }
                        c->ismax = False;


@@ -98,14 +98,14 @@ dotile(void) {
                        else {  /* tile window */
                                c->x += mw;
                                c->w = tw - 2 * BORDERPX;
                        else {  /* tile window */
                                c->x += mw;
                                c->w = tw - 2 * BORDERPX;

-                               if(th > bh) {
+                               if(th > 2 * BORDERPX) {

                                        c->y += (i - nmaster) * th;
                                        c->h = th - 2 * BORDERPX;
                                }
                                        c->y += (i - nmaster) * th;
                                        c->h = th - 2 * BORDERPX;
                                }

-                               else /* fallback if th < bh */
+                               else /* fallback if th <= 2 * BORDERPX */

                                        c->h = wah - 2 * BORDERPX;
                        }
                                        c->h = wah - 2 * BORDERPX;
                        }

-                       resize(c, False, TopLeft);
+                       resize(c, False);

                        i++;
                }
                else
                        i++;
                }
                else


@@ -149,7 +149,8 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {

-       if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+       if((arrange == dofloat) || (nmaster + arg->i < 1)
+               || (wah / (nmaster + arg->i) <= 2 * BORDERPX))

                return;
        nmaster += arg->i;
        if(sel)
                return;
        nmaster += arg->i;
        if(sel)


@@ -173,7 +174,8 @@ resizemaster(Arg *arg) {
        if(arg->i == 0)
                master = MASTER;
        else {
        if(arg->i == 0)
                master = MASTER;
        else {

-               if(master + arg->i > 950 || master + arg->i < 50)
+               if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
+                       || waw * (master + arg->i) / 1000 <= 2 * BORDERPX)

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


@@ -185,10 +187,9 @@ restack(void) {
        Client *c;
        XEvent ev;
 
        Client *c;
        XEvent ev;
 

-       if(!sel) {
-               drawstatus();
+       drawstatus();
+       if(!sel)

                return;
                return;

-       }

        if(sel->isfloat || arrange == dofloat)
                XRaiseWindow(dpy, sel->win);
        if(arrange != dofloat) {
        if(sel->isfloat || arrange == dofloat)
                XRaiseWindow(dpy, sel->win);
        if(arrange != dofloat) {


@@ -206,7 +207,7 @@ restack(void) {
 
 void
 togglefloat(Arg *arg) {
 
 void
 togglefloat(Arg *arg) {

-       if (!sel || arrange == dofloat)
+       if(!sel || arrange == dofloat)

                return;
        sel->isfloat = !sel->isfloat;
        arrange();
                return;
        sel->isfloat = !sel->isfloat;
        arrange();