|
|
@ -75,14 +75,9 @@ dotile(void) { |
|
|
|
|
|
|
|
|
|
|
|
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) |
|
|
|
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) |
|
|
|
n++; |
|
|
|
n++; |
|
|
|
|
|
|
|
|
|
|
|
/* window geoms */ |
|
|
|
/* window geoms */ |
|
|
|
if(nmaster > 0) { |
|
|
|
|
|
|
|
mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1); |
|
|
|
mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1); |
|
|
|
mw = (n > nmaster) ? (waw * master) / 1000 : waw; |
|
|
|
mw = (n > nmaster) ? (waw * master) / 1000 : waw; |
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
mh = mw = 0; |
|
|
|
|
|
|
|
th = (n > nmaster) ? wah / (n - nmaster) : 0; |
|
|
|
th = (n > nmaster) ? wah / (n - nmaster) : 0; |
|
|
|
tw = waw - mw; |
|
|
|
tw = waw - mw; |
|
|
|
|
|
|
|
|
|
|
@ -95,7 +90,7 @@ dotile(void) { |
|
|
|
c->ismax = False; |
|
|
|
c->ismax = False; |
|
|
|
c->x = wax; |
|
|
|
c->x = wax; |
|
|
|
c->y = way; |
|
|
|
c->y = way; |
|
|
|
if((nmaster > 0) && (i < nmaster)) { |
|
|
|
if(i < nmaster) { |
|
|
|
c->y += i * mh; |
|
|
|
c->y += i * mh; |
|
|
|
c->w = mw - 2 * BORDERPX; |
|
|
|
c->w = mw - 2 * BORDERPX; |
|
|
|
c->h = mh - 2 * BORDERPX; |
|
|
|
c->h = mh - 2 * BORDERPX; |
|
|
@ -155,9 +150,7 @@ focusprev(Arg *arg) { |
|
|
|
|
|
|
|
|
|
|
|
void |
|
|
|
void |
|
|
|
incnmaster(Arg *arg) { |
|
|
|
incnmaster(Arg *arg) { |
|
|
|
if((arrange == dofloat) |
|
|
|
if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh)) |
|
|
|
|| ((int)nmaster + arg->i < 0) |
|
|
|
|
|
|
|
|| (((int)nmaster + arg->i > 0) && (wah / (nmaster + arg->i) < bh))) |
|
|
|
|
|
|
|
return; |
|
|
|
return; |
|
|
|
nmaster += arg->i; |
|
|
|
nmaster += arg->i; |
|
|
|
updatemodetext(); |
|
|
|
updatemodetext(); |
|
|
|