#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 */
menu_frame_hide_all();
frame = menu_frame_new(self, client);
- if (client && x < 0 && y < 0)
- menu_frame_move(frame,
- client->frame->area.x + client->frame->size.left,
- client->frame->area.y + client->frame->size.top);
- else
+ if (client && x < 0 && y < 0) {
+ x = client->frame->area.x + client->frame->size.left;
+ y = client->frame->area.y + client->frame->size.top;
+ menu_frame_move(frame, x, y);
+ } else
menu_frame_move(frame,
x - ob_rr_theme->bwidth, y - ob_rr_theme->bwidth);
- frame->monitor = 0;
for (i = 0; i < screen_num_monitors; ++i) {
Rect *a = screen_physical_area_monitor(i);
- if (RECT_CONTAINS(*a, frame->area.x, frame->area.y)) {
+ if (RECT_CONTAINS(*a, x, y)) {
frame->monitor = i;
break;
}
}
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)