X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=66390e7565847db9000a455f2a11928603709f87;hb=615cbd96075905d75533f9b615c4ee6a75f4f9a4;hp=1a3f002a7184d86dd9edf292b48340929d4647d8;hpb=574dd66b326bb3c5893b6bf6bfe7307229def653;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index 1a3f002a..66390e75 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -2,114 +2,98 @@
 #define __menu_h
 
 #include "action.h"
+#include "window.h"
 #include "render/render.h"
+#include "geom.h"
 
 #include <glib.h>
 
-extern GHashTable *menu_map;
+struct _ObClient;
+struct _ObMenuFrame;
 
-struct Menu;
+typedef struct _ObMenu ObMenu;
+typedef struct _ObMenuEntry ObMenuEntry;
+typedef struct _ObNormalMenuEntry ObNormalMenuEntry;
+typedef struct _ObSubmenuMenuEntry ObSubmenuMenuEntry;
+typedef struct _ObSeparatorMenuEntry ObSeparatorMenuEntry;
 
-typedef void(*menu_controller_show)(struct Menu *self, int x, int y, Client *);
-typedef void(*menu_controller_update)(struct Menu *self);
+typedef void (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame, gpointer data);
 
-typedef struct Menu {
-    char *label;
-    char *name;
-    
+extern GList *menu_visible;
+
+struct _ObMenu
+{
+    /* Name of the menu. Used in the showmenu action. */
+    gchar *name;
+    /* Displayed title */
+    gchar *title;
+
+    /* ObMenuEntry list */
     GList *entries;
 
-    gboolean shown;
-    gboolean invalid;
-
-    struct Menu *parent;
-
-    /* place a menu on screen */
-    menu_controller_show show;
-    void (*hide)( /* some bummu */);
-
-    /* render a menu */
-    menu_controller_update update;
-    void (*mouseover)( /* some bummu */);
-    void (*selected)( /* some bummu */);
-
-
-    /* render stuff */
-    Client *client;
-    Window frame;
-    Window title;
-    Appearance *a_title;
-    int title_min_w, title_h;
-    Window items;
-    Appearance *a_items;
-    int bullet_w;
-    int item_h;
-    int width;
-} Menu;
-
-typedef enum MenuEntryRenderType {
-    MenuEntryRenderType_None = 0,
-    MenuEntryRenderType_Submenu = 1 << 0,
-    MenuEntryRenderType_Boolean = 1 << 1,
-    MenuEntryRenderType_Separator = 1 << 2,
-    
-    MenuEntryRenderType_Other = 1 << 7
-} MenuEntryRenderType;
-
-typedef struct {
-    char *label;
-    Menu *parent;
-
-    Action *action;    
-    
-    MenuEntryRenderType render_type;
-    gboolean hilite;
-    gboolean enabled;
-    gboolean boolean_value;
+    /* plugin data */
+    gpointer data;
 
-    Menu *submenu;
+    ObMenuUpdateFunc update_func;
+};
 
-    /* render stuff */
-    Window item;
-    Appearance *a_item;
-    Appearance *a_disabled;
-    Appearance *a_hilite;
-    int y;
-    int min_w;
-} MenuEntry;
+typedef enum
+{
+    OB_MENU_ENTRY_TYPE_NORMAL,
+    OB_MENU_ENTRY_TYPE_SUBMENU,
+    OB_MENU_ENTRY_TYPE_SEPARATOR
+} ObMenuEntryType;
 
-void menu_startup();
-void menu_shutdown();
+struct _ObNormalMenuEntry {
+    gchar *label;
 
-#define menu_new(l, n, p) \
-  menu_new_full(l, n, p, NULL, NULL)
+    /* List of ObActions */
+    GSList *actions;
+};
 
-Menu *menu_new_full(char *label, char *name, Menu *parent, 
-                    menu_controller_show show, menu_controller_update update);
-void menu_free(char *name);
+struct _ObSubmenuMenuEntry {
+    ObMenu *submenu;
+};
 
-void menu_show(char *name, int x, int y, Client *client);
-void menu_hide(Menu *self);
+struct _ObSeparatorMenuEntry {
+    gchar foo; /* placeholder */
+};
 
-MenuEntry *menu_entry_new_full(char *label, Action *action,
-                               MenuEntryRenderType render_type,
-                               gpointer submenu);
+struct _ObMenuEntry
+{
+    ObMenuEntryType type;
+    ObMenu *menu;
 
-#define menu_entry_new(label, action) \
-  menu_entry_new_full(label, action, MenuEntryRenderType_None, NULL)
+    gint id;
 
-void menu_entry_free(MenuEntry *entry);
+    /* state */
+    gboolean enabled;
+
+    union u {
+        ObNormalMenuEntry normal;
+        ObSubmenuMenuEntry submenu;
+        ObSeparatorMenuEntry separator;
+    } data;
+};
+
+void menu_startup();
+void menu_shutdown();
 
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu);
+void menu_parse();
 
-void menu_add_entry(Menu *menu, MenuEntry *entry);
+gboolean menu_new(gchar *name, gchar *title, gpointer data);
+void menu_free(gchar *name);
 
-MenuEntry *menu_find_entry(Menu *menu, Window win);
+void menu_set_update_func(gchar *name, ObMenuUpdateFunc func);
 
-void menu_entry_render(MenuEntry *self);
+void menu_show(gchar *name, gint x, gint y, struct _ObClient *client);
 
-void menu_entry_fire(MenuEntry *self);
+/* 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);
 
-void menu_render(Menu *self);
+ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id);
 
 #endif