Faris
/
dwm
mirror of git://git.suckless.org/dwm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

applied Gottox' resizehints patch, thanks Gottox!

This commit is contained in:
Anselm R Garbe 2009-03-02 10:43:48 +00:00
parent f0d1d5206f
commit af508c2e82
1 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
dwm.c
View File

@ -129,6 +129,7 @@ typedef struct {
/* function declarations */ /* function declarations */
static void applyrules(Client *c); static void applyrules(Client *c);
static void applysizehints(Client *c, int *w, int *h);
static void arrange(void); static void arrange(void);
static void attach(Client *c); static void attach(Client *c);
static void attachstack(Client *c); static void attachstack(Client *c);
@ -270,6 +271,55 @@ applyrules(Client *c) {
c->tags = tagset[seltags]; c->tags = tagset[seltags];
} }
void
applysizehints(Client *c, int *w, int *h) {
Bool baseismin;
/* see last two sentences in ICCCM 4.1.2.3 */
baseismin = c->basew == c->minw && c->baseh == c->minh;
/* set minimum possible */
*w = MAX(1, *w);
*h = MAX(1, *h);
if(!baseismin) { /* temporarily remove base dimensions */
*w -= c->basew;
*h -= c->baseh;
}
/* adjust for aspect limits */
if(c->mina > 0 && c->maxa > 0) {
if(c->maxa < (float)*w / *h)
*w = *h * c->maxa;
else if(c->mina < (float)*h / *w)
*h = *w * c->mina;
}
if(baseismin) { /* increment calculation requires this */
*w -= c->basew;
*h -= c->baseh;
}
/* adjust for increment value */
if(c->incw)
*w -= *w % c->incw;
if(c->inch)
*h -= *h % c->inch;
/* restore base dimensions */
*w += c->basew;
*h += c->baseh;
*w = MAX(*w, c->minw);
*h = MAX(*h, c->minh);
if(c->maxw)
*w = MIN(*w, c->maxw);
if(c->maxh)
*h = MIN(*h, c->maxh);
}
void void
arrange(void) { arrange(void) {
unsigned int nt; unsigned int nt;
@ -1038,51 +1088,8 @@ void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) { resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
XWindowChanges wc; XWindowChanges wc;
if(sizehints) { if(sizehints)
/* see last two sentences in ICCCM 4.1.2.3 */ applysizehints(c, &w, &h);
Bool baseismin = c->basew == c->minw && c->baseh == c->minh;
/* set minimum possible */
w = MAX(1, w);
h = MAX(1, h);
if(!baseismin) { /* temporarily remove base dimensions */
w -= c->basew;
h -= c->baseh;
}
/* adjust for aspect limits */
if(c->mina > 0 && c->maxa > 0) {
if(c->maxa < (float)w / h)
w = h * c->maxa;
else if(c->mina < (float)h / w)
h = w * c->mina;
}
if(baseismin) { /* increment calculation requires this */
w -= c->basew;
h -= c->baseh;
}
/* adjust for increment value */
if(c->incw)
w -= w % c->incw;
if(c->inch)
h -= h % c->inch;
/* restore base dimensions */
w += c->basew;
h += c->baseh;
w = MAX(w, c->minw);
h = MAX(h, c->minh);
if(c->maxw)
w = MIN(w, c->maxw);
if(c->maxh)
h = MIN(h, c->maxh);
}
if(w <= 0 || h <= 0) if(w <= 0 || h <= 0)
return; return;
if(x > sx + sw) if(x > sx + sw)