-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, Client *client);
-void menu_show_full(Menu *menu, int x, int y, Client *client);
-
-void menu_hide(Menu *self);
-
-void menu_clear(Menu *self);
-
-MenuEntry *menu_entry_new_full(char *label, Action *action,
- MenuEntryRenderType render_type,
- gpointer submenu);
-
-#define menu_entry_new(label, action) \
-menu_entry_new_full(label, action, MenuEntryRenderType_None, NULL)
-
-#define menu_entry_new_separator(label) \
-menu_entry_new_full(label, NULL, MenuEntryRenderType_Separator, NULL)
-
-#define menu_entry_new_submenu(label, submenu) \
-menu_entry_new_full(label, NULL, MenuEntryRenderType_Submenu, submenu)
-
-#define menu_entry_new_boolean(label, action) \
-menu_entry_new_full(label, action, MenuEntryRenderType_Boolean, NULL)
-
-void menu_entry_free(MenuEntry *entry);
-
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu);
-
-void menu_add_entry(Menu *menu, MenuEntry *entry);
-
-MenuEntry *menu_find_entry(Menu *menu, Window win);
-
-void menu_entry_render(MenuEntry *self);
-
-void menu_entry_fire(MenuEntry *self);
-
-void menu_render(Menu *self);
-void menu_render_full(Menu *self);
+ gchar *name;
+ ObMenu *submenu;
+
+ guint show_from;
+};
+
+struct _ObSeparatorMenuEntry {
+ gchar *label;
+};
+
+struct _ObMenuEntry
+{
+ guint ref;
+
+ ObMenuEntryType type;
+ ObMenu *menu;
+
+ gint id;
+
+ union u {
+ ObNormalMenuEntry normal;
+ ObSubmenuMenuEntry submenu;
+ ObSeparatorMenuEntry separator;
+ } data;
+};
+
+void menu_startup(gboolean reconfig);
+void menu_shutdown(gboolean reconfig);
+
+void menu_entry_ref(ObMenuEntry *self);
+void menu_entry_unref(ObMenuEntry *self);
+
+ObMenu* menu_new(const gchar *name, const gchar *title,
+ gboolean allow_shortcut_selection, gpointer data);
+void menu_free(ObMenu *menu);
+
+/*! Repopulate a pipe-menu by running its command */
+void menu_pipe_execute(ObMenu *self);
+/*! Clear a pipe-menu's entries */
+void menu_clear_pipe_caches(void);
+
+void menu_show_all_shortcuts(ObMenu *self, gboolean show);
+
+void menu_show(gchar *name, gint x, gint y, gboolean mouse,
+ struct _ObClient *client);
+gboolean menu_hide_delay_reached(void);
+
+/*! The show function is called right after a menu is shown */
+void menu_set_show_func(ObMenu *menu, ObMenuShowFunc func);
+/*! The hide function is called right before a menu is hidden */
+void menu_set_hide_func(ObMenu *menu, ObMenuHideFunc func);
+/*! The update function is called when the menu should refresh its
+ contents, generally right before it is shown */
+void menu_set_update_func(ObMenu *menu, ObMenuUpdateFunc func);
+/*! The execute function is called when a user chooses to execute an
+ entry in the menu */
+void menu_set_execute_func(ObMenu *menu, ObMenuExecuteFunc func);
+/*! The cleanup function is called after a menu is hidden, allowing it
+ to be cleaned up between uses */
+void menu_set_cleanup_func(ObMenu *menu, ObMenuCleanupFunc func);
+/*! The destroy function is called when the menu is being destroyed
+ permanently */
+void menu_set_destroy_func(ObMenu *menu, ObMenuDestroyFunc func);
+/*! The place function is called when the menu is being shown and allows
+ the menu to choose its initial position */
+void menu_set_place_func(ObMenu *menu, ObMenuPlaceFunc func);
+
+/* functions for building menus */
+/*! @param allow_shortcut this should be false when the label is coming from
+ outside data like window or desktop titles */
+ObMenuEntry* menu_add_normal(ObMenu *menu, gint id, const gchar *label,
+ GSList *actions, gboolean allow_shortcut);
+ObMenuEntry* menu_add_submenu(ObMenu *menu, gint id, const gchar *submenu);
+ObMenuEntry* menu_add_separator(ObMenu *menu, gint id, const gchar *label);
+
+/*! This sorts groups of menu entries between consecutive separators */
+void menu_sort_entries(ObMenu *self);
+
+void menu_clear_entries(ObMenu *self);
+void menu_entry_remove(ObMenuEntry *self);
+
+void menu_entry_set_label(ObMenuEntry *self, const gchar *label,
+ gboolean allow_shortcut);
+
+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);
+
+ObMenuEntry* menu_get_more(ObMenu *menu, guint show_from);