X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.h;h=15bae6675cb413e0cbbbebb465fa49c259d4ec6e;hb=edf29cfe733349e3e61de2b4fd9f2a8c1ebec274;hp=26f44b1bee25973c78ef28a53dab6baeec7546d0;hpb=51c3c8c34a9a3a12423a18d12d4c7b9f809151fc;p=chaz%2Fopenbox

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 26f44b1b..15bae667 100644
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -88,8 +88,9 @@ struct _ObMenuEntryFrame
     Window bullet;
 
     RrAppearance *a_normal;
-    RrAppearance *a_disabled;
     RrAppearance *a_selected;
+    RrAppearance *a_disabled;
+    RrAppearance *a_disabled_selected;
 
     RrAppearance *a_icon;
     RrAppearance *a_mask;
@@ -97,8 +98,10 @@ struct _ObMenuEntryFrame
     RrAppearance *a_bullet_selected;
     RrAppearance *a_separator;
     RrAppearance *a_text_normal;
-    RrAppearance *a_text_disabled;
     RrAppearance *a_text_selected;
+    RrAppearance *a_text_disabled;
+    RrAppearance *a_text_disabled_selected;
+    RrAppearance *a_text_title;
 };
 
 extern GHashTable *menu_frame_map;
@@ -110,12 +113,11 @@ ObMenuFrame* menu_frame_new(struct _ObMenu *menu, struct _ObClient *client);
 void menu_frame_free(ObMenuFrame *self);
 
 void menu_frame_move(ObMenuFrame *self, gint x, gint y);
-void menu_frame_move_on_screen(ObMenuFrame *self, gint *dx, gint *dy);
-
-void menu_frame_place_topmenu(ObMenuFrame *self, gint x, gint y);
-void menu_frame_place_submenu(ObMenuFrame *self);
+void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y,
+                               gint *dx, gint *dy);
 
-gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y);
+gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
+                                 gint button);
 gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
                                  ObMenuEntryFrame *parent_entry);
 void menu_frame_hide(ObMenuFrame *self);
@@ -123,7 +125,8 @@ 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(ObMenuFrame *self, ObMenuEntryFrame *entry,
+                       gboolean immediate);
 void menu_frame_select_previous(ObMenuFrame *self);
 void menu_frame_select_next(ObMenuFrame *self);