X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=6cb76a5e67dcceda758287e8dd6e6b8c501254e8;hb=7f2550e0ce97957192e6b467a6be9104feca18c2;hp=1a3f002a7184d86dd9edf292b48340929d4647d8;hpb=574dd66b326bb3c5893b6bf6bfe7307229def653;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index 1a3f002a..6cb76a5e 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -3,17 +3,23 @@
 
 #include "action.h"
 #include "render/render.h"
+#include "geom.h"
 
 #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,
+                                         gboolean enter);
+
+extern GHashTable *menu_hash;
 
 typedef struct Menu {
+    ObWindow obwin;
+
     char *label;
     char *name;
     
@@ -23,6 +29,8 @@ typedef struct Menu {
     gboolean invalid;
 
     struct Menu *parent;
+    
+    struct Menu *open_submenu;
 
     /* place a menu on screen */
     menu_controller_show show;
@@ -30,7 +38,7 @@ typedef struct Menu {
 
     /* render a menu */
     menu_controller_update update;
-    void (*mouseover)( /* some bummu */);
+    menu_controller_mouseover mouseover;
     void (*selected)( /* some bummu */);
 
 
@@ -38,13 +46,18 @@ 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;
-    int width;
+    Point location;
+    Size size;
+
+    /* plugin stuff */
+    char *plugin;
+    void *plugin_data;
 } Menu;
 
 typedef enum MenuEntryRenderType {
@@ -56,7 +69,7 @@ typedef enum MenuEntryRenderType {
     MenuEntryRenderType_Other = 1 << 7
 } MenuEntryRenderType;
 
-typedef struct {
+typedef struct MenuEntry {
     char *label;
     Menu *parent;
 
@@ -71,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;
@@ -89,14 +102,27 @@ Menu *menu_new_full(char *label, char *name, Menu *parent,
 void menu_free(char *name);
 
 void menu_show(char *name, int x, int y, Client *client);
+void menu_show_full(Menu *menu, int x, int y, Client *client);
+
 void menu_hide(Menu *self);
 
+void menu_clear(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_full(label, action, MenuEntryRenderType_None, NULL)
+menu_entry_new_full(label, action, MenuEntryRenderType_None, NULL)
+
+#define menu_entry_new_separator(label) \
+menu_entry_new_full(label, NULL, MenuEntryRenderType_Separator, NULL)
+
+#define menu_entry_new_submenu(label, submenu) \
+menu_entry_new_full(label, NULL, MenuEntryRenderType_Submenu, submenu)
+
+#define menu_entry_new_boolean(label, action) \
+menu_entry_new_full(label, action, MenuEntryRenderType_Boolean, NULL)
 
 void menu_entry_free(MenuEntry *entry);
 
@@ -111,5 +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