X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=4a259387009c43bd491fea71fa6162cb1b83d0d6;hb=8fe0cb8989c1fe12b30b9030b446345f25340d35;hp=7f1b9d2c7626315087ea4de4996e87505c083c6c;hpb=59c3cce4f49f04ed2c2937e7de24255dd53df487;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 7f1b9d2c..4a259387 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,262 +1,431 @@
+#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 "misc.h"
+#include "client_menu.h"
+#include "client_list_menu.h"
+#include "parser/parse.h"
+
+typedef struct _ObMenuParseState ObMenuParseState;
+
+struct _ObMenuParseState
+{
+    ObMenu *parent;
+    ObMenu *pipe_creator;
+};
 
 static GHashTable *menu_hash = NULL;
-GHashTable *menu_map = NULL;
-
-#define TITLE_EVENTMASK (ButtonMotionMask)
-#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
-                         ButtonPressMask | ButtonReleaseMask)
+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;
+
+    if (file[0] == '/') {
+        if (!parse_load(file, "openbox_menu", doc, node)) {
+            g_warning("Failed to load menu from '%s'", file);
+            loaded = FALSE;
+        }
+    } else {
+        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_destroy_hash_key(gpointer data)
+static void client_dest(gpointer client)
 {
-    g_free(data);
+    /* menus can be associated with a client, so close any that are since
+       we are disappearing now */
+    menu_frame_hide_all_client(client);
 }
 
-void menu_destroy_hash_value(Menu *self)
+void menu_startup(gboolean reconfig)
 {
-    GList *it;
-    MenuRenderData *data = self->render_data;
+    xmlDocPtr doc;
+    xmlNodePtr node;
+    gboolean loaded = FALSE;
+    GSList *it;
 
-    for (it = self->entries; it; it = it->next)
-        menu_entry_free(it->data);
-    g_list_free(self->entries);
+    menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
+                                      (GDestroyNotify)menu_destroy_hash_value);
 
-    g_free(self->label);
-    g_free(self->name);
+    client_list_menu_startup();
+    client_menu_startup();
+
+    menu_parse_inst = parse_startup();
+
+    menu_parse_state.parent = NULL;
+    menu_parse_state.pipe_creator = 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);
+
+    for (it = config_menu_files; it; it = g_slist_next(it)) {
+        if (menu_open(it->data, &doc, &node)) {
+            loaded = TRUE;
+            parse_tree(menu_parse_inst, doc, node->children);
+            xmlFreeDoc(doc);
+        }
+    }
+    if (!loaded) {
+        if (menu_open("menu.xml", &doc, &node)) {
+            parse_tree(menu_parse_inst, doc, node->children);
+            xmlFreeDoc(doc);
+        }
+    }
+    
+    g_assert(menu_parse_state.parent == NULL);
 
-    g_hash_table_remove(menu_map, &data->title);
-    g_hash_table_remove(menu_map, &data->frame);
-    g_hash_table_remove(menu_map, &data->items);
+    if (!reconfig)
+        client_add_destructor(client_dest);
+}
 
-    appearance_free(data->a_title);
-    XDestroyWindow(ob_display, data->title);
-    XDestroyWindow(ob_display, data->frame);
-    XDestroyWindow(ob_display, data->items);
+void menu_shutdown(gboolean reconfig)
+{
+    if (!reconfig)
+        client_remove_destructor(client_dest);
 
-    g_free(self);
+    parse_shutdown(menu_parse_inst);
+    menu_parse_inst = NULL;
+
+    menu_frame_hide_all();
+    g_hash_table_destroy(menu_hash);
+    menu_hash = NULL;
 }
 
-void menu_entry_free(MenuEntry *self)
+static gboolean menu_pipe_submenu(gpointer key, gpointer val, gpointer data)
 {
-    MenuEntryRenderData *data = self->render_data;
+    ObMenu *menu = val;
+    return menu->pipe_creator == data;
+}
 
-    g_free(self->label);
-    g_free(self->render_data);
-    action_free(self->action);
+void menu_pipe_execute(ObMenu *self)
+{
+    xmlDocPtr doc;
+    xmlNodePtr node;
+    gchar *output;
+    GError *err = NULL;
 
-    g_hash_table_remove(menu_map, &data->item);
+    if (!self->execute)
+        return;
 
-    appearance_free(data->a_item);
-    XDestroyWindow(ob_display, data->item);
+    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;
+    }
 
