From e05c0a2c600d22841d6950abf6fc013efe6a7cad Mon Sep 17 00:00:00 2001 From: okan Date: Fri, 10 May 2013 16:05:34 +0000 Subject: [PATCH] int type fixes --- conf.c | 6 +++--- xevents.c | 2 +- xutil.c | 14 ++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/conf.c b/conf.c index 06d4e1c..ee18fcd 100644 --- a/conf.c +++ b/conf.c @@ -195,7 +195,7 @@ m_binds[] = { void conf_init(struct conf *c) { - int i; + u_int i; bzero(c, sizeof(*c)); @@ -459,7 +459,7 @@ conf_bindname(struct conf *c, char *name, char *binding) { struct keybinding *current_binding; char *substring, *tmp; - int i; + u_int i; current_binding = xcalloc(1, sizeof(*current_binding)); @@ -564,7 +564,7 @@ conf_mousebind(struct conf *c, char *name, char *binding) struct mousebinding *current_binding; char *substring, *tmp; const char *errstr; - int i; + u_int i; current_binding = xcalloc(1, sizeof(*current_binding)); diff --git a/xevents.c b/xevents.c index 65dba3b..b182299 100644 --- a/xevents.c +++ b/xevents.c @@ -323,7 +323,7 @@ xev_handle_keyrelease(XEvent *ee) struct screen_ctx *sc; struct client_ctx *cc; KeySym keysym; - int i; + u_int i; sc = screen_fromroot(e->root); cc = client_current(); diff --git a/xutil.c b/xutil.c index 496fe0b..6aee4d9 100644 --- a/xutil.c +++ b/xutil.c @@ -56,7 +56,8 @@ xu_ptr_ungrab(void) void xu_btn_grab(Window win, int mask, u_int btn) { - int i; + u_int i; + for (i = 0; i < nitems(ign_mods); i++) XGrabButton(X_Dpy, btn, (mask | ign_mods[i]), win, False, BUTTONMASK, GrabModeAsync, @@ -66,7 +67,8 @@ xu_btn_grab(Window win, int mask, u_int btn) void xu_btn_ungrab(Window win, int mask, u_int btn) { - int i; + u_int i; + for (i = 0; i < nitems(ign_mods); i++) XUngrabButton(X_Dpy, btn, (mask | ign_mods[i]), win); } @@ -91,7 +93,7 @@ void xu_key_grab(Window win, int mask, KeySym keysym) { KeyCode code; - int i; + u_int i; code = XKeysymToKeycode(X_Dpy, keysym); if ((XkbKeycodeToKeysym(X_Dpy, code, 0, 0) != keysym) && @@ -107,7 +109,7 @@ void xu_key_ungrab(Window win, int mask, KeySym keysym) { KeyCode code; - int i; + u_int i; code = XKeysymToKeycode(X_Dpy, keysym); if ((XkbKeycodeToKeysym(X_Dpy, code, 0, 0) != keysym) && @@ -258,7 +260,7 @@ struct atom_ctx ewmh[EWMH_NITEMS] = { void xu_getatoms(void) { - int i; + u_int i; for (i = 0; i < nitems(cwmh); i++) cwmh[i].atom = XInternAtom(X_Dpy, cwmh[i].name, False); @@ -271,7 +273,7 @@ void xu_ewmh_net_supported(struct screen_ctx *sc) { Atom atom[EWMH_NITEMS]; - int i; + u_int i; for (i = 0; i < nitems(ewmh); i++) atom[i] = ewmh[i].atom;