X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fgrab.c;h=97a1a3db2acb631f86351fc16b59bbd64b5ced48;hb=04cfdd261dd6b8030cd7618aee5df588f25ef4d2;hp=830c00022f1a026258e3348a8df6fad4a1ae0f77;hpb=475fb805f2bac50d3c0bb4c35a743b54bd10e650;p=chaz%2Fopenbox diff --git a/openbox/grab.c b/openbox/grab.c index 830c0002..97a1a3db 100644 --- a/openbox/grab.c +++ b/openbox/grab.c @@ -15,18 +15,12 @@ static unsigned int mask_list[MASK_LIST_SIZE]; void grab_keyboard(gboolean grab) { if (grab) { - if (kgrabs++ == 0) { - g_message("GRABBING KEYBOARD %d", kgrabs); + if (kgrabs++ == 0) XGrabKeyboard(ob_display, ob_root, 0, GrabModeAsync, GrabModeSync, event_lasttime); - } else - g_message("NOT GRABBING KEYBOARD %d", kgrabs); } else if (kgrabs > 0) { - if (--kgrabs == 0) { - g_message("UNGRABBING KEYBOARD %d", kgrabs); + if (--kgrabs == 0) XUngrabKeyboard(ob_display, event_lasttime); - } else - g_message("NOT UNGRABBING KEYBOARD %d", kgrabs); } } @@ -88,7 +82,7 @@ void grab_button(guint button, guint state, Window win, guint mask, for (i = 0; i < MASK_LIST_SIZE; ++i) XGrabButton(ob_display, button, state | mask_list[i], win, FALSE, mask, - pointer_mode, GrabModeAsync, None, None); + pointer_mode, GrabModeSync, None, None); } void ungrab_button(guint button, guint state, Window win) @@ -107,7 +101,7 @@ void grab_key(guint keycode, guint state, int keyboard_mode) xerror_occured = FALSE; for (i = 0; i < MASK_LIST_SIZE; ++i) XGrabKey(ob_display, keycode, state | mask_list[i], ob_root, FALSE, - GrabModeAsync, keyboard_mode); + GrabModeSync, keyboard_mode); xerror_set_ignore(FALSE); if (xerror_occured) g_warning("failed to grab keycode %d modifiers %d", keycode, state);