X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=cef0dfd68364179545010102d024c43a8b416e56;hb=bb44e8d047b662db15ef8d181cb925e1135d326d;hp=f8109456894def5c092f472a4388c7230bb6ae75;hpb=806a8c411f10c7a2292bfac15d77c8609f56ee71;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index f8109456..cef0dfd6 100644
--- 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;
         }
@@ -186,12 +186,15 @@ gboolean keyboard_process_interactive_grab(const XEvent *e,
 
             s->action->func(&s->action->data);
 
-            grab_keyboard(FALSE);
-            grab_pointer(FALSE, None);
-            keyboard_reset_chains();
-
             g_free(s);
+
             interactive_states = g_slist_delete_link(interactive_states, it);
+            if (!interactive_states) {
+                grab_keyboard(FALSE);
+                grab_pointer(FALSE, OB_CURSOR_NONE);
+                keyboard_reset_chains();
+            }
+
             handled = TRUE;
         }
     }