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 8cfc837b27085caeed7a315b4b19fe36eff10ad6..3a77ebf40f7ae56accd4bc0a0cadc3e3a38bc0ce 100644 (file)
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -39,6 +39,7 @@ struct _ObMenuFrame
 
     /* 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 */
@@ -69,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;
@@ -88,12 +92,14 @@ 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