X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=3e38c0f99ddfb3ae5b8b653924b697750b045c97;hb=615cbd96075905d75533f9b615c4ee6a75f4f9a4;hp=5c8dcc9de75586afa2ba08a543cd802930485898;hpb=2309520b482d8002802977a8cfcae57eb8aadd59;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 5c8dcc9d..3e38c0f9 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,106 +1,312 @@
-#include <glib.h>
+#include "debug.h"
 #include "menu.h"
-#include <assert.h>
+#include "openbox.h"
+#include "stacking.h"
+#include "client.h"
+#include "grab.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;
 
-void menu_destroy_hash_key(const gpointer data)
+typedef struct _ObMenuParseState ObMenuParseState;
+
+struct _ObMenuParseState
 {
-    g_free(data);
-}
+    GSList *menus;
+};
+
+static void menu_clear_entries_internal(ObMenu *self);
 
-void menu_free_entries(const Menu *menu)
+static ObMenu* menu_from_name(gchar *name)
 {
-    GList *it;
+    ObMenu *self = NULL;
+
+    g_assert(name != NULL);
 
-    for (it = menu->entries; it; it = it->next)
-        menu_entry_free((MenuEntry *)it->data);
+    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_list_free(menu->entries);
+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_destroy_hash_value(const gpointer data)
+static void parse_menu_separator(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node,
+                                 gpointer data)
 {
-    const Menu *del_menu = (Menu *)data;
+    ObMenuParseState *state = data;
 
-    g_free(del_menu->label);
-    g_free(del_menu->name);
+    if (state->menus)
+        menu_add_separator(state->menus->data, 0);
+}
 
-    menu_free_entries(del_menu);
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                       gpointer data)
+{
+    ObMenuParseState *state = data;
+    gchar *name = NULL, *title = NULL;
+
+    if (!parse_attr_string("id", node, &name))
+        goto parse_menu_fail;
+
+    if (!g_hash_table_lookup(menu_hash, name)) {
+        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);
 }
 
-void menu_entry_free(const MenuEntry *entry)
+
+void menu_destroy_hash_value(ObMenu *self)
 {
-    g_free(entry->label);
-    g_free(entry->render_data);
+    /* XXX make sure its not visible */
+    menu_clear_entries_internal(self);
+    g_free(self->name);
+    g_free(self->title);
 }
-    
-void menu_startup()
+
+void menu_startup(ObParseInst *i)
 {
-    menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                      menu_destroy_hash_key,
-                                      menu_destroy_hash_value);
+    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;
 }
 
-Menu *menu_new(const char *label, const char *name, Menu *parent)
+void menu_parse()
 {
-    Menu *new_menu = g_new0(Menu, 1);
-    new_menu->label = g_strdup(label);
-    new_menu->name = g_strdup(name);
-    new_menu->parent = parent;
+    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;
 
-    new_menu->entries = NULL;
-    new_menu->shown = FALSE;
-    new_menu->invalid = FALSE;
-    /* default controllers? */
+        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);
+    }
 
-    g_hash_table_insert(menu_hash, g_strdup(name), new_menu);
-    return new_menu;
+    parse_shutdown(i);
 }
 
-void menu_free(const char *name)
+gboolean menu_new(gchar *name, gchar *title, gpointer data)
 {
-    g_hash_table_remove(menu_hash, name);
+    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);
+
+    return TRUE;
 }
 
-MenuEntry *menu_entry_new_full(const char *label, Action *action,
-                          const MenuEntryRenderType render_type,
-                          gpointer render_data, gpointer submenu)
+void menu_free(gchar *name)
 {
-    MenuEntry *menu_entry = g_new(MenuEntry, 1);
+    ObMenu *self;
+    
+    if (!(self = menu_from_name(name))) return;
+    g_hash_table_remove(menu_hash, self->name);
+}
 
-    menu_entry->label = g_strdup(label);
-    menu_entry->render_type = render_type;
-    menu_entry->action.func = action->func;
-    menu_entry->action.data = action->data; /*watch out. copying Client * ptr*/
+void menu_show(gchar *name, gint x, gint y, ObClient *client)
+{
+    ObMenu *self;
+    ObMenuFrame *frame;
 
-    menu_entry->render_data = render_data; /*watch out.*/
-    menu_entry->submenu = submenu;
+    if (!(self = menu_from_name(name))) return;
 
-    return menu_entry;
+    frame = menu_frame_new(self, client);
+    menu_frame_move(frame, x, y);
+    menu_frame_show(frame, NULL);
 }
 
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu)
+static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)
 {
-    assert(entry != NULL);
-    
-    entry->submenu = submenu;
+    ObMenuEntry *self;
+
+    g_assert(menu);
+
+    self = g_new0(ObMenuEntry, 1);
+    self->type = type;
+    self->menu = menu;
+    self->id = id;
+    self->enabled = TRUE;
+    return self;
+}
+
+static void menu_entry_free(ObMenuEntry *self)
+{
+    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;
+        }
 
-    if(entry->parent != NULL)
-        entry->parent->invalid = TRUE;
+        g_free(self);
+    }
 }
 
-void menu_add_entry(Menu *menu, MenuEntry *entry)
+void menu_clear_entries(gchar *name)
 {
-    assert(menu != NULL && entry != NULL);
+    ObMenu *self;
+
+    if (!(self = menu_from_name(name))) return;
+
+    menu_clear_entries_internal(self);
+}
+
+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_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;
+
+    self->entries = g_list_append(self->entries, e);
+}
+
+void menu_add_submenu(gchar *name, gint id, gchar *submenu)
+{
+    ObMenu *self, *sub;
+    ObMenuEntry *e;
+
+    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_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);
+}
+
+void menu_set_update_func(gchar *name, ObMenuUpdateFunc func)
+{
+    ObMenu *self;
+
+    if (!(self = menu_from_name(name))) return;
+    self->update_func = func;
+}
+
+ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)
+{
+    ObMenuEntry *ret = NULL;
+    GList *it;
 
-    menu->entries = g_list_append(menu->entries, entry);
-    entry->parent = menu;
+    for (it = self->entries; it; it = g_list_next(it)) {
+        ObMenuEntry *e = it->data;
 
-    menu->invalid = TRUE;
+        if (e->id == id) {
+            ret = e;
+            break;
+        }
+    }
+    return ret;
 }