#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"
-GHashTable *menu_hash = NULL;
-
typedef struct _ObMenuParseState ObMenuParseState;
struct _ObMenuParseState
GSList *menus;
};
-static void menu_clear_entries_internal(ObMenu *self);
+static GHashTable *menu_hash = NULL;
+static ObParseInst *menu_parse_inst;
+static ObMenuParseState menu_parse_state;
+
+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()
+{
+ 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) {
+ menu_parse_state.menus = NULL;
+
+ parse_register(menu_parse_inst, "menu", parse_menu, &menu_parse_state);
+ parse_register(menu_parse_inst, "item", parse_menu_item,
+ &menu_parse_state);
+ parse_register(menu_parse_inst, "separator",
+ parse_menu_separator, &menu_parse_state);
+ parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+ xmlFreeDoc(doc);
+
+ g_assert(menu_parse_state.menus == NULL);
+ }
+}
+
+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;
+}
+
+void menu_pipe_execute(ObMenu *self)
+{
+ xmlDocPtr doc;
+ xmlNodePtr node;
+ gchar *output;
+ GError *err = NULL;
+
+ if (!self->execute)
+ return;
+
+ 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;
+ }
+
+ if (parse_load_mem(output, strlen(output),
+ "openbox_pipe_menu", &doc, &node))
+ {
+ menu_clear_entries(self);
+
+ menu_parse_state.menus = g_slist_prepend(NULL, self);
+ parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+ menu_parse_state.menus = g_slist_remove(menu_parse_state.menus, self);
+ xmlFreeDoc(doc);
+
+ g_assert(menu_parse_state.menus == NULL);
+ }
+}
static ObMenu* menu_from_name(gchar *name)
{
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);
}
}
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, *script = 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 (menu_new(name, title, NULL)) {
- state->menus = g_slist_prepend(state->menus, name);
+ if (!parse_attr_string("label", node, &title))
+ goto parse_menu_fail;
+
+ if ((menu = menu_new(name, title, NULL))) {
+ if (parse_attr_string("execute", node, &script)) {
+ menu->execute = g_strdup(script);
+ } else {
+ 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)
-{
- /* XXX make sure its not visible */
-
- if (self->destroy_func)
- self->destroy_func(self, self->data);
-
- menu_clear_entries_internal(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);
-}
-
-void menu_shutdown()
-{
- menu_frame_hide_all();
- g_hash_table_destroy(menu_hash);
- menu_hash = NULL;
-}
-
-void menu_parse()
-{
- 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);
- }
-
- if (loaded) {
- parse_state.menus = NULL;
-
- 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);
- }
-
- parse_shutdown(i);
+ g_free(script);
}
-gboolean menu_new(gchar *name, gchar *title, gpointer data)
+ObMenu* menu_new(gchar *name, gchar *title, gpointer data)
{
ObMenu *self;
- if (g_hash_table_lookup(menu_hash, name)) return FALSE;
-
self = g_new0(ObMenu, 1);
self->name = g_strdup(name);
self->title = g_strdup(title);
self->data = data;
- g_hash_table_insert(menu_hash, self->name, self);
+ g_hash_table_replace(menu_hash, self->name, self);
- return TRUE;
+ return self;
}
-void menu_free(gchar *name)
+static void menu_destroy_hash_value(ObMenu *self)
{
- ObMenu *self;
-
- if (!(self = menu_from_name(name))) return;
- g_hash_table_remove(menu_hash, self->name);
+ /* XXX make sure its not visible */
+
+ if (self->destroy_func)
+ self->destroy_func(self, self->data);
+
+ menu_clear_entries(self);
+ g_free(self->name);
+ g_free(self->title);
+ g_free(self->execute);
+}
+
+void menu_free(ObMenu *menu)
+{
+ g_hash_table_remove(menu_hash, menu->name);
}
void menu_show(gchar *name, gint x, gint y, ObClient *client)
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);
}
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) {
}
}
-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 */
}
}
-void menu_add_normal(gchar *name, gint id, gchar *label, GSList *actions)
+void menu_entry_remove(ObMenuEntry *self)
{
- ObMenu *self;
- ObMenuEntry *e;
+ self->menu->entries = g_list_remove(self->menu->entries, self);
+ menu_entry_free(self);
+}
- if (!(self = menu_from_name(name))) return;
+ObMenuEntry* menu_add_normal(ObMenu *self, gint id, gchar *label,
+ GSList *actions)
+{
+ ObMenuEntry *e;
e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id);
e->data.normal.label = g_strdup(label);
e->data.normal.actions = actions;
self->entries = g_list_append(self->entries, e);
+ return e;
}
-void 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);
self->entries = g_list_append(self->entries, e);
+ return e;
}
-void 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;
}
projects / chaz / openbox / blobdiff