X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=client.c;h=4afa70526c6391f356859984899f9fb0c7a63199;hb=04eb016e782743ec88f150ec6f5389703bed3ce2;hp=34c69aa11e455b0952b9730f90267f55a209620f;hpb=72707c2fae68f5eba6ea97cbf356bfb968c8a15d;p=dwm.git diff --git a/client.c b/client.c index 34c69aa..4afa705 100644 --- a/client.c +++ b/client.c @@ -284,6 +284,7 @@ pop(Client *c) c->next->prev = c->prev; *l = c->next; + c->prev = NULL; if(clients) clients->prev = c; c->next = clients; @@ -292,30 +293,30 @@ pop(Client *c) } void -resize(Client *c, Bool inc, Corner sticky) +resize(Client *c, Bool sizehints, Corner sticky) { int bottom = c->y + c->h; int right = c->x + c->w; XConfigureEvent e; - if(inc) { + if(sizehints) { if(c->incw) c->w -= (c->w - c->basew) % c->incw; if(c->inch) c->h -= (c->h - c->baseh) % c->inch; + if(c->minw && c->w < c->minw) + c->w = c->minw; + if(c->minh && c->h < c->minh) + c->h = c->minh; + if(c->maxw && c->w > c->maxw) + c->w = c->maxw; + if(c->maxh && c->h > c->maxh) + c->h = c->maxh; } if(c->x > sw) /* might happen on restart */ c->x = sw - c->w; if(c->y > sh) c->y = sh - c->h; - if(c->minw && c->w < c->minw) - c->w = c->minw; - if(c->minh && c->h < c->minh) - c->h = c->minh; - if(c->maxw && c->w > c->maxw) - c->w = c->maxw; - if(c->maxh && c->h > c->maxh) - c->h = c->maxh; if(sticky == TopRight || sticky == BotRight) c->x = right - c->w; if(sticky == BotLeft || sticky == BotRight)