X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=mouse.c;h=041ab039806bdc5bcd8bdaa0de81618a3a09836a;hp=896d6b06a884d9f6fa0bd1782f05e78ffb9c1e0d;hb=3f942f9e798d4222116ae4c083d2482ddb1e972b;hpb=dfd84f9bf3b9d949412a73bc62a43109b340d395

diff --git a/mouse.c b/mouse.c
index 896d6b0..041ab03 100644
--- a/mouse.c
+++ b/mouse.c
@@ -1,6 +1,5 @@
 /*
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
 
@@ -13,35 +12,14 @@
 #define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
 #define MouseMask       (ButtonMask | PointerMotionMask)
 
-static void
-mmatch(Client *c, int x1, int y1, int x2, int y2)
-{
-	c->w = abs(x1 - x2);
-	c->h = abs(y1 - y2);
-	if(c->incw)
-		c->w -= (c->w - c->basew) % c->incw;
-	if(c->inch)
-		c->h -= (c->h - c->baseh) % c->inch;
-	if(c->minw && c->w < c->minw)
-		c->w = c->minw;
-	if(c->minh && c->h < c->minh)
-		c->h = c->minh;
-	if(c->maxw && c->w > c->maxw)
-		c->w = c->maxw;
-	if(c->maxh && c->h > c->maxh)
-		c->h = c->maxh;
-	c->x = (x1 <= x2) ? x1 : x1 - c->w;
-	c->y = (y1 <= y2) ? y1 : y1 - c->h;
-}
-
 void
 mresize(Client *c)
 {
 	XEvent ev;
-	int old_cx, old_cy;
+	int ocx, ocy;
 
-	old_cx = c->x;
-	old_cy = c->y;
+	ocx = c->x;
+	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
 				None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
@@ -55,11 +33,13 @@ mresize(Client *c)
 			break;
 		case MotionNotify:
 			XFlush(dpy);
-			mmatch(c, old_cx, old_cy, ev.xmotion.x, ev.xmotion.y);
-			XResizeWindow(dpy, c->win, c->w, c->h);
+			c->w = abs(ocx - ev.xmotion.x);
+			c->h = abs(ocy - ev.xmotion.y);
+			c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
+			c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
+			resize(c);
 			break;
 		case ButtonRelease:
-			resize(c);
 			XUngrabPointer(dpy, CurrentTime);
 			return;
 		}
@@ -70,12 +50,12 @@ void
 mmove(Client *c)
 {
 	XEvent ev;
-	int x1, y1, old_cx, old_cy, di;
+	int x1, y1, ocx, ocy, di;
 	unsigned int dui;
 	Window dummy;
 
-	old_cx = c->x;
-	old_cy = c->y;
+	ocx = c->x;
+	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
 				None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
@@ -89,12 +69,11 @@ mmove(Client *c)
 			break;
 		case MotionNotify:
 			XFlush(dpy);
-			c->x = old_cx + (ev.xmotion.x - x1);
-			c->y = old_cy + (ev.xmotion.y - y1);
-			XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+			c->x = ocx + (ev.xmotion.x - x1);
+			c->y = ocy + (ev.xmotion.y - y1);
+			resize(c);
 			break;
 		case ButtonRelease:
-			resize(c);
 			XUngrabPointer(dpy, CurrentTime);
 			return;
 		}