small simplification to dotile() (thx to Ross for this hint)

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 5c65148..9bc4e99 100644 (file)
--- a/view.c
+++ b/view.c
@@ -69,13 +69,12 @@ dofloat(void) {
 
 void
 dotile(void) {
 
 void
 dotile(void) {

-       unsigned int i, n, mpx, stackw, th;
+       unsigned int i, n, mpw, th;

        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;

-       mpx = (waw * master) / 1000;
-       stackw = waw - mpx;
+       mpw = (waw * master) / 1000;

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


@@ -91,15 +90,15 @@ dotile(void) {
                                c->h = wah - 2 * BORDERPX;
                        }
                        else if(i == 0) { /* master window */
                                c->h = wah - 2 * BORDERPX;
                        }
                        else if(i == 0) { /* master window */

-                               c->w = mpx - 2 * BORDERPX;
+                               c->w = mpw - 2 * BORDERPX;

                                c->h = wah - 2 * BORDERPX;
                                th = wah / (n - 1);
                        }
                        else {  /* tile window */
                                c->h = wah - 2 * BORDERPX;
                                th = wah / (n - 1);
                        }
                        else {  /* tile window */

-                               c->x += mpx;
-                               c->w = stackw - 2 * BORDERPX;
+                               c->x += mpw;
+                               c->w = (waw - mpw) - 2 * BORDERPX;

                                if(th > bh) {
                                if(th > bh) {

-                                       c->y = way + (i - 1) * th;
+                                       c->y += (i - 1) * th;

                                        c->h = th - 2 * BORDERPX;
                                }
                                else /* fallback if th < bh */
                                        c->h = th - 2 * BORDERPX;
                                }
                                else /* fallback if th < bh */


@@ -202,7 +201,7 @@ restack(void) {
 
 void
 togglefloat(Arg *arg) {
 
 void
 togglefloat(Arg *arg) {

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

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


@@ -233,17 +232,9 @@ view(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)

-               seltag[i] = False;
-       seltag[arg->i] = True;
-       arrange();
-}
-
-void
-viewall(Arg *arg) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               seltag[i] = True;
+               seltag[i] = (arg->i == -1) ? True : False;
+       if(arg->i >= 0 && arg->i < ntags)
+               seltag[arg->i] = True;

        arrange();
 }
 
        arrange();
 }