typedef struct _ObSeparatorMenuEntry ObSeparatorMenuEntry;
typedef void (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame, gpointer data);
-typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntryFrame *frame,
- gpointer data);
+typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry, gpointer data);
typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data);
-extern GList *menu_visible;
-
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;
/* List of ObActions */
GSList *actions;
+
+ /* Icon shit */
+ gint icon_width;
+ gint icon_height;
+ RrPixel32 *icon_data;
+
+ /* Mask icon */
+ RrPixmapMask *mask;
+ RrColor *mask_color;
};
struct _ObSubmenuMenuEntry {
void menu_startup();
void menu_shutdown();
-void menu_parse();
+ObMenu* menu_new(gchar *name, gchar *title, gpointer data);
+void menu_free(ObMenu *menu);
-gboolean menu_new(gchar *name, gchar *title, gpointer data);
-void menu_free(gchar *name);
-
-gboolean menu_open_plugin(ObParseInst *i, gchar *name, gchar *plugin);
-
-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);
+/* 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);
+void menu_set_execute_func(ObMenu *menu, ObMenuExecuteFunc func);
+void menu_set_destroy_func(ObMenu *menu, ObMenuDestroyFunc func);
+
/* 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);
+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_clear_entries(ObMenu *menu);
+void menu_entry_remove(ObMenuEntry *self);
ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id);
+/* fills in the submenus, for use when a menu is being shown */
void menu_find_submenus(ObMenu *self);
#endif