X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=2d811c121508a7d5ecbceb27e3c9e418d265b27c;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=d1a99dcfde0eb8082935b3476ef33cf9d4eca1ef;hpb=22be74583bcf40fd5e762eb818676aa12f7152c4;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index d1a99dcf..2d811c12 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -1,61 +1,140 @@
 #ifndef __menu_h
 #define __menu_h
 
+#include "action.h"
+#include "render/render.h"
+#include "geom.h"
+
 #include <glib.h>
 
+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);
+
 typedef struct Menu {
+    ObWindow obwin;
+
     char *label;
+    char *name;
     
     GList *entries;
-    /* GList *tail; */
 
-    /* ? */
     gboolean shown;
     gboolean invalid;
 
     struct Menu *parent;
+    
+    struct Menu *open_submenu;
 
-    /* waste o' pointers */
-    void (*show)( /* some bummu */);
+    /* place a menu on screen */
+    menu_controller_show show;
     void (*hide)( /* some bummu */);
-    void (*update)( /* some bummu */);
-    void (*mouseover)( /* some bummu */);
+
+    /* render a menu */
+    menu_controller_update update;
+    menu_controller_mouseover mouseover;
     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;
+    Point location;
+    Size size;
+
+    /* plugin stuff */
+    char *plugin;
+    void *plugin_data;
 } 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();
+
+#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_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 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)
+
+#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);
 
 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);
+
+void menu_render(Menu *self);
+
+void menu_control_mouseover(MenuEntry *entry, gboolean enter);
 #endif