X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=d742b972a7a6bafe1b025b3dbb7665644f5620ae;hb=c34915ae8d49f61426912ef332e8097be516bdd3;hp=74ac8d3f8c3b5d7036856c4321533a04288ee434;hpb=0e28a07e3d6677aa6af9ad97fbc55f8101f3fdf2;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 74ac8d3f..d742b972 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,243 +1,374 @@
+#include "debug.h"
 #include "menu.h"
 #include "openbox.h"
-#include "render/theme.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;
 
-#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
-                         ButtonPressMask | ButtonReleaseMask)
+typedef struct _ObMenuParseState ObMenuParseState;
 
-void menu_destroy_hash_key(gpointer data)
+struct _ObMenuParseState
 {
-    g_free(data);
-}
+    GSList *menus;
+};
+
+static void menu_clear_entries_internal(ObMenu *self);
 
-void menu_free_entries(Menu *menu)
+static ObMenu* menu_from_name(gchar *name)
 {
-    GList *it;
+    ObMenu *self = NULL;
 
-    for (it = menu->entries; it; it = it->next)
-        menu_entry_free((MenuEntry *)it->data);
+    g_assert(name != NULL);
 
-    g_list_free(menu->entries);
-}
+    if (!(self = g_hash_table_lookup(menu_hash, name)))
+        g_warning("Attempted to access menu '%s' but it does not exist.",
+                  name);
+    return self;
+}  
 
-void menu_destroy_hash_value(gpointer data)
+static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                            gpointer data)
 {
-    Menu *del_menu = (Menu *)data;
-    MenuRenderData *rd = del_menu->render_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(i, doc, node));
+            menu_add_normal(state->menus->data, 0, label, acts);
+            g_free(label);
+        }
+    }
+}
 
-    menu_free_entries(del_menu);
+static void parse_menu_separator(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node,
+                                 gpointer data)
+{
+    ObMenuParseState *state = data;
 
-    g_free(del_menu->label);
-    g_free(del_menu->name);
+    if (state->menus)
+        menu_add_separator(state->menus->data, 0);
+}
 
-    appearance_free(rd->a_title);
-    XDestroyWindow(ob_display, rd->title);
-    XDestroyWindow(ob_display, rd->frame);
+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;
 }
 
-void menu_entry_free(MenuEntry *entry)
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                       gpointer data)
 {
-    g_free(entry->label);
-    g_free(entry->render_data);
-    action_free(entry->action);
+    ObMenuParseState *state = data;
+    gchar *name = NULL, *title = NULL, *plugin = NULL;
+
+    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);
+                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);
+    g_free(plugin);
 }
-    
-void menu_startup()
+
+
+void menu_destroy_hash_value(ObMenu *self)
 {
-    Menu *m;
+    /* XXX make sure its not visible */
+
+    if (self->destroy_func)
+        self->destroy_func(self, self->data);
 
-    menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                      menu_destroy_hash_key,
-                                      menu_destroy_hash_value);
-    m = menu_new("sex menu", "root", NULL);
-    menu_add_entry(m, menu_entry_new("foo shit etc bleh",
-                                     action_from_string("restart")));
-    menu_add_entry(m, menu_entry_new("more shit",
-                                     action_from_string("restart")));
-    menu_add_entry(m, menu_entry_new("",
-                                     action_from_string("restart")));
-    menu_add_entry(m, menu_entry_new("and yet more",
-                                     action_from_string("restart")));
+    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;
 }
 
-static Window createWindow(Window parent, unsigned long mask,
-			   XSetWindowAttributes *attrib)
+void menu_parse()
 {
-    return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
-			 render_depth, InputOutput, render_visual,
-			 mask, attrib);
-                       
+    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);
 }
 
-Menu *menu_new(char *label, char *name, Menu *parent)
+gboolean menu_new(gchar *name, gchar *title, gpointer data)
 {
-    XSetWindowAttributes attrib;
-    Menu *self;
-    MenuRenderData *data;
+    ObMenu *self;
 
-    self = g_new0(Menu, 1);
-    self->label = g_strdup(label);
+    if (g_hash_table_lookup(menu_hash, name)) return FALSE;
+
+    self = g_new0(ObMenu, 1);
     self->name = g_strdup(name);
-    self->parent = parent;
+    self->title = g_strdup(title);
+    self->data = data;
 
-    self->entries = NULL;
-    self->shown = FALSE;
-    self->invalid = FALSE;
-    /* default controllers? */
+    g_hash_table_insert(menu_hash, self->name, self);
 
-    data = g_new(MenuRenderData, 1);
+    return TRUE;
+}
 
