Added tag 3.2.1 for changeset f2cabc83a18f

[dwm.git] / view.c

diff --git a/view.c b/view.c
index b8dd79a..81dd4b3 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;


@@ -105,7 +105,7 @@ dotile(void) {
                                else /* fallback if th < bh */
                                        c->h = wah - 2 * BORDERPX;
                        }
                                else /* fallback if th < bh */
                                        c->h = wah - 2 * BORDERPX;
                        }

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

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


@@ -152,7 +152,6 @@ incnmaster(Arg *arg) {
        if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
                return;
        nmaster += arg->i;
        if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
                return;
        nmaster += arg->i;

-       updatemodetext();

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


@@ -186,10 +185,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) {


@@ -201,7 +199,6 @@ restack(void) {
                        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));
 }


@@ -217,7 +214,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


@@ -235,12 +231,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;