From 187e7dfad2e4cbd46b608b36a8ec654739731edd Mon Sep 17 00:00:00 2001
From: oga <oga>
Date: Wed, 25 Jun 2008 00:52:47 +0000
Subject: Stop keyboard move moving the window utterly off the screen. If that
 happens there's no way to get it back.  Also, stop resize making a windows
 size negative or zero. X does not like that one bit.

Diff from Martynas. Ok okan@.
---
 kbfunc.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'kbfunc.c')

diff --git a/kbfunc.c b/kbfunc.c
index f92efa1..afea8aa 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -77,7 +77,17 @@ kbfunc_moveresize(struct client_ctx *cc, void *arg)
 	switch (flags & typemask) {
 	case CWM_MOVE:
 		cc->geom.y += my;
+		if (cc->geom.y + cc->geom.height < 0)
+			cc->geom.y = -cc->geom.height;
+		if (cc->geom.y > cc->sc->ymax)
+			cc->geom.y = cc->sc->ymax;
+
 		cc->geom.x += mx;
+		if (cc->geom.x + cc->geom.width < 0)
+			cc->geom.x = -cc->geom.width;
+		if (cc->geom.x > cc->sc->xmax)
+			cc->geom.x = cc->sc->xmax;
+
 		client_move(cc);
 		xu_ptr_getpos(cc->pwin, &x, &y);
 		cc->ptr.y = y + my;
@@ -85,8 +95,10 @@ kbfunc_moveresize(struct client_ctx *cc, void *arg)
 		client_ptrwarp(cc);
 		break;
 	case CWM_RESIZE:
-		cc->geom.height += my;
-		cc->geom.width += mx;
+		if ((cc->geom.height += my) < 1)
+			cc->geom.height = 1;
+		if ((cc->geom.width += mx) < 1)
+			cc->geom.width = 1;
 		client_resize(cc);
 
 		/* Make sure the pointer stays within the window. */
-- 
cgit 1.4.1