X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=1a3f002a7184d86dd9edf292b48340929d4647d8;hb=02c7f2e8afbfe5ebc589415a87a2ac156c9ef5af;hp=2371dee011d01ad8f2ea3552a24f1e62e4b95d56;hpb=79a352a40bd16924b1ca3df49f6c82d77e956a0e;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index 2371dee0..1a3f002a 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -8,28 +8,34 @@
 
 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;
 
     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 */);
 
 
     /* render stuff */
+    Client *client;
     Window frame;
     Window title;
     Appearance *a_title;
@@ -75,10 +81,15 @@ typedef struct {
 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,
@@ -97,4 +108,8 @@ 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