From d7bd2998191af2ce1d6c0018e7c3a43a01ed3be5 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Mon, 9 Nov 2015 20:03:29 +0000
Subject: [PATCH 1/9] Extend region to include both view and work areas; switch
 to region_find() which no longer needs to recalculate gap each time a client
 (or menu) is created or altered. If no RandR, fall back to display dimensions
 while building regions instead of during execution.

---
 calmwm.h    |  8 ++---
 client.c    | 94 +++++++++++++++++++++++++++--------------------------
 kbfunc.c    | 10 +++---
 menu.c      |  4 ++-
 mousefunc.c | 10 +++---
 screen.c    | 35 +++++++++++---------
 6 files changed, 84 insertions(+), 77 deletions(-)

diff --git a/calmwm.h b/calmwm.h
index 4aac82c..0069f9e 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -80,9 +80,6 @@
 #define CWM_TILE_HORIZ 		0x0001
 #define CWM_TILE_VERT 		0x0002
 
-#define CWM_GAP			0x0001
-#define CWM_NOGAP		0x0002
-
 #define CWM_WIN			0x0001
 #define CWM_CMD			0x0002
 
@@ -224,7 +221,8 @@ TAILQ_HEAD(autogroupwin_q, autogroupwin);
 struct region_ctx {
 	TAILQ_ENTRY(region_ctx)	 entry;
 	int			 num;
-	struct geom		 area;
+	struct geom		 view; /* viewable area */
+	struct geom		 work; /* workable area, gap-applied */
 };
 TAILQ_HEAD(region_ctx_q, region_ctx);
 
@@ -459,7 +457,7 @@ void			 search_print_group(struct menu *, int);
 
 struct geom		 screen_apply_gap(struct screen_ctx *, struct geom);
 struct screen_ctx	*screen_find(Window);
-struct geom		 screen_area(struct screen_ctx *, int, int, int);
+struct region_ctx	*region_find(struct screen_ctx *, int, int);
 void			 screen_init(int);
 void			 screen_update_geometry(struct screen_ctx *);
 void			 screen_updatestackingorder(struct screen_ctx *);
diff --git a/client.c b/client.c
index 4df5be8..50e2440 100644
--- a/client.c
+++ b/client.c
@@ -290,7 +290,7 @@ void
 client_toggle_fullscreen(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct geom		 area;
+	struct region_ctx	*rc;
 
 	if ((cc->flags & CLIENT_FREEZE) &&
 	    !(cc->flags & CLIENT_FULLSCREEN))
@@ -305,12 +305,12 @@ client_toggle_fullscreen(struct client_ctx *cc)
 
 	cc->fullgeom = cc->geom;
 
-	area = screen_area(sc,
+	rc = region_find(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2, CWM_NOGAP);
+	    cc->geom.y + cc->geom.h / 2);
 
 	cc->bwidth = 0;
-	cc->geom = area;
+	cc->geom = rc->view;
 	cc->flags |= (CLIENT_FULLSCREEN | CLIENT_FREEZE);
 
 resize:
@@ -322,7 +322,7 @@ void
 client_toggle_maximize(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct geom		 area;
+	struct region_ctx	*rc;
 
 	if (cc->flags & CLIENT_FREEZE)
 		return;
@@ -348,14 +348,14 @@ client_toggle_maximize(struct client_ctx *cc)
 	 * that's probably more fair than if just the origin of
 	 * a window is poking over a boundary
 	 */
-	area = screen_area(sc,
+	rc = region_find(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2, CWM_GAP);
+	    cc->geom.y + cc->geom.h / 2);
 
-	cc->geom.x = area.x;
-	cc->geom.y = area.y;
-	cc->geom.w = area.w - (cc->bwidth * 2);
-	cc->geom.h = area.h - (cc->bwidth * 2);
+	cc->geom.x = rc->work.x;
+	cc->geom.y = rc->work.y;
+	cc->geom.w = rc->work.w - (cc->bwidth * 2);
+	cc->geom.h = rc->work.h - (cc->bwidth * 2);
 	cc->flags |= CLIENT_MAXIMIZED;
 
 resize:
@@ -367,7 +367,7 @@ void
 client_toggle_vmaximize(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct geom		 area;
+	struct region_ctx	*rc;
 
 	if (cc->flags & CLIENT_FREEZE)
 		return;
@@ -382,12 +382,12 @@ client_toggle_vmaximize(struct client_ctx *cc)
 	cc->savegeom.y = cc->geom.y;
 	cc->savegeom.h = cc->geom.h;
 
-	area = screen_area(sc,
+	rc = region_find(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2, CWM_GAP);
+	    cc->geom.y + cc->geom.h / 2);
 
-	cc->geom.y = area.y;
-	cc->geom.h = area.h - (cc->bwidth * 2);
+	cc->geom.y = rc->work.y;
+	cc->geom.h = rc->work.h - (cc->bwidth * 2);
 	cc->flags |= CLIENT_VMAXIMIZED;
 
 resize:
@@ -399,7 +399,7 @@ void
 client_toggle_hmaximize(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct geom		 area;
+	struct region_ctx	*rc;
 
 	if (cc->flags & CLIENT_FREEZE)
 		return;
@@ -414,12 +414,12 @@ client_toggle_hmaximize(struct client_ctx *cc)
 	cc->savegeom.x = cc->geom.x;
 	cc->savegeom.w = cc->geom.w;
 
-	area = screen_area(sc,
+	rc = region_find(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2, CWM_GAP);
+	    cc->geom.y + cc->geom.h / 2);
 
-	cc->geom.x = area.x;
-	cc->geom.w = area.w - (cc->bwidth * 2);
+	cc->geom.x = rc->work.x;
+	cc->geom.w = rc->work.w - (cc->bwidth * 2);
 	cc->flags |= CLIENT_HMAXIMIZED;
 
 resize:
@@ -749,6 +749,7 @@ static void
 client_placecalc(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
+	struct region_ctx	*rc;
 	int			 xslack, yslack;
 
 	if (cc->hint.flags & (USPosition | PPosition)) {
@@ -768,7 +769,8 @@ client_placecalc(struct client_ctx *cc)
 		int			 xmouse, ymouse;
 
 		xu_ptr_getpos(sc->rootwin, &xmouse, &ymouse);
-		area = screen_area(sc, xmouse, ymouse, CWM_GAP);
+		rc = region_find(sc, xmouse, ymouse);
+		area = rc->work;
 		area.w += area.x;
 		area.h += area.y;
 		xmouse = MAX(xmouse, area.x) - cc->geom.w / 2;
@@ -973,7 +975,7 @@ client_htile(struct client_ctx *cc)
 	struct client_ctx	*ci;
 	struct group_ctx 	*gc = cc->gc;
 	struct screen_ctx 	*sc = cc->sc;
-	struct geom 		 area;
+	struct region_ctx	*rc;
 	int 			 i, n, mh, x, h, w;
 
 	if (!gc)
@@ -989,36 +991,36 @@ client_htile(struct client_ctx *cc)
 	if (n == 0)
 		return;
 
-	area = screen_area(sc,
+	rc = region_find(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2, CWM_GAP);
+	    cc->geom.y + cc->geom.h / 2);
 
 	if (cc->flags & CLIENT_VMAXIMIZED ||
-	    cc->geom.h + (cc->bwidth * 2) >= area.h)
+	    cc->geom.h + (cc->bwidth * 2) >= rc->work.h)
 		return;
 
 	cc->flags &= ~CLIENT_HMAXIMIZED;
-	cc->geom.x = area.x;
-	cc->geom.y = area.y;
-	cc->geom.w = area.w - (cc->bwidth * 2);
+	cc->geom.x = rc->work.x;
+	cc->geom.y = rc->work.y;
+	cc->geom.w = rc->work.w - (cc->bwidth * 2);
 	client_resize(cc, 1);
 	client_ptrwarp(cc);
 
 	mh = cc->geom.h + (cc->bwidth * 2);
-	x = area.x;
-	w = area.w / n;
-	h = area.h - mh;
+	x = rc->work.x;
+	w = rc->work.w / n;
+	h = rc->work.h - mh;
 	TAILQ_FOREACH(ci, &gc->clientq, group_entry) {
 		if (ci->flags & CLIENT_HIDDEN ||
 		    ci->flags & CLIENT_IGNORE || (ci == cc))
 			continue;
 		ci->bwidth = Conf.bwidth;
-		ci->geom.y = area.y + mh;
+		ci->geom.y = rc->work.y + mh;
 		ci->geom.x = x;
 		ci->geom.h = h - (ci->bwidth * 2);
 		ci->geom.w = w - (ci->bwidth * 2);
 		if (i + 1 == n)
-			ci->geom.w = area.x + area.w -
+			ci->geom.w = rc->work.x + rc->work.w -
 			    ci->geom.x - (ci->bwidth * 2);
 		x += w;
 		client_resize(ci, 1);
@@ -1032,7 +1034,7 @@ client_vtile(struct client_ctx *cc)
 	struct client_ctx	*ci;
 	struct group_ctx 	*gc = cc->gc;
 	struct screen_ctx 	*sc = cc->sc;
-	struct geom 		 area;
+	struct region_ctx	*rc;
 	int 			 i, n, mw, y, h, w;
 
 	if (!gc)
@@ -1048,36 +1050,36 @@ client_vtile(struct client_ctx *cc)
 	if (n == 0)
 		return;
 
-	area = screen_area(sc,
+	rc = region_find(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2, CWM_GAP);
+	    cc->geom.y + cc->geom.h / 2);
 
 	if (cc->flags & CLIENT_HMAXIMIZED ||
-	    cc->geom.w + (cc->bwidth * 2) >= area.w)
+	    cc->geom.w + (cc->bwidth * 2) >= rc->work.w)
 		return;
 
 	cc->flags &= ~CLIENT_VMAXIMIZED;
-	cc->geom.x = area.x;
-	cc->geom.y = area.y;
-	cc->geom.h = area.h - (cc->bwidth * 2);
+	cc->geom.x = rc->work.x;
+	cc->geom.y = rc->work.y;
+	cc->geom.h = rc->work.h - (cc->bwidth * 2);
 	client_resize(cc, 1);
 	client_ptrwarp(cc);
 
 	mw = cc->geom.w + (cc->bwidth * 2);
-	y = area.y;
-	h = area.h / n;
-	w = area.w - mw;
+	y = rc->work.y;
+	h = rc->work.h / n;
+	w = rc->work.w - mw;
 	TAILQ_FOREACH(ci, &gc->clientq, group_entry) {
 		if (ci->flags & CLIENT_HIDDEN ||
 		    ci->flags & CLIENT_IGNORE || (ci == cc))
 			continue;
 		ci->bwidth = Conf.bwidth;
 		ci->geom.y = y;
-		ci->geom.x = area.x + mw;
+		ci->geom.x = rc->work.x + mw;
 		ci->geom.h = h - (ci->bwidth * 2);
 		ci->geom.w = w - (ci->bwidth * 2);
 		if (i + 1 == n)
-			ci->geom.h = area.y + area.h -
+			ci->geom.h = rc->work.y + rc->work.h -
 			    ci->geom.y - (ci->bwidth * 2);
 		y += h;
 		client_resize(ci, 1);
diff --git a/kbfunc.c b/kbfunc.c
index d8cc265..8e9702e 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -57,7 +57,7 @@ void
 kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct geom		 area;
+	struct region_ctx	*rc;
 	int			 x, y, flags, amt;
 	unsigned int		 mx, my;
 
@@ -101,15 +101,15 @@ kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
 		if (cc->geom.y > sc->view.h - 1)
 			cc->geom.y = sc->view.h - 1;
 
-		area = screen_area(sc,
+		rc = region_find(sc,
 		    cc->geom.x + cc->geom.w / 2,
-		    cc->geom.y + cc->geom.h / 2, CWM_GAP);
+		    cc->geom.y + cc->geom.h / 2);
 		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);
+		    rc->work.x, rc->work.x + rc->work.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);
+		    rc->work.y, rc->work.y + rc->work.h, sc->snapdist);
 
 		client_move(cc);
 		xu_ptr_getpos(cc->win, &x, &y);
diff --git a/menu.c b/menu.c
index cb4ee7d..5e0dc98 100644
--- a/menu.c
+++ b/menu.c
@@ -331,6 +331,7 @@ static void
 menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
 {
 	struct screen_ctx	*sc = mc->sc;
+	struct region_ctx	*rc;
 	struct menu		*mi;
 	struct geom		 area;
 	int			 n, xsave, ysave;
@@ -371,7 +372,8 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
 		mc->num++;
 	}
 
-	area = screen_area(sc, mc->geom.x, mc->geom.y, CWM_GAP);
+	rc = region_find(sc, mc->geom.x, mc->geom.y);
+	area = rc->work;
 	area.w += area.x - Conf.bwidth * 2;
 	area.h += area.y - Conf.bwidth * 2;
 
diff --git a/mousefunc.c b/mousefunc.c
index ffa0ab0..3d21eb3 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -123,7 +123,7 @@ mousefunc_client_move(struct client_ctx *cc, union arg *arg)
 	XEvent			 ev;
 	Time			 ltime = 0;
 	struct screen_ctx	*sc = cc->sc;
-	struct geom		 area;
+	struct region_ctx	*rc;
 	int			 px, py;
 
 	client_raise(cc);
@@ -149,15 +149,15 @@ mousefunc_client_move(struct client_ctx *cc, union arg *arg)
 			cc->geom.x = ev.xmotion.x_root - px - cc->bwidth;
 			cc->geom.y = ev.xmotion.y_root - py - cc->bwidth;
 
-			area = screen_area(sc,
+			rc = region_find(sc,
 			    cc->geom.x + cc->geom.w / 2,
-			    cc->geom.y + cc->geom.h / 2, CWM_GAP);
+			    cc->geom.y + cc->geom.h / 2);
 			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);
+			    rc->work.x, rc->work.x + rc->work.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);
+			    rc->work.y, rc->work.y + rc->work.h, sc->snapdist);
 
 			client_move(cc);
 			break;
