projects
/
dana
/
openbox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'backport' into work
[dana/openbox.git]
/
openbox
/
keyboard.c
diff --git
a/openbox/keyboard.c
b/openbox/keyboard.c
index
02ae6a3
..
5ac4236
100644
(file)
--- a/
openbox/keyboard.c
+++ b/
openbox/keyboard.c
@@
-51,13
+51,13
@@
static void grab_keys(gboolean grab)
while (p) {
if (p->key)
grab_key(p->key, p->state, obt_root(ob_screen),
while (p) {
if (p->key)
grab_key(p->key, p->state, obt_root(ob_screen),
- GrabMode
As
ync);
+ GrabMode
S
ync);
p = p->next_sibling;
}
if (curpos)
grab_key(config_keyboard_reset_keycode,
config_keyboard_reset_state,
p = p->next_sibling;
}
if (curpos)
grab_key(config_keyboard_reset_keycode,
config_keyboard_reset_state,
- obt_root(ob_screen), GrabMode
As
ync);
+ obt_root(ob_screen), GrabMode
S
ync);
}
}
}
}
@@
-261,6
+261,8
@@
void keyboard_event(ObClient *client, const XEvent *e)
}
p = p->next_sibling;
}
}
p = p->next_sibling;
}
+
+ XAllowEvents(obt_display, AsyncKeyboard, event_curtime);
}
static void node_rebind(KeyBindingTree *node)
}
static void node_rebind(KeyBindingTree *node)