X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=2f3f9ac2ff65afbb04faab7b4e8c92da68c84549;hb=22ff8c587d815c021cad13f46094a31cc79243cf;hp=32944b79a763d4fc54613e10bffbfaf3de1ba81d;hpb=185d1337e553283530e23b1edff3bb709f04e9bb;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index 32944b79..2f3f9ac2 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -2,103 +2,159 @@
 #define __menu_h
 
 #include "action.h"
+#include "window.h"
 #include "render/render.h"
+#include "geom.h"
 
 #include <glib.h>
 
-extern GHashTable *menu_map;
+struct _ObClient;
 
-typedef struct Menu {
-    char *label;
-    char *name;
+typedef struct _ObMenu      ObMenu;
+typedef struct _ObMenuEntry ObMenuEntry;
+
+typedef void(*menu_controller_show)(ObMenu *self, int x, int y,
+                                    struct _ObClient *);
+typedef void(*menu_controller_update)(ObMenu *self);
+typedef void(*menu_controller_mouseover)(ObMenuEntry *self, gboolean enter);
+
+extern GHashTable *menu_hash;
+extern GSList *menu_visible;
+
+struct _ObMenu
+{
+    ObWindow obwin;
+
+    gchar *label;
+    gchar *name;
     
     GList *entries;
-    /* GList *tail; */
 
-    /* ? */
     gboolean shown;
     gboolean invalid;
 
-    struct Menu *parent;
+    ObMenu *parent;
+    
+    ObMenu *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;
+    struct _ObClient *client;
     Window frame;
     Window title;
-    Appearance *a_title;
-    int title_min_w, title_h;
+    RrAppearance *a_title;
+    gint 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_Other = 1 << 7
-} MenuEntryRenderType;
-
-typedef struct {
+    RrAppearance *a_items;
+    gint bullet_w;
+    gint item_h;
+    Point location;
+    Size size;
+    guint xin_area; /* index of the xinerama head/area */
+
+    /* plugin stuff */
+    char *plugin;
+    void *plugin_data;
+};
+
+typedef enum
+{
+    OB_MENU_ENTRY_RENDER_TYPE_NONE,
+    OB_MENU_ENTRY_RENDER_TYPE_SUBMENU,
+    OB_MENU_ENTRY_RENDER_TYPE_BOOLEAN,
+    OB_MENU_ENTRY_RENDER_TYPE_SEPARATOR,
+    OB_MENU_ENTRY_RENDER_TYPE_OTHER /* XXX what is this? */
+} ObMenuEntryRenderType;
+
+struct _ObMenuEntry
+{
     char *label;
-    Menu *parent;
+    ObMenu *parent;
 
     Action *action;    
     
-    MenuEntryRenderType render_type;
+    ObMenuEntryRenderType render_type;
     gboolean hilite;
     gboolean enabled;
     gboolean boolean_value;
 
-    Menu *submenu;
+    ObMenu *submenu;
 
     /* render stuff */
     Window item;
-    Appearance *a_item;
-    Appearance *a_disabled;
-    Appearance *a_hilite;
-    int y;
-    int min_w;
+    RrAppearance *a_item;
+    RrAppearance *a_disabled;
+    RrAppearance *a_hilite;
+    gint y;
+    gint min_w;
 } MenuEntry;
 
+typedef struct PluginMenuCreateData{
+    xmlDocPtr doc;
+    xmlNodePtr node;
+    ObMenu *parent;
+} PluginMenuCreateData;
+
+
 void menu_startup();
 void menu_shutdown();
 
-Menu *menu_new(char *label, char *name, Menu *parent);
+#define menu_new(l, n, p) \
+  menu_new_full(l, n, p, NULL, NULL)
+
+ObMenu *menu_new_full(char *label, char *name, ObMenu *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);
+void menu_show(char *name, int x, int y, struct _ObClient *client);
+void menu_show_full(ObMenu *menu, int x, int y, struct _ObClient *client);
+
+void menu_hide(ObMenu *self);
+
+void menu_clear(ObMenu *self);
 
-MenuEntry *menu_entry_new_full(char *label, Action *action,
-                               MenuEntryRenderType render_type,
+ObMenuEntry *menu_entry_new_full(char *label, Action *action,
+                               ObMenuEntryRenderType 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, OB_MENU_ENTRY_RENDER_TYPE_NONE, NULL)
+
+#define menu_entry_new_separator(label) \
+menu_entry_new_full(label, NULL, OB_MENU_ENTRY_RENDER_TYPE_SEPARATOR, NULL)
+
+#define menu_entry_new_submenu(label, submenu) \
+menu_entry_new_full(label, NULL, OB_MENU_ENTRY_RENDER_TYPE_SUBMENU, submenu)
+
+#define menu_entry_new_boolean(label, action) \
+menu_entry_new_full(label, action, OB_MENU_ENTRY_RENDER_TYPE_BOOLEAN, NULL)
+
+void menu_entry_free(ObMenuEntry *entry);
 
-void menu_entry_free(MenuEntry *entry);
+void menu_entry_set_submenu(ObMenuEntry *entry, ObMenu *submenu);
 
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu);
+void menu_add_entry(ObMenu *menu, ObMenuEntry *entry);
 
-void menu_add_entry(Menu *menu, MenuEntry *entry);
+ObMenuEntry *menu_find_entry(ObMenu *menu, Window win);
+ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y);
 
-MenuEntry *menu_find_entry(Menu *menu, Window win);
+void menu_entry_render(ObMenuEntry *self);
 
-void menu_entry_render(MenuEntry *self);
+void menu_entry_fire(ObMenuEntry *self);
 
-void menu_entry_fire(MenuEntry *self);
+void menu_render(ObMenu *self);
+void menu_render_full(ObMenu *self);
 
+//so plugins can call it?
+void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data, gboolean new);
+void menu_control_mouseover(ObMenuEntry *entry, gboolean enter);
 #endif