X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=1a3f002a7184d86dd9edf292b48340929d4647d8;hb=5888e7ed4b7a6499f80ea4d4c6f10b16f99243a5;hp=23b6b9c55dd614c287c18d092dddee45ac476ed2;hpb=59c3cce4f49f04ed2c2937e7de24255dd53df487;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index 23b6b9c5..1a3f002a 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -8,37 +8,44 @@
 
 extern GHashTable *menu_map;
 
+struct Menu;
+
+typedef void(*menu_controller_show)(struct Menu *self, int x, int y, Client *);
+typedef void(*menu_controller_update)(struct Menu *self);
+
 typedef struct Menu {
     char *label;
     char *name;
     
     GList *entries;
-    /* GList *tail; */
 
-    /* ? */
     gboolean shown;
     gboolean invalid;
-    gpointer render_data; /* where the engine can store anything it likes */
 
     struct Menu *parent;
 
-    /* waste o' pointers */
-    void (*show)( /* some bummu */);
+    /* place a menu on screen */
+    menu_controller_show show;
     void (*hide)( /* some bummu */);
-    void (*update)( /* some bummu */);
+
+    /* render a menu */
+    menu_controller_update update;
     void (*mouseover)( /* some bummu */);
     void (*selected)( /* some bummu */);
-} Menu;
 
-typedef struct MenuRenderData {
+
+    /* 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;
-} MenuRenderData;
+    int width;
+} Menu;
 
 typedef enum MenuEntryRenderType {
     MenuEntryRenderType_None = 0,
@@ -56,26 +63,33 @@ typedef struct {
     Action *action;    
     
     MenuEntryRenderType render_type;
+    gboolean hilite;
     gboolean enabled;
     gboolean boolean_value;
-    gpointer render_data; /* where the engine can store anything it likes */
 
     Menu *submenu;
-} MenuEntry;
 
-typedef struct MenuEntryRenderData {
+    /* render stuff */
     Window item;
     Appearance *a_item;
+    Appearance *a_disabled;
+    Appearance *a_hilite;
+    int y;
     int min_w;
-} MenuEntryRenderData;
+} MenuEntry;
 
 void menu_startup();
 void menu_shutdown();
 
-Menu *menu_new(char *label, char *name, Menu *parent);
+#define menu_new(l, n, p) \
+  menu_new_full(l, n, p, NULL, NULL)
+
+Menu *menu_new_full(char *label, char *name, Menu *parent, 
+                    menu_controller_show show, menu_controller_update update);
 void menu_free(char *name);
 
 void menu_show(char *name, int x, int y, Client *client);
+void menu_hide(Menu *self);
 
 MenuEntry *menu_entry_new_full(char *label, Action *action,
                                MenuEntryRenderType render_type,
@@ -89,4 +103,13 @@ void menu_entry_free(MenuEntry *entry);
 void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu);
 
 void menu_add_entry(Menu *menu, MenuEntry *entry);
+
+MenuEntry *menu_find_entry(Menu *menu, Window win);
+
+void menu_entry_render(MenuEntry *self);
+
+void menu_entry_fire(MenuEntry *self);
+
+void menu_render(Menu *self);
+
 #endif