dwm-meillo
changeset 721:d3876aa79292 3.2.2
prepared yet another hotfix release
| author | Anselm R. Garbe <arg@suckless.org> |
|---|---|
| date | Thu, 25 Jan 2007 09:59:48 +0100 |
| parents | a7e16dff53f3 |
| children | 33989de7ebbe |
| files | client.c config.mk view.c |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line diff
1.1 --- a/client.c Wed Jan 24 17:25:37 2007 +0100 1.2 +++ b/client.c Thu Jan 25 09:59:48 2007 +0100 1.3 @@ -178,6 +178,8 @@ 1.4 resize(Client *c, Bool sizehints) { 1.5 XWindowChanges wc; 1.6 1.7 + if(c->w <= 0 || c->h <= 0) 1.8 + return; 1.9 if(sizehints) { 1.10 if(c->incw) 1.11 c->w -= (c->w - c->basew) % c->incw;
2.1 --- a/config.mk Wed Jan 24 17:25:37 2007 +0100 2.2 +++ b/config.mk Thu Jan 25 09:59:48 2007 +0100 2.3 @@ -1,5 +1,5 @@ 2.4 # dwm version 2.5 -VERSION = 3.2.1 2.6 +VERSION = 3.2.2 2.7 2.8 # Customize below to fit your system 2.9
3.1 --- a/view.c Wed Jan 24 17:25:37 2007 +0100 3.2 +++ b/view.c Thu Jan 25 09:59:48 2007 +0100 3.3 @@ -98,11 +98,11 @@ 3.4 else { /* tile window */ 3.5 c->x += mw; 3.6 c->w = tw - 2 * BORDERPX; 3.7 - if(th > bh) { 3.8 + if(th - 2 * BORDERPX > bh) { 3.9 c->y += (i - nmaster) * th; 3.10 c->h = th - 2 * BORDERPX; 3.11 } 3.12 - else /* fallback if th < bh */ 3.13 + else /* fallback if th - 2 * BORDERPX < bh */ 3.14 c->h = wah - 2 * BORDERPX; 3.15 } 3.16 resize(c, False); 3.17 @@ -149,7 +149,8 @@ 3.18 3.19 void 3.20 incnmaster(Arg *arg) { 3.21 - if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh)) 3.22 + if((arrange == dofloat) || (nmaster + arg->i < 1) 3.23 + || (wah / (nmaster + arg->i) - 2 * BORDERPX < bh)) 3.24 return; 3.25 nmaster += arg->i; 3.26 if(sel) 3.27 @@ -173,7 +174,8 @@ 3.28 if(arg->i == 0) 3.29 master = MASTER; 3.30 else { 3.31 - if(master + arg->i > 950 || master + arg->i < 50) 3.32 + if(waw * (master + arg->i) / 1000 > waw - bh - 2 * BORDERPX 3.33 + || waw * (master + arg->i) / 1000 < bh + 2 * BORDERPX) 3.34 return; 3.35 master += arg->i; 3.36 }