X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmenu.h;h=6cb76a5e67dcceda758287e8dd6e6b8c501254e8;hb=4541959b8cce89f566c2599d078ae6a28bda4ead;hp=43ac054ff6d2cdc0b11ce10922c46c9b3755cfa7;hpb=03d42b5d8253ad2de94df20b12b9fb22ce51eb3d;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index 43ac054f..6cb76a5e 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -7,17 +7,19 @@
 
 #include <glib.h>
 
-extern GHashTable *menu_map;
-
 struct Menu;
 struct MenuEntry;
 
 typedef void(*menu_controller_show)(struct Menu *self, int x, int y, Client *);
 typedef void(*menu_controller_update)(struct Menu *self);
-typedef void(*menu_controller_mouseover)(struct MenuEntry *self, 
+typedef void(*menu_controller_mouseover)(struct MenuEntry *self,
                                          gboolean enter);
 
+extern GHashTable *menu_hash;
+
 typedef struct Menu {
+    ObWindow obwin;
+
     char *label;
     char *name;
     
@@ -44,10 +46,10 @@ typedef struct Menu {
     Client *client;
     Window frame;
     Window title;
-    Appearance *a_title;
+    RrAppearance *a_title;
     int title_min_w, title_h;
     Window items;
-    Appearance *a_items;
+    RrAppearance *a_items;
     int bullet_w;
     int item_h;
     Point location;
@@ -67,7 +69,7 @@ typedef enum MenuEntryRenderType {
     MenuEntryRenderType_Other = 1 << 7
 } MenuEntryRenderType;
 
-typedef struct {
+typedef struct MenuEntry {
     char *label;
     Menu *parent;
 
@@ -82,9 +84,9 @@ typedef struct {
 
     /* render stuff */
     Window item;
-    Appearance *a_item;
-    Appearance *a_disabled;
-    Appearance *a_hilite;
+    RrAppearance *a_item;
+    RrAppearance *a_disabled;
+    RrAppearance *a_hilite;
     int y;
     int min_w;
 } MenuEntry;
@@ -135,6 +137,7 @@ void menu_entry_render(MenuEntry *self);
 void menu_entry_fire(MenuEntry *self);
 
 void menu_render(Menu *self);
+void menu_render_full(Menu *self);
 
 void menu_control_mouseover(MenuEntry *entry, gboolean enter);
 #endif