X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=72a7ed2404c536f64468393e2b75fb1a312b8c73;hb=a95dc346fe7951dd48e41a41fcaafb6d872b0337;hp=7c39760278a2f0be627dcec7c5cca41613fdfbcc;hpb=434ed8b0bbb42037954e307e5ddc65819261286e;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index 7c397602..72a7ed24 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -2,61 +2,150 @@
 #define __menu_h
 
 #include "action.h"
+#include "window.h"
+#include "render/render.h"
+#include "geom.h"
+
 #include <glib.h>
 
-typedef struct Menu {
-    char *label;
+struct _ObClient;
+
+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 */);
-} Menu;
 
-typedef enum MenuEntryRenderType {
-    MenuEntryRenderType_None = 0,
-    MenuEntryRenderType_Submenu 1 << 0,
-    MenuEntryRenderType_Boolean 1 << 1,
-    MenuEntryRenderType_Separator 1 << 2,
-    
-    MenuEntryRenderType_Other 1 << 7
-} MenuEntryType;
 
+    /* render stuff */
+    struct _ObClient *client;
+    Window frame;
+    Window title;
+    RrAppearance *a_title;
+    gint title_min_w, title_h;
+    Window items;
+    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 struct {
+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;    
+    Action *action;    
     
-    MenuEntryRenderType render_type;
+    ObMenuEntryRenderType render_type;
+    gboolean hilite;
     gboolean enabled;
     gboolean boolean_value;
-    gpointer render_data;
 
-    Menu *submenu;
-} MenuEntry;
+    ObMenu *submenu;
+
+    /* render stuff */
+    Window item;
+    RrAppearance *a_item;
+    RrAppearance *a_disabled;
+    RrAppearance *a_hilite;
+    gint y;
+    gint min_w;
+};
+
+void menu_startup();
+void menu_shutdown();
 
-Menu *menu_new(char *label, Menu *parent);
-MenuEntry *menu_entry_new_full(char *label, Action *action,
-                          MenuEntryRenderType render_type,
-                          gpointer render_data, gpointer submenu);
+#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, 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);
+
+ObMenuEntry *menu_entry_new_full(char *label, Action *action,
+                               ObMenuEntryRenderType 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, 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_set_submenu(ObMenuEntry *entry, ObMenu *submenu);
+
+void menu_add_entry(ObMenu *menu, ObMenuEntry *entry);
+
+ObMenuEntry *menu_find_entry(ObMenu *menu, Window win);
+ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y);
+
+void menu_entry_render(ObMenuEntry *self);
+
+void menu_entry_fire(ObMenuEntry *self);
 
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu);
+void menu_render(ObMenu *self);
+void menu_render_full(ObMenu *self);
 
-void menu_add_entry(Menu *menu, MenuEntry *entry);
+void menu_control_mouseover(ObMenuEntry *entry, gboolean enter);
 #endif