applied Jukkas patch
1c2d673d
3 file(s) · +19 −17
| 214 | 214 | c->border = 0; |
|
| 215 | 215 | updatesize(c); |
|
| 216 | 216 | ||
| 217 | - | if(c->x + c->w + 2 > sw) |
|
| 218 | - | c->x = sw - c->w - 2; |
|
| 217 | + | if(c->x + c->w + 2 * BORDERPX > sw) |
|
| 218 | + | c->x = sw - c->w - 2 * BORDERPX; |
|
| 219 | 219 | if(c->x < 0) |
|
| 220 | 220 | c->x = 0; |
|
| 221 | - | if(c->y + c->h + 2 > sh) |
|
| 221 | + | if(c->y + c->h + 2 * BORDERPX > sh) |
|
| 222 | 222 | c->y = sh - c->h - 2; |
|
| 223 | 223 | if(c->h != sh && c->y < bh) |
|
| 224 | 224 | c->y = bh; |
|
| 302 | 302 | if(c->w == sw && c->h == sh) |
|
| 303 | 303 | wc.border_width = 0; |
|
| 304 | 304 | else |
|
| 305 | - | wc.border_width = 1; |
|
| 305 | + | wc.border_width = BORDERPX; |
|
| 306 | 306 | XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); |
|
| 307 | 307 | configure(c); |
|
| 308 | 308 | XSync(dpy, False); |
|
| 312 | 312 | resizetitle(Client *c) { |
|
| 313 | 313 | c->tw = textw(c->name); |
|
| 314 | 314 | if(c->tw > c->w) |
|
| 315 | - | c->tw = c->w + 2; |
|
| 316 | - | c->tx = c->x + c->w - c->tw + 2; |
|
| 315 | + | c->tw = c->w + 2 * BORDERPX; |
|
| 316 | + | c->tx = c->x + c->w - c->tw + 2 * BORDERPX; |
|
| 317 | 317 | c->ty = c->y; |
|
| 318 | 318 | if(isvisible(c)) |
|
| 319 | 319 | XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th); |
|
| 38 | 38 | /* mask shorthands, used in event.c and client.c */ |
|
| 39 | 39 | #define BUTTONMASK (ButtonPressMask | ButtonReleaseMask) |
|
| 40 | 40 | #define MOUSEMASK (BUTTONMASK | PointerMotionMask) |
|
| 41 | + | /* other stuff used in different places */ |
|
| 42 | + | #define BORDERPX 1 |
|
| 41 | 43 | #define PROTODELWIN 1 |
|
| 42 | 44 | ||
| 43 | 45 | enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */ |
| 49 | 49 | if((c->ismax = !c->ismax)) { |
|
| 50 | 50 | c->rx = c->x; c->x = sx; |
|
| 51 | 51 | c->ry = c->y; c->y = bh; |
|
| 52 | - | c->rw = c->w; c->w = sw; |
|
| 53 | - | c->rh = c->h; c->h = sh - bh - 2; |
|
| 52 | + | c->rw = c->w; c->w = sw - 2 * BORDERPX; |
|
| 53 | + | c->rh = c->h; c->h = sh - bh - 2 * BORDERPX; |
|
| 54 | 54 | } |
|
| 55 | 55 | else { |
|
| 56 | 56 | c->x = c->rx; |
|
| 119 | 119 | if(n == 1) { |
|
| 120 | 120 | c->x = sx; |
|
| 121 | 121 | c->y = sy + bh; |
|
| 122 | - | c->w = sw - 2; |
|
| 123 | - | c->h = sh - 2 - bh; |
|
| 122 | + | c->w = sw - 2 * BORDERPX; |
|
| 123 | + | c->h = sh - 2 * BORDERPX - bh; |
|
| 124 | 124 | } |
|
| 125 | 125 | else if(i == 0) { |
|
| 126 | 126 | c->x = sx; |
|
| 127 | 127 | c->y = sy + bh; |
|
| 128 | - | c->w = mw - 2; |
|
| 129 | - | c->h = sh - 2 - bh; |
|
| 128 | + | c->w = mw - 2 * BORDERPX; |
|
| 129 | + | c->h = sh - 2 * BORDERPX - bh; |
|
| 130 | 130 | } |
|
| 131 | 131 | else if(h > bh) { |
|
| 132 | 132 | c->x = sx + mw; |
|
| 133 | 133 | c->y = sy + (i - 1) * h + bh; |
|
| 134 | - | c->w = w - 2; |
|
| 134 | + | c->w = w - 2 * BORDERPX; |
|
| 135 | 135 | if(i + 1 == n) |
|
| 136 | - | c->h = sh - c->y - 2; |
|
| 136 | + | c->h = sh - c->y - 2 * BORDERPX; |
|
| 137 | 137 | else |
|
| 138 | - | c->h = h - 2; |
|
| 138 | + | c->h = h - 2 * BORDERPX; |
|
| 139 | 139 | } |
|
| 140 | 140 | else { /* fallback if h < bh */ |
|
| 141 | 141 | c->x = sx + mw; |
|
| 142 | 142 | c->y = sy + bh; |
|
| 143 | - | c->w = w - 2; |
|
| 144 | - | c->h = sh - 2 - bh; |
|
| 143 | + | c->w = w - 2 * BORDERPX; |
|
| 144 | + | c->h = sh - 2 * BORDERPX - bh; |
|
| 145 | 145 | } |
|
| 146 | 146 | resize(c, False, TopLeft); |
|
| 147 | 147 | i++; |
|