ungrab the keyboard for passive grabs. kill interactive actions for exec actions. don't ungrab the keyboard during interactive actions though.

1 files changed, 6 insertions, 28 deletions

diff --git a/openbox/action.c b/openbox/action.c
index df496850..3f43a238 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1111,7 +1111,6 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context,
 {
     GSList *it;
     ObAction *a;
-    gboolean ungrabbed = FALSE;
 
     if (!acts)
         return;
@@ -1139,33 +1138,6 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context,
                     if (!keyboard_interactive_grab(state, a->data.any.c, a))
                         continue;
             }
-            else if (!ungrabbed) {
-                /* Ungrab the keyboard before running the action if it's not
-                   interactive.
-
-                   If there is an interactive action going on, then cancel it
-                   to release the keyboard. If not, then call
-                   XUngrabKeyboard().
-
-                   We call XUngrabKeyboard() because a key press causes a
-                   passive grab on the keyboard, and so if program we are
-                   executing wants to grab the keyboard, it will fail if the
-                   button is still held down (which is likely).
-
-                   Use the X function not out own, because we're not
-                   considering a grab to be in place at all so our function
-                   won't try ungrab anything.
-                */
-                if (keyboard_interactively_grabbed())
-                    keyboard_interactive_cancel();
-                else
-                    XUngrabKeyboard(ob_display, time);
-
-                /* We don't the same with XUngrabPointer, even though it can
-                   cause the same problem. But then Press bindings cause
-                   Drag bindings to break.
-                XUngrabPointer(ob_display, time);*/
-            }
 
             /* XXX UGLY HACK race with motion event starting a move and the
                button release gettnig processed first. answer: don't queue
@@ -1240,6 +1212,12 @@ void action_execute(union ActionData *data)
     if (data->execute.path) {
         cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL);
         if (cmd) {
+            /* If there is an interactive action going on, then cancel it
+               to release the keyboard, so that the run application
+               can grab the keyboard if it wants to. */
+            if (keyboard_interactively_grabbed())
+                keyboard_interactive_cancel();
+
             if (!g_shell_parse_argv (cmd, NULL, &argv, &e)) {
                 g_message(_("Failed to execute '%s': %s"),
                           cmd, e->message);