X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=f2aaf1ff8021b22108c26032c995eeee67ad0cd5;hb=485fbff15da1a9001e610b3274747d76c1af57cb;hp=9ca78880a5c5acccad9a9b674db3bf2b6f7858d6;hpb=34e819738b344a992a1dbfd6cdd165e0c8ddb3a9;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index 9ca78880..f2aaf1ff 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -2,145 +2,116 @@
 #define __menu_h
 
 #include "action.h"
-#include "render/render.h"
+#include "window.h"
 #include "geom.h"
+#include "render/render.h"
+#include "parser/parse.h"
 
 #include <glib.h>
 
-struct Menu;
-struct MenuEntry;
+struct _ObClient;
+struct _ObMenuFrame;
+struct _ObMenuEntryFrame;
 
-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 _ObMenu ObMenu;
+typedef struct _ObMenuEntry ObMenuEntry;
+typedef struct _ObNormalMenuEntry ObNormalMenuEntry;
+typedef struct _ObSubmenuMenuEntry ObSubmenuMenuEntry;
+typedef struct _ObSeparatorMenuEntry ObSeparatorMenuEntry;
 
-extern GHashTable *menu_hash;
-extern GSList *menu_visible;
+typedef void (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame, gpointer data);
+typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry, gpointer data);
+typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data);
 
-typedef struct Menu {
-    ObWindow obwin;
+extern ObParseInst *menu_parse_inst;
 
-    char *label;
-    char *name;
-    
-    GList *entries;
+struct _ObMenu
+{
+    /* Name of the menu. Used in the showmenu action. */
+    gchar *name;
+    /* Displayed title */
+    gchar *title;
 
-    gboolean shown;
-    gboolean invalid;
-
-    struct Menu *parent;
-    
-    struct Menu *open_submenu;
-
-    /* place a menu on screen */
-    menu_controller_show show;
-    void (*hide)( /* 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;
-    RrAppearance *a_title;
-    int title_min_w, title_h;
-    Window items;
-    RrAppearance *a_items;
-    int bullet_w;
-    int item_h;
-    Point location;
-    Size size;
-    guint xin_area; /* index of the xinerama head/area */
-
-    /* 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_Other = 1 << 7
-} MenuEntryRenderType;
-
-typedef struct MenuEntry {
-    char *label;
-    Menu *parent;
-
-    Action *action;    
-    
-    MenuEntryRenderType render_type;
-    gboolean hilite;
-    gboolean enabled;
-    gboolean boolean_value;
+    /* ObMenuEntry list */
+    GList *entries;
 
-    Menu *submenu;
+    /* plugin data */
+    gpointer data;
 
-    /* render stuff */
-    Window item;
-    RrAppearance *a_item;
-    RrAppearance *a_disabled;
-    RrAppearance *a_hilite;
-    int y;
-    int min_w;
-} MenuEntry;
+    ObMenuUpdateFunc update_func;
+    ObMenuExecuteFunc execute_func;
+    ObMenuDestroyFunc destroy_func;
+};
 
-void menu_startup();
-void menu_shutdown();
+typedef enum
+{
+    OB_MENU_ENTRY_TYPE_NORMAL,
+    OB_MENU_ENTRY_TYPE_SUBMENU,
+    OB_MENU_ENTRY_TYPE_SEPARATOR
+} ObMenuEntryType;
 
-#define menu_new(l, n, p) \
-  menu_new_full(l, n, p, NULL, NULL)
+struct _ObNormalMenuEntry {
+    gchar *label;
 
-Menu *menu_new_full(char *label, char *name, Menu *parent, 
-                    menu_controller_show show, menu_controller_update update);
-void menu_free(char *name);
+    /* state */
+    gboolean enabled;
 
-void menu_show(char *name, int x, int y, Client *client);
-void menu_show_full(Menu *menu, int x, int y, Client *client);
+    /* List of ObActions */
+    GSList *actions;
 
-void menu_hide(Menu *self);
+    /* Icon shit */
+    gint icon_width;
+    gint icon_height;
+    RrPixel32 *icon_data;
+};
 
-void menu_clear(Menu *self);
+struct _ObSubmenuMenuEntry {
+    gchar *name;
+    ObMenu *submenu;
+};
 
-MenuEntry *menu_entry_new_full(char *label, Action *action,
-                               MenuEntryRenderType render_type,
-                               gpointer submenu);
+struct _ObSeparatorMenuEntry {
+    gchar foo; /* placeholder */
+};
 
-#define menu_entry_new(label, action) \
-menu_entry_new_full(label, action, MenuEntryRenderType_None, NULL)
+struct _ObMenuEntry
+{
+    ObMenuEntryType type;
+    ObMenu *menu;
 
-#define menu_entry_new_separator(label) \
-menu_entry_new_full(label, NULL, MenuEntryRenderType_Separator, NULL)
+    gint id;
 
-#define menu_entry_new_submenu(label, submenu) \
-menu_entry_new_full(label, NULL, MenuEntryRenderType_Submenu, submenu)
+    union u {
+        ObNormalMenuEntry normal;
+        ObSubmenuMenuEntry submenu;
+        ObSeparatorMenuEntry separator;
+    } data;
+};
 
-#define menu_entry_new_boolean(label, action) \
-menu_entry_new_full(label, action, MenuEntryRenderType_Boolean, NULL)
+void menu_startup();
+void menu_shutdown();
 
-void menu_entry_free(MenuEntry *entry);
+ObMenu* menu_new(gchar *name, gchar *title, gpointer data);
+void menu_free(ObMenu *menu);
 
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu);
+void menu_show(gchar *name, gint x, gint y, struct _ObClient *client);
 
-void menu_add_entry(Menu *menu, MenuEntry *entry);
+void menu_set_update_func(ObMenu *menu, ObMenuUpdateFunc func);
+void menu_set_execute_func(ObMenu *menu, ObMenuExecuteFunc func);
+void menu_set_destroy_func(ObMenu *menu, ObMenuDestroyFunc func);
 
-MenuEntry *menu_find_entry(Menu *menu, Window win);
-MenuEntry *menu_find_entry_by_pos(Menu *menu, int x, int y);
+/* functions for building menus */
+ObMenuEntry* menu_add_normal(ObMenu *menu, gint id, gchar *label,
+                             GSList *actions);
+ObMenuEntry* menu_add_submenu(ObMenu *menu, gint id, gchar *submenu);
+ObMenuEntry* menu_add_separator(ObMenu *menu, gint id);
 
-void menu_entry_render(MenuEntry *self);
+void menu_clear_entries(ObMenu *menu);
+void menu_entry_remove(ObMenuEntry *self);
 
-void menu_entry_fire(MenuEntry *self);
+ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id);
 
-void menu_render(Menu *self);
-void menu_render_full(Menu *self);
+/* fills in the submenus, for use when a menu is being shown */
+void menu_find_submenus(ObMenu *self);
 
-void menu_control_mouseover(MenuEntry *entry, gboolean enter);
 #endif