add helper functions for manipulating the focus_order list.

[chaz/openbox] / openbox / menu.h

diff --git a/openbox/menu.h b/openbox/menu.h
index b3e712c3241479b9fd232b81f0e213f8e4379479..1a3f002a7184d86dd9edf292b48340929d4647d8 100644 (file)
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -2,27 +2,49 @@
 #define __menu_h
 
 #include "action.h"
+#include "render/render.h"
+
 #include <glib.h>
 
+extern GHashTable *menu_map;
+
+struct Menu;
+
+typedef void(*menu_controller_show)(struct Menu *self, int x, int y, Client *);
+typedef void(*menu_controller_update)(struct Menu *self);
+
 typedef struct Menu {
     char *label;
     char *name;
     
     GList *entries;
-    /* GList *tail; */
 
-    /* ? */
     gboolean shown;
     gboolean invalid;
 
     struct Menu *parent;
 
-    /* waste o' pointers */
-    void (*show)( /* some bummu */);
+    /* place a menu on screen */
+    menu_controller_show show;
     void (*hide)( /* some bummu */);
-    void (*update)( /* some bummu */);
+
+    /* render a menu */
+    menu_controller_update update;
     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 +56,60 @@ 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);
+#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_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);
+
+void menu_render(Menu *self);
+
 #endif