make submenus not require the menu to exist when they are created, not until they...

[chaz/openbox] / openbox / menu.h

diff --git a/openbox/menu.h b/openbox/menu.h
index 66390e7565847db9000a455f2a11928603709f87..c91be82b67f3e3cdd76dd8d714d59876f8b6f9a9 100644 (file)
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -3,13 +3,15 @@
 
 #include "action.h"
 #include "window.h"
-#include "render/render.h"
 #include "geom.h"
+#include "render/render.h"
+#include "parser/parse.h"
 
 #include <glib.h>
 
 struct _ObClient;
 struct _ObMenuFrame;
+struct _ObMenuEntryFrame;
 
 typedef struct _ObMenu ObMenu;
 typedef struct _ObMenuEntry ObMenuEntry;
@@ -18,6 +20,9 @@ typedef struct _ObSubmenuMenuEntry ObSubmenuMenuEntry;
 typedef struct _ObSeparatorMenuEntry ObSeparatorMenuEntry;
 
 typedef void (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame, gpointer data);
+typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntryFrame *frame,
+                                  gpointer data);
+typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data);
 
 extern GList *menu_visible;
 
@@ -35,6 +40,8 @@ struct _ObMenu
     gpointer data;
 
     ObMenuUpdateFunc update_func;
+    ObMenuExecuteFunc execute_func;
+    ObMenuDestroyFunc destroy_func;
 };
 
 typedef enum
@@ -47,11 +54,15 @@ typedef enum
 struct _ObNormalMenuEntry {
     gchar *label;
 
+    /* state */
+    gboolean enabled;
+
     /* List of ObActions */
     GSList *actions;
 };
 
 struct _ObSubmenuMenuEntry {
+    gchar *name;
     ObMenu *submenu;
 };
 
@@ -66,9 +77,6 @@ struct _ObMenuEntry
 
     gint id;
 
-    /* state */
-    gboolean enabled;
-
     union u {
         ObNormalMenuEntry normal;
         ObSubmenuMenuEntry submenu;
@@ -84,7 +92,11 @@ void menu_parse();
 gboolean menu_new(gchar *name, gchar *title, gpointer data);
 void menu_free(gchar *name);
 
+gboolean menu_open_plugin(ObParseInst *i, gchar *name, gchar *plugin);
+
 void menu_set_update_func(gchar *name, ObMenuUpdateFunc func);
+void menu_set_execute_func(gchar *name, ObMenuExecuteFunc func);
+void menu_set_destroy_func(gchar *name, ObMenuDestroyFunc func);
 
 void menu_show(gchar *name, gint x, gint y, struct _ObClient *client);
 
@@ -96,4 +108,6 @@ void menu_add_separator(gchar *name, gint id);
 
 ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id);
 
+void menu_find_submenus(ObMenu *self);
+
 #endif