X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=de0929e5eb48f05623724e72a1996d86c7d8be78;hb=d075ca0993d6fd54dada927cca3916796ac09593;hp=2ecbb5cdef846ab2c0b62210c51a303026fdbaf6;hpb=c90da6da781932c2d178bfb7e39ec1d5003543b7;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index 2ecbb5cd..de0929e5 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -9,10 +9,12 @@
 #include <glib.h>
 
 struct _ObClient;
+struct _ObParseInst;
 
 typedef struct _ObMenu ObMenu;
 typedef struct _ObMenuEntry ObMenuEntry;
 
+typedef void(*menu_controller_destroy)(ObMenu *self);
 typedef void(*menu_controller_show)(ObMenu *self, int x, int y,
                                     struct _ObClient *);
 typedef void(*menu_controller_update)(ObMenu *self);
@@ -53,6 +55,9 @@ struct _ObMenu
     ObMenu *open_submenu;
     GList *over;
     
+    /* destructor */
+    menu_controller_destroy destroy;
+
     /* behaviour callbacks
        TODO: Document and split code that HAS to be in the overridden callback */
     /* place a menu on screen */
@@ -125,6 +130,7 @@ struct _ObMenuEntry
 } MenuEntry;
 
 typedef struct PluginMenuCreateData{
+    struct _ObParseInst *parse_inst;
     xmlDocPtr doc;
     xmlNodePtr node;
     ObMenu *parent;
@@ -134,17 +140,21 @@ typedef struct PluginMenuCreateData{
 void menu_startup();
 void menu_shutdown();
 
+void menu_parse();
+
 void menu_noop();
 
 #define menu_new(l, n, p) \
   menu_new_full(l, n, p, menu_show_full, menu_render, menu_entry_fire, \
-                menu_hide, menu_control_mouseover)
+                menu_hide, menu_control_mouseover, NULL)
 
 ObMenu *menu_new_full(char *label, char *name, ObMenu *parent, 
-                      menu_controller_show show, menu_controller_update update,
+                      menu_controller_show show,
+                      menu_controller_update update,
                       menu_controller_selected selected,
                       menu_controller_hide hide,
-                      menu_controller_mouseover mouseover);
+                      menu_controller_mouseover mouseover,
+                      menu_controller_destroy destroy);
 
 void menu_free(char *name);
 
@@ -190,7 +200,8 @@ void menu_render(ObMenu *self);
 void menu_render_full(ObMenu *self);
 
 /*so plugins can call it? */
-void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data, gboolean new);
+void parse_menu_full(struct _ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                     void *data, gboolean new);
 void menu_control_mouseover(ObMenuEntry *entry, gboolean enter);
 void menu_control_keyboard_nav(unsigned int key);
 #endif