X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=f2aaf1ff8021b22108c26032c995eeee67ad0cd5;hb=485fbff15da1a9001e610b3274747d76c1af57cb;hp=d1a99dcfde0eb8082935b3476ef33cf9d4eca1ef;hpb=22be74583bcf40fd5e762eb818676aa12f7152c4;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index d1a99dcf..f2aaf1ff 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -1,61 +1,117 @@
 #ifndef __menu_h
 #define __menu_h
 
+#include "action.h"
+#include "window.h"
+#include "geom.h"
+#include "render/render.h"
+#include "parser/parse.h"
+
 #include <glib.h>
 
-typedef struct Menu {
-    char *label;
-    
+struct _ObClient;
+struct _ObMenuFrame;
+struct _ObMenuEntryFrame;
+
+typedef struct _ObMenu ObMenu;
+typedef struct _ObMenuEntry ObMenuEntry;
+typedef struct _ObNormalMenuEntry ObNormalMenuEntry;
+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 ObParseInst *menu_parse_inst;
+
+struct _ObMenu
+{
+    /* Name of the menu. Used in the showmenu action. */
+    gchar *name;
+    /* Displayed title */
+    gchar *title;
+
+    /* ObMenuEntry list */
     GList *entries;
-    /* GList *tail; */
-
-    /* ? */
-    gboolean shown;
-    gboolean invalid;
-
-    struct Menu *parent;
-
-    /* waste o' pointers */
-    void (*show)( /* some bummu */);
-    void (*hide)( /* some bummu */);
-    void (*update)( /* some bummu */);
-    void (*mouseover)( /* some bummu */);
-    void (*selected)( /* some bummu */);
-} Menu;
-
-typedef enum MenuEntryRenderType {
-    MenuEntryRenderType_None = 0,
-    MenuEntryRenderType_Submenu 1 << 0,
-    MenuEntryRenderType_Boolean 1 << 1,
-    MenuEntryRenderType_Separator 1 << 2,
-    
-    MenuEntryRenderType_Other 1 << 7
-} MenuEntryType;
-
-
-typedef struct {
-    char *label;
-    Menu *parent;
-
-    Action action;    
-    
-    MenuEntryRenderType render_type;
+
+    /* plugin data */
+    gpointer data;
+
+    ObMenuUpdateFunc update_func;
+    ObMenuExecuteFunc execute_func;
+    ObMenuDestroyFunc destroy_func;
+};
+
+typedef enum
+{
+    OB_MENU_ENTRY_TYPE_NORMAL,
+    OB_MENU_ENTRY_TYPE_SUBMENU,
+    OB_MENU_ENTRY_TYPE_SEPARATOR
+} ObMenuEntryType;
+
+struct _ObNormalMenuEntry {
+    gchar *label;
+
+    /* state */
     gboolean enabled;
-    gboolean boolean_value;
-    gpointer render_data;
 
-    Menu *submenu;
-} MenuEntry;
+    /* List of ObActions */
+    GSList *actions;
+
+    /* Icon shit */
+    gint icon_width;
+    gint icon_height;
+    RrPixel32 *icon_data;
+};
+
+struct _ObSubmenuMenuEntry {
+    gchar *name;
+    ObMenu *submenu;
+};
+
+struct _ObSeparatorMenuEntry {
+    gchar foo; /* placeholder */
+};
+
+struct _ObMenuEntry
+{
+    ObMenuEntryType type;
+    ObMenu *menu;
+
+    gint id;
+
+    union u {
+        ObNormalMenuEntry normal;
+        ObSubmenuMenuEntry submenu;
+        ObSeparatorMenuEntry separator;
+    } data;
+};
+
+void menu_startup();
+void menu_shutdown();
+
+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 */
+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);
 
-Menu *menu_new(char *label, Menu *parent);
-MenuEntry *menu_entry_new_full(char *label, Action *action,
-                          MenuEntryRenderType render_type,
-                          gpointer render_data, gpointer submenu);
+void menu_clear_entries(ObMenu *menu);
+void menu_entry_remove(ObMenuEntry *self);
 
-#define menu_entry_new(label, action) \
-  menu_entry_new(label, action, MenuEntryRenderType_None, NULL, NULL)
+ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id);
 
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu);
+/* fills in the submenus, for use when a menu is being shown */
+void menu_find_submenus(ObMenu *self);
 
-void menu_add_entry(Menu *menu, MenuEntry *entry);
 #endif