equal
deleted
inserted
replaced
956 c->x = sx; |
956 c->x = sx; |
957 c->y = sy; |
957 c->y = sy; |
958 c->bw = wa->border_width; |
958 c->bw = wa->border_width; |
959 } |
959 } |
960 else { |
960 else { |
961 if(c->x + c->w + 2 * c->bw > wx + ww) |
961 if(c->x + c->w + 2 * c->bw > sx + sw) |
962 c->x = wx + ww - c->w - 2 * c->bw; |
962 c->x = sx + sw - c->w - 2 * c->bw; |
963 if(c->y + c->h + 2 * c->bw > wy + wh) |
963 if(c->y + c->h + 2 * c->bw > sy + sh) |
964 c->y = wy + wh - c->h - 2 * c->bw; |
964 c->y = sy + sh - c->h - 2 * c->bw; |
965 c->x = MAX(c->x, wx); |
965 c->x = MAX(c->x, sx); |
966 c->y = MAX(c->y, wy); |
966 c->y = MAX(c->y, sy); |
967 c->bw = borderpx; |
967 c->bw = borderpx; |
968 } |
968 } |
969 |
969 |
970 wc.border_width = c->bw; |
970 wc.border_width = c->bw; |
971 XConfigureWindow(dpy, w, CWBorderWidth, &wc); |
971 XConfigureWindow(dpy, w, CWBorderWidth, &wc); |