From ab487a45dab25d30ce0645cfee16725e22c2c179 Mon Sep 17 00:00:00 2001
From: okan
Date: Thu, 2 Jan 2014 21:30:20 +0000
Subject: bring mousefunc closer to kbfunc

---
 calmwm.h | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'calmwm.h')

diff --git a/calmwm.h b/calmwm.h
index 7679a29..156b97c 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.238 2014/01/02 21:17:23 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.239 2014/01/02 21:30:20 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -255,7 +255,8 @@ TAILQ_HEAD(keybinding_q, keybinding);
 
 struct mousebinding {
 	TAILQ_ENTRY(mousebinding)	entry;
-	void			 	(*callback)(struct client_ctx *, void *);
+	void			 	(*callback)(struct client_ctx *, union arg *);
+	union arg			argument;
 	u_int				modmask;
 	u_int			 	button;
 #define MOUSEBIND_CTX_ROOT		0x0001
@@ -483,19 +484,25 @@ void			 kbfunc_term(struct client_ctx *, union arg *);
 void 			 kbfunc_tile(struct client_ctx *, union arg *);
 
 void			 mousefunc_client_cyclegroup(struct client_ctx *,
-			    void *);
+			    union arg *);
 void			 mousefunc_client_grouptoggle(struct client_ctx *,
-			    void *);
-void			 mousefunc_client_hide(struct client_ctx *, void *);
-void			 mousefunc_client_lower(struct client_ctx *, void *);
-void			 mousefunc_client_move(struct client_ctx *, void *);
-void			 mousefunc_client_raise(struct client_ctx *, void *);
+			    union arg *);
+void			 mousefunc_client_hide(struct client_ctx *,
+    			    union arg *);
+void			 mousefunc_client_lower(struct client_ctx *,
+    			    union arg *);
+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 *,
-    			   void *);
-void			 mousefunc_client_resize(struct client_ctx *, void *);
-void			 mousefunc_menu_cmd(struct client_ctx *, void *);
-void			 mousefunc_menu_group(struct client_ctx *, void *);
-void			 mousefunc_menu_unhide(struct client_ctx *, void *);
+    			   union arg *);
+void			 mousefunc_client_resize(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 *,
 			     char *, char *, int,
-- 
cgit v1.2.3-2-gb3c3