renamed CAVEATS into BUGS

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 4513a45..de3328e 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,10 +56,10 @@ 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
                }
                else

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

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


@@ -75,27 +75,22 @@ dotile(void) {
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;

-

        /* window geoms */
        /* window geoms */

-       if(nmaster > 0) {
-               mh = (n > nmaster) ?  wah / nmaster : wah / (n > 0 ? n : 1);
-               mw = (n > nmaster) ? (waw * master) / 1000 : waw;
-       }
-       else
-               mh = mw = 0;
+       mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
+       mw = (n > nmaster) ? (waw * master) / 1000 : waw;

        th = (n > nmaster) ? wah / (n - nmaster) : 0;
        tw = waw - mw;
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
                        if(c->isfloat) {
        th = (n > nmaster) ? wah / (n - nmaster) : 0;
        tw = waw - mw;
 
        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;
                        c->x = wax;
                        c->y = way;
                                continue;
                        }
                        c->ismax = False;
                        c->x = wax;
                        c->y = way;

-                       if((nmaster > 0) && (i < nmaster)) {
+                       if(i < nmaster) {

                                c->y += i * mh;
                                c->w = mw - 2 * BORDERPX;
                                c->h = mh - 2 * BORDERPX;
                                c->y += i * mh;
                                c->w = mw - 2 * BORDERPX;
                                c->h = mh - 2 * BORDERPX;


@@ -103,19 +98,18 @@ 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 > bh) {

                                        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 < bh */

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

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

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

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

        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);


@@ -155,12 +149,10 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {

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

                return;
        nmaster += arg->i;
                return;
        nmaster += arg->i;

-       updatemodetext();

        if(sel)
                arrange();
        else
        if(sel)
                arrange();
        else


@@ -182,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 - bh - 2 * BORDERPX
+                       || waw * (master + arg->i) / 1000 < bh + 2 * BORDERPX)

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


@@ -194,27 +187,20 @@ restack(void) {
        Client *c;
        XEvent ev;
 
        Client *c;
        XEvent ev;
 

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

                return;
                return;

-       }
-       if(sel->isfloat || arrange == dofloat) {
+       if(sel->isfloat || arrange == dofloat)

                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->win);

-               XRaiseWindow(dpy, sel->twin);
-       }

        if(arrange != dofloat) {
        if(arrange != dofloat) {

-               if(!sel->isfloat) {
-                       XLowerWindow(dpy, sel->twin);
+               if(!sel->isfloat)

                        XLowerWindow(dpy, sel->win);
                        XLowerWindow(dpy, sel->win);

-               }

                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
                                continue;
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
                                continue;

-                       XLowerWindow(dpy, c->twin);

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

-       drawall();

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


@@ -230,7 +216,6 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;

-       updatemodetext();

        if(sel)
                arrange();
        else
        if(sel)
                arrange();
        else


@@ -248,12 +233,6 @@ toggleview(Arg *arg) {
        arrange();
 }
 
        arrange();
 }
 

-void
-updatemodetext() {
-       snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
-       bmw = textw(mtext);
-}
-

 void
 view(Arg *arg) {
        unsigned int i;
 void
 view(Arg *arg) {
        unsigned int i;