-    attrib.override_redirect = TRUE;
-    data->frame = createWindow(ob_root, CWOverrideRedirect, &attrib);
-    data->title = createWindow(data->frame, 0, &attrib);
-    data->items = createWindow(data->frame, 0, &attrib);
+void menu_free(gchar *name)
+{
+    ObMenu *self;
+    
+    if (!(self = menu_from_name(name))) return;
+    g_hash_table_remove(menu_hash, self->name);
+}
 
-    XSetWindowBorderWidth(ob_display, data->frame, theme_bwidth);
-    XSetWindowBorderWidth(ob_display, data->title, theme_bwidth);
-    XSetWindowBorder(ob_display, data->frame, theme_b_color->pixel);
-    XSetWindowBorder(ob_display, data->title, theme_b_color->pixel);
+void menu_show(gchar *name, gint x, gint y, ObClient *client)
+{
+    ObMenu *self;
+    ObMenuFrame *frame;
 
-    XMapWindow(ob_display, data->title);
-    XMapWindow(ob_display, data->items);
+    if (!(self = menu_from_name(name))) return;
 
-    data->a_title = appearance_copy(theme_a_menu_title);
-    data->a_items = appearance_copy(theme_a_menu);
+    frame = menu_frame_new(self, client);
+    menu_frame_move(frame, x, y);
+    menu_frame_show(frame, NULL);
+}
 
-    self->render_data = data;
+static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)
+{
+    ObMenuEntry *self;
+
+    g_assert(menu);
+
+    self = g_new0(ObMenuEntry, 1);
+    self->type = type;
+    self->menu = menu;
+    self->id = id;
+
+    switch (type) {
+    case OB_MENU_ENTRY_TYPE_NORMAL:
+        self->data.normal.enabled = TRUE;
+        break;
+    case OB_MENU_ENTRY_TYPE_SUBMENU:
+    case OB_MENU_ENTRY_TYPE_SEPARATOR:
+        break;
+    }
 
-    g_hash_table_insert(menu_hash, g_strdup(name), self);
     return self;
 }
 
-void menu_free(char *name)
+static void menu_entry_free(ObMenuEntry *self)
 {
-    g_hash_table_remove(menu_hash, name);
+    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:
+            g_free(self->data.submenu.name);
+            break;
+        case OB_MENU_ENTRY_TYPE_SEPARATOR:
+            break;
+        }
+
+        g_free(self);
+    }
 }
 
-MenuEntry *menu_entry_new_full(char *label, Action *action,
-                               MenuEntryRenderType render_type,
-                               gpointer submenu)
+void menu_clear_entries(gchar *name)
 {
-    MenuEntry *menu_entry = g_new(MenuEntry, 1);
+    ObMenu *self;
 
-    menu_entry->label = g_strdup(label);
-    menu_entry->render_type = render_type;
-    menu_entry->action = action;
+    if (!(self = menu_from_name(name))) return;
 
-    menu_entry->render_data = NULL;
-    menu_entry->submenu = submenu;
+    menu_clear_entries_internal(self);
+}
 
-    return menu_entry;
+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_entry_set_submenu(MenuEntry *entry, Menu *submenu)
+void menu_add_normal(gchar *name, gint id, gchar *label, GSList *actions)
 {
-    g_assert(entry != NULL);
-    
-    entry->submenu = submenu;
+    ObMenu *self;
+    ObMenuEntry *e;
 
-    if(entry->parent != NULL)
-        entry->parent->invalid = TRUE;
+    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_entry(Menu *menu, MenuEntry *entry)
+void menu_add_submenu(gchar *name, gint id, gchar *submenu)
 {
-    MenuEntryRenderData *data;
-    XSetWindowAttributes attrib;
+    ObMenu *self;
+    ObMenuEntry *e;
 
-    g_assert(menu != NULL && entry != NULL && entry->render_data == NULL);
+    if (!(self = menu_from_name(name))) return;
 
-    menu->entries = g_list_append(menu->entries, entry);
-    entry->parent = menu;
+    e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, id);
+    e->data.submenu.name = g_strdup(submenu);
 
-    data = g_new(MenuEntryRenderData, 1);
-    data->item = createWindow(((MenuRenderData*)menu->render_data)->items,
-                              0, &attrib);
-    XMapWindow(ob_display, data->item);
-    data->a_item = appearance_copy(theme_a_menu_item);
+    self->entries = g_list_append(self->entries, e);
+}
+
+void menu_add_separator(gchar *name, gint id)
+{
+    ObMenu *self;
+    ObMenuEntry *e;
 
-    entry->render_data = data;
+    if (!(self = menu_from_name(name))) return;
 
-    menu->invalid = TRUE;
+    e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id);
+
+    self->entries = g_list_append(self->entries, e);
 }
 
