save teh client for interactive actions cuz after teh keyboard is grabbed there is...

diff --git a/openbox/event.c b/openbox/event.c
index 79d350775ed43be0fc2364f37b581928f25af560..2d47fd328a09c55ec9f2a3f01a5e398cd8fba2ee 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -488,7 +488,7 @@ static void event_process(const XEvent *ec, gpointer data)
         if (menu_frame_visible)
             event_handle_menu(e);
         else {
-            if (!keyboard_process_interactive_grab(e)) {
+            if (!keyboard_process_interactive_grab(e, &client)) {
                 if (moveresize_in_progress)
                     moveresize_event(e);
 

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index fe13c97b4c9869ac7a756324fb7e5e5c64d42cb4..d044ba5c10b9866e9a60297aa20c65b6317d2c99 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -157,7 +157,7 @@ void keyboard_interactive_grab(guint state, ObClient *client,
     interactive_states = g_slist_append(interactive_states, s);
 }
 
-gboolean keyboard_process_interactive_grab(const XEvent *e)
+gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
 {
     GSList *it, *next;
     gboolean handled = FALSE;
@@ -192,7 +192,8 @@ gboolean keyboard_process_interactive_grab(const XEvent *e)
             }
 
             handled = TRUE;
-        }
+        } else
+            *client = s->client;
     }
 
     return handled;

diff --git a/openbox/keyboard.h b/openbox/keyboard.h
index 61fe19e0a3671316906c69d1dd8f6d6323cb0900..cf190d4514b6611dc839470290c1018c9f898c31 100644 (file)
--- a/openbox/keyboard.h
+++ b/openbox/keyboard.h
@@ -22,7 +22,8 @@ void keyboard_reset_chains();
 
 void keyboard_interactive_grab(guint state, struct _ObClient *client,
                                struct _ObAction *action);
-gboolean keyboard_process_interactive_grab(const XEvent *e);
+gboolean keyboard_process_interactive_grab(const XEvent *e,
+                                           struct _ObClient **client);
 
 void keyboard_grab_for_client(struct _ObClient *c, gboolean grab);