X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=view.c;h=72a49913dc4fe937b97e971d7ddc1c535ef3ae7c;hp=e7d7a99f82dc33abfcf8d59ff363c590f0b2fecf;hb=ac24f132dba7e59d9d9ff98d984f5e0b0d20fd09;hpb=321e8d51edb8fe433e8e2ce8d5463c6999cc0576 diff --git a/view.c b/view.c index e7d7a99..72a4991 100644 --- a/view.c +++ b/view.c @@ -1,4 +1,4 @@ -/* (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -69,13 +69,12 @@ dofloat(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++; - mpx = (waw * master) / 1000; - stackw = waw - mpx; + mpw = (waw * master) / 1000; 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->w = waw - stackw - 2 * BORDERPX; + c->w = mpw - 2 * BORDERPX; 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) { - c->y = way + (i - 1) * th; + c->y += (i - 1) * th; c->h = th - 2 * BORDERPX; } else /* fallback if th < bh */ @@ -201,6 +200,14 @@ restack(void) { } void +togglefloat(Arg *arg) { + if (!sel || arrange == dofloat) + return; + sel->isfloat = !sel->isfloat; + arrange(); +} + +void togglemode(Arg *arg) { arrange = (arrange == dofloat) ? dotile : dofloat; if(sel) @@ -225,17 +232,9 @@ view(Arg *arg) { 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(); }