diff --git a/screen.c b/screen.c
index aad2159..4fc6f4e 100644
--- a/screen.c
+++ b/screen.c
@@ -124,35 +124,29 @@ screen_updatestackingorder(struct screen_ctx *sc)
 	}
 }
 
-struct geom
-screen_area(struct screen_ctx *sc, int x, int y, int flags)
+struct region_ctx *
+region_find(struct screen_ctx *sc, int x, int y)
 {
 	struct region_ctx	*rc;
-	struct geom		 area = sc->work;
 
 	TAILQ_FOREACH(rc, &sc->regionq, entry) {
-		if ((x >= rc->area.x) && (x < (rc->area.x + rc->area.w)) &&
-		    (y >= rc->area.y) && (y < (rc->area.y + rc->area.h))) {
-			area = rc->area;
+		if ((x >= rc->view.x) && (x < (rc->view.x + rc->view.w)) &&
+		    (y >= rc->view.y) && (y < (rc->view.y + rc->view.h))) {
 			break;
 		}
 	}
-	if (flags & CWM_GAP)
-		area = screen_apply_gap(sc, area);
-	return(area);
+	return(rc);
 }
 
 void
 screen_update_geometry(struct screen_ctx *sc)
 {
 	struct region_ctx	*rc;
-	int			 i;
 
 	sc->view.x = 0;
 	sc->view.y = 0;
 	sc->view.w = DisplayWidth(X_Dpy, sc->which);
 	sc->view.h = DisplayHeight(X_Dpy, sc->which);
-
 	sc->work = screen_apply_gap(sc, sc->view);
 
 	while ((rc = TAILQ_FIRST(&sc->regionq)) != NULL) {
@@ -163,6 +157,7 @@ screen_update_geometry(struct screen_ctx *sc)
 	if (HasRandr) {
 		XRRScreenResources *sr;
 		XRRCrtcInfo *ci;
+		int i;
 
 		sr = XRRGetScreenResources(X_Dpy, sc->rootwin);
 		for (i = 0, ci = NULL; i < sr->ncrtc; i++) {
@@ -176,15 +171,25 @@ screen_update_geometry(struct screen_ctx *sc)
 
 			rc = xmalloc(sizeof(*rc));
 			rc->num = i;
-			rc->area.x = ci->x;
-			rc->area.y = ci->y;
-			rc->area.w = ci->width;
-			rc->area.h = ci->height;
+			rc->view.x = ci->x;
+			rc->view.y = ci->y;
+			rc->view.w = ci->width;
+			rc->view.h = ci->height;
+			rc->work = screen_apply_gap(sc, rc->view);
 			TAILQ_INSERT_TAIL(&sc->regionq, rc, entry);
 
 			XRRFreeCrtcInfo(ci);
 		}
 		XRRFreeScreenResources(sr);
+	} else {
+		rc = xmalloc(sizeof(*rc));
+		rc->num = 0;
+		rc->view.x = 0;
+		rc->view.y = 0;
+		rc->view.w = DisplayWidth(X_Dpy, sc->which);
+		rc->view.h = DisplayHeight(X_Dpy, sc->which);
+		rc->work = screen_apply_gap(sc, rc->view);
+		TAILQ_INSERT_TAIL(&sc->regionq, rc, entry);
 	}
 
 	xu_ewmh_net_desktop_geometry(sc);

From 31c74e915752ef1c4ed637a4fd3cee5cd14a7d8b Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Mon, 9 Nov 2015 20:15:23 +0000
Subject: [PATCH 2/9] Clean up unused defines.

---
 calmwm.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/calmwm.h b/calmwm.h
index 0069f9e..bc14fdd 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -74,9 +74,6 @@
 #define CWM_MENU_FILE		0x0002
 #define CWM_MENU_LIST		0x0004
 
-#define ARG_CHAR		0x0001
-#define ARG_INT			0x0002
-
 #define CWM_TILE_HORIZ 		0x0001
 #define CWM_TILE_VERT 		0x0002
 

From e20110f3445ba7f388482f5be7b72a922e548c92 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Tue, 10 Nov 2015 20:05:33 +0000
Subject: [PATCH 3/9] Start cleaning up name vs function differences; replace
 magic numbers.

---
 calmwm.c    |   2 +-
 calmwm.h    |  47 ++++++-----
 client.c    |   6 +-
 conf.c      | 222 +++++++++++++++++++++++++++++-----------------------
 group.c     |   2 +-
 kbfunc.c    |  34 ++++----
 mousefunc.c |   2 +-
 xevents.c   |   4 +-
 8 files changed, 170 insertions(+), 149 deletions(-)

diff --git a/calmwm.c b/calmwm.c
index 0166c06..a17f0f4 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -116,7 +116,7 @@ main(int argc, char **argv)
 	while (cwm_status == CWM_RUNNING)
 		xev_process();
 	x_teardown();
-	if (cwm_status == CWM_EXECWM)
+	if (cwm_status == CWM_EXEC_WM)
 		u_exec(wm_argv);
 
 	return(0);
diff --git a/calmwm.h b/calmwm.h
index bc14fdd..967eba3 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -60,35 +60,35 @@
 #define CWM_LEFT		0x0040
 #define CWM_RIGHT		0x0080
 
-/* exec */
-#define	CWM_EXEC_PROGRAM	0x0001
-#define	CWM_EXEC_WM		0x0002
+#define CWM_CLIENT_CYCLE	0x0001
+#define CWM_CLIENT_RCYCLE	0x0002
+#define CWM_CLIENT_CYCLE_INGRP	0x0004
 
-/* cycle */
-#define CWM_CYCLE		0x0001
-#define CWM_RCYCLE		0x0002
-#define CWM_INGROUP		0x0004
+#define CWM_CLIENT_TILE_HORIZ	0x0001
+#define CWM_CLIENT_TILE_VERT	0x0002
+
+#define CWM_MENU_EXEC		0x0001
+#define CWM_MENU_EXEC_WM	0x0002
 
-/* menu */
 #define CWM_MENU_DUMMY		0x0001
 #define CWM_MENU_FILE		0x0002
 #define CWM_MENU_LIST		0x0004
 
-#define CWM_TILE_HORIZ 		0x0001
-#define CWM_TILE_VERT 		0x0002
+#define CWM_KBD			0x0001
+#define CWM_MOUSE		0x0002
 
-#define CWM_WIN			0x0001
-#define CWM_CMD			0x0002
+#define CWM_CONTEXT_NONE	0x0000
+#define CWM_CONTEXT_CLIENT	0x0001
+#define CWM_CONTEXT_SCREEN	0x0002
 
 #define CWM_QUIT		0x0000
 #define CWM_RUNNING		0x0001
-#define CWM_EXECWM		0x0002
+#define CWM_EXEC_WM		0x0002
 
 union arg {
 	char	*c;
 	int	 i;
 };
-
 union press {
 	KeySym		 keysym;
 	unsigned int	 button;
@@ -102,7 +102,6 @@ enum cursor_font {
 	CF_RESIZE,
 	CF_NITEMS
 };
-
 enum color {
 	CWM_COLOR_BORDER_ACTIVE,
 	CWM_COLOR_BORDER_INACTIVE,
@@ -251,7 +250,7 @@ struct binding {
 	union arg		 argument;
 	unsigned int		 modmask;
 	union press		 press;
-	int			 flags;
+	int			 context;
 };
 TAILQ_HEAD(keybinding_q, binding);
 TAILQ_HEAD(mousebinding_q, binding);
@@ -479,7 +478,7 @@ void			 kbfunc_client_nogroup(struct client_ctx *,
 			     union arg *);
 void			 kbfunc_client_raise(struct client_ctx *, union arg *);
 void			 kbfunc_client_rcycle(struct client_ctx *, union arg *);
-void			 kbfunc_client_search(struct client_ctx *, union arg *);
+void 			 kbfunc_client_tile(struct client_ctx *, union arg *);
 void			 kbfunc_client_toggle_freeze(struct client_ctx *,
     			     union arg *);
 void			 kbfunc_client_toggle_fullscreen(struct client_ctx *,
@@ -492,24 +491,24 @@ void			 kbfunc_client_toggle_sticky(struct client_ctx *,
     			     union arg *);
 void			 kbfunc_client_toggle_vmaximize(struct client_ctx *,
 			     union arg *);
-void			 kbfunc_cmdexec(struct client_ctx *, union arg *);
 void			 kbfunc_cwm_status(struct client_ctx *, union arg *);
 void			 kbfunc_exec(struct client_ctx *, union arg *);
-void			 kbfunc_lock(struct client_ctx *, union arg *);
+void			 kbfunc_exec_lock(struct client_ctx *, union arg *);
+void			 kbfunc_exec_term(struct client_ctx *, union arg *);
+void			 kbfunc_menu_exec(struct client_ctx *, union arg *);
+void			 kbfunc_menu_client(struct client_ctx *, union arg *);
 void			 kbfunc_menu_cmd(struct client_ctx *, union arg *);
 void			 kbfunc_menu_group(struct client_ctx *, union arg *);
-void			 kbfunc_ssh(struct client_ctx *, union arg *);
-void			 kbfunc_term(struct client_ctx *, union arg *);
-void 			 kbfunc_tile(struct client_ctx *, union arg *);
+void			 kbfunc_menu_ssh(struct client_ctx *, union arg *);
 
 void			 mousefunc_client_move(struct client_ctx *,
     			    union arg *);
 void			 mousefunc_client_resize(struct client_ctx *,
     			    union arg *);
+void			 mousefunc_menu_client(struct client_ctx *,
+			    union arg *);
 void			 mousefunc_menu_cmd(struct client_ctx *, union arg *);
 void			 mousefunc_menu_group(struct client_ctx *, union arg *);
-void			 mousefunc_menu_unhide(struct client_ctx *,
-    			    union arg *);
 
 struct menu  		*menu_filter(struct screen_ctx *, struct menu_q *,
 			     const char *, const char *, int,
diff --git a/client.c b/client.c
index 50e2440..da6d05c 100644
--- a/client.c
+++ b/client.c
@@ -678,7 +678,7 @@ client_cycle(struct screen_ctx *sc, int flags)
 
 	oldcc = client_current();
 	if (oldcc == NULL)
-		oldcc = (flags & CWM_RCYCLE) ?
+		oldcc = (flags & CWM_CLIENT_RCYCLE) ?
 		    TAILQ_LAST(&sc->clientq, client_ctx_q) :
 		    TAILQ_FIRST(&sc->clientq);
 
@@ -686,12 +686,12 @@ client_cycle(struct screen_ctx *sc, int flags)
 	while (again) {
 		again = 0;
 
-		newcc = (flags & CWM_RCYCLE) ? client_prev(newcc) :
+		newcc = (flags & CWM_CLIENT_RCYCLE) ? client_prev(newcc) :
 		    client_next(newcc);
 
 		/* Only cycle visible and non-ignored windows. */
 		if ((newcc->flags & (CLIENT_HIDDEN | CLIENT_IGNORE))
-		    || ((flags & CWM_INGROUP) &&
+		    || ((flags & CWM_CLIENT_CYCLE_INGRP) &&
 			(newcc->gc != oldcc->gc)))
 			again = 1;
 
diff --git a/conf.c b/conf.c
index 7f4ec37..e270606 100644
--- a/conf.c
+++ b/conf.c
@@ -346,126 +346,148 @@ conf_client(struct client_ctx *cc)
 static const struct {
 	const char	*tag;
 	void		 (*handler)(struct client_ctx *, union arg *);
-	int		 flags;
+	int		 context;
 	union arg	 argument;
 } name_to_func[] = {
-	{ "lower", kbfunc_client_lower, CWM_WIN, {0} },
-	{ "raise", kbfunc_client_raise, CWM_WIN, {0} },
-	{ "search", kbfunc_client_search, 0, {0} },
-	{ "menusearch", kbfunc_menu_cmd, 0, {0} },
-	{ "groupsearch", kbfunc_menu_group, 0, {0} },
-	{ "hide", kbfunc_client_hide, CWM_WIN, {0} },
-	{ "cycle", kbfunc_client_cycle, 0, {.i = CWM_CYCLE} },
-	{ "rcycle", kbfunc_client_cycle, 0, {.i = CWM_RCYCLE} },
-	{ "label", kbfunc_client_label, CWM_WIN, {0} },
-	{ "delete", kbfunc_client_delete, CWM_WIN, {0} },
-	{ "group1", kbfunc_client_group, 0, {.i = 1} },
-	{ "group2", kbfunc_client_group, 0, {.i = 2} },
-	{ "group3", kbfunc_client_group, 0, {.i = 3} },
-	{ "group4", kbfunc_client_group, 0, {.i = 4} },
-	{ "group5", kbfunc_client_group, 0, {.i = 5} },
-	{ "group6", kbfunc_client_group, 0, {.i = 6} },
-	{ "group7", kbfunc_client_group, 0, {.i = 7} },
-	{ "group8", kbfunc_client_group, 0, {.i = 8} },
-	{ "group9", kbfunc_client_group, 0, {.i = 9} },
-	{ "grouponly1", kbfunc_client_grouponly, 0, {.i = 1} },
-	{ "grouponly2", kbfunc_client_grouponly, 0, {.i = 2} },
-	{ "grouponly3", kbfunc_client_grouponly, 0, {.i = 3} },
-	{ "grouponly4", kbfunc_client_grouponly, 0, {.i = 4} },
-	{ "grouponly5", kbfunc_client_grouponly, 0, {.i = 5} },
-	{ "grouponly6", kbfunc_client_grouponly, 0, {.i = 6} },
-	{ "grouponly7", kbfunc_client_grouponly, 0, {.i = 7} },
-	{ "grouponly8", kbfunc_client_grouponly, 0, {.i = 8} },
-	{ "grouponly9", kbfunc_client_grouponly, 0, {.i = 9} },
-	{ "movetogroup1", kbfunc_client_movetogroup, CWM_WIN, {.i = 1} },
-	{ "movetogroup2", kbfunc_client_movetogroup, CWM_WIN, {.i = 2} },
-	{ "movetogroup3", kbfunc_client_movetogroup, CWM_WIN, {.i = 3} },
-	{ "movetogroup4", kbfunc_client_movetogroup, CWM_WIN, {.i = 4} },
-	{ "movetogroup5", kbfunc_client_movetogroup, CWM_WIN, {.i = 5} },
-	{ "movetogroup6", kbfunc_client_movetogroup, CWM_WIN, {.i = 6} },
-	{ "movetogroup7", kbfunc_client_movetogroup, CWM_WIN, {.i = 7} },
-	{ "movetogroup8", kbfunc_client_movetogroup, CWM_WIN, {.i = 8} },
-	{ "movetogroup9", kbfunc_client_movetogroup, CWM_WIN, {.i = 9} },
-	{ "nogroup", kbfunc_client_nogroup, 0, {0} },
-	{ "cyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_CYCLE} },
-	{ "rcyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_RCYCLE} },
-	{ "cycleingroup", kbfunc_client_cycle, CWM_WIN,
-	    {.i = (CWM_CYCLE | CWM_INGROUP)} },
-	{ "rcycleingroup", kbfunc_client_cycle, CWM_WIN,
-	    {.i = (CWM_RCYCLE | CWM_INGROUP)} },
-	{ "grouptoggle", kbfunc_client_grouptoggle, CWM_WIN, {.i = 0}},
-	{ "sticky", kbfunc_client_toggle_sticky, CWM_WIN, {0} },
-	{ "fullscreen", kbfunc_client_toggle_fullscreen, CWM_WIN, {0} },
-	{ "maximize", kbfunc_client_toggle_maximize, CWM_WIN, {0} },
-	{ "vmaximize", kbfunc_client_toggle_vmaximize, CWM_WIN, {0} },
-	{ "hmaximize", kbfunc_client_toggle_hmaximize, CWM_WIN, {0} },
-	{ "freeze", kbfunc_client_toggle_freeze, CWM_WIN, {0} },
-	{ "restart", kbfunc_cwm_status, 0, {.i = CWM_EXECWM} },
-	{ "quit", kbfunc_cwm_status, 0, {.i = CWM_QUIT} },
-	{ "exec", kbfunc_exec, 0, {.i = CWM_EXEC_PROGRAM} },
-	{ "exec_wm", kbfunc_exec, 0, {.i = CWM_EXEC_WM} },
-	{ "ssh", kbfunc_ssh, 0, {0} },
-	{ "terminal", kbfunc_term, 0, {0} },
-	{ "lock", kbfunc_lock, 0, {0} },
-	{ "moveup", kbfunc_client_moveresize, CWM_WIN,
+	{ "lower", kbfunc_client_lower, CWM_CONTEXT_CLIENT, {0} },
+	{ "raise", kbfunc_client_raise, CWM_CONTEXT_CLIENT, {0} },
+	{ "search", kbfunc_menu_client, CWM_CONTEXT_SCREEN, {0} },
+	{ "menusearch", kbfunc_menu_cmd, CWM_CONTEXT_SCREEN, {0} },
+	{ "groupsearch", kbfunc_menu_group, CWM_CONTEXT_SCREEN, {0} },
+	{ "hide", kbfunc_client_hide, CWM_CONTEXT_CLIENT, {0} },
+	{ "cycle", kbfunc_client_cycle, CWM_CONTEXT_SCREEN,
+	    {.i = CWM_CLIENT_CYCLE} },
+	{ "rcycle", kbfunc_client_cycle, CWM_CONTEXT_SCREEN,
+	    {.i = CWM_CLIENT_RCYCLE} },
+	{ "label", kbfunc_client_label, CWM_CONTEXT_CLIENT, {0} },
+	{ "delete", kbfunc_client_delete, CWM_CONTEXT_CLIENT, {0} },
+	{ "group1", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 1} },
+	{ "group2", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 2} },
+	{ "group3", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 3} },
+	{ "group4", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 4} },
+	{ "group5", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 5} },
+	{ "group6", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 6} },
+	{ "group7", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 7} },
+	{ "group8", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 8} },
+	{ "group9", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 9} },
+	{ "grouponly1", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 1} },
+	{ "grouponly2", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 2} },
+	{ "grouponly3", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 3} },
+	{ "grouponly4", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 4} },
+	{ "grouponly5", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 5} },
+	{ "grouponly6", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 6} },
+	{ "grouponly7", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 7} },
+	{ "grouponly8", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 8} },
+	{ "grouponly9", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 9} },
+	{ "movetogroup1", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
+	    {.i = 1} },
+	{ "movetogroup2", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
+	    {.i = 2} },
+	{ "movetogroup3", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
+	    {.i = 3} },
+	{ "movetogroup4", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
+	    {.i = 4} },
+	{ "movetogroup5", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
+	    {.i = 5} },
+	{ "movetogroup6", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
+	    {.i = 6} },
+	{ "movetogroup7", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
+	    {.i = 7} },
+	{ "movetogroup8", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
+	    {.i = 8} },
+	{ "movetogroup9", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
+	    {.i = 9} },
+	{ "nogroup", kbfunc_client_nogroup, CWM_CONTEXT_SCREEN, {0} },
+	{ "cyclegroup", kbfunc_client_cyclegroup, CWM_CONTEXT_SCREEN,
+	    {.i = CWM_CLIENT_CYCLE} },
+	{ "rcyclegroup", kbfunc_client_cyclegroup, CWM_CONTEXT_SCREEN,
+	    {.i = CWM_CLIENT_RCYCLE} },
+	{ "cycleingroup", kbfunc_client_cycle, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_CLIENT_CYCLE | CWM_CLIENT_CYCLE_INGRP)} },
+	{ "rcycleingroup", kbfunc_client_cycle, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_CLIENT_RCYCLE | CWM_CLIENT_CYCLE_INGRP)} },
+	{ "grouptoggle", kbfunc_client_grouptoggle, CWM_CONTEXT_CLIENT,
+	    {.i = CWM_KBD}},
+	{ "sticky", kbfunc_client_toggle_sticky, CWM_CONTEXT_CLIENT, {0} },
+	{ "fullscreen", kbfunc_client_toggle_fullscreen, CWM_CONTEXT_CLIENT,
+	    {0} },
+	{ "maximize", kbfunc_client_toggle_maximize, CWM_CONTEXT_CLIENT, {0} },
+	{ "vmaximize", kbfunc_client_toggle_vmaximize, CWM_CONTEXT_CLIENT,
+	    {0} },
+	{ "hmaximize", kbfunc_client_toggle_hmaximize, CWM_CONTEXT_CLIENT,
+	    {0} },
+	{ "freeze", kbfunc_client_toggle_freeze, CWM_CONTEXT_CLIENT, {0} },
+	{ "restart", kbfunc_cwm_status, CWM_CONTEXT_SCREEN,
+	    {.i = CWM_EXEC_WM} },
+	{ "quit", kbfunc_cwm_status, CWM_CONTEXT_SCREEN, {.i = CWM_QUIT} },
+	{ "exec", kbfunc_menu_exec, CWM_CONTEXT_SCREEN, {.i = CWM_MENU_EXEC} },
+	{ "exec_wm", kbfunc_menu_exec, CWM_CONTEXT_SCREEN,
+	    {.i = CWM_MENU_EXEC_WM} },
+	{ "ssh", kbfunc_menu_ssh, CWM_CONTEXT_SCREEN, {0} },
+	{ "terminal", kbfunc_exec_term, CWM_CONTEXT_SCREEN, {0} },
+	{ "lock", kbfunc_exec_lock, CWM_CONTEXT_SCREEN, {0} },
+	{ "moveup", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_UP | CWM_MOVE)} },
-	{ "movedown", kbfunc_client_moveresize, CWM_WIN,
+	{ "movedown", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_DOWN | CWM_MOVE)} },
-	{ "moveright", kbfunc_client_moveresize, CWM_WIN,
+	{ "moveright", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_RIGHT | CWM_MOVE)} },
-	{ "moveleft", kbfunc_client_moveresize, CWM_WIN,
+	{ "moveleft", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_LEFT | CWM_MOVE)} },
-	{ "bigmoveup", kbfunc_client_moveresize, CWM_WIN,
+	{ "bigmoveup", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_UP | CWM_MOVE | CWM_BIGMOVE)} },
-	{ "bigmovedown", kbfunc_client_moveresize, CWM_WIN,
+	{ "bigmovedown", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_DOWN | CWM_MOVE | CWM_BIGMOVE)} },
-	{ "bigmoveright", kbfunc_client_moveresize, CWM_WIN,
+	{ "bigmoveright", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_RIGHT | CWM_MOVE | CWM_BIGMOVE)} },
-	{ "bigmoveleft", kbfunc_client_moveresize, CWM_WIN,
+	{ "bigmoveleft", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_LEFT | CWM_MOVE | CWM_BIGMOVE)} },
-	{ "resizeup", kbfunc_client_moveresize, CWM_WIN,
+	{ "resizeup", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_UP | CWM_RESIZE)} },
-	{ "resizedown", kbfunc_client_moveresize, CWM_WIN,
+	{ "resizedown", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_DOWN | CWM_RESIZE)} },
-	{ "resizeright", kbfunc_client_moveresize, CWM_WIN,
+	{ "resizeright", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_RIGHT | CWM_RESIZE)} },
-	{ "resizeleft", kbfunc_client_moveresize, CWM_WIN,
+	{ "resizeleft", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_LEFT | CWM_RESIZE)} },
-	{ "bigresizeup", kbfunc_client_moveresize, CWM_WIN,
+	{ "bigresizeup", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_UP | CWM_RESIZE | CWM_BIGMOVE)} },
-	{ "bigresizedown", kbfunc_client_moveresize, CWM_WIN,
+	{ "bigresizedown", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_DOWN | CWM_RESIZE | CWM_BIGMOVE)} },
-	{ "bigresizeright", kbfunc_client_moveresize, CWM_WIN,
+	{ "bigresizeright", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_RIGHT | CWM_RESIZE | CWM_BIGMOVE)} },
-	{ "bigresizeleft", kbfunc_client_moveresize, CWM_WIN,
+	{ "bigresizeleft", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_LEFT | CWM_RESIZE | CWM_BIGMOVE)} },
-	{ "ptrmoveup", kbfunc_client_moveresize, 0,
+	{ "ptrmoveup", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
 	    {.i = (CWM_UP | CWM_PTRMOVE)} },
-	{ "ptrmovedown", kbfunc_client_moveresize, 0,
+	{ "ptrmovedown", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
 	    {.i = (CWM_DOWN | CWM_PTRMOVE)} },
-	{ "ptrmoveleft", kbfunc_client_moveresize, 0,
+	{ "ptrmoveleft", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
 	    {.i = (CWM_LEFT | CWM_PTRMOVE)} },
-	{ "ptrmoveright", kbfunc_client_moveresize, 0,
+	{ "ptrmoveright", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
 	    {.i = (CWM_RIGHT | CWM_PTRMOVE)} },
-	{ "bigptrmoveup", kbfunc_client_moveresize, 0,
+	{ "bigptrmoveup", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
 	    {.i = (CWM_UP | CWM_PTRMOVE | CWM_BIGMOVE)} },
-	{ "bigptrmovedown", kbfunc_client_moveresize, 0,
+	{ "bigptrmovedown", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
 	    {.i = (CWM_DOWN | CWM_PTRMOVE | CWM_BIGMOVE)} },
-	{ "bigptrmoveleft", kbfunc_client_moveresize, 0,
+	{ "bigptrmoveleft", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
 	    {.i = (CWM_LEFT | CWM_PTRMOVE | CWM_BIGMOVE)} },
-	{ "bigptrmoveright", kbfunc_client_moveresize, 0,
+	{ "bigptrmoveright", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
 	    {.i = (CWM_RIGHT | CWM_PTRMOVE | CWM_BIGMOVE)} },
-	{ "htile", kbfunc_tile, CWM_WIN, {.i = CWM_TILE_HORIZ} },
-	{ "vtile", kbfunc_tile, CWM_WIN, {.i = CWM_TILE_VERT} },
-	{ "window_lower", kbfunc_client_lower, CWM_WIN, {0} },
-	{ "window_raise", kbfunc_client_raise, CWM_WIN, {0} },
-	{ "window_hide", kbfunc_client_hide, CWM_WIN, {0} },
-	{ "window_move", mousefunc_client_move, CWM_WIN, {0} },
-	{ "window_resize", mousefunc_client_resize, CWM_WIN, {0} },
-	{ "window_grouptoggle", kbfunc_client_grouptoggle, CWM_WIN, {.i = 1} },
-	{ "menu_group", mousefunc_menu_group, 0, {0} },
-	{ "menu_unhide", mousefunc_menu_unhide, 0, {0} },
-	{ "menu_cmd", mousefunc_menu_cmd, 0, {0} },
+	{ "htile", kbfunc_client_tile, CWM_CONTEXT_CLIENT,
+	    {.i = CWM_CLIENT_TILE_HORIZ} },
+	{ "vtile", kbfunc_client_tile, CWM_CONTEXT_CLIENT,
+	    {.i = CWM_CLIENT_TILE_VERT} },
+	{ "window_lower", kbfunc_client_lower, CWM_CONTEXT_CLIENT, {0} },
+	{ "window_raise", kbfunc_client_raise, CWM_CONTEXT_CLIENT, {0} },
+	{ "window_hide", kbfunc_client_hide, CWM_CONTEXT_CLIENT, {0} },
+	{ "window_move", mousefunc_client_move, CWM_CONTEXT_CLIENT, {0} },
+	{ "window_resize", mousefunc_client_resize, CWM_CONTEXT_CLIENT, {0} },
+	{ "window_grouptoggle", kbfunc_client_grouptoggle, CWM_CONTEXT_CLIENT,
+	   {.i = CWM_MOUSE} },
+	{ "menu_group", mousefunc_menu_group, CWM_CONTEXT_SCREEN, {0} },
+	{ "menu_unhide", mousefunc_menu_client, CWM_CONTEXT_SCREEN, {0} },
+	{ "menu_cmd", mousefunc_menu_cmd, CWM_CONTEXT_SCREEN, {0} },
 };
 
 static const struct {
@@ -527,14 +549,14 @@ conf_bind_kbd(struct conf *c, const char *bind, const char *cmd)
 			continue;
 
 		kb->callback = name_to_func[i].handler;
-		kb->flags = name_to_func[i].flags;
+		kb->context = name_to_func[i].context;
 		kb->argument = name_to_func[i].argument;
 		TAILQ_INSERT_TAIL(&c->keybindingq, kb, entry);
 		return(1);
 	}
 
-	kb->callback = kbfunc_cmdexec;
-	kb->flags = CWM_CMD;
+	kb->callback = kbfunc_exec;
+	kb->context = CWM_CONTEXT_NONE;
 	kb->argument.c = xstrdup(cmd);
 	TAILQ_INSERT_TAIL(&c->keybindingq, kb, entry);
 	return(1);
@@ -551,7 +573,7 @@ conf_unbind_kbd(struct conf *c, struct binding *unbind)
 
 		if (key->press.keysym == unbind->press.keysym) {
 			TAILQ_REMOVE(&c->keybindingq, key, entry);
-			if (key->flags & CWM_CMD)
+			if (key->context == CWM_CONTEXT_NONE)
 				free(key->argument.c);
 			free(key);
 		}
@@ -588,7 +610,7 @@ conf_bind_mouse(struct conf *c, const char *bind, const char *cmd)
 			continue;
 
 		mb->callback = name_to_func[i].handler;
-		mb->flags = name_to_func[i].flags;
+		mb->context = name_to_func[i].context;
 		mb->argument = name_to_func[i].argument;
 		TAILQ_INSERT_TAIL(&c->mousebindingq, mb, entry);
 		return(1);
@@ -638,7 +660,7 @@ conf_grab_mouse(Window win)
 	xu_btn_ungrab(win);
 
 	TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) {
-		if (mb->flags & CWM_WIN)
+		if (mb->context == CWM_CONTEXT_CLIENT)
 			xu_btn_grab(win, mb->modmask, mb->press.button);
 	}
 }
diff --git a/group.c b/group.c
index c455bcd..c39e0f1 100644
--- a/group.c
+++ b/group.c
@@ -272,7 +272,7 @@ group_cycle(struct screen_ctx *sc, int flags)
 
 	newgc = oldgc;
 	for (;;) {
-		newgc = (flags & CWM_RCYCLE) ? group_prev(newgc) :
+		newgc = (flags & CWM_CLIENT_RCYCLE) ? group_prev(newgc) :
 		    group_next(newgc);
 
 		if (newgc == oldgc)
diff --git a/kbfunc.c b/kbfunc.c
index 8e9702e..19be227 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -142,7 +142,7 @@ kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
 }
 
 void
-kbfunc_client_search(struct client_ctx *cc, union arg *arg)
+kbfunc_menu_client(struct client_ctx *cc, union arg *arg)
 {
 	struct screen_ctx	*sc = cc->sc;
 	struct client_ctx	*old_cc;
@@ -230,13 +230,13 @@ kbfunc_client_hide(struct client_ctx *cc, union arg *arg)
 }
 
 void
-kbfunc_cmdexec(struct client_ctx *cc, union arg *arg)
+kbfunc_exec(struct client_ctx *cc, union arg *arg)
 {
 	u_spawn(arg->c);
 }
 
 void
-kbfunc_term(struct client_ctx *cc, union arg *arg)
+kbfunc_exec_term(struct client_ctx *cc, union arg *arg)
 {
 	struct cmd *cmd;
 
@@ -247,7 +247,7 @@ kbfunc_term(struct client_ctx *cc, union arg *arg)
 }
 
 void
-kbfunc_lock(struct client_ctx *cc, union arg *arg)
+kbfunc_exec_lock(struct client_ctx *cc, union arg *arg)
 {
 	struct cmd *cmd;
 
@@ -258,7 +258,7 @@ kbfunc_lock(struct client_ctx *cc, union arg *arg)
 }
 
 void
-kbfunc_exec(struct client_ctx *cc, union arg *arg)
+kbfunc_menu_exec(struct client_ctx *cc, union arg *arg)
 {
 #define NPATHS 256
 	struct screen_ctx	*sc = cc->sc;
@@ -272,14 +272,14 @@ kbfunc_exec(struct client_ctx *cc, union arg *arg)
 	int			 l, i, cmd = arg->i;
 
 	switch (cmd) {
-	case CWM_EXEC_PROGRAM:
+	case CWM_MENU_EXEC:
 		label = "exec";
 		break;
-	case CWM_EXEC_WM:
+	case CWM_MENU_EXEC_WM:
 		label = "wm";
 		break;
 	default:
-		errx(1, "kbfunc_exec: invalid cmd %d", cmd);
+		errx(1, "kbfunc_menu_exec: invalid cmd %d", cmd);
 		/*NOTREACHED*/
 	}
 
@@ -321,11 +321,11 @@ kbfunc_exec(struct client_ctx *cc, union arg *arg)
 		if (mi->text[0] == '\0')
 			goto out;
 		switch (cmd) {
-		case CWM_EXEC_PROGRAM:
+		case CWM_MENU_EXEC:
 			u_spawn(mi->text);
 			break;
-		case CWM_EXEC_WM:
-			cwm_status = CWM_EXECWM;
+		case CWM_MENU_EXEC_WM:
+			cwm_status = CWM_EXEC_WM;
 			free(wm_argv);
 			wm_argv = xstrdup(mi->text);
 			break;
@@ -341,7 +341,7 @@ out:
 }
 
 void
-kbfunc_ssh(struct client_ctx *cc, union arg *arg)
+kbfunc_menu_ssh(struct client_ctx *cc, union arg *arg)
 {
 	struct screen_ctx	*sc = cc->sc;
 	struct cmd		*cmd;
@@ -361,7 +361,7 @@ kbfunc_ssh(struct client_ctx *cc, union arg *arg)
 	TAILQ_INIT(&menuq);
 
 	if ((fp = fopen(Conf.known_hosts, "r")) == NULL) {
-		warn("kbfunc_ssh: %s", Conf.known_hosts);
+		warn("kbfunc_menu_ssh: %s", Conf.known_hosts);
 		goto menu;
 	}
 
@@ -459,7 +459,7 @@ kbfunc_client_nogroup(struct client_ctx *cc, union arg *arg)
 void
 kbfunc_client_grouptoggle(struct client_ctx *cc, union arg *arg)
 {
-	if (arg->i == 0) {
+	if (arg->i == CWM_KBD) {
 		/* For X apps that steal events. */
 		XGrabKeyboard(X_Dpy, cc->win, True,
 		    GrabModeAsync, GrabModeAsync, CurrentTime);
@@ -517,13 +517,13 @@ kbfunc_cwm_status(struct client_ctx *cc, union arg *arg)
 }
 
 void
-kbfunc_tile(struct client_ctx *cc, union arg *arg)
+kbfunc_client_tile(struct client_ctx *cc, union arg *arg)
 {
 	switch (arg->i) {
-	case CWM_TILE_HORIZ:
+	case CWM_CLIENT_TILE_HORIZ:
 		client_htile(cc);
 		break;
-	case CWM_TILE_VERT:
+	case CWM_CLIENT_TILE_VERT:
 		client_vtile(cc);
 		break;
 	}
diff --git a/mousefunc.c b/mousefunc.c
index 3d21eb3..565e4c2 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -196,7 +196,7 @@ mousefunc_menu_group(struct client_ctx *cc, union arg *arg)
 }
 
 void
-mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg)
+mousefunc_menu_client(struct client_ctx *cc, union arg *arg)
 {
 	struct screen_ctx	*sc = cc->sc;
 	struct client_ctx	*old_cc;
diff --git a/xevents.c b/xevents.c
index 33b6ea0..a3a12c2 100644
--- a/xevents.c
+++ b/xevents.c
@@ -232,7 +232,7 @@ xev_handle_buttonpress(XEvent *ee)
 
 	if (mb == NULL)
 		return;
-	if (mb->flags & CWM_WIN) {
+	if (mb->context == CWM_CONTEXT_CLIENT) {
 		if (((cc = client_find(e->window)) == NULL) &&
 		    (cc = client_current()) == NULL)
 			return;
@@ -285,7 +285,7 @@ xev_handle_keypress(XEvent *ee)
 
 	if (kb == NULL)
 		return;
-	if (kb->flags & CWM_WIN) {
+	if (kb->context == CWM_CONTEXT_CLIENT) {
 		if (((cc = client_find(e->window)) == NULL) &&
 		    (cc = client_current()) == NULL)
 			return;

From 09565bc42362bb3a9fd24c75441e89c723114364 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Tue, 10 Nov 2015 22:06:57 +0000
Subject: [PATCH 4/9] Use position on root to figure out region.

---
 kbfunc.c    | 5 ++---
 mousefunc.c | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kbfunc.c b/kbfunc.c
index 19be227..1bf311c 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -101,9 +101,8 @@ kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
 		if (cc->geom.y > sc->view.h - 1)
 			cc->geom.y = sc->view.h - 1;
 
-		rc = region_find(sc,
-		    cc->geom.x + cc->geom.w / 2,
-		    cc->geom.y + cc->geom.h / 2);
+		xu_ptr_getpos(cc->win, &x, &y);
+		rc = region_find(sc, x + 1, y + 1);
 		cc->geom.x += client_snapcalc(cc->geom.x,
 		    cc->geom.x + cc->geom.w + (cc->bwidth * 2),
 		    rc->work.x, rc->work.x + rc->work.w, sc->snapdist);
diff --git a/mousefunc.c b/mousefunc.c
index 565e4c2..b58c717 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -150,8 +150,7 @@ mousefunc_client_move(struct client_ctx *cc, union arg *arg)
 			cc->geom.y = ev.xmotion.y_root - py - cc->bwidth;
 
 			rc = region_find(sc,
-			    cc->geom.x + cc->geom.w / 2,
-			    cc->geom.y + cc->geom.h / 2);
+			    ev.xmotion.x_root, ev.xmotion.y_root);
 			cc->geom.x += client_snapcalc(cc->geom.x,
 			    cc->geom.x + cc->geom.w + (cc->bwidth * 2),
 			    rc->work.x, rc->work.x + rc->work.w, sc->snapdist);

From 00bdd48b1d93b91946c7655ec8829060040aec22 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Wed, 11 Nov 2015 14:22:01 +0000
Subject: [PATCH 5/9] Partial revert of replacing screen_area() with
 region_find(); until a fix for a regression is found; this bug has been
 around for a long time it seems, but this change exposed it. Likely need to
 track clients in to and out of regions.

---
 calmwm.h    |  7 +++-
 client.c    | 94 ++++++++++++++++++++++++++---------------------------
 kbfunc.c    | 11 ++++---
 menu.c      |  4 +--
 mousefunc.c | 11 ++++---
 screen.c    | 22 +++++++++++++
 6 files changed, 87 insertions(+), 62 deletions(-)

diff --git a/calmwm.h b/calmwm.h
index 967eba3..cf7a194 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -74,6 +74,9 @@
 #define CWM_MENU_FILE		0x0002
 #define CWM_MENU_LIST		0x0004
 
+#define CWM_GAP			0x0001
+#define CWM_NOGAP		0x0002
+
 #define CWM_KBD			0x0001
 #define CWM_MOUSE		0x0002
 
@@ -217,6 +220,7 @@ TAILQ_HEAD(autogroupwin_q, autogroupwin);
 struct region_ctx {
 	TAILQ_ENTRY(region_ctx)	 entry;
 	int			 num;
+	struct geom		 area;
 	struct geom		 view; /* viewable area */
 	struct geom		 work; /* workable area, gap-applied */
 };
@@ -451,9 +455,10 @@ void			 search_print_client(struct menu *, int);
 void			 search_print_cmd(struct menu *, int);
 void			 search_print_group(struct menu *, int);
 
+struct region_ctx	*region_find(struct screen_ctx *, int, int);
 struct geom		 screen_apply_gap(struct screen_ctx *, struct geom);
 struct screen_ctx	*screen_find(Window);
-struct region_ctx	*region_find(struct screen_ctx *, int, int);
+struct geom		 screen_area(struct screen_ctx *, int, int, int);
 void			 screen_init(int);
 void			 screen_update_geometry(struct screen_ctx *);
 void			 screen_updatestackingorder(struct screen_ctx *);
diff --git a/client.c b/client.c
index da6d05c..2a5bede 100644
--- a/client.c
+++ b/client.c
@@ -290,7 +290,7 @@ void
 client_toggle_fullscreen(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct region_ctx	*rc;
+	struct geom		 area;
 
 	if ((cc->flags & CLIENT_FREEZE) &&
 	    !(cc->flags & CLIENT_FULLSCREEN))
@@ -305,12 +305,12 @@ client_toggle_fullscreen(struct client_ctx *cc)
 
 	cc->fullgeom = cc->geom;
 
-	rc = region_find(sc,
+	area = screen_area(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2);
+	    cc->geom.y + cc->geom.h / 2, CWM_NOGAP);
 
 	cc->bwidth = 0;
-	cc->geom = rc->view;
+	cc->geom = area;
 	cc->flags |= (CLIENT_FULLSCREEN | CLIENT_FREEZE);
 
 resize:
@@ -322,7 +322,7 @@ void
 client_toggle_maximize(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct region_ctx	*rc;
+	struct geom		 area;
 
 	if (cc->flags & CLIENT_FREEZE)
 		return;
@@ -348,14 +348,14 @@ client_toggle_maximize(struct client_ctx *cc)
 	 * that's probably more fair than if just the origin of
 	 * a window is poking over a boundary
 	 */
-	rc = region_find(sc,
+	area = screen_area(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2);
+	    cc->geom.y + cc->geom.h / 2, CWM_GAP);
 
-	cc->geom.x = rc->work.x;
-	cc->geom.y = rc->work.y;
-	cc->geom.w = rc->work.w - (cc->bwidth * 2);
-	cc->geom.h = rc->work.h - (cc->bwidth * 2);
+	cc->geom.x = area.x;
+	cc->geom.y = area.y;
+	cc->geom.w = area.w - (cc->bwidth * 2);
+	cc->geom.h = area.h - (cc->bwidth * 2);
 	cc->flags |= CLIENT_MAXIMIZED;
 
 resize:
@@ -367,7 +367,7 @@ void
 client_toggle_vmaximize(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct region_ctx	*rc;
+	struct geom		 area;
 
 	if (cc->flags & CLIENT_FREEZE)
 		return;
@@ -382,12 +382,12 @@ client_toggle_vmaximize(struct client_ctx *cc)
 	cc->savegeom.y = cc->geom.y;
 	cc->savegeom.h = cc->geom.h;
 
-	rc = region_find(sc,
+	area = screen_area(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2);
+	    cc->geom.y + cc->geom.h / 2, CWM_GAP);
 
-	cc->geom.y = rc->work.y;
-	cc->geom.h = rc->work.h - (cc->bwidth * 2);
+	cc->geom.y = area.y;
+	cc->geom.h = area.h - (cc->bwidth * 2);
 	cc->flags |= CLIENT_VMAXIMIZED;
 
 resize:
@@ -399,7 +399,7 @@ void
 client_toggle_hmaximize(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct region_ctx	*rc;
+	struct geom		 area;
 
 	if (cc->flags & CLIENT_FREEZE)
 		return;
@@ -414,12 +414,12 @@ client_toggle_hmaximize(struct client_ctx *cc)
 	cc->savegeom.x = cc->geom.x;
 	cc->savegeom.w = cc->geom.w;
 
-	rc = region_find(sc,
+	area = screen_area(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2);
+	    cc->geom.y + cc->geom.h / 2, CWM_GAP);
 
-	cc->geom.x = rc->work.x;
-	cc->geom.w = rc->work.w - (cc->bwidth * 2);
+	cc->geom.x = area.x;
+	cc->geom.w = area.w - (cc->bwidth * 2);
 	cc->flags |= CLIENT_HMAXIMIZED;
 
 resize:
@@ -749,7 +749,6 @@ static void
 client_placecalc(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct region_ctx	*rc;
 	int			 xslack, yslack;
 
 	if (cc->hint.flags & (USPosition | PPosition)) {
@@ -769,8 +768,7 @@ client_placecalc(struct client_ctx *cc)
 		int			 xmouse, ymouse;
 
 		xu_ptr_getpos(sc->rootwin, &xmouse, &ymouse);
-		rc = region_find(sc, xmouse, ymouse);
-		area = rc->work;
+		area = screen_area(sc, xmouse, ymouse, CWM_GAP);
 		area.w += area.x;
 		area.h += area.y;
 		xmouse = MAX(xmouse, area.x) - cc->geom.w / 2;
@@ -975,7 +973,7 @@ client_htile(struct client_ctx *cc)
 	struct client_ctx	*ci;
 	struct group_ctx 	*gc = cc->gc;
 	struct screen_ctx 	*sc = cc->sc;
-	struct region_ctx	*rc;
+	struct geom 		 area;
 	int 			 i, n, mh, x, h, w;
 
 	if (!gc)
@@ -991,36 +989,36 @@ client_htile(struct client_ctx *cc)
 	if (n == 0)
 		return;
 
-	rc = region_find(sc,
+	area = screen_area(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2);
+	    cc->geom.y + cc->geom.h / 2, CWM_GAP);
 
 	if (cc->flags & CLIENT_VMAXIMIZED ||
-	    cc->geom.h + (cc->bwidth * 2) >= rc->work.h)
+	    cc->geom.h + (cc->bwidth * 2) >= area.h)
 		return;
 
 	cc->flags &= ~CLIENT_HMAXIMIZED;
-	cc->geom.x = rc->work.x;
-	cc->geom.y = rc->work.y;
-	cc->geom.w = rc->work.w - (cc->bwidth * 2);
+	cc->geom.x = area.x;
+	cc->geom.y = area.y;
+	cc->geom.w = area.w - (cc->bwidth * 2);
 	client_resize(cc, 1);
 	client_ptrwarp(cc);
 
 	mh = cc->geom.h + (cc->bwidth * 2);
-	x = rc->work.x;
-	w = rc->work.w / n;
-	h = rc->work.h - mh;
+	x = area.x;
+	w = area.w / n;
+	h = area.h - mh;
 	TAILQ_FOREACH(ci, &gc->clientq, group_entry) {
 		if (ci->flags & CLIENT_HIDDEN ||
 		    ci->flags & CLIENT_IGNORE || (ci == cc))
 			continue;
 		ci->bwidth = Conf.bwidth;
-		ci->geom.y = rc->work.y + mh;
+		ci->geom.y = area.y + mh;
 		ci->geom.x = x;
 		ci->geom.h = h - (ci->bwidth * 2);
 		ci->geom.w = w - (ci->bwidth * 2);
 		if (i + 1 == n)
-			ci->geom.w = rc->work.x + rc->work.w -
+			ci->geom.w = area.x + area.w -
 			    ci->geom.x - (ci->bwidth * 2);
 		x += w;
 		client_resize(ci, 1);
@@ -1034,7 +1032,7 @@ client_vtile(struct client_ctx *cc)
 	struct client_ctx	*ci;
 	struct group_ctx 	*gc = cc->gc;
 	struct screen_ctx 	*sc = cc->sc;
-	struct region_ctx	*rc;
+	struct geom 		 area;
 	int 			 i, n, mw, y, h, w;
 
 	if (!gc)
@@ -1050,36 +1048,36 @@ client_vtile(struct client_ctx *cc)
 	if (n == 0)
 		return;
 
-	rc = region_find(sc,
+	area = screen_area(sc,
 	    cc->geom.x + cc->geom.w / 2,
-	    cc->geom.y + cc->geom.h / 2);
+	    cc->geom.y + cc->geom.h / 2, CWM_GAP);
 
 	if (cc->flags & CLIENT_HMAXIMIZED ||
-	    cc->geom.w + (cc->bwidth * 2) >= rc->work.w)
+	    cc->geom.w + (cc->bwidth * 2) >= area.w)
 		return;
 
 	cc->flags &= ~CLIENT_VMAXIMIZED;
-	cc->geom.x = rc->work.x;
-	cc->geom.y = rc->work.y;
-	cc->geom.h = rc->work.h - (cc->bwidth * 2);
+	cc->geom.x = area.x;
+	cc->geom.y = area.y;
+	cc->geom.h = area.h - (cc->bwidth * 2);
 	client_resize(cc, 1);
 	client_ptrwarp(cc);
 
 	mw = cc->geom.w + (cc->bwidth * 2);
-	y = rc->work.y;
-	h = rc->work.h / n;
-	w = rc->work.w - mw;
+	y = area.y;
+	h = area.h / n;
+	w = area.w - mw;
 	TAILQ_FOREACH(ci, &gc->clientq, group_entry) {
 		if (ci->flags & CLIENT_HIDDEN ||
 		    ci->flags & CLIENT_IGNORE || (ci == cc))
 			continue;
 		ci->bwidth = Conf.bwidth;
 		ci->geom.y = y;
-		ci->geom.x = rc->work.x + mw;
+		ci->geom.x = area.x + mw;
 		ci->geom.h = h - (ci->bwidth * 2);
 		ci->geom.w = w - (ci->bwidth * 2);
 		if (i + 1 == n)
-			ci->geom.h = rc->work.y + rc->work.h -
+			ci->geom.h = area.y + area.h -
 			    ci->geom.y - (ci->bwidth * 2);
 		y += h;
 		client_resize(ci, 1);
diff --git a/kbfunc.c b/kbfunc.c
index 1bf311c..8e2f579 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -57,7 +57,7 @@ void
 kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
 {
 	struct screen_ctx	*sc = cc->sc;
-	struct region_ctx	*rc;
+	struct geom		 area;
 	int			 x, y, flags, amt;
 	unsigned int		 mx, my;
 
@@ -101,14 +101,15 @@ kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
 		if (cc->geom.y > sc->view.h - 1)
 			cc->geom.y = sc->view.h - 1;
 
-		xu_ptr_getpos(cc->win, &x, &y);
-		rc = region_find(sc, x + 1, y + 1);
+		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),
-		    rc->work.x, rc->work.x + rc->work.w, sc->snapdist);
+		    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),
-		    rc->work.y, rc->work.y + rc->work.h, sc->snapdist);
+		    area.y, area.y + area.h, sc->snapdist);
 
 		client_move(cc);
 		xu_ptr_getpos(cc->win, &x, &y);
diff --git a/menu.c b/menu.c
index 5e0dc98..cb4ee7d 100644
--- a/menu.c
+++ b/menu.c
@@ -331,7 +331,6 @@ static void
 menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
 {
 	struct screen_ctx	*sc = mc->sc;
-	struct region_ctx	*rc;
 	struct menu		*mi;
 	struct geom		 area;
 	int			 n, xsave, ysave;
@@ -372,8 +371,7 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
 		mc->num++;
 	}
 
-	rc = region_find(sc, mc->geom.x, mc->geom.y);
-	area = rc->work;
+	area = screen_area(sc, mc->geom.x, mc->geom.y, CWM_GAP);
 	area.w += area.x - Conf.bwidth * 2;
 	area.h += area.y - Conf.bwidth * 2;
 
diff --git a/mousefunc.c b/mousefunc.c
index b58c717..8f97897 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -123,7 +123,7 @@ mousefunc_client_move(struct client_ctx *cc, union arg *arg)
 	XEvent			 ev;
 	Time			 ltime = 0;
 	struct screen_ctx	*sc = cc->sc;
-	struct region_ctx	*rc;
+	struct geom		 area;
 	int			 px, py;
 
 	client_raise(cc);
@@ -149,14 +149,15 @@ mousefunc_client_move(struct client_ctx *cc, union arg *arg)
 			cc->geom.x = ev.xmotion.x_root - px - cc->bwidth;
 			cc->geom.y = ev.xmotion.y_root - py - cc->bwidth;
 
-			rc = region_find(sc,
-			    ev.xmotion.x_root, ev.xmotion.y_root);
+			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),
-			    rc->work.x, rc->work.x + rc->work.w, sc->snapdist);
+			    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),
-			    rc->work.y, rc->work.y + rc->work.h, sc->snapdist);
+			    area.y, area.y + area.h, sc->snapdist);
 
 			client_move(cc);
 			break;
diff --git a/screen.c b/screen.c
index 4fc6f4e..a1b8b30 100644
--- a/screen.c
+++ b/screen.c
@@ -138,6 +138,24 @@ region_find(struct screen_ctx *sc, int x, int y)
 	return(rc);
 }
 
+struct geom
+screen_area(struct screen_ctx *sc, int x, int y, int flags)
+{
+	struct region_ctx	*rc;
+	struct geom		 area = sc->work;
+
+	TAILQ_FOREACH(rc, &sc->regionq, entry) {
+		if ((x >= rc->area.x) && (x < (rc->area.x + rc->area.w)) &&
+		    (y >= rc->area.y) && (y < (rc->area.y + rc->area.h))) {
+			area = rc->area;
+			break;
+		}
+	}
+	if (flags & CWM_GAP)
+		area = screen_apply_gap(sc, area);
+	return(area);
+}
+
 void
 screen_update_geometry(struct screen_ctx *sc)
 {
@@ -171,6 +189,10 @@ screen_update_geometry(struct screen_ctx *sc)
 
 			rc = xmalloc(sizeof(*rc));
 			rc->num = i;
+			rc->area.x = ci->x;
+			rc->area.y = ci->y;
+			rc->area.w = ci->width;
+			rc->area.h = ci->height;
 			rc->view.x = ci->x;
 			rc->view.y = ci->y;
 			rc->view.w = ci->width;

From a2c066e447f8c3f754cc5559066b09f80e4c148e Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Thu, 12 Nov 2015 17:56:54 +0000
Subject: [PATCH 6/9] pledge "stdio rpath proc exec" cwm before main event
 loop, after init/setup - mostly for menu building.

ok semarie@ (another cwm user)
---
 calmwm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/calmwm.c b/calmwm.c
index a17f0f4..9166485 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -113,6 +113,10 @@ main(int argc, char **argv)
 
 	x_init(display_name);
 	cwm_status = CWM_RUNNING;
+
+	if (pledge("stdio rpath proc exec", NULL) == -1)
+		err(1, "pledge");
+
 	while (cwm_status == CWM_RUNNING)
 		xev_process();
 	x_teardown();

From 9a48836ceb40313cd12c05781d57f291401de7b0 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Thu, 12 Nov 2015 18:26:41 +0000
Subject: [PATCH 7/9] Move kb pointer movement out of the
 kbfunc_client_moveresize since it's got nothing to do with clients, thus
 doing flags work causes lots of waste and almost useless jumpy pointer
 movements; while here, split out move and resize since they share almost no
 code, just like mouse client move/resize; factor out amount and factor. Still
 wonder why this is here, but it works now.

---
 calmwm.h |  21 ++++---
 conf.c   |  96 ++++++++++++++++----------------
 kbfunc.c | 165 ++++++++++++++++++++++++++++++-------------------------
 3 files changed, 149 insertions(+), 133 deletions(-)

diff --git a/calmwm.h b/calmwm.h
index cf7a194..ddc0a4e 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -50,15 +50,13 @@
 #define KEYMASK		(KeyPressMask | ExposureMask)
 #define IGNOREMODMASK	(LockMask | Mod2Mask | 0x2000)
 
-/* kb movement */
-#define CWM_MOVE		0x0001
-#define CWM_RESIZE		0x0002
-#define CWM_PTRMOVE		0x0004
-#define CWM_BIGMOVE		0x0008
-#define CWM_UP			0x0010
-#define CWM_DOWN		0x0020
-#define CWM_LEFT		0x0040
-#define CWM_RIGHT		0x0080
+/* direction/amount */
+#define CWM_UP			0x0001
+#define CWM_DOWN		0x0002
+#define CWM_LEFT		0x0004
+#define CWM_RIGHT		0x0008
+#define CWM_BIGAMOUNT		0x0010
+#define DIRECTIONMASK	(CWM_UP | CWM_DOWN | CWM_LEFT | CWM_RIGHT)
 
 #define CWM_CLIENT_CYCLE	0x0001
 #define CWM_CLIENT_RCYCLE	0x0002
@@ -475,14 +473,14 @@ void			 kbfunc_client_grouptoggle(struct client_ctx *,
 void			 kbfunc_client_hide(struct client_ctx *, union arg *);
 void			 kbfunc_client_label(struct client_ctx *, union arg *);
 void			 kbfunc_client_lower(struct client_ctx *, union arg *);
-void			 kbfunc_client_moveresize(struct client_ctx *,
-			     union arg *);
+void			 kbfunc_client_move(struct client_ctx *, union arg *);
 void			 kbfunc_client_movetogroup(struct client_ctx *,
 			     union arg *);
 void			 kbfunc_client_nogroup(struct client_ctx *,
 			     union arg *);
 void			 kbfunc_client_raise(struct client_ctx *, union arg *);
 void			 kbfunc_client_rcycle(struct client_ctx *, union arg *);
+void			 kbfunc_client_resize(struct client_ctx *, union arg *);
 void 			 kbfunc_client_tile(struct client_ctx *, union arg *);
 void			 kbfunc_client_toggle_freeze(struct client_ctx *,
     			     union arg *);
@@ -505,6 +503,7 @@ void			 kbfunc_menu_client(struct client_ctx *, union arg *);
 void			 kbfunc_menu_cmd(struct client_ctx *, union arg *);
 void			 kbfunc_menu_group(struct client_ctx *, union arg *);
 void			 kbfunc_menu_ssh(struct client_ctx *, union arg *);
+void			 kbfunc_ptrmove(struct client_ctx *, union arg *);
 
 void			 mousefunc_client_move(struct client_ctx *,
     			    union arg *);
diff --git a/conf.c b/conf.c
index e270606..65300db 100644
--- a/conf.c
+++ b/conf.c
@@ -426,54 +426,54 @@ static const struct {
 	{ "ssh", kbfunc_menu_ssh, CWM_CONTEXT_SCREEN, {0} },
 	{ "terminal", kbfunc_exec_term, CWM_CONTEXT_SCREEN, {0} },
 	{ "lock", kbfunc_exec_lock, CWM_CONTEXT_SCREEN, {0} },
-	{ "moveup", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_UP | CWM_MOVE)} },
-	{ "movedown", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_DOWN | CWM_MOVE)} },
-	{ "moveright", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_RIGHT | CWM_MOVE)} },
-	{ "moveleft", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_LEFT | CWM_MOVE)} },
-	{ "bigmoveup", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_UP | CWM_MOVE | CWM_BIGMOVE)} },
-	{ "bigmovedown", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_DOWN | CWM_MOVE | CWM_BIGMOVE)} },
-	{ "bigmoveright", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_RIGHT | CWM_MOVE | CWM_BIGMOVE)} },
-	{ "bigmoveleft", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_LEFT | CWM_MOVE | CWM_BIGMOVE)} },
-	{ "resizeup", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_UP | CWM_RESIZE)} },
-	{ "resizedown", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_DOWN | CWM_RESIZE)} },
-	{ "resizeright", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_RIGHT | CWM_RESIZE)} },
-	{ "resizeleft", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_LEFT | CWM_RESIZE)} },
-	{ "bigresizeup", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_UP | CWM_RESIZE | CWM_BIGMOVE)} },
-	{ "bigresizedown", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_DOWN | CWM_RESIZE | CWM_BIGMOVE)} },
-	{ "bigresizeright", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_RIGHT | CWM_RESIZE | CWM_BIGMOVE)} },
-	{ "bigresizeleft", kbfunc_client_moveresize, CWM_CONTEXT_CLIENT,
-	    {.i = (CWM_LEFT | CWM_RESIZE | CWM_BIGMOVE)} },
-	{ "ptrmoveup", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
-	    {.i = (CWM_UP | CWM_PTRMOVE)} },
-	{ "ptrmovedown", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
-	    {.i = (CWM_DOWN | CWM_PTRMOVE)} },
-	{ "ptrmoveleft", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
-	    {.i = (CWM_LEFT | CWM_PTRMOVE)} },
-	{ "ptrmoveright", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
-	    {.i = (CWM_RIGHT | CWM_PTRMOVE)} },
-	{ "bigptrmoveup", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
-	    {.i = (CWM_UP | CWM_PTRMOVE | CWM_BIGMOVE)} },
-	{ "bigptrmovedown", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
-	    {.i = (CWM_DOWN | CWM_PTRMOVE | CWM_BIGMOVE)} },
-	{ "bigptrmoveleft", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
-	    {.i = (CWM_LEFT | CWM_PTRMOVE | CWM_BIGMOVE)} },
-	{ "bigptrmoveright", kbfunc_client_moveresize, CWM_CONTEXT_SCREEN,
-	    {.i = (CWM_RIGHT | CWM_PTRMOVE | CWM_BIGMOVE)} },
+	{ "moveup", kbfunc_client_move, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_UP)} },
+	{ "movedown", kbfunc_client_move, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_DOWN)} },
+	{ "moveright", kbfunc_client_move, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_RIGHT)} },
+	{ "moveleft", kbfunc_client_move, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_LEFT)} },
+	{ "bigmoveup", kbfunc_client_move, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_UP | CWM_BIGAMOUNT)} },
+	{ "bigmovedown", kbfunc_client_move, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_DOWN | CWM_BIGAMOUNT)} },
+	{ "bigmoveright", kbfunc_client_move, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_RIGHT | CWM_BIGAMOUNT)} },
+	{ "bigmoveleft", kbfunc_client_move, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_LEFT | CWM_BIGAMOUNT)} },
+	{ "resizeup", kbfunc_client_resize, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_UP)} },
+	{ "resizedown", kbfunc_client_resize, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_DOWN)} },
+	{ "resizeright", kbfunc_client_resize, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_RIGHT)} },
+	{ "resizeleft", kbfunc_client_resize, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_LEFT)} },
+	{ "bigresizeup", kbfunc_client_resize, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_UP | CWM_BIGAMOUNT)} },
+	{ "bigresizedown", kbfunc_client_resize, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_DOWN | CWM_BIGAMOUNT)} },
+	{ "bigresizeright", kbfunc_client_resize, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_RIGHT | CWM_BIGAMOUNT)} },
+	{ "bigresizeleft", kbfunc_client_resize, CWM_CONTEXT_CLIENT,
+	    {.i = (CWM_LEFT | CWM_BIGAMOUNT)} },
+	{ "ptrmoveup", kbfunc_ptrmove, CWM_CONTEXT_SCREEN,
+	    {.i = (CWM_UP)} },
+	{ "ptrmovedown", kbfunc_ptrmove, CWM_CONTEXT_SCREEN,
+	    {.i = (CWM_DOWN)} },
+	{ "ptrmoveleft", kbfunc_ptrmove, CWM_CONTEXT_SCREEN,
+	    {.i = (CWM_LEFT)} },
+	{ "ptrmoveright", kbfunc_ptrmove, CWM_CONTEXT_SCREEN,
+	    {.i = (CWM_RIGHT)} },
+	{ "bigptrmoveup", kbfunc_ptrmove, CWM_CONTEXT_SCREEN,
+	    {.i = (CWM_UP | CWM_BIGAMOUNT)} },
+	{ "bigptrmovedown", kbfunc_ptrmove, CWM_CONTEXT_SCREEN,
+	    {.i = (CWM_DOWN | CWM_BIGAMOUNT)} },
+	{ "bigptrmoveleft", kbfunc_ptrmove, CWM_CONTEXT_SCREEN,
+	    {.i = (CWM_LEFT | CWM_BIGAMOUNT)} },
+	{ "bigptrmoveright", kbfunc_ptrmove, CWM_CONTEXT_SCREEN,
+	    {.i = (CWM_RIGHT | CWM_BIGAMOUNT)} },
 	{ "htile", kbfunc_client_tile, CWM_CONTEXT_CLIENT,
 	    {.i = CWM_CLIENT_TILE_HORIZ} },
 	{ "vtile", kbfunc_client_tile, CWM_CONTEXT_CLIENT,
diff --git a/kbfunc.c b/kbfunc.c
index 8e2f579..121ae7d 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -38,6 +38,8 @@
 
 extern sig_atomic_t	 cwm_status;
 
+static void kbfunc_amount(int, unsigned int *, unsigned int *);
+
 void
 kbfunc_client_lower(struct client_ctx *cc, union arg *arg)
 {
@@ -51,94 +53,109 @@ kbfunc_client_raise(struct client_ctx *cc, union arg *arg)
 	client_raise(cc);
 }
 
-#define TYPEMASK	(CWM_MOVE | CWM_RESIZE | CWM_PTRMOVE)
-#define MOVEMASK	(CWM_UP | CWM_DOWN | CWM_LEFT | CWM_RIGHT)
+static void
+kbfunc_amount(int flags, unsigned int *mx, unsigned int *my)
+{
+#define CWM_FACTOR 10
+	int	amt;
+
+	amt = Conf.mamount;
+	if (flags & CWM_BIGAMOUNT)
+		amt *= CWM_FACTOR;
+
+	switch (flags & DIRECTIONMASK) {
+	case CWM_UP:
+		*my -= amt;
+		break;
+	case CWM_DOWN:
+		*my += amt;
+		break;
+	case CWM_RIGHT:
+		*mx += amt;
+		break;
+	case CWM_LEFT:
+		*mx -= amt;
+		break;
+	}
+}
+
 void
-kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
+kbfunc_ptrmove(struct client_ctx *cc, union arg *arg)
+{
+	struct screen_ctx	*sc = cc->sc;
+	int			 x, y;
+	unsigned int		 mx = 0, my = 0;
+
+	kbfunc_amount(arg->i, &mx, &my);
+
+	xu_ptr_getpos(sc->rootwin, &x, &y);
+	xu_ptr_setpos(sc->rootwin, x + mx, y + my);
+}
+
+void
+kbfunc_client_move(struct client_ctx *cc, union arg *arg)
 {
 	struct screen_ctx	*sc = cc->sc;
 	struct geom		 area;
-	int			 x, y, flags, amt;
-	unsigned int		 mx, my;
+	int			 x, y;
+	unsigned int		 mx = 0, my = 0;
 
 	if (cc->flags & CLIENT_FREEZE)
 		return;
 
-	mx = my = 0;
+	kbfunc_amount(arg->i, &mx, &my);
 
-	flags = arg->i;
-	amt = Conf.mamount;
+	cc->geom.x += mx;
+	if (cc->geom.x + cc->geom.w < 0)
+		cc->geom.x = -cc->geom.w;
+	if (cc->geom.x > sc->view.w - 1)
+		cc->geom.x = sc->view.w - 1;
+	cc->geom.y += my;
+	if (cc->geom.y + cc->geom.h < 0)
+		cc->geom.y = -cc->geom.h;
+	if (cc->geom.y > sc->view.h - 1)
+		cc->geom.y = sc->view.h - 1;
 
-	if (flags & CWM_BIGMOVE) {
-		flags -= CWM_BIGMOVE;
-		amt = amt * 10;
-	}
+	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);
 
-	switch (flags & MOVEMASK) {
-	case CWM_UP:
-		my -= amt;
-		break;
-	case CWM_DOWN:
-		my += amt;
-		break;
-	case CWM_RIGHT:
-		mx += amt;
-		break;
-	case CWM_LEFT:
-		mx -= amt;
-		break;
-	}
-	switch (flags & TYPEMASK) {
-	case CWM_MOVE:
-		cc->geom.x += mx;
-		if (cc->geom.x + cc->geom.w < 0)
-			cc->geom.x = -cc->geom.w;
-		if (cc->geom.x > sc->view.w - 1)
-			cc->geom.x = sc->view.w - 1;
-		cc->geom.y += my;
-		if (cc->geom.y + cc->geom.h < 0)
-			cc->geom.y = -cc->geom.h;
-		if (cc->geom.y > sc->view.h - 1)
-			cc->geom.y = sc->view.h - 1;
+	xu_ptr_getpos(cc->win, &x, &y);
+	cc->ptr.x = x + mx;
+	cc->ptr.y = y + my;
+	client_ptrwarp(cc);
+}
 
-		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);
+void
+kbfunc_client_resize(struct client_ctx *cc, union arg *arg)
+{
+	unsigned int		 mx = 0, my = 0;
 
-		client_move(cc);
-		xu_ptr_getpos(cc->win, &x, &y);
-		cc->ptr.x = x + mx;
-		cc->ptr.y = y + my;
-		client_ptrwarp(cc);
-		break;
-	case CWM_RESIZE:
-		if ((cc->geom.w += mx) < 1)
-			cc->geom.w = 1;
-		if ((cc->geom.h += my) < 1)
-			cc->geom.h = 1;
-		client_resize(cc, 1);
+	if (cc->flags & CLIENT_FREEZE)
+		return;
 
-		/* Make sure the pointer stays within the window. */
-		xu_ptr_getpos(cc->win, &cc->ptr.x, &cc->ptr.y);
-		if (cc->ptr.x > cc->geom.w)
-			cc->ptr.x = cc->geom.w - cc->bwidth;
-		if (cc->ptr.y > cc->geom.h)
-			cc->ptr.y = cc->geom.h - cc->bwidth;
-		client_ptrwarp(cc);
-		break;
-	case CWM_PTRMOVE:
-		xu_ptr_getpos(sc->rootwin, &x, &y);
-		xu_ptr_setpos(sc->rootwin, x + mx, y + my);
-		break;
-	default:
-		warnx("invalid flags passed to kbfunc_client_moveresize");
-	}
+	kbfunc_amount(arg->i, &mx, &my);
+
+	if ((cc->geom.w += mx) < 1)
+		cc->geom.w = 1;
+	if ((cc->geom.h += my) < 1)
+		cc->geom.h = 1;
+	client_resize(cc, 1);
+
+	/* Make sure the pointer stays within the window. */
+	xu_ptr_getpos(cc->win, &cc->ptr.x, &cc->ptr.y);
+	if (cc->ptr.x > cc->geom.w)
+		cc->ptr.x = cc->geom.w - cc->bwidth;
+	if (cc->ptr.y > cc->geom.h)
+		cc->ptr.y = cc->geom.h - cc->bwidth;
+	client_ptrwarp(cc);
 }
 
 void

