From 81d2fa85214b3c84c60b29cf852fd6618ebaacc9 Mon Sep 17 00:00:00 2001
From: okan
Date: Mon, 3 Oct 2016 13:52:17 +0000
Subject: For both kb and mouse move, it is possible to grab a client and move
 it completely off the screen/region; instead, if the pointer is outside of
 the client bounds, warp the pointer to the closest edge before moving.

---
 kbfunc.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'kbfunc.c')

diff --git a/kbfunc.c b/kbfunc.c
index f30f809..fd7b096 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.
  *
- * $OpenBSD: kbfunc.c,v 1.128 2016/10/03 13:41:30 okan Exp $
+ * $OpenBSD: kbfunc.c,v 1.129 2016/10/03 13:52:17 okan Exp $
  */
 
 #include <sys/types.h>
@@ -95,12 +95,24 @@ kbfunc_client_move(struct client_ctx *cc, union arg *arg)
 {
 	struct screen_ctx	*sc = cc->sc;
 	struct geom		 area;
-	int			 x, y;
+	int			 x, y, px, py;
 	unsigned int		 mx = 0, my = 0;
 
 	if (cc->flags & CLIENT_FREEZE)
 		return;
 
+	xu_ptr_getpos(cc->win, &px, &py);
+	if (px < 0)
+		px = 0;
+	else if (px > cc->geom.w)
+		px = cc->geom.w;
+	if (py < 0)
+		py = 0;
+	else if (py > cc->geom.h)
+		py = cc->geom.h;
+
+	xu_ptr_setpos(cc->win, px, py);
+
 	kbfunc_amount(arg->i, Conf.mamount, &mx, &my);
 
 	cc->geom.x += mx;
-- 
cgit v1.2.3-2-gb3c3