little bit of an actions overhaul, added action_run* so that duplicated code can...

[chaz/openbox] / openbox / menuframe.h

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index f73914443ae9bda885a53dc97b6fe6b9b0a9e00e..3a77ebf40f7ae56accd4bc0a0cadc3e3a38bc0ce 100644 (file)
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -31,17 +31,21 @@ struct _ObMenuFrame
     ObMenuFrame *parent;
     ObMenuFrame *child;
 
+    GList *entries;
+    ObMenuEntryFrame *selected;
+
+    /* If a titlebar is displayed for the menu or not (for top-level menus) */
+    gboolean show_title;
+
     /* On-screen area (including borders!) */
     Rect area;
+    Strut item_margin;
     gint inner_w; /* inside the borders */
     gint title_h; /* includes the bwidth below it */
     gint item_h;  /* height of all normal items */
     gint text_x;  /* offset at which the text appears in the items */
     gint text_w;  /* width of the text area in the items */
 
-    GList *entries;
-    ObMenuEntryFrame *selected;
-
     Window title;
     Window items;
 
@@ -66,7 +70,10 @@ struct _ObMenuEntryFrame
     RrAppearance *a_selected;
 
     RrAppearance *a_icon;
-    RrAppearance *a_bullet;
+    RrAppearance *a_mask;
+    RrAppearance *a_bullet_normal;
+    RrAppearance *a_bullet_selected;
+    RrAppearance *a_separator;
     RrAppearance *a_text_normal;
     RrAppearance *a_text_disabled;
     RrAppearance *a_text_selected;
@@ -82,14 +89,17 @@ void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent);
 void menu_frame_hide(ObMenuFrame *self);
 
 void menu_frame_hide_all();
+void menu_frame_hide_all_client(struct _ObClient *client);
 
 void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry);
+void menu_frame_select_previous(ObMenuFrame *self);
+void menu_frame_select_next(ObMenuFrame *self);
 
 ObMenuFrame* menu_frame_under(gint x, gint y);
 ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y);
 
 void menu_entry_frame_show_submenu(ObMenuEntryFrame *self);
 
-void menu_entry_frame_execute(ObMenuEntryFrame *self);
+void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state);
 
 #endif