Pull over the remaining re-implemented window move/resize functions and create

a wrapper so that the key and mouse based move/resize callbacks can be unified.
This has already been done with other window operations and menus.

5 files changed, 146 insertions, 159 deletions

diff --git a/Makefile b/Makefile
index b6fa03b..3a47404 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2017/07/06 17:01:10 okan Exp $
+# $OpenBSD: Makefile,v 1.25 2017/07/14 17:23:38 okan Exp $
 
 .include <bsd.xconf.mk>
 
@@ -6,7 +6,7 @@ PROG=		cwm
 
 SRCS=		calmwm.c screen.c xmalloc.c client.c menu.c \
 		search.c util.c xutil.c conf.c xevents.c group.c \
-		kbfunc.c mousefunc.c parse.y
+		kbfunc.c parse.y
 
 CPPFLAGS+=	-I${X11BASE}/include -I${X11BASE}/include/freetype2 -I${.CURDIR}
 
diff --git a/calmwm.h b/calmwm.h
index cf02118..9d2d99f 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -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: calmwm.h,v 1.340 2017/07/12 16:56:26 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.341 2017/07/14 17:23:38 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -493,9 +493,6 @@ void			 kbfunc_exec_cmd(void *, struct cargs *);
 void			 kbfunc_exec_lock(void *, struct cargs *);
 void			 kbfunc_exec_term(void *, struct cargs *);
 
