|
|
@ -142,14 +142,14 @@ manage(Window w, XWindowAttributes *wa) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
c->border = BORDERPX;
|
|
|
|
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)
|
|
|
|
if(c->x + c->w + 2 * c->border > wax + waw)
|
|
|
|
c->x = wax + waw - c->w - 2 * c->border;
|
|
|
|
c->x = wax + waw - c->w - 2 * c->border;
|
|
|
|
if(c->y + c->h + 2 * c->border > way + wah)
|
|
|
|
if(c->y + c->h + 2 * c->border > way + wah)
|
|
|
|
c->y = way + wah - c->h - 2 * c->border;
|
|
|
|
c->y = way + wah - c->h - 2 * c->border;
|
|
|
|
|
|
|
|
if(c->x < wax)
|
|
|
|
|
|
|
|
c->x = wax;
|
|
|
|
|
|
|
|
if(c->y < way)
|
|
|
|
|
|
|
|
c->y = way;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
updatesizehints(c);
|
|
|
|
updatesizehints(c);
|
|
|
|
c->proto = getproto(c->win);
|
|
|
|
c->proto = getproto(c->win);
|
|
|
@ -197,14 +197,14 @@ resize(Client *c, Bool sizehints) {
|
|
|
|
else
|
|
|
|
else
|
|
|
|
c->border = BORDERPX;
|
|
|
|
c->border = BORDERPX;
|
|
|
|
/* offscreen appearance fixes */
|
|
|
|
/* offscreen appearance fixes */
|
|
|
|
if(c->x + c->w + 2 * c->border < sx)
|
|
|
|
|
|
|
|
c->x = sx;
|
|
|
|
|
|
|
|
if(c->y + c->h + 2 * c->border < sy)
|
|
|
|
|
|
|
|
c->y = sy;
|
|
|
|
|
|
|
|
if(c->x > sw)
|
|
|
|
if(c->x > sw)
|
|
|
|
c->x = sw - c->w - 2 * c->border;
|
|
|
|
c->x = sw - c->w - 2 * c->border;
|
|
|
|
if(c->y > sh)
|
|
|
|
if(c->y > sh)
|
|
|
|
c->y = sh - c->h - 2 * c->border;
|
|
|
|
c->y = sh - c->h - 2 * c->border;
|
|
|
|
|
|
|
|
if(c->x + c->w + 2 * c->border < sx)
|
|
|
|
|
|
|
|
c->x = sx;
|
|
|
|
|
|
|
|
if(c->y + c->h + 2 * c->border < sy)
|
|
|
|
|
|
|
|
c->y = sy;
|
|
|
|
wc.x = c->x;
|
|
|
|
wc.x = c->x;
|
|
|
|
wc.y = c->y;
|
|
|
|
wc.y = c->y;
|
|
|
|
wc.width = c->w;
|
|
|
|
wc.width = c->w;
|
|
|
|