Add a wrapper based upon xevent handlers around client move/resize for key and

mouse bindings.

1 files changed, 23 insertions, 1 deletions

diff --git a/app/cwm/kbfunc.c b/app/cwm/kbfunc.c
index 76f3d2e1b..a9d69391b 100644
--- a/app/cwm/kbfunc.c
+++ b/app/cwm/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.134 2016/10/24 20:44:08 okan Exp $
+ * $OpenBSD: kbfunc.c,v 1.135 2016/11/15 00:07:03 okan Exp $
  */
 
 #include <sys/types.h>
@@ -86,6 +86,17 @@ kbfunc_ptrmove(void *ctx, union arg *arg, enum xev xev)
 void
 kbfunc_client_move(void *ctx, union arg *arg, enum xev xev)
 {
+	int			 m = (xev == CWM_XEV_BTN);
+
+	if (m)
+		mousefunc_client_move(ctx, arg, xev);
+	else
+		kbfunc_client_move_key(ctx, arg, xev);
+}
+
+void
+kbfunc_client_move_key(void *ctx, union arg *arg, enum xev xev)
+{
 	struct client_ctx	*cc = ctx;
 	struct screen_ctx	*sc = cc->sc;
 	struct geom		 area;
@@ -140,6 +151,17 @@ kbfunc_client_move(void *ctx, union arg *arg, enum xev xev)
 void
 kbfunc_client_resize(void *ctx, union arg *arg, enum xev xev)
 {
+	int			 m = (xev == CWM_XEV_BTN);
+
+	if (m)
+		mousefunc_client_resize(ctx, arg, xev);
+	else
+		kbfunc_client_resize_key(ctx, arg, xev);
+}
+
+void
+kbfunc_client_resize_key(void *ctx, union arg *arg, enum xev xev)
+{
 	struct client_ctx	*cc = ctx;
 	unsigned int		 mx = 0, my = 0;
 	int			 amt = 1;