remove plugins from the menu parsing
This commit is contained in:
Dana Jansens
parent
a9567a8163
commit
485fbff15d
3 changed files with 120 additions and 161 deletions
|
|
@ -8,7 +8,6 @@
|
|||
#include "frame.h"
|
||||
#include "screen.h"
|
||||
#include "action.h"
|
||||
#include "dispatch.h"
|
||||
#include "openbox.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -705,13 +704,8 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
|
|||
if ((n = parse_find_node("execute", node->xmlChildrenNode)))
|
||||
act->data.execute.path = parse_string(doc, n);
|
||||
} else if (act->func == action_showmenu) {
|
||||
if ((n = parse_find_node("menu", node->xmlChildrenNode))) {
|
||||
gchar *plugin;
|
||||
|
||||
if ((n = parse_find_node("menu", node->xmlChildrenNode)))
|
||||
act->data.showmenu.name = parse_string(doc, n);
|
||||
if (parse_attr_string("plugin", n, &plugin))
|
||||
menu_open_plugin(i, act->data.showmenu.name, plugin);
|
||||
}
|
||||
} else if (act->func == action_desktop) {
|
||||
if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
|
||||
act->data.desktop.desk = parse_int(doc, n);
|
||||
|
|
|
|||
248
openbox/menu.c
248
openbox/menu.c
|
|
@ -8,8 +8,9 @@
|
|||
#include "screen.h"
|
||||
#include "menuframe.h"
|
||||
#include "geom.h"
|
||||
#include "plugin.h"
|
||||
#include "misc.h"
|
||||
#include "client_menu.h"
|
||||
#include "client_list_menu.h"
|
||||
#include "parser/parse.h"
|
||||
|
||||
static GHashTable *menu_hash = NULL;
|
||||
|
|
@ -23,7 +24,82 @@ struct _ObMenuParseState
|
|||
GSList *menus;
|
||||
};
|
||||
|
||||
static void menu_clear_entries_internal(ObMenu *self);
|
||||
static void menu_destroy_hash_value(ObMenu *self);
|
||||
static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
|
||||
gpointer data);
|
||||
static void parse_menu_separator(ObParseInst *i,
|
||||
xmlDocPtr doc, xmlNodePtr node,
|
||||
gpointer data);
|
||||
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;
|
||||
}
|
||||
|
||||
void menu_startup()
|
||||
{
|
||||
ObMenuParseState parse_state;
|
||||
xmlDocPtr doc;
|
||||
xmlNodePtr node;
|
||||
gboolean loaded = FALSE;
|
||||
GSList *it;
|
||||
|
||||
menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
|
||||
(GDestroyNotify)menu_destroy_hash_value);
|
||||
|
||||
client_list_menu_startup();
|
||||
client_menu_startup();
|
||||
|
||||
menu_parse_inst = parse_startup();
|
||||
|
||||
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);
|
||||
xmlFreeDoc(doc);
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
static ObMenu* menu_from_name(gchar *name)
|
||||
{
|
||||
|
|
@ -50,7 +126,7 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
|
|||
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);
|
||||
menu_add_normal(state->menus->data, -1, label, acts);
|
||||
g_free(label);
|
||||
}
|
||||
}
|
||||
|
|
@ -63,137 +139,51 @@ static void parse_menu_separator(ObParseInst *i,
|
|||
ObMenuParseState *state = data;
|
||||
|
||||
if (state->menus)
|
||||
menu_add_separator(state->menus->data, 0);
|
||||
}
|
||||
|
||||
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;
|
||||
menu_add_separator(state->menus->data, -1);
|
||||
}
|
||||
|
||||
static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
|
||||
gpointer data)
|
||||
{
|
||||
ObMenuParseState *state = data;
|
||||
gchar *name = NULL, *title = NULL, *plugin = NULL;
|
||||
gchar *name = NULL, *title = NULL;
|
||||
ObMenu *menu;
|
||||
|
||||
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 (!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 ((menu = menu_new(name, title, NULL))) {
|
||||
state->menus = g_slist_prepend(state->menus, menu);
|
||||
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);
|
||||
menu_add_submenu(state->menus->data, -1, name);
|
||||
|
||||
parse_menu_fail:
|
||||
g_free(name);
|
||||
g_free(title);
|
||||
g_free(plugin);
|
||||
}
|
||||
|
||||
|
||||
void menu_destroy_hash_value(ObMenu *self)
|
||||
static void menu_destroy_hash_value(ObMenu *self)
|
||||
{
|
||||
/* XXX make sure its not visible */
|
||||
|
||||
if (self->destroy_func)
|
||||
self->destroy_func(self, self->data);
|
||||
|
||||
menu_clear_entries_internal(self);
|
||||
menu_clear_entries(self);
|
||||
g_free(self->name);
|
||||
g_free(self->title);
|
||||
}
|
||||
|
||||
void menu_startup(ObParseInst *i)
|
||||
{
|
||||
menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
|
||||
(GDestroyNotify)menu_destroy_hash_value);
|
||||
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;
|
||||
}
|
||||
|
||||
void menu_parse()
|
||||
{
|
||||
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);
|
||||
xmlFreeDoc(doc);
|
||||
}
|
||||
}
|
||||
|
||||
ObMenu* menu_new(gchar *name, gchar *title, gpointer data)
|
||||
{
|
||||
ObMenu *self;
|
||||
|
|
@ -210,12 +200,9 @@ ObMenu* menu_new(gchar *name, gchar *title, gpointer data)
|
|||
return self;
|
||||
}
|
||||
|
||||
void menu_free(gchar *name)
|
||||
void menu_free(ObMenu *menu)
|
||||
{
|
||||
ObMenu *self;
|
||||
|
||||
if (!(self = menu_from_name(name))) return;
|
||||
g_hash_table_remove(menu_hash, self->name);
|
||||
g_hash_table_remove(menu_hash, menu->name);
|
||||
}
|
||||
|
||||
void menu_show(gchar *name, gint x, gint y, ObClient *client)
|
||||
|
|
@ -253,7 +240,7 @@ static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)
|
|||
return self;
|
||||
}
|
||||
|
||||
static void menu_entry_free(ObMenuEntry *self)
|
||||
void menu_entry_free(ObMenuEntry *self)
|
||||
{
|
||||
if (self) {
|
||||
switch (self->type) {
|
||||
|
|
@ -277,16 +264,7 @@ static void menu_entry_free(ObMenuEntry *self)
|
|||
}
|
||||
}
|
||||
|
||||
void menu_clear_entries(gchar *name)
|
||||
{
|
||||
ObMenu *self;
|
||||
|
||||
if (!(self = menu_from_name(name))) return;
|
||||
|
||||
menu_clear_entries_internal(self);
|
||||
}
|
||||
|
||||
static void menu_clear_entries_internal(ObMenu *self)
|
||||
void menu_clear_entries(ObMenu *self)
|
||||
{
|
||||
/* XXX assert that the menu isn't visible */
|
||||
|
||||
|
|
@ -296,14 +274,17 @@ static void menu_clear_entries_internal(ObMenu *self)
|
|||
}
|
||||
}
|
||||
|
||||
ObMenuEntry* menu_add_normal(gchar *name, gint id, gchar *label,
|
||||
void menu_entry_remove(ObMenuEntry *self)
|
||||
{
|
||||
self->menu->entries = g_list_remove(self->menu->entries, self);
|
||||
menu_entry_free(self);
|
||||
}
|
||||
|
||||
ObMenuEntry* menu_add_normal(ObMenu *self, 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;
|
||||
|
|
@ -312,13 +293,10 @@ ObMenuEntry* menu_add_normal(gchar *name, gint id, gchar *label,
|
|||
return e;
|
||||
}
|
||||
|
||||
ObMenuEntry* menu_add_submenu(gchar *name, gint id, gchar *submenu)
|
||||
ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, gchar *submenu)
|
||||
{
|
||||
ObMenu *self;
|
||||
ObMenuEntry *e;
|
||||
|
||||
if (!(self = menu_from_name(name))) return;
|
||||
|
||||
e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, id);
|
||||
e->data.submenu.name = g_strdup(submenu);
|
||||
|
||||
|
|
@ -326,40 +304,28 @@ ObMenuEntry* menu_add_submenu(gchar *name, gint id, gchar *submenu)
|
|||
return e;
|
||||
}
|
||||
|
||||
ObMenuEntry* menu_add_separator(gchar *name, gint id)
|
||||
ObMenuEntry* menu_add_separator(ObMenu *self, 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_set_update_func(gchar *name, ObMenuUpdateFunc func)
|
||||
void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func)
|
||||
{
|
||||
ObMenu *self;
|
||||
|
||||
if (!(self = menu_from_name(name))) return;
|
||||
self->update_func = func;
|
||||
}
|
||||
|
||||
void menu_set_execute_func(gchar *name, ObMenuExecuteFunc func)
|
||||
void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func)
|
||||
{
|
||||
ObMenu *self;
|
||||
|
||||
if (!(self = menu_from_name(name))) return;
|
||||
self->execute_func = func;
|
||||
}
|
||||
|
||||
void menu_set_destroy_func(gchar *name, ObMenuDestroyFunc func)
|
||||
void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func)
|
||||
{
|
||||
ObMenu *self;
|
||||
|
||||
if (!(self = menu_from_name(name))) return;
|
||||
self->destroy_func = func;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -91,28 +91,27 @@ struct _ObMenuEntry
|
|||
void menu_startup();
|
||||
void menu_shutdown();
|
||||
|
||||
void menu_parse();
|
||||
|
||||
ObMenu* menu_new(gchar *name, gchar *title, gpointer data);
|
||||
void menu_free(gchar *name);
|
||||
|
||||
gboolean menu_open_plugin(ObParseInst *i, gchar *name, gchar *plugin);
|
||||
|
||||
void menu_set_update_func(gchar *name, ObMenuUpdateFunc func);
|
||||
void menu_set_execute_func(gchar *name, ObMenuExecuteFunc func);
|
||||
void menu_set_destroy_func(gchar *name, ObMenuDestroyFunc func);
|
||||
void menu_free(ObMenu *menu);
|
||||
|
||||
void menu_show(gchar *name, gint x, gint y, struct _ObClient *client);
|
||||
|
||||
void menu_set_update_func(ObMenu *menu, ObMenuUpdateFunc func);
|
||||
void menu_set_execute_func(ObMenu *menu, ObMenuExecuteFunc func);
|
||||
void menu_set_destroy_func(ObMenu *menu, ObMenuDestroyFunc func);
|
||||
|
||||
/* functions for building menus */
|
||||
void menu_clear_entries(gchar *name);
|
||||
ObMenuEntry* menu_add_normal(gchar *name, gint id, gchar *label,
|
||||
ObMenuEntry* menu_add_normal(ObMenu *menu, gint id, gchar *label,
|
||||
GSList *actions);
|
||||
ObMenuEntry* menu_add_submenu(gchar *name, gint id, gchar *submenu);
|
||||
ObMenuEntry* menu_add_separator(gchar *name, gint id);
|
||||
ObMenuEntry* menu_add_submenu(ObMenu *menu, gint id, gchar *submenu);
|
||||
ObMenuEntry* menu_add_separator(ObMenu *menu, gint id);
|
||||
|
||||
void menu_clear_entries(ObMenu *menu);
|
||||
void menu_entry_remove(ObMenuEntry *self);
|
||||
|
||||
ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id);
|
||||
|
||||
/* fills in the submenus, for use when a menu is being shown */
|
||||
void menu_find_submenus(ObMenu *self);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue