typedef struct _ObSeparatorMenuEntry ObSeparatorMenuEntry;
typedef void (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame, gpointer data);
-typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry, gpointer data);
+typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry,
+ guint state, gpointer data);
typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data);
-extern ObParseInst *menu_parse_inst;
-
struct _ObMenu
{
/* Name of the menu. Used in the showmenu action. */
/* Displayed title */
gchar *title;
+ /* Command to execute to rebuild the menu */
+ gchar *execute;
+
/* ObMenuEntry list */
GList *entries;
ObMenuUpdateFunc update_func;
ObMenuExecuteFunc execute_func;
ObMenuDestroyFunc destroy_func;
+
+ /* Pipe-menu parent, we get destroyed when it is destroyed */
+ ObMenu *pipe_creator;
};
typedef enum
gint icon_width;
gint icon_height;
RrPixel32 *icon_data;
+
+ /* Mask icon */
+ RrPixmapMask *mask;
+ RrColor *mask_normal_color;
+ RrColor *mask_disabled_color;
+ RrColor *mask_selected_color;
};
struct _ObSubmenuMenuEntry {
} data;
};
-void menu_startup();
-void menu_shutdown();
+void menu_startup(gboolean reconfig);
+void menu_shutdown(gboolean reconfig);
ObMenu* menu_new(gchar *name, gchar *title, gpointer data);
void menu_free(ObMenu *menu);
+/* Repopulate a pipe-menu by running its command */
+void menu_pipe_execute(ObMenu *self);
+
void menu_show(gchar *name, gint x, gint y, struct _ObClient *client);
void menu_set_update_func(ObMenu *menu, ObMenuUpdateFunc func);