X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=e2436810791b717e3221a71a6840ca6efe194c07;hb=4c672be2e1f39e72eb7d7e99f129e61338f481b2;hp=ab2294ed89790dac04f8f13765e415ff605d0c7a;hpb=8617f504a734e417e76e350977f656124bec1b51;p=chaz%2Fopenbox diff --git a/openbox/menu.c b/openbox/menu.c index ab2294ed..e2436810 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -1,16 +1,36 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + menu.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "debug.h" #include "menu.h" #include "openbox.h" #include "stacking.h" #include "client.h" -#include "grab.h" #include "config.h" #include "screen.h" #include "menuframe.h" +#include "keyboard.h" #include "geom.h" #include "misc.h" #include "client_menu.h" #include "client_list_menu.h" +#include "client_list_combined_menu.h" #include "parser/parse.h" typedef struct _ObMenuParseState ObMenuParseState; @@ -34,29 +54,7 @@ static void parse_menu_separator(ObParseInst *i, static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, gpointer data); -static 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 void client_dest(gpointer client) +static void client_dest(ObClient *client, gpointer data) { /* menus can be associated with a client, so close any that are since we are disappearing now */ @@ -73,7 +71,8 @@ void menu_startup(gboolean reconfig) menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify)menu_destroy_hash_value); - client_list_menu_startup(); + client_list_menu_startup(reconfig); + client_list_combined_menu_startup(reconfig); client_menu_startup(); menu_parse_inst = parse_startup(); @@ -87,15 +86,15 @@ void menu_startup(gboolean reconfig) parse_menu_separator, &menu_parse_state); for (it = config_menu_files; it; it = g_slist_next(it)) { - if (menu_open(it->data, &doc, &node)) { + if (parse_load_menu(it->data, &doc, &node)) { loaded = TRUE; - parse_tree(menu_parse_inst, doc, node->xmlChildrenNode); + parse_tree(menu_parse_inst, doc, node->children); xmlFreeDoc(doc); } } if (!loaded) { - if (menu_open("menu.xml", &doc, &node)) { - parse_tree(menu_parse_inst, doc, node->xmlChildrenNode); + if (parse_load_menu("menu.xml", &doc, &node)) { + parse_tree(menu_parse_inst, doc, node->children); xmlFreeDoc(doc); } } @@ -103,7 +102,7 @@ void menu_startup(gboolean reconfig) g_assert(menu_parse_state.parent == NULL); if (!reconfig) - client_add_destructor(client_dest); + client_add_destructor(client_dest, NULL); } void menu_shutdown(gboolean reconfig) @@ -114,6 +113,9 @@ void menu_shutdown(gboolean reconfig) parse_shutdown(menu_parse_inst); menu_parse_inst = NULL; + client_list_menu_shutdown(reconfig); + client_list_combined_menu_shutdown(reconfig); + menu_frame_hide_all(); g_hash_table_destroy(menu_hash); menu_hash = NULL; @@ -135,8 +137,7 @@ void menu_pipe_execute(ObMenu *self) if (!self->execute) return; - if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) - { + if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) { g_warning("Failed to execute command for pipe-menu: %s", err->message); g_error_free(err); return; @@ -150,11 +151,13 @@ void menu_pipe_execute(ObMenu *self) menu_parse_state.pipe_creator = self; menu_parse_state.parent = self; - parse_tree(menu_parse_inst, doc, node->xmlChildrenNode); + parse_tree(menu_parse_inst, doc, node->children); xmlFreeDoc(doc); } else { g_warning("Invalid output from pipe-menu: %s", self->execute); } + + g_free(output); } static ObMenu* menu_from_name(gchar *name) @@ -179,9 +182,13 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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)); + for (node = node->children; node; node = node->next) + if (!xmlStrcasecmp(node->name, (const xmlChar*) "action")) { + ObAction *a = action_parse + (i, doc, node, OB_USER_ACTION_MENU_SELECTION); + if (a) + acts = g_slist_append(acts, a); + } menu_add_normal(state->parent, -1, label, acts); g_free(label); } @@ -194,8 +201,15 @@ static void parse_menu_separator(ObParseInst *i, { ObMenuParseState *state = data; - if (state->parent) - menu_add_separator(state->parent, -1); + if (state->parent) { + gchar *label; + + if (!parse_attr_string("label", node, &label)) + label = NULL; + + menu_add_separator(state->parent, -1, label); + g_free(label); + } } static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, @@ -215,13 +229,13 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if ((menu = menu_new(name, title, NULL))) { menu->pipe_creator = state->pipe_creator; if (parse_attr_string("execute", node, &script)) { - menu->execute = ob_expand_tilde(script); + menu->execute = parse_expand_tilde(script); } else { ObMenu *old; old = state->parent; state->parent = menu; - parse_tree(i, doc, node->xmlChildrenNode); + parse_tree(i, doc, node->children); state->parent = old; } } @@ -236,7 +250,7 @@ parse_menu_fail: g_free(script); } -ObMenu* menu_new(gchar *name, gchar *title, gpointer data) +ObMenu* menu_new(const gchar *name, const gchar *title, gpointer data) { ObMenu *self; @@ -252,7 +266,17 @@ ObMenu* menu_new(gchar *name, gchar *title, gpointer data) static void menu_destroy_hash_value(ObMenu *self) { - /* XXX make sure its not visible */ + /* make sure its not visible */ + { + GList *it; + ObMenuFrame *f; + + for (it = menu_frame_visible; it; it = g_list_next(it)) { + f = it->data; + if (f->menu == self) + menu_frame_hide_all(); + } + } if (self->destroy_func) self->destroy_func(self, self->data); @@ -261,6 +285,8 @@ static void menu_destroy_hash_value(ObMenu *self) g_free(self->name); g_free(self->title); g_free(self->execute); + + g_free(self); } void menu_free(ObMenu *menu) @@ -273,13 +299,28 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client) ObMenu *self; ObMenuFrame *frame; - if (!(self = menu_from_name(name))) return; + if (!(self = menu_from_name(name)) + || keyboard_interactively_grabbed()) return; + + /* if the requested menu is already the top visible menu, then don't + bother */ + if (menu_frame_visible) { + frame = menu_frame_visible->data; + if (frame->menu == self) + return; + } + + menu_frame_hide_all(); frame = menu_frame_new(self, client); - menu_frame_move(frame, x, y); - menu_frame_show(frame, NULL); - if (frame->entries) - menu_frame_select_next(frame); + if (!menu_frame_show_topmenu(frame, x, y)) + menu_frame_free(frame); + else if (frame->entries) { + ObMenuEntryFrame *e = frame->entries->data; + if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + e->entry->data.normal.enabled) + menu_frame_select(frame, e); + } } static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id) @@ -312,7 +353,7 @@ void menu_entry_free(ObMenuEntry *self) case OB_MENU_ENTRY_TYPE_NORMAL: g_free(self->data.normal.label); while (self->data.normal.actions) { - action_free(self->data.normal.actions->data); + action_unref(self->data.normal.actions->data); self->data.normal.actions = g_slist_delete_link(self->data.normal.actions, self->data.normal.actions); @@ -331,10 +372,21 @@ void menu_entry_free(ObMenuEntry *self) void menu_clear_entries(ObMenu *self) { - /* XXX assert that the menu isn't visible */ +#ifdef DEBUG + /* assert that the menu isn't visible */ + { + GList *it; + ObMenuFrame *f; + + for (it = menu_frame_visible; it; it = g_list_next(it)) { + f = it->data; + g_assert(f->menu != self); + } + } +#endif while (self->entries) { - menu_entry_free(self->entries->data); + menu_entry_free(self->entries->data); self->entries = g_list_delete_link(self->entries, self->entries); } } @@ -345,7 +397,7 @@ void menu_entry_remove(ObMenuEntry *self) menu_entry_free(self); } -ObMenuEntry* menu_add_normal(ObMenu *self, gint id, gchar *label, +ObMenuEntry* menu_add_normal(ObMenu *self, gint id, const gchar *label, GSList *actions) { ObMenuEntry *e; @@ -358,7 +410,7 @@ ObMenuEntry* menu_add_normal(ObMenu *self, gint id, gchar *label, return e; } -ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, gchar *submenu) +ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, const gchar *submenu) { ObMenuEntry *e; @@ -369,11 +421,12 @@ ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, gchar *submenu) return e; } -ObMenuEntry* menu_add_separator(ObMenu *self, gint id) +ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label) { ObMenuEntry *e; e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id); + e->data.separator.label = g_strdup(label); self->entries = g_list_append(self->entries, e); return e;