fix KeySym type

This commit is contained in:
okan 2013-05-10 15:44:43 +00:00
parent 384bb6c501
commit f0fe071b5a
3 changed files with 10 additions and 9 deletions

View File

@ -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.194 2013/05/06 16:03:11 okan Exp $
* $OpenBSD: calmwm.h,v 1.195 2013/05/10 15:44:43 okan Exp $
*/
#ifndef _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);

View File

@ -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: xevents.c,v 1.72 2013/04/29 00:56:48 okan Exp $
* $OpenBSD: xevents.c,v 1.73 2013/05/10 15:44:43 okan Exp $
*/
/*
@ -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();

View File

@ -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: xutil.c,v 1.56 2013/04/17 13:57:06 okan Exp $
* $OpenBSD: xutil.c,v 1.57 2013/05/10 15:44:43 okan Exp $
*/
#include <sys/param.h>
@ -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;