+#include "grab.h"
#include "openbox.h"
#include "event.h"
#include "xerror.h"
XUngrabKeyboard(ob_display, event_lasttime);
ret = TRUE;
}
+
return ret;
}
return ret;
}
-int grab_server(gboolean grab)
+gint grab_server(gboolean grab)
{
static guint sgrabs = 0;
if (grab) {
return sgrabs;
}
-void grab_startup()
+void grab_startup(gboolean reconfig)
{
guint i = 0;
+ if (reconfig) return;
+
mask_list[i++] = 0;
mask_list[i++] = LockMask;
mask_list[i++] = NumLockMask;
g_assert(i == MASK_LIST_SIZE);
}
-void grab_shutdown()
+void grab_shutdown(gboolean reconfig)
{
+ if (reconfig) return;
+
while (grab_keyboard(FALSE));
- while (grab_pointer(FALSE, None));
- while (grab_pointer_window(FALSE, None, None));
+ while (grab_pointer(FALSE, OB_CURSOR_NONE));
+ while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None));
while (grab_server(FALSE));
}
pointer_mode, GrabModeSync, None, ob_cursor(cur));
xerror_set_ignore(FALSE);
if (xerror_occured)
- g_warning("failed to grab keycode %d modifiers %d", keycode, state);
+ g_warning("failed to grab button %d modifiers %d", button, state);
}
void grab_button(guint button, guint state, Window win, guint mask)
{
- grab_button_full(button, state, win, mask, GrabModeAsync, None);
+ grab_button_full(button, state, win, mask, GrabModeAsync, OB_CURSOR_NONE);
}
void ungrab_button(guint button, guint state, Window win)
xerror_occured = FALSE;
for (i = 0; i < MASK_LIST_SIZE; ++i)
XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE,
- GrabModeSync, keyboard_mode);
+ GrabModeAsync, keyboard_mode);
xerror_set_ignore(FALSE);
if (xerror_occured)
g_warning("failed to grab keycode %d modifiers %d", keycode, state);