- if(c->y + c->h + 2 * BORDERPX > sh)
- c->y = sh - c->h - 2 * BORDERPX;
- if(c->h != sh && c->y < bh)
- c->y = bh;
+ c->y = sy;
+ }
+ else {
+ c->border = BORDERPX;
+ if(c->x < wax)
+ c->x = wax;
+ if(c->y < way)
+ c->y = way;
+ if(c->x + c->w + 2 * c->border > wax + waw)
+ c->x = wax + waw - c->w - 2 * c->border;
+ if(c->y + c->h + 2 * c->border > way + wah)
+ c->y = way + wah - c->h - 2 * c->border;
+ }
+ updatesizehints(c);