grab_for_window(screen_support_win, grab);
for (it = client_list; it; it = g_list_next(it))
- grab_for_window(((ObClient*)it->data)->frame->window, grab);
+ grab_for_window(((ObClient*)it->data)->window, grab);
}
static gboolean chain_timeout(gpointer data)
if (!interactive_states) {
if (!grab_keyboard(TRUE))
return;
- if (!grab_pointer(TRUE, None)) {
+ if (!grab_pointer(TRUE, OB_CURSOR_NONE)) {
grab_keyboard(FALSE);
return;
}
s->action->func(&s->action->data);
grab_keyboard(FALSE);
- grab_pointer(FALSE, None);
+ grab_pointer(FALSE, OB_CURSOR_NONE);
keyboard_reset_chains();
g_free(s);
}
}
-void keyboard_startup()
+void keyboard_startup(gboolean reconfig)
{
grab_keys(TRUE);
}
-void keyboard_shutdown()
+void keyboard_shutdown(gboolean reconfig)
{
+ GSList *it;
+
tree_destroy(keyboard_firstnode);
keyboard_firstnode = NULL;
+
+ for (it = interactive_states; it; it = g_slist_next(it))
+ g_free(it->data);
+ g_slist_free(interactive_states);
+ interactive_states = NULL;
+
+ ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
grab_keys(FALSE);
+ curpos = NULL;
}