From 3905872982478e4e0ae05f4ce114a8025a2389ee Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 7 May 2007 22:07:13 +0000 Subject: merge in r6153-6154 from the 3.4 branch --- openbox/menu.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'openbox/menu.h') diff --git a/openbox/menu.h b/openbox/menu.h index 64cbbd6a..f66e423e 100644 --- a/openbox/menu.h +++ b/openbox/menu.h @@ -82,6 +82,9 @@ struct _ObMenu /* Pipe-menu parent, we get destroyed when it is destroyed */ ObMenu *pipe_creator; + + /* The menu used as the destination for the "More..." entry for this menu*/ + ObMenu *more_menu; }; typedef enum @@ -120,6 +123,7 @@ struct _ObNormalMenuEntry { struct _ObSubmenuMenuEntry { gchar *name; ObMenu *submenu; + guint show_from; }; struct _ObSeparatorMenuEntry { @@ -128,6 +132,8 @@ struct _ObSeparatorMenuEntry { struct _ObMenuEntry { + guint ref; + ObMenuEntryType type; ObMenu *menu; @@ -143,10 +149,13 @@ struct _ObMenuEntry void menu_startup(gboolean reconfig); void menu_shutdown(gboolean reconfig); +void menu_entry_ref(ObMenuEntry *self); +void menu_entry_unref(ObMenuEntry *self); + /*! @param allow_shortcut this should be false when the label is coming from outside data like window or desktop titles */ ObMenu* menu_new(const gchar *name, const gchar *title, - gboolean allow_shortcut, gpointer data); + gboolean allow_shortcut_selection, gpointer data); void menu_free(ObMenu *menu); /* Repopulate a pipe-menu by running its command */ @@ -181,4 +190,6 @@ 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); + #endif -- cgit v1.2.3