Add resizecorners patch
This commit is contained in:
parent
a0fe569f7e
commit
1b96862ae2
2
PATCHES
2
PATCHES
|
@ -4,6 +4,6 @@ fullgaps
|
||||||
gaplessgrid
|
gaplessgrid
|
||||||
status2d + extrabar
|
status2d + extrabar
|
||||||
barpadding + notitle
|
barpadding + notitle
|
||||||
|
resizecorners
|
||||||
|
|
||||||
anycorners
|
|
||||||
fonts?
|
fonts?
|
||||||
|
|
26
dwm.c
26
dwm.c
|
@ -1426,9 +1426,15 @@ void
|
||||||
resizemouse(const Arg *arg)
|
resizemouse(const Arg *arg)
|
||||||
{
|
{
|
||||||
int ocx, ocy, nw, nh;
|
int ocx, ocy, nw, nh;
|
||||||
|
int ocx2, ocy2, nx, ny;
|
||||||
Client *c;
|
Client *c;
|
||||||
Monitor *m;
|
Monitor *m;
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
|
int horizcorner, vertcorner;
|
||||||
|
int di;
|
||||||
|
unsigned int dui;
|
||||||
|
Window dummy;
|
||||||
|
|
||||||
Time lasttime = 0;
|
Time lasttime = 0;
|
||||||
|
|
||||||
if (!(c = selmon->sel))
|
if (!(c = selmon->sel))
|
||||||
|
@ -1438,10 +1444,18 @@ resizemouse(const Arg *arg)
|
||||||
restack(selmon);
|
restack(selmon);
|
||||||
ocx = c->x;
|
ocx = c->x;
|
||||||
ocy = c->y;
|
ocy = c->y;
|
||||||
|
ocx2 = c->x + c->w;
|
||||||
|
ocy2 = c->y + c->h;
|
||||||
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
||||||
None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
|
None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
|
||||||
return;
|
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 {
|
do {
|
||||||
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
|
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
|
||||||
switch(ev.type) {
|
switch(ev.type) {
|
||||||
|
@ -1455,8 +1469,10 @@ resizemouse(const Arg *arg)
|
||||||
continue;
|
continue;
|
||||||
lasttime = ev.xmotion.time;
|
lasttime = ev.xmotion.time;
|
||||||
|
|
||||||
nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
|
nx = horizcorner ? ev.xmotion.x : c->x;
|
||||||
nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
|
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
|
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)
|
&& c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
|
||||||
{
|
{
|
||||||
|
@ -1469,7 +1485,9 @@ resizemouse(const Arg *arg)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} while (ev.type != ButtonRelease);
|
} 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);
|
XUngrabPointer(dpy, CurrentTime);
|
||||||
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
||||||
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|
||||||
|
|
Loading…
Reference in New Issue