merge the incredibly important revisions 5984,5985 from trunk

diff --git a/openbox/event.c b/openbox/event.c
index a36e9223d3d345195735cee2474d16dc4a3942c5..c00212f849a221b07027bcb8955aced902872ea8 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1365,7 +1365,9 @@ static gboolean event_handle_menu(XEvent *ev)
 
     switch (ev->type) {
     case ButtonRelease:
-        if (ev->xbutton.button <= 3 && menu_can_hide) {
+        if ((ev->xbutton.button < 4 || ev->xbutton.button > 5)
+            && menu_can_hide)
+        {
             if ((e = menu_entry_frame_under(ev->xbutton.x_root,
                                             ev->xbutton.y_root)))
                 menu_entry_frame_execute(e, ev->xbutton.state,