From 4aca2b876485fa011298c9d7c0fe5b296b2ed122 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Thu, 12 Nov 2015 18:33:30 +0000
Subject: [PATCH 8/9] If a client sets hints, honor them for kb resize
 requests, just like we do for mouse based resize requests.

Based on a patch from Vadim Vygonets.
---
 client.c | 2 ++
 kbfunc.c | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client.c b/client.c
index 2a5bede..bb8f8dc 100644
--- a/client.c
+++ b/client.c
@@ -839,6 +839,8 @@ client_getsizehints(struct client_ctx *cc)
 	}
 	cc->hint.incw = MAX(1, cc->hint.incw);
 	cc->hint.inch = MAX(1, cc->hint.inch);
+	cc->hint.minw = MAX(1, cc->hint.minw);
+	cc->hint.minh = MAX(1, cc->hint.minh);
 
 	if (size.flags & PAspect) {
 		if (size.min_aspect.x > 0)
diff --git a/kbfunc.c b/kbfunc.c
index 121ae7d..e5e0708 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -143,10 +143,10 @@ kbfunc_client_resize(struct client_ctx *cc, union arg *arg)
 
 	kbfunc_amount(arg->i, &mx, &my);
 
-	if ((cc->geom.w += mx) < 1)
-		cc->geom.w = 1;
-	if ((cc->geom.h += my) < 1)
-		cc->geom.h = 1;
+	if ((cc->geom.w += mx * cc->hint.incw) < cc->hint.minw)
+		cc->geom.w = cc->hint.minw;
+	if ((cc->geom.h += my * cc->hint.inch) < cc->hint.minh)
+		cc->geom.h = cc->hint.minh;
 	client_resize(cc, 1);
 
 	/* Make sure the pointer stays within the window. */

From 323672ace778a61f6f51032453f781d50701e349 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Thu, 12 Nov 2015 21:28:03 +0000
Subject: [PATCH 9/9] more client vs screen context differences

---
 calmwm.h | 12 +++++-------
 conf.c   | 44 ++++++++++++++++++++++----------------------
 kbfunc.c |  8 ++++----
 3 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/calmwm.h b/calmwm.h
index ddc0a4e..f21de98 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -462,12 +462,7 @@ void			 screen_update_geometry(struct screen_ctx *);
 void			 screen_updatestackingorder(struct screen_ctx *);
 
 void			 kbfunc_client_cycle(struct client_ctx *, union arg *);
-void			 kbfunc_client_cyclegroup(struct client_ctx *,
-			     union arg *);
 void			 kbfunc_client_delete(struct client_ctx *, union arg *);
-void			 kbfunc_client_group(struct client_ctx *, union arg *);
-void			 kbfunc_client_grouponly(struct client_ctx *,
-			     union arg *);
 void			 kbfunc_client_grouptoggle(struct client_ctx *,
 			     union arg *);
 void			 kbfunc_client_hide(struct client_ctx *, union arg *);
@@ -476,8 +471,6 @@ void			 kbfunc_client_lower(struct client_ctx *, union arg *);
 void			 kbfunc_client_move(struct client_ctx *, union arg *);
 void			 kbfunc_client_movetogroup(struct client_ctx *,
 			     union arg *);
-void			 kbfunc_client_nogroup(struct client_ctx *,
-			     union arg *);
 void			 kbfunc_client_raise(struct client_ctx *, union arg *);
 void			 kbfunc_client_rcycle(struct client_ctx *, union arg *);
 void			 kbfunc_client_resize(struct client_ctx *, union arg *);
@@ -498,6 +491,11 @@ void			 kbfunc_cwm_status(struct client_ctx *, union arg *);
 void			 kbfunc_exec(struct client_ctx *, union arg *);
 void			 kbfunc_exec_lock(struct client_ctx *, union arg *);
 void			 kbfunc_exec_term(struct client_ctx *, union arg *);
+void			 kbfunc_group_alltoggle(struct client_ctx *,
+			     union arg *);
+void			 kbfunc_group_cycle(struct client_ctx *, union arg *);
+void			 kbfunc_group_only(struct client_ctx *, union arg *);
+void			 kbfunc_group_toggle(struct client_ctx *, union arg *);
 void			 kbfunc_menu_exec(struct client_ctx *, union arg *);
 void			 kbfunc_menu_client(struct client_ctx *, union arg *);
 void			 kbfunc_menu_cmd(struct client_ctx *, union arg *);
diff --git a/conf.c b/conf.c
index 65300db..29ba248 100644
--- a/conf.c
+++ b/conf.c
@@ -361,24 +361,24 @@ static const struct {
 	    {.i = CWM_CLIENT_RCYCLE} },
 	{ "label", kbfunc_client_label, CWM_CONTEXT_CLIENT, {0} },
 	{ "delete", kbfunc_client_delete, CWM_CONTEXT_CLIENT, {0} },
-	{ "group1", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 1} },
-	{ "group2", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 2} },
-	{ "group3", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 3} },
-	{ "group4", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 4} },
-	{ "group5", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 5} },
-	{ "group6", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 6} },
-	{ "group7", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 7} },
-	{ "group8", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 8} },
-	{ "group9", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 9} },
-	{ "grouponly1", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 1} },
-	{ "grouponly2", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 2} },
-	{ "grouponly3", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 3} },
-	{ "grouponly4", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 4} },
-	{ "grouponly5", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 5} },
-	{ "grouponly6", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 6} },
-	{ "grouponly7", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 7} },
-	{ "grouponly8", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 8} },
-	{ "grouponly9", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 9} },
+	{ "group1", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 1} },
+	{ "group2", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 2} },
+	{ "group3", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 3} },
+	{ "group4", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 4} },
+	{ "group5", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 5} },
+	{ "group6", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 6} },
+	{ "group7", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 7} },
+	{ "group8", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 8} },
+	{ "group9", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 9} },
+	{ "grouponly1", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 1} },
+	{ "grouponly2", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 2} },
+	{ "grouponly3", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 3} },
+	{ "grouponly4", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 4} },
+	{ "grouponly5", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 5} },
+	{ "grouponly6", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 6} },
+	{ "grouponly7", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 7} },
+	{ "grouponly8", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 8} },
+	{ "grouponly9", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 9} },
 	{ "movetogroup1", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
 	    {.i = 1} },
 	{ "movetogroup2", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
@@ -397,10 +397,10 @@ static const struct {
 	    {.i = 8} },
 	{ "movetogroup9", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
 	    {.i = 9} },
-	{ "nogroup", kbfunc_client_nogroup, CWM_CONTEXT_SCREEN, {0} },
-	{ "cyclegroup", kbfunc_client_cyclegroup, CWM_CONTEXT_SCREEN,
+	{ "nogroup", kbfunc_group_alltoggle, CWM_CONTEXT_SCREEN, {0} },
+	{ "cyclegroup", kbfunc_group_cycle, CWM_CONTEXT_SCREEN,
 	    {.i = CWM_CLIENT_CYCLE} },
-	{ "rcyclegroup", kbfunc_client_cyclegroup, CWM_CONTEXT_SCREEN,
+	{ "rcyclegroup", kbfunc_group_cycle, CWM_CONTEXT_SCREEN,
 	    {.i = CWM_CLIENT_RCYCLE} },
 	{ "cycleingroup", kbfunc_client_cycle, CWM_CONTEXT_CLIENT,
 	    {.i = (CWM_CLIENT_CYCLE | CWM_CLIENT_CYCLE_INGRP)} },
@@ -483,7 +483,7 @@ static const struct {
 	{ "window_hide", kbfunc_client_hide, CWM_CONTEXT_CLIENT, {0} },
 	{ "window_move", mousefunc_client_move, CWM_CONTEXT_CLIENT, {0} },
 	{ "window_resize", mousefunc_client_resize, CWM_CONTEXT_CLIENT, {0} },
-	{ "window_grouptoggle", kbfunc_client_grouptoggle, CWM_CONTEXT_CLIENT,
+	{ "window_grouptoggle", kbfunc_group_toggle, CWM_CONTEXT_CLIENT,
 	   {.i = CWM_MOUSE} },
 	{ "menu_group", mousefunc_menu_group, CWM_CONTEXT_SCREEN, {0} },
 	{ "menu_unhide", mousefunc_menu_client, CWM_CONTEXT_SCREEN, {0} },
diff --git a/kbfunc.c b/kbfunc.c
index e5e0708..c3c1050 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -450,25 +450,25 @@ kbfunc_client_delete(struct client_ctx *cc, union arg *arg)
 }
 
 void
-kbfunc_client_group(struct client_ctx *cc, union arg *arg)
+kbfunc_group_toggle(struct client_ctx *cc, union arg *arg)
 {
 	group_hidetoggle(cc->sc, arg->i);
 }
 
 void
-kbfunc_client_grouponly(struct client_ctx *cc, union arg *arg)
+kbfunc_group_only(struct client_ctx *cc, union arg *arg)
 {
 	group_only(cc->sc, arg->i);
 }
 
 void
-kbfunc_client_cyclegroup(struct client_ctx *cc, union arg *arg)
+kbfunc_group_cycle(struct client_ctx *cc, union arg *arg)
 {
 	group_cycle(cc->sc, arg->i);
 }
 
 void
-kbfunc_client_nogroup(struct client_ctx *cc, union arg *arg)
+kbfunc_group_alltoggle(struct client_ctx *cc, union arg *arg)
 {
 	group_alltoggle(cc->sc);
 }