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

diff --git a/openbox/menu.c b/openbox/menu.c
index 52903dcd..3e38c0f9 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,326 +1,312 @@
+#include "debug.h"
 #include "menu.h"
 #include "openbox.h"
 #include "stacking.h"
+#include "client.h"
 #include "grab.h"
-#include "render/theme.h"
+#include "config.h"
+#include "screen.h"
+#include "menuframe.h"
+#include "geom.h"
+#include "plugin.h"
+#include "misc.h"
+#include "parser/parse.h"
 
-static GHashTable *menu_hash = NULL;
-GHashTable *menu_map = NULL;
+GHashTable *menu_hash = NULL;
 
-#define FRAME_EVENTMASK (ButtonMotionMask | EnterWindowMask | LeaveWindowMask)
-#define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask)
-#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_destroy_hash_value(Menu *self)
+static ObMenu* menu_from_name(gchar *name)
 {
-    GList *it;
+    ObMenu *self = NULL;
 
-    for (it = self->entries; it; it = it->next)
-        menu_entry_free(it->data);
-    g_list_free(self->entries);
+    g_assert(name != NULL);
 
-    g_free(self->label);
-    g_free(self->name);
+    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_hash_table_remove(menu_map, &self->title);
-    g_hash_table_remove(menu_map, &self->frame);
-    g_hash_table_remove(menu_map, &self->items);
+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);
+        }
+    }
+}
 
-    appearance_free(self->a_title);
-    XDestroyWindow(ob_display, self->title);
-    XDestroyWindow(ob_display, self->frame);
-    XDestroyWindow(ob_display, self->items);
+static void parse_menu_separator(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node,
+                                 gpointer data)
+{
+    ObMenuParseState *state = data;
 
-    g_free(self);
+    if (state->menus)
+        menu_add_separator(state->menus->data, 0);
 }
 
-void menu_entry_free(MenuEntry *self)
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                       gpointer data)
 {
-    g_free(self->label);
-    action_free(self->action);
+    ObMenuParseState *state = data;
+    gchar *name = NULL, *title = NULL;
 
-    g_hash_table_remove(menu_map, &self->item);
+    if (!parse_attr_string("id", node, &name))
+        goto parse_menu_fail;
 
-    appearance_free(self->a_item);
-    appearance_free(self->a_disabled);
-    appearance_free(self->a_hilite);
-    XDestroyWindow(ob_display, self->item);
+    if (!g_hash_table_lookup(menu_hash, name)) {
+        if (!parse_attr_string("label", node, &title))
+            goto parse_menu_fail;
 
-    g_free(self);
+        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_startup()
+
+
+void menu_destroy_hash_value(ObMenu *self)
 {
-    Menu *m;
-    Action *a;
+    /* XXX make sure its not visible */
+    menu_clear_entries_internal(self);
+    g_free(self->name);
+    g_free(self->title);
+}
 
-    menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                      menu_destroy_hash_key,
+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_map = g_hash_table_new(g_int_hash, g_int_equal);
-
-    m = menu_new("sex menu", "root", NULL);
-    a = action_from_string("execute");
-    a->data.execute.path = g_strdup("xterm");
-    menu_add_entry(m, menu_entry_new("xterm", a));
-    a = action_from_string("restart");
-    menu_add_entry(m, menu_entry_new("restart", a));
-    menu_add_entry(m, menu_entry_new("--", NULL));
-    a = action_from_string("exit");
-    menu_add_entry(m, menu_entry_new("exit", a));
 }
 
 void menu_shutdown()
 {
+    menu_frame_hide_all();
     g_hash_table_destroy(menu_hash);
-    g_hash_table_destroy(menu_map);
+    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);
+    }
 
-Menu *menu_new(char *label, char *name, Menu *parent)
-{
-    XSetWindowAttributes attrib;
-    Menu *self;
+    if (loaded) {
+        parse_state.menus = NULL;
 
-    self = g_new0(Menu, 1);
-    self->label = g_strdup(label);
-    self->name = g_strdup(name);
-    self->parent = parent;
-
-    self->entries = NULL;
-    self->shown = FALSE;
-    self->invalid = FALSE;
-    /* default controllers? */
-
-    attrib.override_redirect = TRUE;
-    attrib.event_mask = FRAME_EVENTMASK;
-    self->frame = createWindow(ob_root, CWOverrideRedirect|CWEventMask, &attrib);
-    attrib.event_mask = TITLE_EVENTMASK;
-    self->title = createWindow(self->frame, CWEventMask, &attrib);
-    self->items = createWindow(self->frame, 0, &attrib);
-
-    XSetWindowBorderWidth(ob_display, self->frame, theme_bwidth);
-    XSetWindowBorderWidth(ob_display, self->title, theme_bwidth);
-    XSetWindowBorder(ob_display, self->frame, theme_b_color->pixel);
-    XSetWindowBorder(ob_display, self->title, theme_b_color->pixel);
-
-    XMapWindow(ob_display, self->title);
-    XMapWindow(ob_display, self->items);
-
-    self->a_title = appearance_copy(theme_a_menu_title);
-    self->a_items = appearance_copy(theme_a_menu);
-
-    g_hash_table_insert(menu_map, &self->frame, self);
-    g_hash_table_insert(menu_map, &self->title, self);
-    g_hash_table_insert(menu_map, &self->items, self);
-    g_hash_table_insert(menu_hash, g_strdup(name), self);
-    return self;
-}
+        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);
+    }
 
