X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=3e38c0f99ddfb3ae5b8b653924b697750b045c97;hb=615cbd96075905d75533f9b615c4ee6a75f4f9a4;hp=11d040092bb1b917a4247260309832610c080069;hpb=78a8680cd7379cc0d75af810dabe62c7a6c4a8b2;p=chaz%2Fopenbox diff --git a/openbox/menu.c b/openbox/menu.c index 11d04009..3e38c0f9 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -1,397 +1,312 @@ +#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" -static GHashTable *menu_hash = NULL; -GHashTable *menu_map = NULL; +GHashTable *menu_hash = NULL; -#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask | \ - LeaveWindowMask) -#define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask) -#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \ - ButtonPressMask | ButtonReleaseMask) +typedef struct _ObMenuParseState ObMenuParseState; -void menu_control_show(Menu *self, int x, int y, Client *client); - -void menu_destroy_hash_key(gpointer data) +struct _ObMenuParseState { - g_free(data); -} - -void menu_destroy_hash_value(Menu *self) -{ - GList *it; + GSList *menus; +}; - for (it = self->entries; it; it = it->next) - menu_entry_free(it->data); - g_list_free(self->entries); +static void menu_clear_entries_internal(ObMenu *self); - g_free(self->label); - g_free(self->name); - - g_hash_table_remove(menu_map, &self->title); - g_hash_table_remove(menu_map, &self->frame); - g_hash_table_remove(menu_map, &self->items); +static ObMenu* menu_from_name(gchar *name) +{ + ObMenu *self = NULL; - stacking_remove(self); + g_assert(name != NULL); - appearance_free(self->a_title); - XDestroyWindow(ob_display, self->title); - XDestroyWindow(ob_display, self->frame); - XDestroyWindow(ob_display, self->items); + 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_free(self); +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(doc, node)); + menu_add_normal(state->menus->data, 0, label, acts); + g_free(label); + } + } } -void menu_entry_free(MenuEntry *self) +static void parse_menu_separator(ObParseInst *i, + xmlDocPtr doc, xmlNodePtr node, + gpointer data) { - g_free(self->label); - action_free(self->action); + ObMenuParseState *state = data; - g_hash_table_remove(menu_map, &self->item); - - appearance_free(self->a_item); - appearance_free(self->a_disabled); - appearance_free(self->a_hilite); - XDestroyWindow(ob_display, self->item); - - g_free(self); + if (state->menus) + menu_add_separator(state->menus->data, 0); } - -void menu_startup() + +static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + gpointer data) { - Menu *m; - Menu *s; - Menu *t; - Action *a; + ObMenuParseState *state = data; + gchar *name = NULL, *title = NULL; - menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, - menu_destroy_hash_key, - (GDestroyNotify)menu_destroy_hash_value); - menu_map = g_hash_table_new(g_int_hash, g_int_equal); - - m = menu_new(NULL, "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)); - - t = (Menu *)plugin_create("timed_menu"); - a = action_from_string("execute"); - a->data.execute.path = g_strdup("xeyes"); - menu_add_entry(t, menu_entry_new("xeyes", a)); - menu_add_entry(m, menu_entry_new_submenu("timed", t)); - - s = menu_new("empty", "chub", m); - menu_add_entry(m, menu_entry_new_submenu("empty", s)); + if (!parse_attr_string("id", node, &name)) + goto parse_menu_fail; - s = menu_new("", "s-club", m); - menu_add_entry(m, menu_entry_new_submenu("empty", s)); + if (!g_hash_table_lookup(menu_hash, name)) { + if (!parse_attr_string("label", node, &title)) + goto parse_menu_fail; - s = menu_new(NULL, "h-club", m); - menu_add_entry(m, menu_entry_new_submenu("empty", s)); + 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); + } + } - s = menu_new(NULL, "g-club", m); + if (state->menus) + menu_add_submenu(state->menus->data, 0, name); - 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)); +parse_menu_fail: + g_free(name); + g_free(title); +} - menu_add_entry(m, menu_entry_new_submenu("long", s)); - - m = menu_new(NULL, "client", NULL); - a = action_from_string("iconify"); - menu_add_entry(m, menu_entry_new("iconify", a)); - a = action_from_string("toggleshade"); - menu_add_entry(m, menu_entry_new("(un)shade", a)); - a = action_from_string("togglemaximizefull"); - menu_add_entry(m, menu_entry_new("(un)maximize", a)); - a = action_from_string("close"); - menu_add_entry(m, menu_entry_new("close", a)); +void menu_destroy_hash_value(ObMenu *self) +{ + /* XXX make sure its not visible */ + menu_clear_entries_internal(self); + g_free(self->name); + g_free(self->title); } -void menu_shutdown() +void menu_startup(ObParseInst *i) { - g_hash_table_destroy(menu_hash); - g_hash_table_destroy(menu_map); + menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, + (GDestroyNotify)menu_destroy_hash_value); } -static Window createWindow(Window parent, unsigned long mask, - XSetWindowAttributes *attrib) +void menu_shutdown() { - return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0, - render_depth, InputOutput, render_visual, - mask, attrib); - + menu_frame_hide_all(); + g_hash_table_destroy(menu_hash); + menu_hash = NULL; } -Menu *menu_new_full(char *label, char *name, Menu *parent, - menu_controller_show show, menu_controller_update update) +void menu_parse() { - XSetWindowAttributes attrib; - Menu *self; + ObParseInst *i; + ObMenuParseState parse_state; + xmlDocPtr doc; + xmlNodePtr node; + gchar *p; + gboolean loaded = FALSE; + + i = parse_startup(); + + if (config_menu_path) + if (!(loaded = + parse_load(config_menu_path, "openbox_menu", &doc, &node))) + g_warning("Failed to load menu from '%s'", config_menu_path); + if (!loaded) { + p = g_build_filename(g_get_home_dir(), ".openbox", "menu", NULL); + if (!(loaded = + parse_load(p, "openbox_menu", &doc, &node))) + g_warning("Failed to load menu from '%s'", p); + g_free(p); + } + if (!loaded) { + p = g_build_filename(RCDIR, "menu", NULL); + if (!(loaded = + parse_load(p, "openbox_menu", &doc, &node))) + g_warning("Failed to load menu from '%s'", p); + g_free(p); + } - self = g_new0(Menu, 1); - self->obwin.type = Window_Menu; - self->label = g_strdup(label); - 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, theme_bwidth); - XSetWindowBackground(ob_display, self->frame, theme_b_color->pixel); - XSetWindowBorderWidth(ob_display, self->title, theme_bwidth); - XSetWindowBorder(ob_display, self->frame, theme_b_color->pixel); - XSetWindowBorder(ob_display, self->title, theme_b_color->pixel); - - XMapWindow(ob_display, self->title); - XMapWindow(ob_display, self->items); - - self->a_title = appearance_copy(theme_a_menu_title); - self->a_items = appearance_copy(theme_a_menu); - - g_hash_table_insert(menu_map, &self->frame, self); - g_hash_table_insert(menu_map, &self->title, self); - g_hash_table_insert(menu_map, &self->items, self); - g_hash_table_insert(menu_hash, g_strdup(name), self); - - stacking_add(self); - stacking_raise(MENU_AS_WINDOW(self)); + if (loaded) { + parse_state.menus = NULL; - return self; -} + parse_register(i, "menu", parse_menu, &parse_state); + parse_register(i, "item", parse_menu_item, &parse_state); + parse_register(i, "separator", parse_menu_separator, &parse_state); + parse_tree(i, doc, node->xmlChildrenNode); + } -void menu_free(char *name) -{ - g_hash_table_remove(menu_hash, name); + parse_shutdown(i); } -MenuEntry *menu_entry_new_full(char *label, Action *action, - MenuEntryRenderType render_type, - gpointer submenu) +gboolean menu_new(gchar *name, gchar *title, gpointer data) { - MenuEntry *menu_entry = g_new0(MenuEntry, 1); + ObMenu *self; - menu_entry->label = g_strdup(label); - menu_entry->render_type = render_type; - menu_entry->action = action; + if (g_hash_table_lookup(menu_hash, name)) return FALSE; - menu_entry->hilite = FALSE; - menu_entry->enabled = TRUE; + self = g_new0(ObMenu, 1); + self->name = g_strdup(name); + self->title = g_strdup(title); + self->data = data; - menu_entry->submenu = submenu; + g_hash_table_insert(menu_hash, self->name, self); - return menu_entry; + return TRUE; } -void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu) +void menu_free(gchar *name) { - g_assert(entry != NULL); + ObMenu *self; - entry->submenu = submenu; - - if(entry->parent != NULL) - entry->parent->invalid = TRUE; + if (!(self = menu_from_name(name))) return; + g_hash_table_remove(menu_hash, self->name); } -void menu_add_entry(Menu *menu, MenuEntry *entry) +void menu_show(gchar *name, gint x, gint y, ObClient *client) { - XSetWindowAttributes attrib; + ObMenu *self; + ObMenuFrame *frame; - g_assert(menu != NULL); - g_assert(entry != NULL); - g_assert(entry->item == None); + if (!(self = menu_from_name(name))) return; - menu->entries = g_list_append(menu->entries, entry); - entry->parent = menu; + frame = menu_frame_new(self, client); + menu_frame_move(frame, x, y); + menu_frame_show(frame, NULL); +} - attrib.event_mask = ENTRY_EVENTMASK; - entry->item = createWindow(menu->items, CWEventMask, &attrib); - XMapWindow(ob_display, entry->item); - entry->a_item = appearance_copy(theme_a_menu_item); - entry->a_disabled = appearance_copy(theme_a_menu_disabled); - entry->a_hilite = appearance_copy(theme_a_menu_hilite); +static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id) +{ + ObMenuEntry *self; - menu->invalid = TRUE; + g_assert(menu); - g_hash_table_insert(menu_map, &entry->item, menu); + self = g_new0(ObMenuEntry, 1); + self->type = type; + self->menu = menu; + self->id = id; + self->enabled = TRUE; + return self; } -void menu_show(char *name, int x, int y, Client *client) +static void menu_entry_free(ObMenuEntry *self) { - 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; + 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: + case OB_MENU_ENTRY_TYPE_SEPARATOR: + break; + } + + g_free(self); } - - menu_show_full(self, x, y, client); -} +} -void menu_show_full(Menu *self, int x, int y, Client *client) +void menu_clear_entries(gchar *name) { - g_assert(self != NULL); - - menu_render(self); - - self->client = client; + ObMenu *self; - if (self->show) { - self->show(self, x, y, client); - } else { - menu_control_show(self, x, y, client); - } -} + if (!(self = menu_from_name(name))) return; + menu_clear_entries_internal(self); +} -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; +static void menu_clear_entries_internal(ObMenu *self) +{ + /* XXX assert that the menu isn't visible */ + while (self->entries) { + menu_entry_free(self->entries->data); + self->entries = g_list_delete_link(self->entries, self->entries); } } -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_add_normal(gchar *name, gint id, gchar *label, GSList *actions) +{ + ObMenu *self; + ObMenuEntry *e; + + if (!(self = menu_from_name(name))) return; + e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id); + e->data.normal.label = g_strdup(label); + e->data.normal.actions = actions; -MenuEntry *menu_find_entry(Menu *menu, Window win) + self->entries = g_list_append(self->entries, e); +} + +void menu_add_submenu(gchar *name, gint id, gchar *submenu) { - GList *it; + ObMenu *self, *sub; + ObMenuEntry *e; - 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; + if (!(sub = menu_from_name(submenu))) return; + + e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, id); + e->data.submenu.submenu = sub; + + self->entries = g_list_append(self->entries, e); } -void menu_entry_fire(MenuEntry *self) +void menu_add_separator(gchar *name, gint id) { - Menu *m; + ObMenu *self; + ObMenuEntry *e; - if (self->action) { - self->action->data.any.c = self->parent->client; - self->action->func(&self->action->data); + if (!(self = menu_from_name(name))) return; - /* hide the whole thing */ - m = self->parent; - while (m->parent) m = m->parent; - menu_hide(m); - } + e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id); + + self->entries = g_list_append(self->entries, e); } -/* - Default menu controller action for showing. -*/ +void menu_set_update_func(gchar *name, ObMenuUpdateFunc func) +{ + ObMenu *self; -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); - } + if (!(self = menu_from_name(name))) return; + self->update_func = func; } -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 + - 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 - - theme_bevel; - - menu_show_full(self->submenu, x, - self->parent->location.y + self->y, NULL); - } +ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id) +{ + ObMenuEntry *ret = NULL; + GList *it; + + for (it = self->entries; it; it = g_list_next(it)) { + ObMenuEntry *e = it->data; + + if (e->id == id) { + ret = e; + break; + } } + return ret; }