sites

commit f4621eac6899b2a3b489e5826c2bc00ae25ac51b
parent 5efc012923e28e3d4ec9489cf65238233f1a0237
Author: Klemens Nanni <kl3@posteo.org>
Date:   Wed, 17 Feb 2016 09:23:45 +0100

[dwm] Add 6.1 version of resizecorners patch

Diffstat:
A
dwm.suckless.org/patches/dwm-6.1-resizecorners.diff
 | 
68
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
dwm.suckless.org/patches/resizecorners.md
 | 
2
++

2 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/dwm.suckless.org/patches/dwm-6.1-resizecorners.diff b/dwm.suckless.org/patches/dwm-6.1-resizecorners.diff
@@ -0,0 +1,68 @@
+diff --git a/dwm.c b/dwm.c
+index ff7e096..b6ce27c 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -1313,9 +1313,14 @@ void
+ 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))
+@@ -1325,10 +1330,19 @@ resizemouse(const Arg *arg)
+ 	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) {
+@@ -1344,6 +1358,11 @@ resizemouse(const Arg *arg)
+ 
+ 			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)
+ 			{
+@@ -1352,11 +1371,13 @@ resizemouse(const Arg *arg)
+ 					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) {
diff --git a/dwm.suckless.org/patches/resizecorners.md b/dwm.suckless.org/patches/resizecorners.md
@@ -6,8 +6,10 @@ By default, windows only from the bottom right corner. With this Patch, the mous
 
 ## Download
 
+ * [dwm-6.1-resizecorners.diff](dwm-6.1-resizecorners.diff) (17.02.2016)
  * [dwm-6.0-resizecorners.diff](dwm-6.0-resizecorners.diff) (12.05.2015)
 
 ## Author
 
  * dusty - <dusty@teknik.io>
+ * Klemens Nanni <[kl3@posteo.org](mailto:kl3@posteo.org)> (6.1 version)