revert previous; upcoming changes will hopefully deal with these more

naturally.

3 files changed, 5 insertions, 29 deletions

diff --git a/calmwm.h b/calmwm.h
index c948bf1..8861a34 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.332 2016/11/15 00:07:03 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.333 2016/11/15 00:22:02 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -463,9 +463,7 @@ void			 screen_assert_clients_within(struct screen_ctx *);
 void			 kbfunc_cwm_status(void *, union arg *, enum xev);
 void			 kbfunc_ptrmove(void *, union arg *, enum xev);
 void			 kbfunc_client_move(void *, union arg *, enum xev);
-void			 kbfunc_client_move_key(void *, union arg *, enum xev);
 void			 kbfunc_client_resize(void *, union arg *, enum xev);
-void			 kbfunc_client_resize_key(void *, union arg *, enum xev);
 void			 kbfunc_client_delete(void *, union arg *, enum xev);
 void			 kbfunc_client_lower(void *, union arg *, enum xev);
 void			 kbfunc_client_raise(void *, union arg *, enum xev);
diff --git a/conf.c b/conf.c
index 902fe90..50cf846 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.223 2016/11/15 00:07:03 okan Exp $
+ * $OpenBSD: conf.c,v 1.224 2016/11/15 00:22:02 okan Exp $
  */
 
 #include <sys/types.h>
@@ -177,8 +177,8 @@ static const struct {
 	{ "window_lower", kbfunc_client_lower, CWM_CONTEXT_CC, {0} },
 	{ "window_raise", kbfunc_client_raise, CWM_CONTEXT_CC, {0} },
 	{ "window_hide", kbfunc_client_hide, CWM_CONTEXT_CC, {0} },
-	{ "window_move", kbfunc_client_move, CWM_CONTEXT_CC, {0} },
-	{ "window_resize", kbfunc_client_resize, CWM_CONTEXT_CC, {0} },
+	{ "window_move", mousefunc_client_move, CWM_CONTEXT_CC, {0} },
+	{ "window_resize", mousefunc_client_resize, CWM_CONTEXT_CC, {0} },
 	{ "window_grouptoggle", kbfunc_client_toggle_group, CWM_CONTEXT_CC, {0} },
 	{ "menu_group", kbfunc_menu_group, CWM_CONTEXT_SC, {0} },
 	{ "menu_unhide", kbfunc_menu_client, CWM_CONTEXT_SC, {0} },
diff --git a/kbfunc.c b/kbfunc.c
index a9d6939..f682452 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.135 2016/11/15 00:07:03 okan Exp $
+ * $OpenBSD: kbfunc.c,v 1.136 2016/11/15 00:22:02 okan Exp $
  */
 
 #include <sys/types.h>
@@ -86,17 +86,6 @@ 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;
@@ -151,17 +140,6 @@ kbfunc_client_move_key(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;