use the new ptr cursor defn

[chaz/openbox] / openbox / menu.h

diff --git a/openbox/menu.h b/openbox/menu.h
index d7d27c2cd9da602db381fb393046aeccea496a29..32944b79a763d4fc54613e10bffbfaf3de1ba81d 100644 (file)
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -1,10 +1,16 @@
 #ifndef __menu_h
 #define __menu_h
 
+#include "action.h"
+#include "render/render.h"
+
 #include <glib.h>
 
-typedef struct {
+extern GHashTable *menu_map;
+
+typedef struct Menu {
     char *label;
+    char *name;
     
     GList *entries;
     /* GList *tail; */
@@ -13,7 +19,7 @@ typedef struct {
     gboolean shown;
     gboolean invalid;
 
-    Menu *parent;
+    struct Menu *parent;
 
     /* waste o' pointers */
     void (*show)( /* some bummu */);
@@ -21,41 +27,78 @@ typedef struct {
     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 {
     MenuEntryRenderType_None = 0,
-    MenuEntryRenderType_Submenu 1 << 0,
-    MenuEntryRenderType_Boolean 1 << 1,
-    MenuEntryRenderType_Separator 1 << 2,
+    MenuEntryRenderType_Submenu = 1 << 0,
+    MenuEntryRenderType_Boolean = 1 << 1,
+    MenuEntryRenderType_Separator = 1 << 2,
     
-    MenuEntryRenderType_Other 1 << 7
-} MenuEntryType;
-
+    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;
 
     Menu *submenu;
+
+    /* render stuff */
+    Window item;
+    Appearance *a_item;
+    Appearance *a_disabled;
+    Appearance *a_hilite;
+    int y;
+    int min_w;
 } MenuEntry;
 
-Menu *menu_new(char *label, Menu *parent);
+void menu_startup();
+void menu_shutdown();
+
+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 render_data, gpointer submenu);
+                               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(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