don't allow inventive users to open the menu while in an interactive grab (ie changin...

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index d4e444182dfee20370f4cda0c74e67849d335995..c1d1138be270ad8652a0bc9501f7336b5eec0828 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "screen.h"
 #include "menuframe.h"
+#include "keyboard.h"
 #include "geom.h"
 #include "misc.h"
 #include "client_menu.h"
@@ -286,7 +287,8 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
     ObMenuFrame *frame;
     guint i;
 
-    if (!(self = menu_from_name(name))) return;
+    if (!(self = menu_from_name(name))
+        || keyboard_interactively_grabbed()) return;
 
     /* if the requested menu is already the top visible menu, then don't
        bother */
@@ -315,6 +317,12 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
     }
     if (!menu_frame_show(frame, NULL))
         menu_frame_free(frame);
+    else if (frame->entries) {
+        ObMenuEntryFrame *e = frame->entries->data;
+        if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+            e->entry->data.normal.enabled)
+                menu_frame_select(frame, e);
+    }
 }
 
 static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)