menuframe.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\
LeaveWindowMask)
-#define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask)
#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
ButtonPressMask | ButtonReleaseMask)
RrVisual(ob_rr_inst), mask, attrib);
}
+GHashTable *menu_frame_map;
+
+void menu_frame_startup(gboolean reconfig)
+{
+ if (reconfig) return;
+
+ menu_frame_map = g_hash_table_new(g_int_hash, g_int_equal);
+}
+
+void menu_frame_shutdown(gboolean reconfig)
+{
+ if (reconfig) return;
+
+ g_hash_table_destroy(menu_frame_map);
+}
+
ObMenuFrame* menu_frame_new(ObMenu *menu, ObClient *client)
{
ObMenuFrame *self;
self->type = Window_Menu;
self->menu = menu;
self->selected = NULL;
- self->show_title = TRUE;
self->client = client;
self->direction_right = TRUE;
attr.event_mask = FRAME_EVENTMASK;
self->window = createWindow(RootWindow(ob_display, ob_screen),
CWEventMask, &attr);
- attr.event_mask = TITLE_EVENTMASK;
- self->title = createWindow(self->window, CWEventMask, &attr);
- self->items = createWindow(self->window, 0, NULL);
-
- XMapWindow(ob_display, self->items);
self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
stacking_remove(MENU_AS_WINDOW(self));
- XDestroyWindow(ob_display, self->items);
- XDestroyWindow(ob_display, self->title);
XDestroyWindow(ob_display, self->window);
RrAppearanceFree(self->a_items);
self->frame = frame;
attr.event_mask = ENTRY_EVENTMASK;
- self->window = createWindow(self->frame->items, CWEventMask, &attr);
+ self->window = createWindow(self->frame->window, CWEventMask, &attr);
self->text = createWindow(self->window, 0, NULL);
- if (entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) {
+ g_hash_table_insert(menu_frame_map, &self->window, self);
+ g_hash_table_insert(menu_frame_map, &self->text, self);
+ if (entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
self->icon = createWindow(self->window, 0, NULL);
+ g_hash_table_insert(menu_frame_map, &self->icon, self);
+ }
+ if (entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
self->bullet = createWindow(self->window, 0, NULL);
+ g_hash_table_insert(menu_frame_map, &self->bullet, self);
}
XMapWindow(ob_display, self->window);
RrAppearanceCopy(ob_rr_theme->a_menu_text_disabled);
self->a_text_selected =
RrAppearanceCopy(ob_rr_theme->a_menu_text_selected);
+ self->a_text_title =
+ RrAppearanceCopy(ob_rr_theme->a_menu_text_title);
return self;
}
if (self) {
XDestroyWindow(ob_display, self->text);
XDestroyWindow(ob_display, self->window);
- if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) {
+ g_hash_table_remove(menu_frame_map, &self->text);
+ g_hash_table_remove(menu_frame_map, &self->window);
+ if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
XDestroyWindow(ob_display, self->icon);
+ g_hash_table_remove(menu_frame_map, &self->icon);
+ }
+ if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
XDestroyWindow(ob_display, self->bullet);
+ g_hash_table_remove(menu_frame_map, &self->bullet);
}
RrAppearanceFree(self->a_normal);
RrAppearanceFree(self->a_text_normal);
RrAppearanceFree(self->a_text_disabled);
RrAppearanceFree(self->a_text_selected);
+ RrAppearanceFree(self->a_text_title);
RrAppearanceFree(self->a_bullet_normal);
RrAppearanceFree(self->a_bullet_selected);
XMoveWindow(ob_display, self->window, self->area.x, self->area.y);
}
-void menu_frame_place_topmenu(ObMenuFrame *self, gint x, gint y)
+static void menu_frame_place_topmenu(ObMenuFrame *self, gint *x, gint *y)
{
- if (self->client && x < 0 && y < 0) {
- x = self->client->frame->area.x + self->client->frame->size.left;
- y = self->client->frame->area.y + self->client->frame->size.top;
+ gint dx, dy;
+
+ if (config_menu_middle) {
+ gint myx;
+
+ myx = *x;
+ *y -= self->area.height / 2;
+
+ /* try to the right of the cursor */
+ menu_frame_move_on_screen(self, myx, *y, &dx, &dy);
+ self->direction_right = TRUE;
+ if (dx != 0) {
+ /* try to the left of the cursor */
+ myx = *x - self->area.width;
+ menu_frame_move_on_screen(self, myx, *y, &dx, &dy);
+ self->direction_right = FALSE;
+ }
+ if (dx != 0) {
+ /* if didnt fit on either side so just use what it says */
+ myx = *x;
+ menu_frame_move_on_screen(self, myx, *y, &dx, &dy);
+ self->direction_right = TRUE;
+ }
+ *x = myx + dx;
+ *y += dy;
} else {
- if (config_menu_middle) {
- x -= self->area.width / 2;
- y -= self->title_h*3/4;
- } else {
- x -= ob_rr_theme->mbwidth;
- y -= ob_rr_theme->mbwidth;
+ gint myx, myy;
+
+ myx = *x;
+ myy = *y;
+
+ /* try to the bottom right of the cursor */
+ menu_frame_move_on_screen(self, myx, myy, &dx, &dy);
+ self->direction_right = TRUE;
+ if (dx != 0 || dy != 0) {
+ /* try to the bottom left of the cursor */
+ myx = *x - self->area.width;
+ myy = *y;
+ menu_frame_move_on_screen(self, myx, myy, &dx, &dy);
+ self->direction_right = FALSE;
+ }
+ if (dx != 0 || dy != 0) {
+ /* try to the top right of the cursor */
+ myx = *x;
+ myy = *y - self->area.height;
+ menu_frame_move_on_screen(self, myx, myy, &dx, &dy);
+ self->direction_right = TRUE;
+ }
+ if (dx != 0 || dy != 0) {
+ /* try to the top left of the cursor */
+ myx = *x - self->area.width;
+ myy = *y - self->area.height;
+ menu_frame_move_on_screen(self, myx, myy, &dx, &dy);
+ self->direction_right = FALSE;
}
+ if (dx != 0 || dy != 0) {
+ /* if didnt fit on either side so just use what it says */
+ myx = *x;
+ myy = *y;
+ menu_frame_move_on_screen(self, myx, myy, &dx, &dy);
+ self->direction_right = TRUE;
+ }
+ *x = myx + dx;
+ *y = myy + dy;
}
- menu_frame_move(self, x, y);
}
-void menu_frame_place_submenu(ObMenuFrame *self)
+static void menu_frame_place_submenu(ObMenuFrame *self, gint *x, gint *y)
{
- gint x, y;
gint overlap;
gint bwidth;
- overlap = (config_menu_middle ? 0 : ob_rr_theme->menu_overlap);
+ overlap = ob_rr_theme->menu_overlap;
bwidth = ob_rr_theme->mbwidth;
-
if (self->direction_right)
- x = self->parent->area.x + self->parent->area.width - overlap - bwidth;
+ *x = self->parent->area.x + self->parent->area.width -
+ overlap - bwidth;
else
- x = self->parent->area.x - self->area.width + overlap + bwidth;
+ *x = self->parent->area.x - self->area.width + overlap + bwidth;
- y = self->parent->area.y + self->parent->title_h +
- self->parent_entry->area.y + overlap;
+ *y = self->parent->area.y + self->parent_entry->area.y;
if (config_menu_middle)
- y = y - self->area.height/2 + self->item_h/2;
-
- menu_frame_move(self, x, y);
+ *y -= (self->area.height - (bwidth * 2) - self->item_h) / 2;
+ else
+ *y += overlap;
}
-void menu_frame_move_on_screen(ObMenuFrame *self, gint *dx, gint *dy)
+void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y,
+ gint *dx, gint *dy)
{
Rect *a = NULL;
gint pos, half;
/* if in the bottom half then check this stuff first, will keep the bottom
edge of the menu visible */
if (pos > half) {
- *dx = MAX(*dx, a->x - self->area.x);
- *dy = MAX(*dy, a->y - self->area.y);
+ *dx = MAX(*dx, a->x - x);
+ *dy = MAX(*dy, a->y - y);
}
- *dx = MIN(*dx, (a->x + a->width) - (self->area.x + self->area.width));
- *dy = MIN(*dy, (a->y + a->height) - (self->area.y + self->area.height));
+ *dx = MIN(*dx, (a->x + a->width) - (x + self->area.width));
+ *dy = MIN(*dy, (a->y + a->height) - (y + self->area.height));
/* if in the top half then check this stuff last, will keep the top
edge of the menu visible */
if (pos <= half) {
- *dx = MAX(*dx, a->x - self->area.x);
- *dy = MAX(*dy, a->y - self->area.y);
+ *dx = MAX(*dx, a->x - x);
+ *dy = MAX(*dy, a->y - y);
}
}
ObMenu *sub;
ObMenuFrame *frame = self->frame;
- item_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
- !self->entry->data.normal.enabled) ?
- self->a_disabled :
- (self == self->frame->selected ?
- self->a_selected :
- self->a_normal));
switch (self->entry->type) {
case OB_MENU_ENTRY_TYPE_NORMAL:
case OB_MENU_ENTRY_TYPE_SUBMENU:
+ item_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+ !self->entry->data.normal.enabled) ?
+ self->a_disabled :
+ (self == self->frame->selected ?
+ self->a_selected :
+ self->a_normal));
th = self->frame->item_h;
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
- th = SEPARATOR_HEIGHT + 2*PADDING;
+ if (self->entry->data.separator.label) {
+ item_a = self->frame->a_title;
+ th = ob_rr_theme->menu_title_height;
+ } else {
+ item_a = self->a_normal;
+ th = SEPARATOR_HEIGHT + 2*PADDING;
+ }
break;
default:
g_assert_not_reached();
item_a->surface.parenty = self->area.y;
RrPaint(item_a, self->window, self->area.width, self->area.height);
- text_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
- !self->entry->data.normal.enabled) ?
- self->a_text_disabled :
- (self == self->frame->selected ?
- self->a_text_selected :
- self->a_text_normal));
switch (self->entry->type) {
case OB_MENU_ENTRY_TYPE_NORMAL:
+ text_a = (!self->entry->data.normal.enabled ?
+ self->a_text_disabled :
+ (self == self->frame->selected ?
+ self->a_text_selected :
+ self->a_text_normal));
text_a->texture[0].data.text.string = self->entry->data.normal.label;
+ if (self->entry->data.normal.shortcut &&
+ (self->frame->menu->show_all_shortcuts ||
+ self->entry->data.normal.shortcut_position > 0))
+ {
+ text_a->texture[0].data.text.shortcut = TRUE;
+ text_a->texture[0].data.text.shortcut_pos =
+ self->entry->data.normal.shortcut_position;
+ } else
+ text_a->texture[0].data.text.shortcut = FALSE;
break;
case OB_MENU_ENTRY_TYPE_SUBMENU:
+ text_a = (self == self->frame->selected ?
+ self->a_text_selected :
+ self->a_text_normal);
sub = self->entry->data.submenu.submenu;
text_a->texture[0].data.text.string = sub ? sub->title : "";
+ if (sub->shortcut && (self->frame->menu->show_all_shortcuts ||
+ sub->shortcut_position > 0))
+ {
+ text_a->texture[0].data.text.shortcut = TRUE;
+ text_a->texture[0].data.text.shortcut_pos = sub->shortcut_position;
+ } else
+ text_a->texture[0].data.text.shortcut = FALSE;
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
+ if (self->entry->data.separator.label != NULL)
+ text_a = self->a_text_title;
+ else
+ text_a = self->a_text_normal;
break;
}
self->frame->item_h - 2*PADDING);
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
- XMoveResizeWindow(ob_display, self->text, PADDING, PADDING,
- self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
- self->a_separator->surface.parent = item_a;
- self->a_separator->surface.parentx = PADDING;
- self->a_separator->surface.parenty = PADDING;
- self->a_separator->texture[0].data.lineart.color =
- text_a->texture[0].data.text.color;
- self->a_separator->texture[0].data.lineart.x1 = 2*PADDING;
- self->a_separator->texture[0].data.lineart.y1 = SEPARATOR_HEIGHT / 2;
- self->a_separator->texture[0].data.lineart.x2 =
- self->area.width - 4*PADDING;
- self->a_separator->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT / 2;
- RrPaint(self->a_separator, self->text,
- self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
+ if (self->entry->data.separator.label != NULL) {
+ /* labeled separator */
+ XMoveResizeWindow(ob_display, self->text,
+ ob_rr_theme->paddingx, ob_rr_theme->paddingy,
+ self->area.width - 2*ob_rr_theme->paddingx,
+ ob_rr_theme->menu_title_height -
+ 2*ob_rr_theme->paddingy);
+ text_a->surface.parent = item_a;
+ text_a->surface.parentx = ob_rr_theme->paddingx;
+ text_a->surface.parenty = ob_rr_theme->paddingy;
+ RrPaint(text_a, self->text,
+ self->area.width - 2*ob_rr_theme->paddingx,
+ ob_rr_theme->menu_title_height -
+ 2*ob_rr_theme->paddingy);
+ } else {
+ /* unlabeled separaator */
+ XMoveResizeWindow(ob_display, self->text, PADDING, PADDING,
+ self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
+ self->a_separator->surface.parent = item_a;
+ self->a_separator->surface.parentx = PADDING;
+ self->a_separator->surface.parenty = PADDING;
+ self->a_separator->texture[0].data.lineart.color =
+ text_a->texture[0].data.text.color;
+ self->a_separator->texture[0].data.lineart.x1 = 2*PADDING;
+ self->a_separator->texture[0].data.lineart.y1 = SEPARATOR_HEIGHT/2;
+ self->a_separator->texture[0].data.lineart.x2 =
+ self->area.width - 4*PADDING;
+ self->a_separator->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT/2;
+ RrPaint(self->a_separator, self->text,
+ self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
+ }
break;
}
- if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR &&
+ if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
self->entry->data.normal.icon_data)
{
XMoveResizeWindow(ob_display, self->icon,
self->frame->item_h - frame->item_margin.top
- frame->item_margin.bottom);
XMapWindow(ob_display, self->icon);
- } else if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR &&
+ } else if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
self->entry->data.normal.mask)
{
RrColor *c;
static void menu_frame_render(ObMenuFrame *self)
{
gint w = 0, h = 0;
- gint allitems_h = 0;
gint tw, th; /* temps */
GList *it;
gboolean has_icon = FALSE;
ObMenu *sub;
+ ObMenuEntryFrame *e;
XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->mbwidth);
XSetWindowBorder(ob_display, self->window,
RrColorPixel(ob_rr_theme->menu_b_color));
- if (!self->parent && self->show_title) {
- XMoveWindow(ob_display, self->title,
- -ob_rr_theme->mbwidth, h - ob_rr_theme->mbwidth);
-
- self->a_title->texture[0].data.text.string = self->menu->title;
- RrMinsize(self->a_title, &tw, &th);
- tw = MIN(tw, MAX_MENU_WIDTH) + ob_rr_theme->paddingx * 2;
- w = MAX(w, tw);
-
- th = ob_rr_theme->menu_title_height;
- h += (self->title_h = th + ob_rr_theme->mbwidth);
-
- XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->mbwidth);
- XSetWindowBorder(ob_display, self->title,
- RrColorPixel(ob_rr_theme->menu_b_color));
- }
-
- XMoveWindow(ob_display, self->items, 0, h);
+ /* find text dimensions */
STRUT_SET(self->item_margin, 0, 0, 0, 0);
gint l, t, r, b;
e->a_text_normal->texture[0].data.text.string = "";
- RrMinsize(e->a_text_normal, &tw, &th);
+ RrMinSize(e->a_text_normal, &tw, &th);
tw += 2*PADDING;
th += 2*PADDING;
self->item_h = th;
} else
self->item_h = 0;
+ /* render the entries */
+
for (it = self->entries; it; it = g_list_next(it)) {
RrAppearance *text_a;
- ObMenuEntryFrame *e = it->data;
+ e = it->data;
+
+ /* if the first entry is a labeled separator, then make its border
+ overlap with the menu's outside border */
+ if (it == self->entries &&
+ e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR &&
+ e->entry->data.separator.label)
+ {
+ h -= ob_rr_theme->mbwidth;
+ }
- RECT_SET_POINT(e->area, 0, allitems_h);
- XMoveWindow(ob_display, e->window, 0, e->area.y);
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR &&
+ e->entry->data.separator.label)
+ {
+ e->border = ob_rr_theme->mbwidth;
+ }
+
+ RECT_SET_POINT(e->area, 0, h+e->border);
+ XMoveWindow(ob_display, e->window, e->area.x-e->border, e->area.y-e->border);
+ XSetWindowBorderWidth(ob_display, e->window, e->border);
+ XSetWindowBorder(ob_display, e->window,
+ RrColorPixel(ob_rr_theme->menu_b_color));
text_a = ((e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
!e->entry->data.normal.enabled) ?
switch (e->entry->type) {
case OB_MENU_ENTRY_TYPE_NORMAL:
text_a->texture[0].data.text.string = e->entry->data.normal.label;
- RrMinsize(text_a, &tw, &th);
+ RrMinSize(text_a, &tw, &th);
tw = MIN(tw, MAX_MENU_WIDTH);
if (e->entry->data.normal.icon_data ||
case OB_MENU_ENTRY_TYPE_SUBMENU:
sub = e->entry->data.submenu.submenu;
text_a->texture[0].data.text.string = sub ? sub->title : "";
- RrMinsize(text_a, &tw, &th);
+ RrMinSize(text_a, &tw, &th);
tw = MIN(tw, MAX_MENU_WIDTH);
if (e->entry->data.normal.icon_data ||
tw += self->item_h - PADDING;
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
- tw = 0;
- th = SEPARATOR_HEIGHT;
+ if (e->entry->data.separator.label != NULL) {
+ e->a_text_title->texture[0].data.text.string =
+ e->entry->data.separator.label;
+ RrMinSize(e->a_text_title, &tw, &th);
+ tw = MIN(tw, MAX_MENU_WIDTH);
+ th = ob_rr_theme->menu_title_height +
+ (ob_rr_theme->mbwidth - PADDING) *2;
+ } else {
+ tw = 0;
+ th = SEPARATOR_HEIGHT;
+ }
break;
}
tw += 2*PADDING;
th += 2*PADDING;
w = MAX(w, tw);
h += th;
- allitems_h += th;
+ }
+
+ /* if the last entry is a labeled separator, then make its border
+ overlap with the menu's outside border */
+ it = g_list_last(self->entries);
+ e = it ? it->data : NULL;
+ if (e && e->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR &&
+ e->entry->data.separator.label)
+ {
+ h -= ob_rr_theme->mbwidth;
}
self->text_x = PADDING;
}
if (!w) w = 10;
- if (!allitems_h) {
- allitems_h = 3;
- h += 3;
- }
+ if (!h) h = 3;
XResizeWindow(ob_display, self->window, w, h);
- XResizeWindow(ob_display, self->items, w, allitems_h);
self->inner_w = w;
- if (!self->parent && self->show_title) {
- XResizeWindow(ob_display, self->title,
- w, self->title_h - ob_rr_theme->mbwidth);
- RrPaint(self->a_title, self->title,
- w, self->title_h - ob_rr_theme->mbwidth);
- XMapWindow(ob_display, self->title);
- } else
- XUnmapWindow(ob_display, self->title);
-
- RrPaint(self->a_items, self->items, w, allitems_h);
+ RrPaint(self->a_items, self->window, w, h);
for (it = self->entries; it; it = g_list_next(it))
menu_entry_frame_render(it->data);
{
GList *it;
- if (menu_frame_visible == NULL) {
- /* no menus shown yet */
- if (!grab_pointer(TRUE, OB_CURSOR_NONE))
- return FALSE;
- if (!grab_keyboard(TRUE)) {
- grab_pointer(FALSE, OB_CURSOR_NONE);
- return FALSE;
- }
- }
-
/* determine if the underlying menu is already visible */
for (it = menu_frame_visible; it; it = g_list_next(it)) {
ObMenuFrame *f = it->data;
}
if (!it) {
if (self->menu->update_func)
- self->menu->update_func(self, self->menu->data);
+ if (!self->menu->update_func(self, self->menu->data))
+ return FALSE;
+ }
+
+ if (menu_frame_visible == NULL) {
+ /* no menus shown yet */
+ if (!grab_pointer(TRUE, TRUE, OB_CURSOR_POINTER))
+ return FALSE;
+ if (!grab_keyboard(TRUE)) {
+ grab_pointer(FALSE, TRUE, OB_CURSOR_POINTER);
+ return FALSE;
+ }
}
menu_frame_update(self);
return TRUE;
}
-gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y)
+gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
+ gint button)
{
- gint dx, dy;
guint i;
if (menu_frame_is_visible(self))
if (!menu_frame_show(self))
return FALSE;
- menu_frame_place_topmenu(self, x, y);
-
/* find the monitor the menu is on */
for (i = 0; i < screen_num_monitors; ++i) {
Rect *a = screen_physical_area_monitor(i);
}
}
- menu_frame_move_on_screen(self, &dx, &dy);
- menu_frame_move(self, self->area.x + dx, self->area.y + dy);
+ if (self->menu->place_func)
+ self->menu->place_func(self, &x, &y, button, self->menu->data);
+ else
+ menu_frame_place_topmenu(self, &x, &y);
+
+ menu_frame_move(self, x, y);
XMapWindow(ob_display, self->window);
gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
ObMenuEntryFrame *parent_entry)
{
- gint dx, dy;
+ ObMenuEntryFrame *e;
+ gint x, y, dx, dy;
if (menu_frame_is_visible(self))
return TRUE;
- if (!menu_frame_show(self))
- return FALSE;
self->monitor = parent->monitor;
self->parent = parent;
menu_frame_hide(parent->child);
parent->child = self;
- menu_frame_place_submenu(self);
- menu_frame_move_on_screen(self, &dx, &dy);
+ if (!menu_frame_show(self))
+ return FALSE;
- if (dx == 0) {
- menu_frame_move(self, self->area.x, self->area.y + dy);
- } else {
- gboolean dir;
+ menu_frame_place_submenu(self, &x, &y);
+ menu_frame_move_on_screen(self, x, y, &dx, &dy);
- /* flip the direction in which we're placing submenus */
- if (dx > 0)
- dir = TRUE;
- else
- dir = FALSE;
-
- /* if it changed, then replace the menu on the opposite side,
- and try keep it on the screen too */
- if (dir != self->direction_right) {
- self->direction_right = dir;
- menu_frame_place_submenu(self);
- menu_frame_move_on_screen(self, &dx, &dy);
- menu_frame_move(self, self->area.x + dx, self->area.y + dy);
- }
+ if (dx != 0) {
+ /*try the other side */
+ self->direction_right = !self->direction_right;
+ menu_frame_place_submenu(self, &x, &y);
+ menu_frame_move_on_screen(self, x, y, &dx, &dy);
}
+ menu_frame_move(self, x + dx, y + dy);
XMapWindow(ob_display, self->window);
+ if (screen_pointer_pos(&dx, &dy) && (e = menu_entry_frame_under(dx, dy)) &&
+ e->frame == self)
+ ++e->ignore_enters;
+
return TRUE;
}
if (menu_frame_visible == NULL) {
/* last menu shown */
- grab_pointer(FALSE, OB_CURSOR_NONE);
+ grab_pointer(FALSE, TRUE, OB_CURSOR_NONE);
grab_keyboard(FALSE);
}
if ((frame = menu_frame_under(x, y))) {
x -= ob_rr_theme->mbwidth + frame->area.x;
- y -= frame->title_h + ob_rr_theme->mbwidth + frame->area.y;
+ y -= ob_rr_theme->mbwidth + frame->area.y;
for (it = frame->entries; it; it = g_list_next(it)) {
ObMenuEntryFrame *e = it->data;
return FALSE;
}
-void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry)
+void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
+ gboolean immediate)
{
ObMenuEntryFrame *old = self->selected;
ObMenuFrame *oldchild = self->child;
menu_entry_frame_render(self->selected);
if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
- if (config_submenu_show_delay) {
+ if (config_submenu_show_delay && !immediate) {
/* initiate a new submenu open request */
ob_main_loop_timeout_add(ob_main_loop,
config_submenu_show_delay * 1000,
menu_entry_frame_submenu_timeout,
- self->selected,
+ self->selected, g_direct_equal,
NULL);
} else {
menu_entry_frame_show_submenu(self->selected);
}
}
}
- menu_frame_select(self, it ? it->data : NULL);
+ menu_frame_select(self, it ? it->data : NULL, TRUE);
}
void menu_frame_select_next(ObMenuFrame *self)
}
}
}
- menu_frame_select(self, it ? it->data : NULL);
+ menu_frame_select(self, it ? it->data : NULL, TRUE);
}