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

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 4cd27d37..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,9 @@ 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;
 };
 
@@ -111,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);