removed mode label stuff

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 2f2d42a..935525f 100644 (file)
--- a/view.c
+++ b/view.c
@@ -59,7 +59,7 @@ dofloat(void) {
                        resize(c, True, TopLeft);
                }
                else
                        resize(c, True, TopLeft);
                }
                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);


@@ -76,10 +76,10 @@ dotile(void) {
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
        /* window geoms */
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
        /* window geoms */

-       mw = (n > nmaster) ? (waw * master) / 1000 : waw;

        mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
        mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);

-       tw = waw - mw;
+       mw = (n > nmaster) ? (waw * master) / 1000 : waw;

        th = (n > nmaster) ? wah / (n - nmaster) : 0;
        th = (n > nmaster) ? wah / (n - nmaster) : 0;

+       tw = waw - mw;

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


@@ -109,8 +109,7 @@ dotile(void) {
                        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);


@@ -153,8 +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;

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

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


@@ -192,19 +189,14 @@ restack(void) {
                drawstatus();
                return;
        }
                drawstatus();
                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);
                }
        }


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

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

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