summary refs log tree commit diff
diff options
context:
space:
mode:
authorokan <okan>2014-01-20 22:31:53 +0000
committerokan <okan>2014-01-20 22:31:53 +0000
commit34f43e3f2d34874cd2e7d8c81d6b8814f8292de6 (patch)
tree9e926164036d9df8cbbd51e421196ddc9a447c32
parentd91571c567fc74c422d766fd2613c9ae23ccbc36 (diff)
downloadcwm-34f43e3f2d34874cd2e7d8c81d6b8814f8292de6.tar.gz
cwm-34f43e3f2d34874cd2e7d8c81d6b8814f8292de6.tar.xz
cwm-34f43e3f2d34874cd2e7d8c81d6b8814f8292de6.zip
Use argument to pass down flags for mousefunc cyclegroup; removes
rcyclegroup wrapper need - now similar to kbfunc.
-rw-r--r--calmwm.h2
-rw-r--r--conf.c7
-rw-r--r--mousefunc.c8
3 files changed, 5 insertions, 12 deletions
diff --git a/calmwm.h b/calmwm.h
index ed64cb6..e656b6c 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -495,8 +495,6 @@ void			 mousefunc_client_move(struct client_ctx *,
     			    union arg *);
 void			 mousefunc_client_raise(struct client_ctx *,
     			    union arg *);
-void			 mousefunc_client_rcyclegroup(struct client_ctx *,
-    			   union arg *);
 void			 mousefunc_client_resize(struct client_ctx *,
     			    union arg *);
 void			 mousefunc_menu_cmd(struct client_ctx *, union arg *);
diff --git a/conf.c b/conf.c
index 57dd344..e322e66 100644
--- a/conf.c
+++ b/conf.c
@@ -549,9 +549,10 @@ static struct {
 	{ "window_lower", mousefunc_client_lower, MOUSEBIND_CTX_WIN, {0} },
 	{ "window_raise", mousefunc_client_raise, MOUSEBIND_CTX_WIN, {0} },
 	{ "window_hide", mousefunc_client_hide, MOUSEBIND_CTX_WIN, {0} },
-	{ "cyclegroup", mousefunc_client_cyclegroup, MOUSEBIND_CTX_ROOT, {0} },
-	{ "rcyclegroup", mousefunc_client_rcyclegroup,
-	    MOUSEBIND_CTX_ROOT, {0} },
+	{ "cyclegroup", mousefunc_client_cyclegroup,
+	    MOUSEBIND_CTX_ROOT, {.i = CWM_CYCLE} },
+	{ "rcyclegroup", mousefunc_client_cyclegroup,
+	    MOUSEBIND_CTX_ROOT, {.i = CWM_RCYCLE} },
 	{ "menu_group", mousefunc_menu_group, MOUSEBIND_CTX_ROOT, {0} },
 	{ "menu_unhide", mousefunc_menu_unhide, MOUSEBIND_CTX_ROOT, {0} },
 	{ "menu_cmd", mousefunc_menu_cmd, MOUSEBIND_CTX_ROOT, {0} },
diff --git a/mousefunc.c b/mousefunc.c
index b96517d..72953b2 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -200,13 +200,7 @@ mousefunc_client_hide(struct client_ctx *cc, union arg *arg)
 void
 mousefunc_client_cyclegroup(struct client_ctx *cc, union arg *arg)
 {
-	group_cycle(cc->sc, CWM_CYCLE);
-}
-
-void
-mousefunc_client_rcyclegroup(struct client_ctx *cc, union arg *arg)
-{
-	group_cycle(cc->sc, CWM_RCYCLE);
+	group_cycle(cc->sc, arg->i);
 }
 
 void