Menu data structures basically completed.

Need the engine support still, parser, and controllers.

1 files changed, 15 insertions, 10 deletions

diff --git a/openbox/menu.h b/openbox/menu.h
index 7c397602..b3e712c3 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -6,6 +6,7 @@
 
 typedef struct Menu {
     char *label;
+    char *name;
     
     GList *entries;
     /* GList *tail; */
@@ -26,12 +27,12 @@ typedef struct Menu {
 
 typedef enum MenuEntryRenderType {
     MenuEntryRenderType_None = 0,
-    MenuEntryRenderType_Submenu 1 << 0,
-    MenuEntryRenderType_Boolean 1 << 1,
-    MenuEntryRenderType_Separator 1 << 2,
+    MenuEntryRenderType_Submenu = 1 << 0,
+    MenuEntryRenderType_Boolean = 1 << 1,
+    MenuEntryRenderType_Separator = 1 << 2,
     
-    MenuEntryRenderType_Other 1 << 7
-} MenuEntryType;
+    MenuEntryRenderType_Other = 1 << 7
+} MenuEntryRenderType;
 
 
 typedef struct {
@@ -43,19 +44,23 @@ typedef struct {
     MenuEntryRenderType render_type;
     gboolean enabled;
     gboolean boolean_value;
-    gpointer render_data;
+    gpointer render_data; /* where the engine can store anything it likes */
 
     Menu *submenu;
 } MenuEntry;
 
-Menu *menu_new(char *label, Menu *parent);
-MenuEntry *menu_entry_new_full(char *label, Action *action,
-                          MenuEntryRenderType render_type,
-                          gpointer render_data, gpointer submenu);
+Menu *menu_new(const char *label, const char *name, Menu *parent);
+void menu_free(const char *name);
+
+MenuEntry *menu_entry_new_full(const char *label, Action *action,
+                               const MenuEntryRenderType render_type,
+                               gpointer render_data, gpointer submenu);
 
 #define menu_entry_new(label, action) \
   menu_entry_new(label, action, MenuEntryRenderType_None, NULL, NULL)
 
+void menu_entry_free(const MenuEntry *entry);
+
 void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu);
 
 void menu_add_entry(Menu *menu, MenuEntry *entry);