-void menu_show(char *name, int x, int y, Client *client)
+void menu_set_update_func(gchar *name, ObMenuUpdateFunc func)
 {
-    Menu *self;
-    MenuRenderData *data;
-    GList *it;
-    int w = 1;
-    int items_h;
-    int item_h = 0, nitems = 0; /* each item, only one is used */
-    int item_y;
-    int bullet_w;
-
-    self = g_hash_table_lookup(menu_hash, name);
-    if (!self) {
-        g_warning("Attempted to show menu '%s' but it does not exist.",
-                  name);
-        return;
-    }
+    ObMenu *self;
 
-    data = self->render_data;
+    if (!(self = menu_from_name(name))) return;
+    self->update_func = func;
+}
 
-    /* set texture data and size them mofos out */
-    data->a_title->texture[0].data.text.string = self->label;
-    appearance_minsize(data->a_title, &data->title_min_w, &data->title_h);
-    data->title_min_w += theme_bevel * 2;
-    data->title_h += theme_bevel * 2;
-    w = MAX(w, data->title_min_w);
+void menu_set_execute_func(gchar *name, ObMenuExecuteFunc func)
+{
+    ObMenu *self;
 
-    for (it = self->entries; it; it = it->next) {
-        MenuEntryRenderData *r = ((MenuEntry*)it->data)->render_data;
+    if (!(self = menu_from_name(name))) return;
+    self->execute_func = func;
+}
 
-        r->a_item->texture[0].data.text.string = ((MenuEntry*)it->data)->label;
-        appearance_minsize(r->a_item, &r->min_w, &item_h);
-        r->min_w += theme_bevel * 2;
-        item_h += theme_bevel * 2;
-        w = MAX(w, r->min_w);
-        ++nitems;
-    }
-    bullet_w = item_h + theme_bevel;
-    w += 2 * bullet_w;
-    items_h = item_h * nitems;
-
-    /* size appearances */
-    RECT_SET(data->a_title->area, 0, 0, w, data->title_h);
-    RECT_SET(data->a_title->texture[0].position, 0, 0, w, data->title_h);
-    RECT_SET(data->a_items->area, 0, 0, w, items_h);
-    for (it = self->entries; it; it = it->next) {
-        MenuEntryRenderData *r = ((MenuEntry*)it->data)->render_data;
-        RECT_SET(r->a_item->area, 0, 0, w, item_h);
-        RECT_SET(r->a_item->texture[0].position, bullet_w, 0,
-                 w - 2 * bullet_w, item_h);
-    }
+void menu_set_destroy_func(gchar *name, ObMenuDestroyFunc func)
+{
+    ObMenu *self;
+
+    if (!(self = menu_from_name(name))) return;
+    self->destroy_func = func;
+}
 
-    /* size windows and paint the suckers */
-    XMoveResizeWindow(ob_display, data->frame, x, y, w,
-                      data->title_h + items_h);
-    XMoveResizeWindow(ob_display, data->title, -theme_bwidth, -theme_bwidth,
-                      w, data->title_h);
-    paint(data->title, data->a_title);
-    XMoveResizeWindow(ob_display, data->items, 0, data->title_h + theme_bwidth,
-                      w, items_h);
-    paint(data->items, data->a_items);
-    for (item_y = 0, it = self->entries; it; item_y += item_h, it = it->next) {
-        MenuEntryRenderData *r = ((MenuEntry*)it->data)->render_data;
-        XMoveResizeWindow(ob_display, r->item, 0, item_y, w, item_h);
-        r->a_item->surface.data.planar.parent = data->a_items;
-        r->a_item->surface.data.planar.parentx = 0;
-        r->a_item->surface.data.planar.parenty = item_y;
-        paint(r->item, r->a_item);
+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;
+}
 
+void menu_find_submenus(ObMenu *self)
+{
+    GList *it;
 
-    XMapWindow(ob_display, data->frame);
+    for (it = self->entries; it; it = g_list_next(it)) {
+        ObMenuEntry *e = it->data;
+
+        if (e->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+            e->data.submenu.submenu = menu_from_name(e->data.submenu.name);
+    }
 }