X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=4ffcca0d397adf6eb4ddf7cb5f1b5432e5d27f0e;hb=ec9dd7fdd7531d2ca951a0b812bf8e63b6e9a377;hp=a02cda9d61f304376bdaf6ac7b60b659938b54e8;hpb=4541959b8cce89f566c2599d078ae6a28bda4ead;p=chaz%2Fopenbox diff --git a/openbox/menu.c b/openbox/menu.c index a02cda9d..4ffcca0d 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -1,382 +1,391 @@ +#include "debug.h" #include "menu.h" #include "openbox.h" #include "stacking.h" +#include "client.h" #include "grab.h" -#include "render/theme.h" +#include "config.h" #include "screen.h" +#include "menuframe.h" #include "geom.h" #include "plugin.h" +#include "misc.h" +#include "parser/parse.h" -GHashTable *menu_hash = NULL; +static GHashTable *menu_hash = NULL; -#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask | \ - LeaveWindowMask) -#define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask) -#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \ - ButtonPressMask | ButtonReleaseMask) +ObParseInst *menu_parse_inst; -void menu_control_show(Menu *self, int x, int y, Client *client); +typedef struct _ObMenuParseState ObMenuParseState; -void menu_destroy_hash_key(Menu *menu) +struct _ObMenuParseState { - g_free(menu); -} + GSList *menus; +}; + +static void menu_clear_entries_internal(ObMenu *self); -void menu_destroy_hash_value(Menu *self) +static ObMenu* menu_from_name(gchar *name) { - GList *it; + ObMenu *self = NULL; - for (it = self->entries; it; it = it->next) - menu_entry_free(it->data); - g_list_free(self->entries); + g_assert(name != NULL); - g_free(self->label); - g_free(self->name); + if (!(self = g_hash_table_lookup(menu_hash, name))) + g_warning("Attempted to access menu '%s' but it does not exist.", + name); + return self; +} - g_hash_table_remove(window_map, &self->title); - g_hash_table_remove(window_map, &self->frame); - g_hash_table_remove(window_map, &self->items); +static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + gpointer data) +{ + ObMenuParseState *state = data; + gchar *label; + + if (state->menus) { + if (parse_attr_string("label", node, &label)) { + GSList *acts = NULL; + + for (node = node->xmlChildrenNode; node; node = node->next) + if (!xmlStrcasecmp(node->name, (const xmlChar*) "action")) + acts = g_slist_append(acts, action_parse(i, doc, node)); + menu_add_normal(state->menus->data, 0, label, acts); + g_free(label); + } + } +} - stacking_remove(self); +static void parse_menu_separator(ObParseInst *i, + xmlDocPtr doc, xmlNodePtr node, + gpointer data) +{ + ObMenuParseState *state = data; - RrAppearanceFree(self->a_title); - XDestroyWindow(ob_display, self->title); - XDestroyWindow(ob_display, self->frame); - XDestroyWindow(ob_display, self->items); + if (state->menus) + menu_add_separator(state->menus->data, 0); +} - g_free(self); +gboolean menu_open_plugin(ObParseInst *i, gchar *name, gchar *plugin) +{ + gboolean ret = FALSE; + + if (plugin_open(plugin, i)) { + plugin_start(plugin); + if (g_hash_table_lookup(menu_hash, name)) + ret = TRUE; + else + g_warning("Specified plugin '%s' did not provide the " + "menu '%s'", plugin, name); + } + return ret; } -void menu_entry_free(MenuEntry *self) +static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + gpointer data) { - g_free(self->label); - action_free(self->action); + ObMenuParseState *state = data; + gchar *name = NULL, *title = NULL, *plugin = NULL; + + if (!parse_attr_string("id", node, &name)) + goto parse_menu_fail; + + if (!g_hash_table_lookup(menu_hash, name)) { + if (parse_attr_string("plugin", node, &plugin)) { + menu_open_plugin(i, name, plugin); + } else { + if (!parse_attr_string("label", node, &title)) + goto parse_menu_fail; + + if (menu_new(name, title, NULL)) { + state->menus = g_slist_prepend(state->menus, name); + parse_tree(i, doc, node->xmlChildrenNode); + state->menus = g_slist_delete_link(state->menus, state->menus); + } + } + } + + if (state->menus) + menu_add_submenu(state->menus->data, 0, name); + +parse_menu_fail: + g_free(name); + g_free(title); + g_free(plugin); +} + - g_hash_table_remove(window_map, &self->item); +void menu_destroy_hash_value(ObMenu *self) +{ + /* XXX make sure its not visible */ - RrAppearanceFree(self->a_item); - RrAppearanceFree(self->a_disabled); - RrAppearanceFree(self->a_hilite); - XDestroyWindow(ob_display, self->item); + if (self->destroy_func) + self->destroy_func(self, self->data); - g_free(self); + menu_clear_entries_internal(self); + g_free(self->name); + g_free(self->title); } - -void menu_startup() + +void menu_startup(ObParseInst *i) { - Menu *m; -/* - Menu *s; - Menu *t; -*/ - Action *a; - - menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, - (GDestroyNotify)menu_destroy_hash_key, + menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify)menu_destroy_hash_value); - - m = menu_new("sex menu", "root", NULL); - - a = action_from_string("execute"); - a->data.execute.path = g_strdup("xterm"); - menu_add_entry(m, menu_entry_new("xterm", a)); - a = action_from_string("restart"); - menu_add_entry(m, menu_entry_new("restart", a)); - menu_add_entry(m, menu_entry_new_separator("--")); - a = action_from_string("exit"); - menu_add_entry(m, menu_entry_new("exit", a)); - - /* - s = menu_new("subsex menu", "submenu", m); - a = action_from_string("execute"); - a->data.execute.path = g_strdup("xclock"); - menu_add_entry(s, menu_entry_new("xclock", a)); - - menu_add_entry(m, menu_entry_new_submenu("subz", s)); - - s = menu_new("empty", "chub", m); - menu_add_entry(m, menu_entry_new_submenu("empty", s)); - - s = menu_new("", "s-club", m); - menu_add_entry(m, menu_entry_new_submenu("empty", s)); - - s = menu_new(NULL, "h-club", m); - menu_add_entry(m, menu_entry_new_submenu("empty", s)); - - s = menu_new(NULL, "g-club", m); - - a = action_from_string("execute"); - a->data.execute.path = g_strdup("xterm"); - menu_add_entry(s, menu_entry_new("xterm", a)); - a = action_from_string("restart"); - menu_add_entry(s, menu_entry_new("restart", a)); - menu_add_entry(s, menu_entry_new_separator("--")); - a = action_from_string("exit"); - menu_add_entry(s, menu_entry_new("exit", a)); - - menu_add_entry(m, menu_entry_new_submenu("long", s)); - */ + menu_parse_inst = parse_startup(); } void menu_shutdown() { + parse_shutdown(menu_parse_inst); + menu_parse_inst = NULL; + + menu_frame_hide_all(); g_hash_table_destroy(menu_hash); + menu_hash = NULL; +} + +gboolean menu_open(gchar *file, xmlDocPtr *doc, xmlNodePtr *node) +{ + gboolean loaded = TRUE; + gchar *p; + + p = g_build_filename(g_get_home_dir(), ".openbox", file, NULL); + if (!parse_load(p, "openbox_menu", doc, node)) { + g_free(p); + p = g_build_filename(RCDIR, file, NULL); + if (!parse_load(p, "openbox_menu", doc, node)) { + g_free(p); + p = g_strdup(file); + if (!parse_load(p, "openbox_menu", doc, node)) { + g_warning("Failed to load menu from '%s'", file); + loaded = FALSE; + } + } + } + g_free(p); + return loaded; } -static Window createWindow(Window parent, unsigned long mask, - XSetWindowAttributes *attrib) +void menu_parse() { - return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0, - RrDepth(ob_rr_inst), InputOutput, - RrVisual(ob_rr_inst), mask, attrib); - + ObMenuParseState parse_state; + xmlDocPtr doc; + xmlNodePtr node; + gboolean loaded = FALSE; + GSList *it; + + for (it = config_menu_files; it; it = g_slist_next(it)) { + if (menu_open(it->data, &doc, &node)) + loaded = TRUE; + + } + if (!loaded) + loaded = menu_open("menu", &doc, &node); + + if (loaded) { + parse_state.menus = NULL; + + parse_register(menu_parse_inst, "menu", parse_menu, &parse_state); + parse_register(menu_parse_inst, "item", parse_menu_item, &parse_state); + parse_register(menu_parse_inst, "separator", + parse_menu_separator, &parse_state); + parse_tree(menu_parse_inst, doc, node->xmlChildrenNode); + } } -Menu *menu_new_full(char *label, char *name, Menu *parent, - menu_controller_show show, menu_controller_update update) +ObMenu* menu_new(gchar *name, gchar *title, gpointer data) { - XSetWindowAttributes attrib; - Menu *self; + ObMenu *self; + + /*if (g_hash_table_lookup(menu_hash, name)) return FALSE;*/ - self = g_new0(Menu, 1); - self->obwin.type = Window_Menu; - self->label = g_strdup(label); + self = g_new0(ObMenu, 1); self->name = g_strdup(name); - self->parent = parent; - self->open_submenu = NULL; - - self->entries = NULL; - self->shown = FALSE; - self->invalid = TRUE; - - /* default controllers */ - self->show = show; - self->hide = NULL; - self->update = update; - self->mouseover = NULL; - self->selected = NULL; - - self->plugin = NULL; - self->plugin_data = NULL; - - attrib.override_redirect = TRUE; - attrib.event_mask = FRAME_EVENTMASK; - self->frame = createWindow(ob_root, CWOverrideRedirect|CWEventMask, &attrib); - attrib.event_mask = TITLE_EVENTMASK; - self->title = createWindow(self->frame, CWEventMask, &attrib); - self->items = createWindow(self->frame, 0, &attrib); - - XSetWindowBorderWidth(ob_display, self->frame, ob_rr_theme->bwidth); - XSetWindowBackground(ob_display, self->frame, ob_rr_theme->b_color->pixel); - XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth); - XSetWindowBorder(ob_display, self->frame, ob_rr_theme->b_color->pixel); - XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel); - - XMapWindow(ob_display, self->title); - XMapWindow(ob_display, self->items); - - self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title); - self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu); - - g_hash_table_insert(window_map, &self->frame, self); - g_hash_table_insert(window_map, &self->title, self); - g_hash_table_insert(window_map, &self->items, self); - g_hash_table_insert(menu_hash, g_strdup(name), self); - - stacking_add(MENU_AS_WINDOW(self)); - stacking_raise(MENU_AS_WINDOW(self)); + self->title = g_strdup(title); + self->data = data; + + g_hash_table_replace(menu_hash, self->name, self); return self; } -void menu_free(char *name) +void menu_free(gchar *name) { - g_hash_table_remove(menu_hash, name); + ObMenu *self; + + if (!(self = menu_from_name(name))) return; + g_hash_table_remove(menu_hash, self->name); } -MenuEntry *menu_entry_new_full(char *label, Action *action, - MenuEntryRenderType render_type, - gpointer submenu) +void menu_show(gchar *name, gint x, gint y, ObClient *client) { - MenuEntry *menu_entry = g_new0(MenuEntry, 1); + ObMenu *self; + ObMenuFrame *frame; - menu_entry->label = g_strdup(label); - menu_entry->render_type = render_type; - menu_entry->action = action; + if (!(self = menu_from_name(name))) return; - menu_entry->hilite = FALSE; - menu_entry->enabled = TRUE; + frame = menu_frame_new(self, client); + menu_frame_move(frame, x, y); + menu_frame_show(frame, NULL); +} - menu_entry->submenu = submenu; +static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id) +{ + ObMenuEntry *self; + + g_assert(menu); + + self = g_new0(ObMenuEntry, 1); + self->type = type; + self->menu = menu; + self->id = id; + + switch (type) { + case OB_MENU_ENTRY_TYPE_NORMAL: + self->data.normal.enabled = TRUE; + break; + case OB_MENU_ENTRY_TYPE_SUBMENU: + case OB_MENU_ENTRY_TYPE_SEPARATOR: + break; + } - return menu_entry; + return self; } -void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu) +static void menu_entry_free(ObMenuEntry *self) { - g_assert(entry != NULL); - - entry->submenu = submenu; + if (self) { + switch (self->type) { + case OB_MENU_ENTRY_TYPE_NORMAL: + g_free(self->data.normal.label); + while (self->data.normal.actions) { + action_free(self->data.normal.actions->data); + self->data.normal.actions = + g_slist_delete_link(self->data.normal.actions, + self->data.normal.actions); + } + break; + case OB_MENU_ENTRY_TYPE_SUBMENU: + g_free(self->data.submenu.name); + break; + case OB_MENU_ENTRY_TYPE_SEPARATOR: + break; + } + + g_free(self); + } +} + +void menu_clear_entries(gchar *name) +{ + ObMenu *self; - if(entry->parent != NULL) - entry->parent->invalid = TRUE; + if (!(self = menu_from_name(name))) return; + + menu_clear_entries_internal(self); } -void menu_add_entry(Menu *menu, MenuEntry *entry) +static void menu_clear_entries_internal(ObMenu *self) { - XSetWindowAttributes attrib; + /* XXX assert that the menu isn't visible */ - g_assert(menu != NULL); - g_assert(entry != NULL); - g_assert(entry->item == None); + while (self->entries) { + menu_entry_free(self->entries->data); + self->entries = g_list_delete_link(self->entries, self->entries); + } +} - menu->entries = g_list_append(menu->entries, entry); - entry->parent = menu; +ObMenuEntry* menu_add_normal(gchar *name, gint id, gchar *label, + GSList *actions) +{ + ObMenu *self; + ObMenuEntry *e; - attrib.event_mask = ENTRY_EVENTMASK; - entry->item = createWindow(menu->items, CWEventMask, &attrib); - XMapWindow(ob_display, entry->item); - entry->a_item = RrAppearanceCopy(ob_rr_theme->a_menu_item); - entry->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled); - entry->a_hilite = RrAppearanceCopy(ob_rr_theme->a_menu_hilite); + if (!(self = menu_from_name(name))) return; - menu->invalid = TRUE; + e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id); + e->data.normal.label = g_strdup(label); + e->data.normal.actions = actions; - g_hash_table_insert(window_map, &entry->item, menu); + self->entries = g_list_append(self->entries, e); + return e; } -void menu_show(char *name, int x, int y, Client *client) +ObMenuEntry* menu_add_submenu(gchar *name, gint id, gchar *submenu) { - Menu *self; - - self = g_hash_table_lookup(menu_hash, name); - if (!self) { - g_warning("Attempted to show menu '%s' but it does not exist.", - name); - return; - } - - menu_show_full(self, x, y, client); -} + ObMenu *self; + ObMenuEntry *e; -void menu_show_full(Menu *self, int x, int y, Client *client) -{ - g_assert(self != NULL); - - menu_render(self); - - self->client = client; + if (!(self = menu_from_name(name))) return; - if (self->show) { - self->show(self, x, y, client); - } else { - menu_control_show(self, x, y, client); - } + e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, id); + e->data.submenu.name = g_strdup(submenu); + + self->entries = g_list_append(self->entries, e); + return e; } -void menu_hide(Menu *self) { - if (self->shown) { - XUnmapWindow(ob_display, self->frame); - self->shown = FALSE; - if (self->open_submenu) - menu_hide(self->open_submenu); - if (self->parent && self->parent->open_submenu == self) - self->parent->open_submenu = NULL; +ObMenuEntry* menu_add_separator(gchar *name, gint id) +{ + ObMenu *self; + ObMenuEntry *e; - } + if (!(self = menu_from_name(name))) return; + + e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id); + + self->entries = g_list_append(self->entries, e); + return e; } -void menu_clear(Menu *self) { - GList *it; - - for (it = self->entries; it; it = it->next) { - MenuEntry *entry = it->data; - menu_entry_free(entry); - } - self->entries = NULL; - self->invalid = TRUE; +void menu_set_update_func(gchar *name, ObMenuUpdateFunc func) +{ + ObMenu *self; + + if (!(self = menu_from_name(name))) return; + self->update_func = func; } +void menu_set_execute_func(gchar *name, ObMenuExecuteFunc func) +{ + ObMenu *self; -MenuEntry *menu_find_entry(Menu *menu, Window win) + if (!(self = menu_from_name(name))) return; + self->execute_func = func; +} + +void menu_set_destroy_func(gchar *name, ObMenuDestroyFunc func) { - GList *it; + ObMenu *self; - for (it = menu->entries; it; it = it->next) { - MenuEntry *entry = it->data; - if (entry->item == win) - return entry; - } - return NULL; + if (!(self = menu_from_name(name))) return; + self->destroy_func = func; } -void menu_entry_fire(MenuEntry *self) +ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id) { - Menu *m; + ObMenuEntry *ret = NULL; + GList *it; - if (self->action) { - self->action->data.any.c = self->parent->client; - self->action->func(&self->action->data); + for (it = self->entries; it; it = g_list_next(it)) { + ObMenuEntry *e = it->data; - /* hide the whole thing */ - m = self->parent; - while (m->parent) m = m->parent; - menu_hide(m); + if (e->id == id) { + ret = e; + break; + } } + return ret; } -/* - Default menu controller action for showing. -*/ +void menu_find_submenus(ObMenu *self) +{ + GList *it; -void menu_control_show(Menu *self, int x, int y, Client *client) { - g_assert(!self->invalid); - - XMoveWindow(ob_display, self->frame, - MIN(x, screen_physical_size.width - self->size.width), - MIN(y, screen_physical_size.height - self->size.height)); - POINT_SET(self->location, - MIN(x, screen_physical_size.width - self->size.width), - MIN(y, screen_physical_size.height - self->size.height)); - - if (!self->shown) { - XMapWindow(ob_display, self->frame); - stacking_raise(MENU_AS_WINDOW(self)); - self->shown = TRUE; - } else if (self->shown && self->open_submenu) { - menu_hide(self->open_submenu); - } -} + for (it = self->entries; it; it = g_list_next(it)) { + ObMenuEntry *e = it->data; -void menu_control_mouseover(MenuEntry *self, gboolean enter) { - int x; - self->hilite = enter; - - if (enter) { - if (self->parent->open_submenu && self->submenu - != self->parent->open_submenu) - menu_hide(self->parent->open_submenu); - - if (self->submenu) { - self->parent->open_submenu = self->submenu; - - /* shouldn't be invalid since it must be displayed */ - g_assert(!self->parent->invalid); - /* 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->bevel; - - /* need to get the width. is this bad?*/ - menu_render(self->submenu); - - if (self->submenu->size.width + x > screen_physical_size.width) - x = self->parent->location.x - self->submenu->size.width - - ob_rr_theme->bevel; - - menu_show_full(self->submenu, x, - self->parent->location.y + self->y, - self->parent->client); - } + if (e->type == OB_MENU_ENTRY_TYPE_SUBMENU) + e->data.submenu.submenu = menu_from_name(e->data.submenu.name); } }