remove plugins from the menu parsing

[chaz/openbox] / openbox / menu.h

diff --git a/openbox/menu.h b/openbox/menu.h
index 66390e7565847db9000a455f2a11928603709f87..f2aaf1ff8021b22108c26032c995eeee67ad0cd5 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,8 +20,10 @@ typedef struct _ObSubmenuMenuEntry ObSubmenuMenuEntry;
 typedef struct _ObSeparatorMenuEntry ObSeparatorMenuEntry;
 
 typedef void (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame, gpointer data);
+typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry, gpointer data);
+typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data);
 
-extern GList *menu_visible;
+extern ObParseInst *menu_parse_inst;
 
 struct _ObMenu
 {
@@ -35,6 +39,8 @@ struct _ObMenu
     gpointer data;
 
     ObMenuUpdateFunc update_func;
+    ObMenuExecuteFunc execute_func;
+    ObMenuDestroyFunc destroy_func;
 };
 
 typedef enum
@@ -47,11 +53,20 @@ typedef enum
 struct _ObNormalMenuEntry {
     gchar *label;
 
+    /* state */
+    gboolean enabled;
+
     /* List of ObActions */
     GSList *actions;
+
+    /* Icon shit */
+    gint icon_width;
+    gint icon_height;
+    RrPixel32 *icon_data;
 };
 
 struct _ObSubmenuMenuEntry {
+    gchar *name;
     ObMenu *submenu;
 };
 
@@ -66,9 +81,6 @@ struct _ObMenuEntry
 
     gint id;
 
-    /* state */
-    gboolean enabled;
-
     union u {
         ObNormalMenuEntry normal;
         ObSubmenuMenuEntry submenu;
@@ -79,21 +91,27 @@ struct _ObMenuEntry
 void menu_startup();
 void menu_shutdown();
 
-void menu_parse();
-
-gboolean menu_new(gchar *name, gchar *title, gpointer data);
-void menu_free(gchar *name);
-
-void menu_set_update_func(gchar *name, ObMenuUpdateFunc func);
+ObMenu* menu_new(gchar *name, gchar *title, gpointer data);
+void menu_free(ObMenu *menu);
 
 void menu_show(gchar *name, gint x, gint y, struct _ObClient *client);
 
+void menu_set_update_func(ObMenu *menu, ObMenuUpdateFunc func);
+void menu_set_execute_func(ObMenu *menu, ObMenuExecuteFunc func);
+void menu_set_destroy_func(ObMenu *menu, ObMenuDestroyFunc func);
+
 /* functions for building menus */
-void menu_clear_entries(gchar *name);
-void menu_add_normal(gchar *name, gint id, gchar *label, GSList *actions);
-void menu_add_submenu(gchar *name, gint id, gchar *submenu);
-void menu_add_separator(gchar *name, gint id);
+ObMenuEntry* menu_add_normal(ObMenu *menu, gint id, gchar *label,
+                             GSList *actions);
+ObMenuEntry* menu_add_submenu(ObMenu *menu, gint id, gchar *submenu);
+ObMenuEntry* menu_add_separator(ObMenu *menu, gint id);
+
+void menu_clear_entries(ObMenu *menu);
+void menu_entry_remove(ObMenuEntry *self);
 
 ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id);
 
+/* fills in the submenus, for use when a menu is being shown */
+void menu_find_submenus(ObMenu *self);
+
 #endif