mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

more type fixes for mask/button

Browse Source
This commit is contained in:
okan 2013-05-10 16:32:47 +00:00
parent d0fe80b1f4
commit 9b9e95d742
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calmwm.h
View File

@ -235,7 +235,7 @@ struct keybinding {
TAILQ_ENTRY(keybinding) entry; TAILQ_ENTRY(keybinding) entry;
void (*callback)(struct client_ctx *, union arg *); void (*callback)(struct client_ctx *, union arg *);
union arg argument; union arg argument;
int modmask; u_int modmask;
KeySym keysym; KeySym keysym;
int keycode; int keycode;
#define KBFLAG_NEEDCLIENT 0x0001 #define KBFLAG_NEEDCLIENT 0x0001
@ -247,8 +247,8 @@ TAILQ_HEAD(keybinding_q, keybinding);
struct mousebinding { struct mousebinding {
TAILQ_ENTRY(mousebinding) entry; TAILQ_ENTRY(mousebinding) entry;
void (*callback)(struct client_ctx *, void *); void (*callback)(struct client_ctx *, void *);
int modmask; u_int modmask;
int button; u_int button;
#define MOUSEBIND_CTX_ROOT 0x0001 #define MOUSEBIND_CTX_ROOT 0x0001
#define MOUSEBIND_CTX_WIN 0x0002 #define MOUSEBIND_CTX_WIN 0x0002
int context; int context;
@ -465,11 +465,11 @@ unsigned long xu_getcolor(struct screen_ctx *, char *);
int xu_getprop(Window, Atom, Atom, long, u_char **); int xu_getprop(Window, Atom, Atom, long, u_char **);
int xu_get_wm_state(Window, int *); int xu_get_wm_state(Window, int *);
int xu_getstrprop(Window, Atom, char **); int xu_getstrprop(Window, Atom, char **);
void xu_key_grab(Window, int, KeySym); void xu_key_grab(Window, u_int, KeySym);
void xu_key_ungrab(Window, int, KeySym); void xu_key_ungrab(Window, u_int, KeySym);
void xu_ptr_getpos(Window, int *, int *); void xu_ptr_getpos(Window, int *, int *);
int xu_ptr_grab(Window, int, Cursor); int xu_ptr_grab(Window, u_int, Cursor);
int xu_ptr_regrab(int, Cursor); int xu_ptr_regrab(u_int, Cursor);
void xu_ptr_setpos(Window, int, int); void xu_ptr_setpos(Window, int, int);
void xu_ptr_ungrab(void); void xu_ptr_ungrab(void);
void xu_sendmsg(Window, Atom, long); void xu_sendmsg(Window, Atom, long);

2
conf.c
View File

@ -627,7 +627,7 @@ void
conf_grab_mouse(struct client_ctx *cc) conf_grab_mouse(struct client_ctx *cc)
{ {
struct mousebinding *mb; struct mousebinding *mb;
int button; u_int button;
TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) { TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) {
if (mb->context != MOUSEBIND_CTX_WIN) if (mb->context != MOUSEBIND_CTX_WIN)

2
xevents.c
View File

@ -277,7 +277,7 @@ xev_handle_keypress(XEvent *ee)
struct client_ctx *cc = NULL, fakecc; struct client_ctx *cc = NULL, fakecc;
struct keybinding *kb; struct keybinding *kb;
KeySym keysym, skeysym; KeySym keysym, skeysym;
int modshift; u_int modshift;
keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0); keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0);
skeysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 1); skeysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 1);

8
xutil.c
View File

@ -33,7 +33,7 @@
static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask }; static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask };
int int
xu_ptr_grab(Window win, int mask, Cursor curs) xu_ptr_grab(Window win, u_int mask, Cursor curs)
{ {
return (XGrabPointer(X_Dpy, win, False, mask, return (XGrabPointer(X_Dpy, win, False, mask,
GrabModeAsync, GrabModeAsync, GrabModeAsync, GrabModeAsync,
@ -41,7 +41,7 @@ xu_ptr_grab(Window win, int mask, Cursor curs)
} }
int int
xu_ptr_regrab(int mask, Cursor curs) xu_ptr_regrab(u_int mask, Cursor curs)
{ {
return (XChangeActivePointerGrab(X_Dpy, mask, return (XChangeActivePointerGrab(X_Dpy, mask,
curs, CurrentTime) == GrabSuccess ? 0 : -1); curs, CurrentTime) == GrabSuccess ? 0 : -1);
@ -90,7 +90,7 @@ xu_ptr_setpos(Window win, int x, int y)
} }
void void
xu_key_grab(Window win, int mask, KeySym keysym) xu_key_grab(Window win, u_int mask, KeySym keysym)
{ {
KeyCode code; KeyCode code;
u_int i; u_int i;
@ -106,7 +106,7 @@ xu_key_grab(Window win, int mask, KeySym keysym)
} }
void void
xu_key_ungrab(Window win, int mask, KeySym keysym) xu_key_ungrab(Window win, u_int mask, KeySym keysym)
{ {
KeyCode code; KeyCode code;
u_int i; u_int i;