+#include "debug.h"
#include "menu.h"
#include "openbox.h"
#include "stacking.h"
ObMenu *menu = NULL, *parent;
if (newmenu == TRUE) {
- if (!parse_attr_string("id", node->parent, &id))
+ if (!parse_attr_string("id", node, &id))
goto parse_menu_fail;
- if (!parse_attr_string("label", node->parent, &title))
+ if (!parse_attr_string("label", node, &title))
goto parse_menu_fail;
-
- g_message("menu label %s", title);
-
- menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
-
+ ob_debug("menu label %s\n", title);
+
+ if (parse_attr_string("plugin", node, &plugin)) {
+ PluginMenuCreateData data;
+ data.doc = doc;
+ data.node = node;
+ data.parent = menu;
+ parent = plugin_create(plugin, &data);
+ g_free(plugin);
+ } else
+ menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
+
if (data)
*((ObMenu**)data) = menu;
} else {
menu = (ObMenu *)data;
}
+
+ node = node->xmlChildrenNode;
while (node) {
if (!xmlStrcasecmp(node->name, (const xmlChar*) "menu")) {
if (parse_attr_string("plugin", node, &plugin)) {
- PluginMenuCreateData data = {
- .doc = doc,
- .node = node,
- .parent = menu
- };
+ PluginMenuCreateData data;
+ data.doc = doc;
+ data.node = node;
+ data.parent = menu;
parent = plugin_create(plugin, &data);
g_free(plugin);
} else {
parent = menu;
- parse_menu(doc, node->xmlChildrenNode, &parent);
+ parse_menu(doc, node, &parent);
menu_add_entry(menu, menu_entry_new_submenu(parent->label,
parent));
}
self->shown = FALSE;
if (self->open_submenu)
menu_hide(self->open_submenu);
- if (self->parent && self->parent->open_submenu == self)
+ if (self->parent && self->parent->open_submenu == self) {
+ ObMenuEntry *e;
+
self->parent->open_submenu = NULL;
+ e = menu_find_entry_by_submenu(self->parent, self);
+ if (self->parent->mouseover)
+ self->parent->mouseover(e, FALSE);
+ else
+ menu_control_mouseover(e, FALSE);
+ menu_entry_render(e);
+ }
+
if (!(self->parent && self->parent->shown)) {
grab_keyboard(FALSE);
grab_pointer(FALSE, None);
return NULL;
}
+ObMenuEntry *menu_find_entry_by_submenu(ObMenu *menu, ObMenu *submenu)
+{
+ GList *it;
+
+ for (it = menu->entries; it; it = it->next) {
+ ObMenuEntry *entry = it->data;
+ if (entry->submenu == submenu)
+ return entry;
+ }
+ return NULL;
+}
+
ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y)
{
if (x < 0 || x >= menu->size.width || y < 0 || y >= menu->size.height)
y -= menu->title_h + ob_rr_theme->bwidth;
if (y < 0) return NULL;
- g_message ("%d %p", y/menu->item_h, g_list_nth_data(menu->entries, y / menu->item_h));
+ ob_debug("%d %p\n", y/menu->item_h,
+ g_list_nth_data(menu->entries, y / menu->item_h));
return g_list_nth_data(menu->entries, y / menu->item_h);
}
{
int x;
Rect *a;
+ ObMenuEntry *e;
- self->hilite = enter;
-
if (enter) {
if (self->parent->open_submenu && self->submenu
!= self->parent->open_submenu)
+ {
+ e = menu_find_entry_by_submenu(self->parent,
+ self->parent->open_submenu);
+ e->hilite = FALSE;
+ menu_entry_render(e);
menu_hide(self->parent->open_submenu);
+ }
if (self->submenu && self->parent->open_submenu != self->submenu) {
self->parent->open_submenu = self->submenu;
self->parent->client);
}
}
+
+ if (enter || !self->submenu ||
+ menu_find_entry_by_submenu(self->parent,
+ self->parent->open_submenu) != self)
+ self->hilite = enter;
}
ObMenuEntry *menu_control_keyboard_nav(ObMenuEntry *over, ObKey key)