-    g_free(self);
+    if (parse_load_mem(output, strlen(output),
+                       "openbox_pipe_menu", &doc, &node))
+    {
+        g_hash_table_foreach_remove(menu_hash, menu_pipe_submenu, self);
+        menu_clear_entries(self);
+
+        menu_parse_state.pipe_creator = self;
+        menu_parse_state.parent = self;
+        parse_tree(menu_parse_inst, doc, node->children);
+        xmlFreeDoc(doc);
+    } else {
+        g_warning("Invalid output from pipe-menu: %s", self->execute);
+    }
 }
-    
-void menu_startup()
+
+static ObMenu* menu_from_name(gchar *name)
 {
-    Menu *m;
+    ObMenu *self = NULL;
 
-    menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                      menu_destroy_hash_key,
-                                      (GDestroyNotify)menu_destroy_hash_value);
-    menu_map = g_hash_table_new(g_int_hash, g_int_equal);
-
-    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")));
+    g_assert(name != NULL);
+
+    if (!(self = g_hash_table_lookup(menu_hash, name)))
+        g_warning("Attempted to access menu '%s' but it does not exist.",
+                  name);
+    return self;
+}  
+
+static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                            gpointer data)
+{
+    ObMenuParseState *state = data;
+    gchar *label;
+    
+    if (state->parent) {
+        if (parse_attr_string("label", node, &label)) {
+            GSList *acts = NULL;
+
+            for (node = node->children; node; node = node->next)
+                if (!xmlStrcasecmp(node->name, (const xmlChar*) "action"))
+                    acts = g_slist_append(acts, action_parse
+                                          (i, doc, node,
+                                           OB_USER_ACTION_MENU_SELECTION));
+            menu_add_normal(state->parent, -1, label, acts);
+            g_free(label);
+        }
+    }
 }
 
-void menu_shutdown()
+static void parse_menu_separator(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node,
+                                 gpointer data)
 {
-    g_hash_table_destroy(menu_hash);
-    g_hash_table_destroy(menu_map);
+    ObMenuParseState *state = data;
+
+    if (state->parent)
+        menu_add_separator(state->parent, -1);
 }
 
-static Window createWindow(Window parent, unsigned long mask,
-			   XSetWindowAttributes *attrib)
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                       gpointer data)
 {
-    return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
-			 render_depth, InputOutput, render_visual,
-			 mask, attrib);
-                       
+    ObMenuParseState *state = data;
+    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("label", node, &title))
+            goto parse_menu_fail;
+
+        if ((menu = menu_new(name, title, NULL))) {
+            menu->pipe_creator = state->pipe_creator;
+            if (parse_attr_string("execute", node, &script)) {
+                menu->execute = ob_expand_tilde(script);
+            } else {
+                ObMenu *old;
+
+                old = state->parent;
+                state->parent = menu;
+                parse_tree(i, doc, node->children);
+                state->parent = old;
+            }
+        }
+    }
+
+    if (state->parent)
+        menu_add_submenu(state->parent, -1, name);
+
+parse_menu_fail:
+    g_free(name);
+    g_free(title);
+    g_free(script);
 }
 
-Menu *menu_new(char *label, char *name, Menu *parent)
+ObMenu* 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);
+    self = g_new0(ObMenu, 1);
     self->name = g_strdup(name);
-    self->parent = parent;
+    self->title = g_strdup(title);
+    self->data = data;
+
+    g_hash_table_replace(menu_hash, self->name, self);
+
+    return self;
+}
 
-    self->entries = NULL;
-    self->shown = FALSE;
-    self->invalid = FALSE;
-    /* default controllers? */
+static void menu_destroy_hash_value(ObMenu *self)
+{
+    /* XXX make sure its not visible */
 
-    data = g_new(MenuRenderData, 1);
+    if (self->destroy_func)
+        self->destroy_func(self, self->data);
 
-    attrib.override_redirect = TRUE;
-    data->frame = createWindow(ob_root, CWOverrideRedirect, &attrib);
-    attrib.event_mask = TITLE_EVENTMASK;
-    data->title = createWindow(data->frame, CWEventMask, &attrib);
-    data->items = createWindow(data->frame, 0, &attrib);
+    menu_clear_entries(self);
+    g_free(self->name);
+    g_free(self->title);
+    g_free(self->execute);
+}
 