-void menu_free(char *name)
-{
-    g_hash_table_remove(menu_hash, name);
+    parse_shutdown(i);
 }
 
-MenuEntry *menu_entry_new_full(char *label, Action *action,
-                               MenuEntryRenderType render_type,
-                               gpointer submenu)
+gboolean menu_new(gchar *name, gchar *title, gpointer data)
 {
-    MenuEntry *menu_entry = g_new0(MenuEntry, 1);
+    ObMenu *self;
 
-    menu_entry->label = g_strdup(label);
-    menu_entry->render_type = render_type;
-    menu_entry->action = action;
+    if (g_hash_table_lookup(menu_hash, name)) return FALSE;
 
-    menu_entry->hilite = FALSE;
-    menu_entry->enabled = TRUE;
+    self = g_new0(ObMenu, 1);
+    self->name = g_strdup(name);
+    self->title = g_strdup(title);
+    self->data = data;
 
-    menu_entry->submenu = submenu;
+    g_hash_table_insert(menu_hash, self->name, self);
 
-    return menu_entry;
+    return TRUE;
 }
 
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu)
+void menu_free(gchar *name)
 {
-    g_assert(entry != NULL);
+    ObMenu *self;
     
-    entry->submenu = submenu;
-
-    if(entry->parent != NULL)
-        entry->parent->invalid = TRUE;
+    if (!(self = menu_from_name(name))) return;
+    g_hash_table_remove(menu_hash, self->name);
 }
 
-void menu_add_entry(Menu *menu, MenuEntry *entry)
+void menu_show(gchar *name, gint x, gint y, ObClient *client)
 {
-    XSetWindowAttributes attrib;
+    ObMenu *self;
+    ObMenuFrame *frame;
 
-    g_assert(menu != NULL && entry != NULL && entry->item == None);
+    if (!(self = menu_from_name(name))) return;
 
-    menu->entries = g_list_append(menu->entries, entry);
-    entry->parent = menu;
+    frame = menu_frame_new(self, client);
+    menu_frame_move(frame, x, y);
+    menu_frame_show(frame, NULL);
+}
 
-    attrib.event_mask = ENTRY_EVENTMASK;
-    entry->item = createWindow(menu->items, CWEventMask, &attrib);
-    XMapWindow(ob_display, entry->item);
-    entry->a_item = appearance_copy(theme_a_menu_item);
-    entry->a_disabled = appearance_copy(theme_a_menu_disabled);
-    entry->a_hilite = appearance_copy(theme_a_menu_hilite);
+static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)
+{
+    ObMenuEntry *self;
 
-    menu->invalid = TRUE;
+    g_assert(menu);
 
-    g_hash_table_insert(menu_map, &entry->item, menu);
+    self = g_new0(ObMenuEntry, 1);
+    self->type = type;
+    self->menu = menu;
+    self->id = id;
+    self->enabled = TRUE;
+    return self;
 }
 
-void menu_show(char *name, int x, int y, Client *client)
+static void menu_entry_free(ObMenuEntry *self)
 {
-    Menu *self;
-    GList *it;
-    int items_h;
-    int nitems = 0; /* each item, only one is used */
-    int item_y;
-
-    self = g_hash_table_lookup(menu_hash, name);
-    if (!self) {
-        g_warning("Attempted to show menu '%s' but it does not exist.",
-                  name);
-        return;
+    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;
+        }
+
+        g_free(self);
     }
+}
 
