#include "config.h"
#include "screen.h"
#include "menuframe.h"
+#include "keyboard.h"
#include "geom.h"
#include "misc.h"
#include "client_menu.h"
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 */
}
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)