make key grabbing per window instead of always root

This commit is contained in:
Dana Jansens 2003-06-04 22:45:54 +00:00
parent bb93763373
commit 795d90c3bc
2 changed files with 6 additions and 6 deletions

View file

@ -119,21 +119,21 @@ void ungrab_button(guint button, guint state, Window win)
XUngrabButton(ob_display, button, state | mask_list[i], win); XUngrabButton(ob_display, button, state | mask_list[i], win);
} }
void grab_key(guint keycode, guint state, int keyboard_mode) void grab_key(guint keycode, guint state, Window win, int keyboard_mode)
{ {
guint i; guint i;
xerror_set_ignore(TRUE); /* can get BadAccess' from these */ xerror_set_ignore(TRUE); /* can get BadAccess' from these */
xerror_occured = FALSE; xerror_occured = FALSE;
for (i = 0; i < MASK_LIST_SIZE; ++i) for (i = 0; i < MASK_LIST_SIZE; ++i)
XGrabKey(ob_display, keycode, state | mask_list[i], ob_root, FALSE, XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE,
GrabModeSync, keyboard_mode); GrabModeSync, keyboard_mode);
xerror_set_ignore(FALSE); xerror_set_ignore(FALSE);
if (xerror_occured) if (xerror_occured)
g_warning("failed to grab keycode %d modifiers %d", keycode, state); g_warning("failed to grab keycode %d modifiers %d", keycode, state);
} }
void ungrab_all_keys() void ungrab_all_keys(Window win)
{ {
XUngrabKey(ob_display, AnyKey, AnyModifier, ob_root); XUngrabKey(ob_display, AnyKey, AnyModifier, win);
} }

View file

@ -17,8 +17,8 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
int pointer_mode, Cursor cursor); int pointer_mode, Cursor cursor);
void ungrab_button(guint button, guint state, Window win); void ungrab_button(guint button, guint state, Window win);
void grab_key(guint keycode, guint state, int keyboard_mode); void grab_key(guint keycode, guint state, Window win, int keyboard_mode);
void ungrab_all_keys(); void ungrab_all_keys(Window win);
#endif #endif