-    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_free(ObMenu *menu)
+{
+    g_hash_table_remove(menu_hash, menu->name);
+}
 
-    XMapWindow(ob_display, data->title);
-    XMapWindow(ob_display, data->items);
+void menu_show(gchar *name, gint x, gint y, ObClient *client)
+{
+    ObMenu *self;
+    ObMenuFrame *frame;
 
-    data->a_title = appearance_copy(theme_a_menu_title);
-    data->a_items = appearance_copy(theme_a_menu);
+    if (!(self = menu_from_name(name))) return;
 
-    self->render_data = data;
+    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)
+{
+    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_map, &data->frame, self);
-    g_hash_table_insert(menu_map, &data->title, self);
-    g_hash_table_insert(menu_map, &data->items, self);
-    g_hash_table_insert(menu_hash, g_strdup(name), self);
     return self;
 }
 
-void menu_free(char *name)
+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(ObMenu *self)
 {
-    MenuEntry *menu_entry = g_new(MenuEntry, 1);
+    /* XXX assert that the menu isn't visible */
 
-    menu_entry->label = g_strdup(label);
-    menu_entry->render_type = render_type;
-    menu_entry->action = action;
-
-    menu_entry->render_data = NULL;
-    menu_entry->submenu = submenu;
+    while (self->entries) {
+	menu_entry_free(self->entries->data);
+        self->entries = g_list_delete_link(self->entries, self->entries);
+    }
+}
 
-    return menu_entry;
+void menu_entry_remove(ObMenuEntry *self)
+{
+    self->menu->entries = g_list_remove(self->menu->entries, self);
+    menu_entry_free(self);
 }
 
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu)
+ObMenuEntry* menu_add_normal(ObMenu *self, gint id, gchar *label,
+                             GSList *actions)
 {
-    g_assert(entry != NULL);
-    
-    entry->submenu = submenu;
+    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;
 
-    if(entry->parent != NULL)
-        entry->parent->invalid = TRUE;
+    self->entries = g_list_append(self->entries, e);
+    return e;
 }
 
-void menu_add_entry(Menu *menu, MenuEntry *entry)
+ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, gchar *submenu)
 {
-    MenuEntryRenderData *data;
-    XSetWindowAttributes attrib;
+    ObMenuEntry *e;
 
-    g_assert(menu != NULL && entry != NULL && entry->render_data == NULL);
+    e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, id);
+    e->data.submenu.name = g_strdup(submenu);
 
-    menu->entries = g_list_append(menu->entries, entry);
-    entry->parent = menu;
+    self->entries = g_list_append(self->entries, e);
+    return e;
+}
 
-    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);
+ObMenuEntry* menu_add_separator(ObMenu *self, gint id)
+{
+    ObMenuEntry *e;
 
-    entry->render_data = data;
+    e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id);
 
-    menu->invalid = TRUE;
+    self->entries = g_list_append(self->entries, e);
+    return e;
+}
 
-    g_hash_table_insert(menu_map, &data->item, menu);
+void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func)
+{
+    self->update_func = func;
 }
 
-void menu_show(char *name, int x, int y, Client *client)
+void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc 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;
-    }
+    self->execute_func = func;
+}
 
-    data = self->render_data;
+void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func)
+{
+    self->destroy_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);
+ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)
+{
+    ObMenuEntry *ret = NULL;
+    GList *it;
 
-    for (it = self->entries; it; it = it->next) {
-        MenuEntryRenderData *r = ((MenuEntry*)it->data)->render_data;
+    for (it = self->entries; it; it = g_list_next(it)) {
+        ObMenuEntry *e = it->data;
 
-        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);
+        if (e->id == id) {
+            ret = e;
+            break;
+        }
     }
+    return ret;
+}
 
-    /* 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);
-    }
+void menu_find_submenus(ObMenu *self)
+{
+    GList *it;
 
+    for (it = self->entries; it; it = g_list_next(it)) {
+        ObMenuEntry *e = it->data;
 
-    XMapWindow(ob_display, data->frame);
+        if (e->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+            e->data.submenu.submenu = menu_from_name(e->data.submenu.name);
+    }
 }