+#include "debug.h"
#include "menu.h"
#include "openbox.h"
#include "stacking.h"
#include "screen.h"
#include "geom.h"
#include "plugin.h"
+#include "misc.h"
GHashTable *menu_hash = NULL;
-GSList *menu_visible = NULL;
+GList *menu_visible = NULL;
-#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask | \
+#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\
LeaveWindowMask)
#define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask)
#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
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->client = client;
if (!self->shown) {
- if (!self->parent) {
+ if (!(self->parent && self->parent->shown)) {
grab_pointer(TRUE, None);
grab_keyboard(TRUE);
}
- menu_visible = g_slist_append(menu_visible, self);
+ menu_visible = g_list_append(menu_visible, self);
}
if (self->show) {
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;
- if (!self->parent) {
+ 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);
}
- menu_visible = g_slist_remove(menu_visible, self);
+ menu_visible = g_list_remove(menu_visible, self);
}
}
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);
}
Default menu controller action for showing.
*/
-void menu_control_show(ObMenu *self, int x, int y, ObClient *client) {
+void menu_control_show(ObMenu *self, int x, int y, ObClient *client)
+{
guint i;
Rect *a = NULL;
}
}
-void menu_control_mouseover(ObMenuEntry *self, gboolean enter) {
+void menu_control_mouseover(ObMenuEntry *self, gboolean enter)
+{
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;
/* TODO: I don't understand why these bevels should be here.
Something must be wrong in the width calculation */
x = self->parent->location.x + self->parent->size.width +
- ob_rr_theme->bwidth;
+ ob_rr_theme->bwidth - ob_rr_theme->menu_overlap;
/* need to get the width. is this bad?*/
menu_render(self->submenu);
if (self->submenu->size.width + x >= a->x + a->width)
x = self->parent->location.x - self->submenu->size.width -
- ob_rr_theme->bwidth;
+ ob_rr_theme->bwidth + ob_rr_theme->menu_overlap;
menu_show_full(self->submenu, x,
self->parent->location.y + self->y,
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)
+{
+ GList *it = NULL;
+
+ switch (key) {
+ case OB_KEY_DOWN: {
+ if (over != NULL) {
+ if (over->parent->mouseover)
+ over->parent->mouseover(over, FALSE);
+ else
+ menu_control_mouseover(over, FALSE);
+ menu_entry_render(over);
+
+ it = over->parent->entries;
+ while (it != NULL && it->data != over)
+ it = it->next;
+ }
+
+ if (it && it->next)
+ over = (ObMenuEntry *)it->next->data;
+ else if (over == NULL) {
+ if (menu_visible && ((ObMenu *)menu_visible->data)->entries)
+ over = (ObMenuEntry *)
+ (((ObMenu *)menu_visible->data)->entries)->data;
+ else
+ over = NULL;
+ } else {
+ over = (over->parent->entries != NULL ?
+ over->parent->entries->data : NULL);
+ }
+
+ if (over) {
+ if (over->parent->mouseover)
+ over->parent->mouseover(over, TRUE);
+ else
+ menu_control_mouseover(over, TRUE);
+ menu_entry_render(over);
+ }
+
+ break;
+ }
+ case OB_KEY_UP: {
+ if (over != NULL) {
+ if (over->parent->mouseover)
+ over->parent->mouseover(over, FALSE);
+ else
+ menu_control_mouseover(over, FALSE);
+ menu_entry_render(over);
+
+ it = g_list_last(over->parent->entries);
+ while (it != NULL && it->data != over)
+ it = it->prev;
+ }
+
+ if (it && it->prev)
+ over = (ObMenuEntry *)it->prev->data;
+ else if (over == NULL) {
+ it = g_list_last(menu_visible);
+ if (it != NULL) {
+ it = g_list_last(((ObMenu *)it->data)->entries);
+ over = (ObMenuEntry *)(it != NULL ? it->data : NULL);
+ }
+ } else
+ over = (over->parent->entries != NULL ?
+ g_list_last(over->parent->entries)->data :
+ NULL);
+
+ if (over->parent->mouseover)
+ over->parent->mouseover(over, TRUE);
+ else
+ menu_control_mouseover(over, TRUE);
+ menu_entry_render(over);
+ break;
+ }
+ case OB_KEY_RETURN: {
+ if (over == NULL)
+ return over;
+
+ if (over->submenu) {
+ if (over->parent->mouseover)
+ over->parent->mouseover(over, FALSE);
+ else
+ menu_control_mouseover(over, FALSE);
+ menu_entry_render(over);
+
+ if (over->submenu->entries)
+ over = over->submenu->entries->data;
+
+ if (over->parent->mouseover)
+ over->parent->mouseover(over, TRUE);
+ else
+ menu_control_mouseover(over, TRUE);
+ menu_entry_render(over);
+ }
+ else {
+ if (over->parent->mouseover)
+ over->parent->mouseover(over, FALSE);
+ else
+ menu_control_mouseover(over, FALSE);
+ menu_entry_render(over);
+
+ menu_entry_fire(over);
+ }
+ break;
+ }
+ case OB_KEY_ESCAPE: {
+ if (over != NULL) {
+ if (over->parent->mouseover)
+ over->parent->mouseover(over, FALSE);
+ else
+ menu_control_mouseover(over, FALSE);
+ menu_entry_render(over);
+
+ menu_hide(over->parent);
+ } else {
+ it = g_list_last(menu_visible);
+ if (it) {
+ menu_hide((ObMenu *)it->data);
+ }
+ }
+
+ over = NULL;
+ break;
+ }
+ default:
+ g_error("Unknown key");
+ }
+
+ return over;
}
projects / chaz / openbox / blobdiff