tsome changes to updatesizehints, I don't change the aspect ratio algorithm now… | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 9ca5c3b108dbda55c1ac9f068b631911f5685eeb | |
parent bab5b1178dd0a6bfe08e3d658a47b3b5671a93d4 | |
Author: Anselm R. Garbe <[email protected]> | |
Date: Thu, 1 Mar 2007 12:33:45 +0100 | |
some changes to updatesizehints, I don't change the aspect ratio algorithm now … | |
Diffstat: | |
M client.c | 39 ++++++++++++++++++-----------… | |
M dwm.h | 2 +- | |
2 files changed, 24 insertions(+), 17 deletions(-) | |
--- | |
diff --git a/client.c b/client.c | |
t@@ -227,35 +227,26 @@ manage(Window w, XWindowAttributes *wa) { | |
void | |
resize(Client *c, int x, int y, int w, int h, Bool sizehints) { | |
- float actual, dx, dy, max, min; | |
+ float dx, dy, max, min, ratio; | |
XWindowChanges wc; | |
if(w <= 0 || h <= 0) | |
return; | |
if(sizehints) { | |
- if(c->minw && w < c->minw) | |
- w = c->minw; | |
- if(c->minh && h < c->minh) | |
- h = c->minh; | |
- if(c->maxw && w > c->maxw) | |
- w = c->maxw; | |
- if(c->maxh && h > c->maxh) | |
- h = c->maxh; | |
- /* inspired by algorithm from fluxbox */ | |
if(c->minay > 0 && c->maxay && (h - c->baseh) > 0) { | |
dx = (float)(w - c->basew); | |
dy = (float)(h - c->baseh); | |
min = (float)(c->minax) / (float)(c->minay); | |
max = (float)(c->maxax) / (float)(c->maxay); | |
- actual = dx / dy; | |
- if(max > 0 && min > 0 && actual > 0) { | |
- if(actual < min) { | |
+ ratio = dx / dy; | |
+ if(max > 0 && min > 0 && ratio > 0) { | |
+ if(ratio < min) { | |
dy = (dx * min + dy) / (min * min + 1); | |
dx = dy * min; | |
w = (int)dx + c->basew; | |
h = (int)dy + c->baseh; | |
} | |
- else if(actual > max) { | |
+ else if(ratio > max) { | |
dy = (dx * min + dy) / (max * max + 1); | |
dx = dy * min; | |
w = (int)dx + c->basew; | |
t@@ -263,6 +254,14 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehi… | |
} | |
} | |
} | |
+ if(c->minw && w < c->minw) | |
+ w = c->minw; | |
+ if(c->minh && h < c->minh) | |
+ h = c->minh; | |
+ if(c->maxw && w > c->maxw) | |
+ w = c->maxw; | |
+ if(c->maxh && h > c->maxh) | |
+ h = c->maxh; | |
if(c->incw) | |
w -= (w - c->basew) % c->incw; | |
if(c->inch) | |
t@@ -313,6 +312,10 @@ updatesizehints(Client *c) { | |
c->basew = size.base_width; | |
c->baseh = size.base_height; | |
} | |
+ else if(c->flags & PMinSize) { | |
+ c->basew = size.min_width; | |
+ c->baseh = size.min_height; | |
+ } | |
else | |
c->basew = c->baseh = 0; | |
if(c->flags & PResizeInc) { | |
t@@ -331,16 +334,20 @@ updatesizehints(Client *c) { | |
c->minw = size.min_width; | |
c->minh = size.min_height; | |
} | |
+ else if(c->flags & PBaseSize) { | |
+ c->minw = size.base_width; | |
+ c->minh = size.base_height; | |
+ } | |
else | |
c->minw = c->minh = 0; | |
if(c->flags & PAspect) { | |
c->minax = size.min_aspect.x; | |
- c->minay = size.min_aspect.y; | |
c->maxax = size.max_aspect.x; | |
+ c->minay = size.min_aspect.y; | |
c->maxay = size.max_aspect.y; | |
} | |
else | |
- c->minax = c->minay = c->maxax = c->maxay = 0; | |
+ c->minax = c->maxax = c->minay = c->maxay = 0; | |
c->isfixed = (c->maxw && c->minw && c->maxh && c->minh | |
&& c->maxw == c->minw && c->maxh == c->minh); | |
} | |
diff --git a/dwm.h b/dwm.h | |
t@@ -47,7 +47,7 @@ struct Client { | |
int x, y, w, h; | |
int rx, ry, rw, rh; /* revert geometry */ | |
int basew, baseh, incw, inch, maxw, maxh, minw, minh; | |
- int minax, minay, maxax, maxay; | |
+ int minax, maxax, minay, maxay; | |
long flags; | |
unsigned int border; | |
Bool isbanned, isfixed, ismax, isfloating; |