match the func prototypes in the header

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index f73fe2986575325cadc08e823fbdb2d0b1aa08c3..1f509f77ff8c5e61aa0544690053f95faea16b3d 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -58,7 +58,7 @@ static void grab_keys(gboolean grab)
 
     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)
@@ -136,7 +136,7 @@ void keyboard_interactive_grab(guint state, ObClient *client,
     if (!interactive_states) {
         if (!grab_keyboard(TRUE))
             return;
-        if (!grab_pointer(TRUE, None)) {
+        if (!grab_pointer(TRUE, OB_CURSOR_NONE)) {
             grab_keyboard(FALSE);
             return;
         }
@@ -187,7 +187,7 @@ gboolean keyboard_process_interactive_grab(const XEvent *e,
             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);
@@ -264,15 +264,25 @@ void keyboard_event(ObClient *client, const XEvent *e)
     }
 }
 
-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;
 }