X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=32944b79a763d4fc54613e10bffbfaf3de1ba81d;hb=827e7baf20c3d0bb8251f5d024d304d0f9bebbe6;hp=b3e712c3241479b9fd232b81f0e213f8e4379479;hpb=a116f2c6310db702e377e9cd1a95c9a980aba5ae;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index b3e712c3..32944b79 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -2,8 +2,12 @@
 #define __menu_h
 
 #include "action.h"
+#include "render/render.h"
+
 #include <glib.h>
 
+extern GHashTable *menu_map;
+
 typedef struct Menu {
     char *label;
     char *name;
@@ -23,6 +27,19 @@ typedef struct Menu {
     void (*update)( /* some bummu */);
     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 {
@@ -34,34 +51,54 @@ typedef enum MenuEntryRenderType {
     MenuEntryRenderType_Other = 1 << 7
 } MenuEntryRenderType;
 
-
 typedef struct {
     char *label;
     Menu *parent;
 
-    Action action;    
+    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;
+
+    /* render stuff */
+    Window item;
+    Appearance *a_item;
+    Appearance *a_disabled;
+    Appearance *a_hilite;
+    int y;
+    int min_w;
 } MenuEntry;
 
-Menu *menu_new(const char *label, const char *name, Menu *parent);
-void menu_free(const char *name);
+void menu_startup();
+void menu_shutdown();
 
-MenuEntry *menu_entry_new_full(const char *label, Action *action,
-                               const MenuEntryRenderType render_type,
-                               gpointer render_data, gpointer submenu);
+Menu *menu_new(char *label, char *name, Menu *parent);
+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,
+                               gpointer submenu);
 
 #define menu_entry_new(label, action) \
-  menu_entry_new(label, action, MenuEntryRenderType_None, NULL, NULL)
+  menu_entry_new_full(label, action, MenuEntryRenderType_None, NULL)
 
-void menu_entry_free(const MenuEntry *entry);
+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);
+
 #endif