X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.h;h=aa32b2117c41a042544efb4f99e8a600785c1271;hb=567fd15eebdd44e50cef140419dbf7a336708109;hp=62df87ca3263b5a8a9f8200db96e569e7cc2a5b2;hpb=8968b38338529cd0a7f2ad08a7c2e0d2e76b6e62;p=chaz%2Fopenbox

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 62df87ca..aa32b211 100644
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -22,7 +22,7 @@
 
 #include "geom.h"
 #include "window.h"
-#include "render/render.h"
+#include "obrender/render.h"
 
 #include <glib.h>
 
@@ -38,7 +38,7 @@ extern GList *menu_frame_visible;
 struct _ObMenuFrame
 {
     /* stuff to be an ObWindow */
-    Window_InternalType type;
+    ObWindow obwin;
     Window window;
 
     struct _ObMenu *menu;
@@ -50,6 +50,7 @@ struct _ObMenuFrame
     ObMenuFrame *parent;
     ObMenuEntryFrame *parent_entry;
     ObMenuFrame *child;
+    ObMenuEntryFrame *child_entry;
 
     GList *entries;
     ObMenuEntryFrame *selected;
@@ -80,9 +81,6 @@ struct _ObMenuFrame
                            menu until it has seen a KeyPress.  this is to
                            avoid having the keybinding used to show the menu
                            end up running something inside the menu */
-    ObMenuEntryFrame * submenu_to_hide;  /* if exist (single!) submenu hide request
-               then this variable hold a copy of 'selected' field of the parent menu,
-               otherwice NULL */
 };
 
 struct _ObMenuEntryFrame
@@ -120,7 +118,7 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
 gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
                                  ObMenuEntryFrame *parent_entry);
 
-void menu_frame_hide_all();
+void menu_frame_hide_all(void);
 void menu_frame_hide_all_client(struct _ObClient *client);
 
 void menu_frame_render(ObMenuFrame *self);
@@ -129,6 +127,8 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
                        gboolean immediate);
 void menu_frame_select_previous(ObMenuFrame *self);
 void menu_frame_select_next(ObMenuFrame *self);
+void menu_frame_select_first(ObMenuFrame *self);
+void menu_frame_select_last(ObMenuFrame *self);
 
 ObMenuFrame* menu_frame_under(gint x, gint y);
 ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y);