69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
|
diff -r -u a/dwm.c b/dwm.c
|
||
|
|
--- a/dwm.c 2019-02-02 07:55:28.000000000 -0500
|
||
|
|
+++ b/dwm.c 2022-01-17 22:38:33.614493243 -0500
|
||
|
|
@@ -1291,9 +1291,14 @@
|
||
|
|
resizemouse(const Arg *arg)
|
||
|
|
{
|
||
|
|
int ocx, ocy, nw, nh;
|
||
|
|
+ int ocx2, ocy2, nx, ny;
|
||
|
|
Client *c;
|
||
|
|
Monitor *m;
|
||
|
|
XEvent ev;
|
||
|
|
+ int horizcorner, vertcorner;
|
||
|
|
+ int di;
|
||
|
|
+ unsigned int dui;
|
||
|
|
+ Window dummy;
|
||
|
|
Time lasttime = 0;
|
||
|
|
|
||
|
|
if (!(c = selmon->sel))
|
||
|
|
@@ -1303,10 +1308,18 @@
|
||
|
|
restack(selmon);
|
||
|
|
ocx = c->x;
|
||
|
|
ocy = c->y;
|
||
|
|
+ ocx2 = c->x + c->w;
|
||
|
|
+ ocy2 = c->y + c->h;
|
||
|
|
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
||
|
|
None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
|
||
|
|
return;
|
||
|
|
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
||
|
|
+ if (!XQueryPointer (dpy, c->win, &dummy, &dummy, &di, &di, &nx, &ny, &dui))
|
||
|
|
+ return;
|
||
|
|
+ horizcorner = nx < c->w / 2;
|
||
|
|
+ vertcorner = ny < c->h / 2;
|
||
|
|
+ XWarpPointer (dpy, None, c->win, 0, 0, 0, 0,
|
||
|
|
+ horizcorner ? (-c->bw) : (c->w + c->bw -1),
|
||
|
|
+ vertcorner ? (-c->bw) : (c->h + c->bw -1));
|
||
|
|
do {
|
||
|
|
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
|
||
|
|
switch(ev.type) {
|
||
|
|
@@ -1320,8 +1333,11 @@
|
||
|
|
continue;
|
||
|
|
lasttime = ev.xmotion.time;
|
||
|
|
|
||
|
|
- nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
|
||
|
|
- nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
|
||
|
|
+ nx = horizcorner ? ev.xmotion.x : c->x;
|
||
|
|
+ ny = vertcorner ? ev.xmotion.y : c->y;
|
||
|
|
+ nw = MAX(horizcorner ? (ocx2 - nx) : (ev.xmotion.x - ocx - 2 * c->bw + 1), 1);
|
||
|
|
+ nh = MAX(vertcorner ? (ocy2 - ny) : (ev.xmotion.y - ocy - 2 * c->bw + 1), 1);
|
||
|
|
+
|
||
|
|
if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
|
||
|
|
&& c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
|
||
|
|
{
|
||
|
|
@@ -1330,11 +1346,13 @@
|
||
|
|
togglefloating(NULL);
|
||
|
|
}
|
||
|
|
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
|
||
|
|
- resize(c, c->x, c->y, nw, nh, 1);
|
||
|
|
+ resize(c, nx, ny, nw, nh, 1);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
} while (ev.type != ButtonRelease);
|
||
|
|
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
||
|
|
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
|
||
|
|
+ horizcorner ? (-c->bw) : (c->w + c->bw - 1),
|
||
|
|
+ vertcorner ? (-c->bw) : (c->h + c->bw - 1));
|
||
|
|
XUngrabPointer(dpy, CurrentTime);
|
||
|
|
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
||
|
|
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|