-void			 mousefunc_client_move(void *, struct cargs *);
-void			 mousefunc_client_resize(void *, struct cargs *);
-
 void			 menu_windraw(struct screen_ctx *, Window,
 			     const char *, ...);
 struct menu  		*menu_filter(struct screen_ctx *, struct menu_q *,
diff --git a/conf.c b/conf.c
index e2ffa31..e934b06 100644
--- a/conf.c
+++ b/conf.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: conf.c,v 1.232 2017/07/12 16:56:26 okan Exp $
+ * $OpenBSD: conf.c,v 1.233 2017/07/14 17:23:38 okan Exp $
  */
 
 #include <sys/types.h>
@@ -92,7 +92,7 @@ static const struct {
 	{ "window-movetogroup-8", kbfunc_client_movetogroup, CWM_CONTEXT_CC, 8 },
 	{ "window-movetogroup-9", kbfunc_client_movetogroup, CWM_CONTEXT_CC, 9 },
 
-	{ "window-move", mousefunc_client_move, CWM_CONTEXT_CC, 0 },
+	{ "window-move", kbfunc_client_move, CWM_CONTEXT_CC, 0 },
 	{ "window-move-up", kbfunc_client_move, CWM_CONTEXT_CC,
 	    (CWM_UP) },
 	{ "window-move-down", kbfunc_client_move, CWM_CONTEXT_CC,
@@ -109,7 +109,7 @@ static const struct {
 	    (CWM_RIGHT | CWM_BIGAMOUNT) },
 	{ "window-move-left-big", kbfunc_client_move, CWM_CONTEXT_CC,
 	    (CWM_LEFT | CWM_BIGAMOUNT) },
-	{ "window-resize", mousefunc_client_resize, CWM_CONTEXT_CC, 0 },
+	{ "window-resize", kbfunc_client_resize, CWM_CONTEXT_CC, 0 },
 	{ "window-resize-up", kbfunc_client_resize, CWM_CONTEXT_CC,
 	    (CWM_UP) },
 	{ "window-resize-down", kbfunc_client_resize, CWM_CONTEXT_CC,
diff --git a/kbfunc.c b/kbfunc.c
index 2d7d34f..fd993f4 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.147 2017/07/12 16:56:26 okan Exp $
+ * $OpenBSD: kbfunc.c,v 1.148 2017/07/14 17:23:38 okan Exp $
  */
 
 #include <sys/types.h>
@@ -39,6 +39,10 @@
 extern sig_atomic_t	 cwm_status;
 
 static void kbfunc_amount(int, int, int *, int *);
+static void kbfunc_client_move_kb(void *, struct cargs *);
+static void kbfunc_client_move_mb(void *, struct cargs *);
+static void kbfunc_client_resize_kb(void *, struct cargs *);
+static void kbfunc_client_resize_mb(void *, struct cargs *);
 
 void
 kbfunc_cwm_status(void *ctx, struct cargs *cargs)
@@ -86,6 +90,24 @@ kbfunc_ptrmove(void *ctx, struct cargs *cargs)
 void
 kbfunc_client_move(void *ctx, struct cargs *cargs)
 {
+	if ((cargs->xev == CWM_XEV_BTN))
+		kbfunc_client_move_mb(ctx, cargs);
+	else
+		kbfunc_client_move_kb(ctx, cargs);
+}
+
+void
+kbfunc_client_resize(void *ctx, struct cargs *cargs)
+{
+	if ((cargs->xev == CWM_XEV_BTN))
+		kbfunc_client_resize_mb(ctx, cargs);
+	else
+		kbfunc_client_resize_kb(ctx, cargs);
+}
+
+static void
+kbfunc_client_move_kb(void *ctx, struct cargs *cargs)
+{
 	struct client_ctx	*cc = ctx;
 	struct screen_ctx	*sc = cc->sc;
 	struct geom		 area;
@@ -121,8 +143,69 @@ kbfunc_client_move(void *ctx, struct cargs *cargs)
 	client_ptr_inbound(cc, 1);
 }
 
-void
-kbfunc_client_resize(void *ctx, struct cargs *cargs)
+static void
+kbfunc_client_move_mb(void *ctx, struct cargs *cargs)
+{
+	struct client_ctx	*cc = ctx;
+	XEvent			 ev;
+	Time			 ltime = 0;
+	struct screen_ctx	*sc = cc->sc;
+	struct geom		 area;
+	int			 move = 1;
+
+	client_raise(cc);
+
+	if (cc->flags & CLIENT_FREEZE)
+		return;
+
+	client_ptr_inbound(cc, 1);
+
+	if (XGrabPointer(X_Dpy, cc->win, False, MOUSEMASK,
+	    GrabModeAsync, GrabModeAsync, None, Conf.cursor[CF_MOVE],
+	    CurrentTime) != GrabSuccess)
+		return;
+
+	menu_windraw(sc, cc->win, "%4d, %-4d", cc->geom.x, cc->geom.y);
+
+	while (move) {
+		XWindowEvent(X_Dpy, cc->win, MOUSEMASK, &ev);
+		switch (ev.type) {
+		case MotionNotify:
+			/* not more than 60 times / second */
+			if ((ev.xmotion.time - ltime) <= (1000 / 60))
+				continue;
+			ltime = ev.xmotion.time;
+
+			cc->geom.x = ev.xmotion.x_root - cc->ptr.x - cc->bwidth;
+			cc->geom.y = ev.xmotion.y_root - cc->ptr.y - cc->bwidth;
+
+			area = screen_area(sc,
+			    cc->geom.x + cc->geom.w / 2,
+			    cc->geom.y + cc->geom.h / 2, CWM_GAP);
+			cc->geom.x += client_snapcalc(cc->geom.x,
+			    cc->geom.x + cc->geom.w + (cc->bwidth * 2),
+			    area.x, area.x + area.w, sc->snapdist);
+			cc->geom.y += client_snapcalc(cc->geom.y,
+			    cc->geom.y + cc->geom.h + (cc->bwidth * 2),
+			    area.y, area.y + area.h, sc->snapdist);
+			client_move(cc);
+			menu_windraw(sc, cc->win,
+			    "%4d, %-4d", cc->geom.x, cc->geom.y);
+			break;
+		case ButtonRelease:
+			move = 0;
+			break;
+		}
+	}
+	if (ltime)
+		client_move(cc);
+	XUnmapWindow(X_Dpy, sc->menu.win);
+	XReparentWindow(X_Dpy, sc->menu.win, sc->rootwin, 0, 0);
+	XUngrabPointer(X_Dpy, CurrentTime);
+}
+
+static void
+kbfunc_client_resize_kb(void *ctx, struct cargs *cargs)
 {
 	struct client_ctx	*cc = ctx;
 	int			 mx = 0, my = 0;
@@ -149,6 +232,60 @@ kbfunc_client_resize(void *ctx, struct cargs *cargs)
 	client_ptr_inbound(cc, 1);
 }
 
+static void
+kbfunc_client_resize_mb(void *ctx, struct cargs *cargs)
+{
+	struct client_ctx	*cc = ctx;
+	XEvent			 ev;
+	Time			 ltime = 0;
+	struct screen_ctx	*sc = cc->sc;
+	int			 resize = 1;
+
+	if (cc->flags & CLIENT_FREEZE)
+		return;
+
+	client_raise(cc);
+	client_ptrsave(cc);
+
+	xu_ptr_setpos(cc->win, cc->geom.w, cc->geom.h);
+
+	if (XGrabPointer(X_Dpy, cc->win, False, MOUSEMASK,
+	    GrabModeAsync, GrabModeAsync, None, Conf.cursor[CF_RESIZE],
+	    CurrentTime) != GrabSuccess)
+		return;
+
+	menu_windraw(sc, cc->win, "%4d x %-4d", cc->dim.w, cc->dim.h);
+	while (resize) {
+		XWindowEvent(X_Dpy, cc->win, MOUSEMASK, &ev);
+		switch (ev.type) {
+		case MotionNotify:
+			/* not more than 60 times / second */
+			if ((ev.xmotion.time - ltime) <= (1000 / 60))
+				continue;
+			ltime = ev.xmotion.time;
+
+			cc->geom.w = ev.xmotion.x;
+			cc->geom.h = ev.xmotion.y;
+			client_applysizehints(cc);
+			client_resize(cc, 1);
+			menu_windraw(sc, cc->win,
+			    "%4d x %-4d", cc->dim.w, cc->dim.h);
+			break;
+		case ButtonRelease:
+			resize = 0;
+			break;
+		}
+	}
+	if (ltime)
+		client_resize(cc, 1);
+	XUnmapWindow(X_Dpy, sc->menu.win);
+	XReparentWindow(X_Dpy, sc->menu.win, sc->rootwin, 0, 0);
+	XUngrabPointer(X_Dpy, CurrentTime);
+
+	/* Make sure the pointer stays within the window. */
+	client_ptr_inbound(cc, 0);
+}
+
 void
 kbfunc_client_delete(void *ctx, struct cargs *cargs)
 {
diff --git a/mousefunc.c b/mousefunc.c
deleted file mode 100644
index d771baa..0000000
--- a/mousefunc.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * calmwm - the calm window manager
- *
- * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
- * Copyright (c) 2008 rivo nurges <rix@estpak.ee>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $OpenBSD: mousefunc.c,v 1.117 2017/05/09 13:40:18 okan Exp $
- */
-
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include <err.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "calmwm.h"
-
-void
-mousefunc_client_resize(void *ctx, struct cargs *cargs)
-{
-	struct client_ctx	*cc = ctx;
-	XEvent			 ev;
-	Time			 ltime = 0;
-	struct screen_ctx	*sc = cc->sc;
-
-	if (cc->flags & CLIENT_FREEZE)
-		return;
-
-	client_raise(cc);
-	client_ptrsave(cc);
-
-	xu_ptr_setpos(cc->win, cc->geom.w, cc->geom.h);
-
-	if (XGrabPointer(X_Dpy, cc->win, False, MOUSEMASK,
-	    GrabModeAsync, GrabModeAsync, None, Conf.cursor[CF_RESIZE],
-	    CurrentTime) != GrabSuccess)
-		return;
-
-	menu_windraw(sc, cc->win, "%4d x %-4d", cc->dim.w, cc->dim.h);
-
-	for (;;) {
-		XWindowEvent(X_Dpy, cc->win, MOUSEMASK, &ev);
-
-		switch (ev.type) {
-		case MotionNotify:
-			/* not more than 60 times / second */
-			if ((ev.xmotion.time - ltime) <= (1000 / 60))
-				continue;
-			ltime = ev.xmotion.time;
-
-			cc->geom.w = ev.xmotion.x;
-			cc->geom.h = ev.xmotion.y;
-			client_applysizehints(cc);
-			client_resize(cc, 1);
-			menu_windraw(sc, cc->win,
-			    "%4d x %-4d", cc->dim.w, cc->dim.h);
-			break;
-		case ButtonRelease:
-			client_resize(cc, 1);
-			XUnmapWindow(X_Dpy, sc->menu.win);
-			XReparentWindow(X_Dpy, sc->menu.win, sc->rootwin, 0, 0);
-			XUngrabPointer(X_Dpy, CurrentTime);
-
-			/* Make sure the pointer stays within the window. */
-			client_ptr_inbound(cc, 0);
-			return;
-		}
-	}
-	/* NOTREACHED */
-}
-
-void
-mousefunc_client_move(void *ctx, struct cargs *cargs)
-{
-	struct client_ctx	*cc = ctx;
-	XEvent			 ev;
-	Time			 ltime = 0;
-	struct screen_ctx	*sc = cc->sc;
-	struct geom		 area;
-
-	client_raise(cc);
-
-	if (cc->flags & CLIENT_FREEZE)
-		return;
-
-	client_ptr_inbound(cc, 1);
-
-	if (XGrabPointer(X_Dpy, cc->win, False, MOUSEMASK,
-	    GrabModeAsync, GrabModeAsync, None, Conf.cursor[CF_MOVE],
-	    CurrentTime) != GrabSuccess)
-		return;
-
-	menu_windraw(sc, cc->win, "%4d, %-4d", cc->geom.x, cc->geom.y);
-
-	for (;;) {
-		XWindowEvent(X_Dpy, cc->win, MOUSEMASK, &ev);
-
-		switch (ev.type) {
-		case MotionNotify:
-			/* not more than 60 times / second */
-			if ((ev.xmotion.time - ltime) <= (1000 / 60))
-				continue;
-			ltime = ev.xmotion.time;
-
-			cc->geom.x = ev.xmotion.x_root - cc->ptr.x - cc->bwidth;
-			cc->geom.y = ev.xmotion.y_root - cc->ptr.y - cc->bwidth;
-
-			area = screen_area(sc,
-			    cc->geom.x + cc->geom.w / 2,
-			    cc->geom.y + cc->geom.h / 2, CWM_GAP);
-			cc->geom.x += client_snapcalc(cc->geom.x,
-			    cc->geom.x + cc->geom.w + (cc->bwidth * 2),
-			    area.x, area.x + area.w, sc->snapdist);
-			cc->geom.y += client_snapcalc(cc->geom.y,
-			    cc->geom.y + cc->geom.h + (cc->bwidth * 2),
-			    area.y, area.y + area.h, sc->snapdist);
-			client_move(cc);
-			menu_windraw(sc, cc->win,
-			    "%4d, %-4d", cc->geom.x, cc->geom.y);
-			break;
-		case ButtonRelease:
-			client_move(cc);
-			XUnmapWindow(X_Dpy, sc->menu.win);
-			XReparentWindow(X_Dpy, sc->menu.win, sc->rootwin, 0, 0);
-			XUngrabPointer(X_Dpy, CurrentTime);
-			return;
-		}
-	}
-	/* NOTREACHED */
-}