X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=c91be82b67f3e3cdd76dd8d714d59876f8b6f9a9;hb=c34915ae8d49f61426912ef332e8097be516bdd3;hp=94e1daae1afe2e7b0f5e92ae55976bb0e3e13e3e;hpb=d51702affa3e3895f9fca218de39690f8958b500;p=chaz%2Fopenbox diff --git a/openbox/menu.h b/openbox/menu.h index 94e1daae..c91be82b 100644 --- a/openbox/menu.h +++ b/openbox/menu.h @@ -3,172 +3,111 @@ #include "action.h" #include "window.h" -#include "render/render.h" #include "geom.h" +#include "render/render.h" +#include "parser/parse.h" #include struct _ObClient; +struct _ObMenuFrame; +struct _ObMenuEntryFrame; -typedef struct _ObMenu ObMenu; +typedef struct _ObMenu ObMenu; typedef struct _ObMenuEntry ObMenuEntry; +typedef struct _ObNormalMenuEntry ObNormalMenuEntry; +typedef struct _ObSubmenuMenuEntry ObSubmenuMenuEntry; +typedef struct _ObSeparatorMenuEntry ObSeparatorMenuEntry; -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); -typedef void(*menu_controller_selected)(ObMenuEntry *self, unsigned int button, - unsigned int x, unsigned int y); -typedef void(*menu_controller_hide)(ObMenu *self); +typedef void (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame, gpointer data); +typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntryFrame *frame, + gpointer data); +typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data); - -extern GHashTable *menu_hash; extern GList *menu_visible; struct _ObMenu { - ObWindow obwin; - - gchar *label; + /* Name of the menu. Used in the showmenu action. */ gchar *name; - + /* Displayed title */ + gchar *title; + + /* ObMenuEntry list */ GList *entries; - gboolean shown; - gboolean invalid; - - ObMenu *parent; - - ObMenu *open_submenu; - - /* place a menu on screen */ - menu_controller_show show; - menu_controller_hide hide; - - /* render a menu */ - menu_controller_update update; - menu_controller_mouseover mouseover; - menu_controller_selected selected; - - - /* 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; + /* plugin data */ + gpointer data; + + ObMenuUpdateFunc update_func; + ObMenuExecuteFunc execute_func; + ObMenuDestroyFunc destroy_func; }; 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; + OB_MENU_ENTRY_TYPE_NORMAL, + OB_MENU_ENTRY_TYPE_SUBMENU, + OB_MENU_ENTRY_TYPE_SEPARATOR +} ObMenuEntryType; -struct _ObMenuEntry -{ - char *label; - ObMenu *parent; +struct _ObNormalMenuEntry { + gchar *label; - Action *action; - - ObMenuEntryRenderType render_type; - gboolean hilite; + /* state */ gboolean enabled; - gboolean boolean_value; + /* List of ObActions */ + GSList *actions; +}; + +struct _ObSubmenuMenuEntry { + gchar *name; ObMenu *submenu; +}; + +struct _ObSeparatorMenuEntry { + gchar foo; /* placeholder */ +}; - /* render stuff */ - Window item; - RrAppearance *a_item; - RrAppearance *a_disabled; - RrAppearance *a_hilite; - gint y; - gint min_w; -} MenuEntry; +struct _ObMenuEntry +{ + ObMenuEntryType type; + ObMenu *menu; -typedef struct PluginMenuCreateData{ - xmlDocPtr doc; - xmlNodePtr node; - ObMenu *parent; -} PluginMenuCreateData; + gint id; + union u { + ObNormalMenuEntry normal; + ObSubmenuMenuEntry submenu; + ObSeparatorMenuEntry separator; + } data; +}; void menu_startup(); void menu_shutdown(); -void menu_noop(); - -#define menu_new(l, n, p) \ - menu_new_full(l, n, p, menu_show_full, menu_render, menu_entry_fire, \ - menu_hide, menu_control_mouseover) - -ObMenu *menu_new_full(char *label, char *name, ObMenu *parent, - menu_controller_show show, menu_controller_update update, - menu_controller_selected selected, - menu_controller_hide hide, - menu_controller_mouseover mouseover); - -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_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_parse(); -void menu_entry_free(ObMenuEntry *entry); +gboolean menu_new(gchar *name, gchar *title, gpointer data); +void menu_free(gchar *name); -void menu_entry_set_submenu(ObMenuEntry *entry, ObMenu *submenu); +gboolean menu_open_plugin(ObParseInst *i, gchar *name, gchar *plugin); -void menu_add_entry(ObMenu *menu, ObMenuEntry *entry); +void menu_set_update_func(gchar *name, ObMenuUpdateFunc func); +void menu_set_execute_func(gchar *name, ObMenuExecuteFunc func); +void menu_set_destroy_func(gchar *name, ObMenuDestroyFunc func); -ObMenuEntry *menu_find_entry(ObMenu *menu, Window win); -ObMenuEntry *menu_find_entry_by_submenu(ObMenu *menu, ObMenu *submenu); -ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y); +void menu_show(gchar *name, gint x, gint y, struct _ObClient *client); -void menu_entry_render(ObMenuEntry *self); +/* functions for building menus */ +void menu_clear_entries(gchar *name); +void menu_add_normal(gchar *name, gint id, gchar *label, GSList *actions); +void menu_add_submenu(gchar *name, gint id, gchar *submenu); +void menu_add_separator(gchar *name, gint id); -void menu_entry_fire(ObMenuEntry *self, unsigned int button, unsigned int x, - unsigned int y); +ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id); -void menu_render(ObMenu *self); -void menu_render_full(ObMenu *self); +void menu_find_submenus(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); -ObMenuEntry *menu_control_keyboard_nav(ObMenuEntry *over, ObKey key); #endif