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

1 files changed, 5 insertions, 0 deletions

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 8b0cfccb..78e25d89 100644
--- 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);