X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=990e946c5ecc8962972eab50fe6c15f24271f72b;hb=7a39cb3e8db767effc47508168b4b1dffb321224;hp=b08f7c952507fd30b0b26246ec422c09016bc50a;hpb=e0e1d4ba7e150b215b55029ddbff3c824b94caf7;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index b08f7c95..990e946c 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -37,9 +37,13 @@ typedef struct _ObNormalMenuEntry ObNormalMenuEntry;
 typedef struct _ObSubmenuMenuEntry ObSubmenuMenuEntry;
 typedef struct _ObSeparatorMenuEntry ObSeparatorMenuEntry;
 
+typedef void (*ObMenuShowFunc)(struct _ObMenuFrame *frame, gpointer data);
+typedef void (*ObMenuHideFunc)(struct _ObMenuFrame *frame, gpointer data);
 typedef gboolean (*ObMenuUpdateFunc)(struct _ObMenuFrame *frame,
                                      gpointer data);
 typedef void (*ObMenuExecuteFunc)(struct _ObMenuEntry *entry,
+                                  struct _ObMenuFrame *frame,
+                                  struct _ObClient *client,
                                   guint state, gpointer data, Time time);
 typedef void (*ObMenuDestroyFunc)(struct _ObMenu *menu, gpointer data);
 /*! @param x is the mouse x coordinate. on return it should be the x coordinate
@@ -75,6 +79,8 @@ struct _ObMenu
     /* plugin data */
     gpointer data;
 
+    ObMenuShowFunc show_func;
+    ObMenuHideFunc hide_func;
     ObMenuUpdateFunc update_func;
     ObMenuExecuteFunc execute_func;
     ObMenuDestroyFunc destroy_func;
@@ -82,6 +88,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
@@ -112,13 +121,15 @@ struct _ObNormalMenuEntry {
     /* Mask icon */
     RrPixmapMask *mask;
     RrColor *mask_normal_color;
-    RrColor *mask_disabled_color;
     RrColor *mask_selected_color;
+    RrColor *mask_disabled_color;
+    RrColor *mask_disabled_selected_color;
 };
 
 struct _ObSubmenuMenuEntry {
     gchar *name;
     ObMenu *submenu;
+    guint show_from;
 };
 
 struct _ObSeparatorMenuEntry {
@@ -127,6 +138,8 @@ struct _ObSeparatorMenuEntry {
 
 struct _ObMenuEntry
 {
+    guint ref;
+
     ObMenuEntryType type;
     ObMenu *menu;
 
@@ -142,10 +155,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 */
@@ -156,6 +172,8 @@ void menu_show_all_shortcuts(ObMenu *self, gboolean show);
 void menu_show(gchar *name, gint x, gint y, gint button,
                struct _ObClient *client);
 
+void menu_set_show_func(ObMenu *menu, ObMenuShowFunc func);
+void menu_set_hide_func(ObMenu *menu, ObMenuHideFunc func);
 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);
@@ -180,4 +198,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