don't queue showmenu events, and set button to 0 when a grab is in place after the...

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 13152f72d9b1382ba3796319db624c9ec3cb1dad..b01f9d3e59298c6bf54db472377acf0dcb00ecbb 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1143,7 +1143,7 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context,
                button release gettnig processed first. answer: don't queue
                moveresize starts. UGLY HACK XXX */
             if (a->data.any.interactive || a->func == action_move ||
-                a->func == action_resize)
+                a->func == action_resize || a->func == action_showmenu)
             {
                 /* interactive actions are not queued */
                 a->func(&a->data);
@@ -1296,7 +1296,7 @@ void action_focus(union ActionData *data)
                go moving on us */
             event_halt_focus_delay();
 
-            client_focus(data->client.any.c, FALSE);
+            client_focus(data->client.any.c);
         }
     } else {
         /* focus action on something other than a client, make keybindings