X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=1adac022e10e12d2e97992cd6eafc8a81fe2ebd1;hb=950b85b9880012ed45b81854b5b5865b1de08a87;hp=9beb8f2a591615f21076d80e8210f4cd5005ba7d;hpb=122d55fbadea0409fbc902a1740e1c8ff3aecd88;p=chaz%2Fopenbox diff --git a/openbox/menu.h b/openbox/menu.h index 9beb8f2a..1adac022 100644 --- a/openbox/menu.h +++ b/openbox/menu.h @@ -9,42 +9,65 @@ #include struct _ObClient; +struct _ObParseInst; -struct Menu; -struct MenuEntry; +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); +typedef void(*menu_controller_selected)(ObMenuEntry *entry, + unsigned int button, + unsigned int x, unsigned int y); +typedef void(*menu_controller_hide)(ObMenu *self); -typedef void(*menu_controller_show)(struct Menu *self, - int x, int y, struct _ObClient *); -typedef void(*menu_controller_update)(struct Menu *self); -typedef void(*menu_controller_mouseover)(struct MenuEntry *self, - gboolean enter); extern GHashTable *menu_hash; -extern GSList *menu_visible; +extern GList *menu_visible; -typedef struct Menu { +struct _ObMenu +{ ObWindow obwin; - char *label; - char *name; - + /* The title displayed above the menu. + NULL for no titlebar */ + gchar *label; + + /* Name of the menu. + Used in the action showmenu */ + gchar *name; + + /* ObMenuEntry list */ GList *entries; + /* If the menu is currently displayed */ gboolean shown; + + /* If the rendering of the menu has changed and needs to be rerendered. */ gboolean invalid; - struct Menu *parent; + /* Kind of lame.Each menu can only be a submenu, and each menu can only + have one submenu open */ + ObMenu *parent; + ObMenu *open_submenu; + GList *over; - struct Menu *open_submenu; - + /* behaviour callbacks + TODO: Document and split code that HAS to be in the overridden callback */ /* place a menu on screen */ menu_controller_show show; - void (*hide)( /* some bummu */); - + /* Hide the menu */ + menu_controller_hide hide; /* render a menu */ menu_controller_update update; + /* Event for a mouse enter/exit on an entry + TODO: May have to split from simple render updating? + */ menu_controller_mouseover mouseover; - void (*selected)( /* some bummu */); + /* Entry is clicked/hit enter on */ + menu_controller_selected selected; /* render stuff */ @@ -52,99 +75,127 @@ typedef struct Menu { Window frame; Window title; RrAppearance *a_title; - int title_min_w, title_h; + gint title_min_w, title_h; Window items; RrAppearance *a_items; - int bullet_w; - int item_h; + gint bullet_w; + gint item_h; Point location; Size size; guint xin_area; /* index of the xinerama head/area */ - /* plugin stuff */ + /* Name of plugin for menu */ char *plugin; + /* plugin's data */ 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 { +}; + +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; + ObAction *action; - MenuEntryRenderType render_type; + ObMenuEntryRenderType render_type; gboolean hilite; gboolean enabled; gboolean boolean_value; - Menu *submenu; + ObMenu *submenu; /* render stuff */ Window item; + Window submenu_pic; + RrAppearance *a_item; RrAppearance *a_disabled; RrAppearance *a_hilite; - int y; - int min_w; + RrAppearance *a_submenu; + gint y; + gint min_w; } MenuEntry; +typedef struct PluginMenuCreateData{ + struct _ObParseInst *parse_inst; + xmlDocPtr doc; + xmlNodePtr node; + ObMenu *parent; +} PluginMenuCreateData; + + void menu_startup(); void menu_shutdown(); +void menu_parse(); + +void menu_noop(); + #define menu_new(l, n, p) \ - menu_new_full(l, n, p, NULL, NULL) + 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); -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, struct _ObClient *client); -void menu_show_full(Menu *menu, int x, int y, struct _ObClient *client); +void menu_show_full(ObMenu *menu, int x, int y, struct _ObClient *client); -void menu_hide(Menu *self); +void menu_hide(ObMenu *self); -void menu_clear(Menu *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, ObAction *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, MenuEntryRenderType_Separator, NULL) +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, MenuEntryRenderType_Submenu, 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, MenuEntryRenderType_Boolean, NULL) +menu_entry_new_full(label, action, OB_MENU_ENTRY_RENDER_TYPE_BOOLEAN, NULL) -void menu_entry_free(MenuEntry *entry); +void menu_entry_free(ObMenuEntry *entry); -void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu); +void menu_entry_set_submenu(ObMenuEntry *entry, ObMenu *submenu); -void menu_add_entry(Menu *menu, MenuEntry *entry); +void menu_add_entry(ObMenu *menu, ObMenuEntry *entry); -MenuEntry *menu_find_entry(Menu *menu, Window win); -MenuEntry *menu_find_entry_by_pos(Menu *menu, int x, int y); +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_entry_render(MenuEntry *self); +void menu_entry_render(ObMenuEntry *self); -void menu_entry_fire(MenuEntry *self); +void menu_entry_fire(ObMenuEntry *entry, + unsigned int button, unsigned int x, unsigned int y); -void menu_render(Menu *self); -void menu_render_full(Menu *self); +void menu_render(ObMenu *self); +void menu_render_full(ObMenu *self); -void menu_control_mouseover(MenuEntry *entry, gboolean enter); +/*so plugins can call it? */ +void parse_menu_full(struct _ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + void *data, gboolean new); +void menu_control_mouseover(ObMenuEntry *entry, gboolean enter); +void menu_control_keyboard_nav(unsigned int key); #endif