removed NOBORDER(broken and badly used), introduce WIDTH/HEIGHT macros for computing client size with border added, fixes bug announced by sergey_m
4883a062
1 file(s) · +19 −18
| 53 | 53 | #define MIN(a, b) ((a) < (b) ? (a) : (b)) |
|
| 54 | 54 | #define MAXTAGLEN 16 |
|
| 55 | 55 | #define MOUSEMASK (BUTTONMASK|PointerMotionMask) |
|
| 56 | - | #define NOBORDER(x) ((x) - 2 * c->bw) |
|
| 56 | + | #define WIDTH(x) ((x)->w + 2*(x)->bw) |
|
| 57 | + | #define HEIGHT(x) ((x)->h + 2*(x)->bw) |
|
| 57 | 58 | #define TAGMASK ((int)((1LL << LENGTH(tags)) - 1)) |
|
| 58 | 59 | #define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height) |
|
| 59 | 60 | ||
| 868 | 869 | c->bw = 0; |
|
| 869 | 870 | } |
|
| 870 | 871 | else { |
|
| 871 | - | if(c->x + c->w + 2 * c->bw > sx + sw) |
|
| 872 | - | c->x = sx + sw - NOBORDER(c->w); |
|
| 873 | - | if(c->y + c->h + 2 * c->bw > sy + sh) |
|
| 874 | - | c->y = sy + sh - NOBORDER(c->h); |
|
| 872 | + | if(c->x + WIDTH(c) > sx + sw) |
|
| 873 | + | c->x = sx + sw - WIDTH(c); |
|
| 874 | + | if(c->y + HEIGHT(c) > sy + sh) |
|
| 875 | + | c->y = sy + sh - HEIGHT(c); |
|
| 875 | 876 | c->x = MAX(c->x, sx); |
|
| 876 | 877 | /* only fix client y-offset, if the client center might cover the bar */ |
|
| 877 | 878 | c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy); |
|
| 931 | 932 | Client *c; |
|
| 932 | 933 | ||
| 933 | 934 | for(c = nexttiled(clients); c; c = nexttiled(c->next)) |
|
| 934 | - | resize(c, wx, wy, NOBORDER(ww), NOBORDER(wh), resizehints); |
|
| 935 | + | resize(c, wx, wy, ww - 2*c->bw, wh - 2*c->bw, resizehints); |
|
| 935 | 936 | } |
|
| 936 | 937 | ||
| 937 | 938 | void |
|
| 967 | 968 | && ny >= wy && ny <= wy + wh) { |
|
| 968 | 969 | if(abs(wx - nx) < snap) |
|
| 969 | 970 | nx = wx; |
|
| 970 | - | else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap) |
|
| 971 | - | nx = wx + ww - NOBORDER(c->w); |
|
| 971 | + | else if(abs((wx + ww) - (nx + WIDTH(c))) < snap) |
|
| 972 | + | nx = wx + ww - WIDTH(c); |
|
| 972 | 973 | if(abs(wy - ny) < snap) |
|
| 973 | 974 | ny = wy; |
|
| 974 | - | else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap) |
|
| 975 | - | ny = wy + wh - NOBORDER(c->h); |
|
| 975 | + | else if(abs((wy + wh) - (ny + HEIGHT(c))) < snap) |
|
| 976 | + | ny = wy + wh - HEIGHT(c); |
|
| 976 | 977 | if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) |
|
| 977 | 978 | togglefloating(NULL); |
|
| 978 | 979 | } |
|
| 1080 | 1081 | if(w <= 0 || h <= 0) |
|
| 1081 | 1082 | return; |
|
| 1082 | 1083 | if(x > sx + sw) |
|
| 1083 | - | x = sw - NOBORDER(w); |
|
| 1084 | + | x = sw - WIDTH(c); |
|
| 1084 | 1085 | if(y > sy + sh) |
|
| 1085 | - | y = sh - NOBORDER(h); |
|
| 1086 | + | y = sh - HEIGHT(c); |
|
| 1086 | 1087 | if(x + w + 2 * c->bw < sx) |
|
| 1087 | 1088 | x = sx; |
|
| 1088 | 1089 | if(y + h + 2 * c->bw < sy) |
|
| 1130 | 1131 | break; |
|
| 1131 | 1132 | case MotionNotify: |
|
| 1132 | 1133 | XSync(dpy, False); |
|
| 1133 | - | nw = MAX(ev.xmotion.x - NOBORDER(ocx) + 1, 1); |
|
| 1134 | - | nh = MAX(ev.xmotion.y - NOBORDER(ocy) + 1, 1); |
|
| 1134 | + | nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1); |
|
| 1135 | + | nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 1, 1); |
|
| 1135 | 1136 | ||
| 1136 | 1137 | if(snap && nw >= wx && nw <= wx + ww |
|
| 1137 | 1138 | && nh >= wy && nh <= wy + wh) { |
|
| 1434 | 1435 | /* master */ |
|
| 1435 | 1436 | c = nexttiled(clients); |
|
| 1436 | 1437 | mw = mfact * ww; |
|
| 1437 | - | resize(c, wx, wy, NOBORDER(n == 1 ? ww : mw), NOBORDER(wh), resizehints); |
|
| 1438 | + | resize(c, wx, wy, (n == 1 ? ww : mw) - 2*c->bw, wh - 2*c->bw, resizehints); |
|
| 1438 | 1439 | ||
| 1439 | 1440 | if(--n == 0) |
|
| 1440 | 1441 | return; |
|
| 1448 | 1449 | h = wh; |
|
| 1449 | 1450 | ||
| 1450 | 1451 | for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { |
|
| 1451 | - | resize(c, x, y, NOBORDER(w), /* remainder */ ((i + 1 == n) |
|
| 1452 | - | ? NOBORDER(wy + wh) - y : h), resizehints); |
|
| 1452 | + | resize(c, x, y, w - 2*c->bw, /* remainder */ ((i + 1 == n) |
|
| 1453 | + | ? wy + wh - y : h) - 2*c->bw, resizehints); |
|
| 1453 | 1454 | if(h != wh) |
|
| 1454 | - | y = c->y + c->h + 2 * c->bw; |
|
| 1455 | + | y = c->y + HEIGHT(c); |
|
| 1455 | 1456 | } |
|
| 1456 | 1457 | } |
|
| 1457 | 1458 | ||