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

diff --git a/openbox/action.c b/openbox/action.c
index 5900de7cd0c3ae05772317208457a25579afc20c..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);

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 8b0cfccbd0a0b887e2de95ff2a7d4e449958f92c..78e25d8966275c23d9d8f1b384fa86328ce798ca 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -205,6 +205,11 @@ void mouse_event(ObClient *client, XEvent *e)
                      e->xbutton.x_root, e->xbutton.y_root,
                      e->xbutton.time);
 
+        /* if the bindings grab the pointer, there won't be a ButtonRelease
+           event for us */
+        if (grab_on_pointer())
+            button = 0;
+
         if (CLIENT_CONTEXT(context, client)) {
             /* Replay the event, so it goes to the client*/
             XAllowEvents(ob_display, ReplayPointer, event_curtime);