X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmenu.c;h=69a5fe5aa4010d6da5bdbdeb95830a6070c9c2f6;hb=d77c8f62f2f908cfe1d09686a35dce1ccaf65aec;hp=a969da8365d05a55e229dac72d71f0437ff2703c;hpb=ad215303e7e651c0274d219709e109073bc4a032;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index a969da83..69a5fe5a 100644
--- 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"
@@ -68,7 +69,7 @@ void menu_startup(gboolean reconfig)
     menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
                                       (GDestroyNotify)menu_destroy_hash_value);
 
-    client_list_menu_startup();
+    client_list_menu_startup(reconfig);
     client_menu_startup();
 
     menu_parse_inst = parse_startup();
@@ -109,6 +110,8 @@ void menu_shutdown(gboolean reconfig)
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
 
+    client_list_menu_shutdown(reconfig);
+
     menu_frame_hide_all();
     g_hash_table_destroy(menu_hash);
     menu_hash = NULL;
@@ -286,7 +289,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,8 +319,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)
-        menu_frame_select_next(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)