From a8b0f3678cb1715574383318d0561555d48e941b Mon Sep 17 00:00:00 2001 From: David Hill Date: Fri, 13 Jul 2012 14:03:24 -0400 Subject: [PATCH] Convert XGrabKey and Keycode to XCB --- spectrwm.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/spectrwm.c b/spectrwm.c index fb70aca..ce5a1f6 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -5573,7 +5573,7 @@ grabkeys(void) { int num_screens; unsigned int j, k; - KeyCode code; + xcb_keycode_t *code; unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask | LockMask }; struct key *kp; @@ -5588,12 +5588,14 @@ grabkeys(void) xcb_ungrab_key(conn, XCB_GRAB_ANY, screens[k].root, XCB_MOD_MASK_ANY); RB_FOREACH(kp, key_tree, &keys) { - if ((code = XKeysymToKeycode(display, kp->keysym))) + if ((code = xcb_key_symbols_get_keycode(syms, + kp->keysym))) for (j = 0; j < LENGTH(modifiers); j++) - XGrabKey(display, code, + xcb_grab_key(conn, True, + screens[k].root, kp->mod | modifiers[j], - screens[k].root, True, - GrabModeAsync, GrabModeAsync); + *code, XCB_GRAB_MODE_ASYNC, + XCB_GRAB_MODE_ASYNC); } } } -- 1.7.10.4