M openbox/action.c → openbox/action.c

@@ -1042,7 +1042,7 @@ /* sometimes when we execute another app as an action,
            it won't work right unless we XUngrabKeyboard first,
            even though we grabbed the key/button Asychronously.
            e.g. "gnome-panel-control --main-menu" */
-        XUngrabKeyboard(ob_display, event_curtime);
+        grab_keyboard(FALSE);
     }
 
     for (it = acts; it; it = g_slist_next(it)) {

M openbox/event.c → openbox/event.c

@@ -591,8 +591,7 @@ NULL, g_direct_equal, NULL);
 
                 if (e->type == ButtonPress || e->type == ButtonRelease ||
                     e->type == MotionNotify) {
-                    if (!keyboard_interactively_grabbed())
-                        mouse_event(client, e);
+                    mouse_event(client, e);
                 } else if (e->type == KeyPress) {
                     keyboard_event((focus_cycle_target ? focus_cycle_target :
                                     (focus_hilite ? focus_hilite : client)),