summary refs log tree commit diff
diff options
context:
space:
mode:
authorokan <okan>2013-05-10 15:44:43 +0000
committerokan <okan>2013-05-10 15:44:43 +0000
commit457938fbd750388907876ce30a98b216ae758922 (patch)
treee39fe1e3158f2f5ddfaa68ccf11ccb1d6345ae50
parent5f06e5a8caf07223bef5da977868ca8738f95a0f (diff)
downloadcwm-457938fbd750388907876ce30a98b216ae758922.tar.gz
cwm-457938fbd750388907876ce30a98b216ae758922.tar.xz
cwm-457938fbd750388907876ce30a98b216ae758922.zip
fix KeySym type
-rw-r--r--calmwm.h6
-rw-r--r--xevents.c3
-rw-r--r--xutil.c4
3 files changed, 7 insertions, 6 deletions
diff --git a/calmwm.h b/calmwm.h
index 82f43aa..3cb8442 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -236,7 +236,7 @@ struct keybinding {
 	void			(*callback)(struct client_ctx *, union arg *);
 	union arg		 argument;
 	int			 modmask;
-	int			 keysym;
+	KeySym			 keysym;
 	int			 keycode;
 #define KBFLAG_NEEDCLIENT	 0x0001
 	int			 flags;
@@ -465,8 +465,8 @@ unsigned long		 xu_getcolor(struct screen_ctx *, char *);
 int			 xu_getprop(Window, Atom, Atom, long, u_char **);
 int			 xu_get_wm_state(Window, int *);
 int			 xu_getstrprop(Window, Atom, char **);
-void			 xu_key_grab(Window, int, int);
-void			 xu_key_ungrab(Window, int, int);
+void			 xu_key_grab(Window, int, KeySym);
+void			 xu_key_ungrab(Window, int, KeySym);
 void			 xu_ptr_getpos(Window, int *, int *);
 int			 xu_ptr_grab(Window, int, Cursor);
 int			 xu_ptr_regrab(int, Cursor);
diff --git a/xevents.c b/xevents.c
index 96d51d2..65dba3b 100644
--- a/xevents.c
+++ b/xevents.c
@@ -322,7 +322,8 @@ xev_handle_keyrelease(XEvent *ee)
 	XKeyEvent		*e = &ee->xkey;
 	struct screen_ctx	*sc;
 	struct client_ctx	*cc;
-	int			 i, keysym;
+	KeySym			 keysym;
+	int			 i;
 
 	sc = screen_fromroot(e->root);
 	cc = client_current();
diff --git a/xutil.c b/xutil.c
index 765b664..496fe0b 100644
--- a/xutil.c
+++ b/xutil.c
@@ -88,7 +88,7 @@ xu_ptr_setpos(Window win, int x, int y)
 }
 
 void
-xu_key_grab(Window win, int mask, int keysym)
+xu_key_grab(Window win, int mask, KeySym keysym)
 {
 	KeyCode	 code;
 	int	 i;
@@ -104,7 +104,7 @@ xu_key_grab(Window win, int mask, int keysym)
 }
 
 void
-xu_key_ungrab(Window win, int mask, int keysym)
+xu_key_ungrab(Window win, int mask, KeySym keysym)
 {
 	KeyCode	 code;
 	int	 i;