use consistent types

This commit is contained in:
okan
2014-01-03 15:29:06 +00:00
parent 08342471c8
commit 43ccf4eae0
9 changed files with 43 additions and 43 deletions

28
xutil.c
View File

@@ -33,9 +33,9 @@
static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask };
void
xu_btn_grab(Window win, int mask, u_int btn)
xu_btn_grab(Window win, int mask, unsigned int btn)
{
u_int i;
unsigned int i;
for (i = 0; i < nitems(ign_mods); i++)
XGrabButton(X_Dpy, btn, (mask | ign_mods[i]), win,
@@ -50,10 +50,10 @@ xu_btn_ungrab(Window win)
}
void
xu_key_grab(Window win, u_int mask, KeySym keysym)
xu_key_grab(Window win, unsigned int mask, KeySym keysym)
{
KeyCode code;
u_int i;
KeyCode code;
unsigned int i;
code = XKeysymToKeycode(X_Dpy, keysym);
if ((XkbKeycodeToKeysym(X_Dpy, code, 0, 0) != keysym) &&
@@ -72,7 +72,7 @@ xu_key_ungrab(Window win)
}
int
xu_ptr_grab(Window win, u_int mask, Cursor curs)
xu_ptr_grab(Window win, unsigned int mask, Cursor curs)
{
return (XGrabPointer(X_Dpy, win, False, mask,
GrabModeAsync, GrabModeAsync,
@@ -80,7 +80,7 @@ xu_ptr_grab(Window win, u_int mask, Cursor curs)
}
int
xu_ptr_regrab(u_int mask, Cursor curs)
xu_ptr_regrab(unsigned int mask, Cursor curs)
{
return (XChangeActivePointerGrab(X_Dpy, mask,
curs, CurrentTime) == GrabSuccess ? 0 : -1);
@@ -95,9 +95,9 @@ xu_ptr_ungrab(void)
void
xu_ptr_getpos(Window win, int *x, int *y)
{
Window w0, w1;
int tmp0, tmp1;
u_int tmp2;
Window w0, w1;
int tmp0, tmp1;
unsigned int tmp2;
XQueryPointer(X_Dpy, win, &w0, &w1, &tmp0, &tmp1, x, y, &tmp2);
}
@@ -111,9 +111,9 @@ xu_ptr_setpos(Window win, int x, int y)
int
xu_getprop(Window win, Atom atm, Atom type, long len, unsigned char **p)
{
Atom realtype;
u_long n, extra;
int format;
Atom realtype;
unsigned long n, extra;
int format;
if (XGetWindowProperty(X_Dpy, win, atm, 0L, len, False, type,
&realtype, &format, &n, &extra, p) != Success || *p == NULL)
@@ -321,7 +321,7 @@ void
xu_ewmh_handle_net_wm_state_msg(struct client_ctx *cc, int action,
Atom first, Atom second)
{
u_int i;
unsigned int i;
static struct handlers {
int atom;
int property;