From 6c0b80a21fe472dddaa1224b1f775b9dfdb161c7 Mon Sep 17 00:00:00 2001
From: okan
Date: Thu, 12 Jun 2008 18:32:06 +0000
Subject: instead of forcing the ptr in the middle everytime, be more 'calm';
 keep the ptr still unless it moves out-of-bounds, then just follow the edge.

brought up by todd@

ok oga@
---
 grab.c   | 11 ++++++++---
 kbfunc.c | 14 +++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/grab.c b/grab.c
index 6a25e88..acd413f 100644
--- a/grab.c
+++ b/grab.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: grab.c,v 1.15 2008/06/12 05:10:24 okan Exp $
+ * $Id: grab.c,v 1.16 2008/06/12 18:32:06 okan Exp $
  */
 
 #include "headers.h"
@@ -100,9 +100,14 @@ grab_sweep(struct client_ctx *cc)
 			XUnmapWindow(X_Dpy, sc->menuwin);
 			XReparentWindow(X_Dpy, sc->menuwin, sc->rootwin, 0, 0);
 			xu_ptr_ungrab();
-			cc->ptr.x = -1;
-			cc->ptr.y = -1;
+
+			/* Make sure the pointer stays within the window. */
+			if (cc->ptr.x > cc->geom.width)
+				cc->ptr.x = cc->geom.width - cc->bwidth;
+			if (cc->ptr.y > cc->geom.height)
+				cc->ptr.y = cc->geom.height - cc->bwidth;
 			client_ptrwarp(cc);
+
 			client_do_shape(cc);
 			return;
 		}
diff --git a/kbfunc.c b/kbfunc.c
index 683da5f..b3e39c1 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: kbfunc.c,v 1.28 2008/05/20 14:50:51 oga Exp $
+ * $Id: kbfunc.c,v 1.29 2008/06/12 18:32:06 okan Exp $
  */
 
 #include <paths.h>
@@ -89,12 +89,12 @@ kbfunc_moveresize(struct client_ctx *cc, void *arg)
 		cc->geom.width += mx;
 		client_resize(cc);
 
-		/*
-		 * Moving the cursor while resizing is problematic. Just place
-		 * it in the middle of the window.
-		 */
-		cc->ptr.x = -1;
-		cc->ptr.y = -1;
+		/* Make sure the pointer stays within the window. */
+		xu_ptr_getpos(cc->pwin, &cc->ptr.x, &cc->ptr.y);
+		if (cc->ptr.x > cc->geom.width)
+			cc->ptr.x = cc->geom.width - cc->bwidth;
+		if (cc->ptr.y > cc->geom.height)
+			cc->ptr.y = cc->geom.height - cc->bwidth;
 		client_ptrwarp(cc);
 		break;
 	case CWM_PTRMOVE:
-- 
cgit v1.2.3-2-gb3c3