-    self->client = client;
-
-    self->width = 1;
-    self->item_h = 0;
+void menu_clear_entries(gchar *name)
+{
+    ObMenu *self;
 
-    /* set texture data and size them mofos out */
-    self->a_title->texture[0].data.text.string = self->label;
-    appearance_minsize(self->a_title, &self->title_min_w, &self->title_h);
-    self->title_min_w += theme_bevel * 2;
-    self->title_h += theme_bevel * 2;
-    self->width = MAX(self->width, self->title_min_w);
+    if (!(self = menu_from_name(name))) return;
 
-    for (it = self->entries; it; it = it->next) {
-        MenuEntry *e = it->data;
-        int h;
+    menu_clear_entries_internal(self);
+}
 
-        e->a_item->texture[0].data.text.string = e->label;
-        appearance_minsize(e->a_item, &e->min_w, &self->item_h);
-        self->width = MAX(self->width, e->min_w);
+static void menu_clear_entries_internal(ObMenu *self)
+{
+    /* XXX assert that the menu isn't visible */
 
-        e->a_disabled->texture[0].data.text.string = e->label;
-        appearance_minsize(e->a_disabled, &e->min_w, &h);
-        self->item_h = MAX(self->item_h, h);
-        self->width = MAX(self->width, e->min_w);
+    while (self->entries) {
+	menu_entry_free(self->entries->data);
+        self->entries = g_list_delete_link(self->entries, self->entries);
+    }
+}
 
-        e->a_hilite->texture[0].data.text.string = e->label;
-        appearance_minsize(e->a_hilite, &e->min_w, &h);
-        self->item_h = MAX(self->item_h, h);
-        self->width = MAX(self->width, e->min_w);
+void menu_add_normal(gchar *name, gint id, gchar *label, GSList *actions)
+{
+    ObMenu *self;
+    ObMenuEntry *e;
 
-        e->min_w += theme_bevel * 2;
-        ++nitems;
-    }
-    self->bullet_w = self->item_h + theme_bevel;
-    self->width += 2 * self->bullet_w;
-    self->item_h += theme_bevel * 2;
-    items_h = self->item_h * nitems;
-
-    RECT_SET(self->a_title->area, 0, 0, self->width, self->title_h);
-    RECT_SET(self->a_title->texture[0].position, 0, 0, self->width,
-             self->title_h);
-    RECT_SET(self->a_items->area, 0, 0, self->width, items_h);
-
-    XMoveResizeWindow(ob_display, self->frame, x, y, self->width,
-                      self->title_h + items_h);
-    XMoveResizeWindow(ob_display, self->title, -theme_bwidth, -theme_bwidth,
-                      self->width, self->title_h);
-    XMoveResizeWindow(ob_display, self->items, 0, self->title_h + theme_bwidth,
-                      self->width, items_h);
-
-    paint(self->title, self->a_title);
-    paint(self->items, self->a_items);
-
-    item_y = 0;
-    for (it = self->entries; it; it = it->next) {
-        ((MenuEntry*)it->data)->y = item_y;
-        menu_entry_render(it->data);
-        item_y += self->item_h;
-    }
+    if (!(self = menu_from_name(name))) return;
 
-    if (!self->shown) {
-        stacking_raise_internal(self->frame);
-        XMapWindow(ob_display, self->frame);
-/*        grab_pointer_window(TRUE, None, self->frame);*/
-        self->shown = TRUE;
-    }
-}
+    e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id);
+    e->data.normal.label = g_strdup(label);
+    e->data.normal.actions = actions;
 
-void menu_hide(Menu *self) {
-    if (self->shown) {
-        XUnmapWindow(ob_display, self->frame);
-        self->shown = FALSE;
-    }
+    self->entries = g_list_append(self->entries, e);
 }
 
-MenuEntry *menu_find_entry(Menu *menu, Window win)
+void menu_add_submenu(gchar *name, gint id, gchar *submenu)
 {
-    GList *it;
+    ObMenu *self, *sub;
+    ObMenuEntry *e;
 
-    for (it = menu->entries; it; it = it->next) {
-        MenuEntry *entry = it->data;
-        if (entry->item == win)
-            return entry;
-    }
-    return NULL;
+    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_entry_render(MenuEntry *self)
+void menu_add_separator(gchar *name, gint id)
 {
-    Menu *menu = self->parent;
-    Appearance *a;
+    ObMenu *self;
+    ObMenuEntry *e;
 
-    a = !self->enabled ? self->a_disabled :
-        (self->hilite && self->action ? self->a_hilite : self->a_item);
+    if (!(self = menu_from_name(name))) return;
 
-    RECT_SET(a->area, 0, 0, menu->width,
-             menu->item_h);
-    RECT_SET(a->texture[0].position, menu->bullet_w,
-             0, menu->width - 2 * menu->bullet_w,
-             menu->item_h);
+    e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id);
 
-    XMoveResizeWindow(ob_display, self->item, 0, self->y,
-                      menu->width, menu->item_h);
-    a->surface.data.planar.parent = menu->a_items;
-    a->surface.data.planar.parentx = 0;
-    a->surface.data.planar.parenty = self->y;
+    self->entries = g_list_append(self->entries, e);
+}
 
-    paint(self->item, a);
+void menu_set_update_func(gchar *name, ObMenuUpdateFunc func)
+{
+    ObMenu *self;
+
+    if (!(self = menu_from_name(name))) return;
+    self->update_func = func;
 }
 
-void menu_entry_fire(MenuEntry *self)
+ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)
 {
-    Menu *m;
+    ObMenuEntry *ret = NULL;
+    GList *it;
 
-    if (self->action) {
-        self->action->data.any.c = self->parent->client;
-        self->action->func(&self->action->data);
+    for (it = self->entries; it; it = g_list_next(it)) {
+        ObMenuEntry *e = it->data;
 
-        /* hide the whole thing */
-        m = self->parent;
-        while (m->parent) m = m->parent;
-        menu_hide(m);
+        if (e->id == id) {
+            ret = e;
+            break;
+        }
     }
+    return ret;
 }