X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.h;h=069759721e0c0b8a437156d2afe9dc69f3d10464;hb=040d344a89f40487de8a1920e0aaeccd93a6a995;hp=15bae6675cb413e0cbbbebb465fa49c259d4ec6e;hpb=526560b8a0871cd93f27c32442b3e470ec42ecb3;p=chaz%2Fopenbox

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 15bae667..06975972 100644
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -54,6 +54,9 @@ struct _ObMenuFrame
     GList *entries;
     ObMenuEntryFrame *selected;
 
+    /* show entries from the menu starting at this index */
+    guint show_from;
+
     /* If the submenus are being drawn to the right or the left */
     gboolean direction_right;
 
@@ -61,15 +64,20 @@ struct _ObMenuFrame
     Rect area;
     Strut item_margin;
     gint inner_w; /* inside the borders */
-    gint title_h;  /* height of all title items */
     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 */
+    gint text_h;  /* height of the items */
 
     gint monitor; /* monitor on which to show the menu in xinerama */
 
     RrAppearance *a_title;
     RrAppearance *a_items;
+
+    gboolean got_press; /* don't allow a KeyRelease event to run things in the
+                           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 */
 };
 
 struct _ObMenuEntryFrame
@@ -109,7 +117,9 @@ extern GHashTable *menu_frame_map;
 void menu_frame_startup(gboolean reconfig);
 void menu_frame_shutdown(gboolean reconfig);
 
-ObMenuFrame* menu_frame_new(struct _ObMenu *menu, struct _ObClient *client);
+ObMenuFrame* menu_frame_new(struct _ObMenu *menu,
+                            guint show_from,
+                            struct _ObClient *client);
 void menu_frame_free(ObMenuFrame *self);
 
 void menu_frame_move(ObMenuFrame *self, gint x, gint y);
@@ -120,11 +130,12 @@ 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);
 
 void menu_frame_hide_all();
 void menu_frame_hide_all_client(struct _ObClient *client);
 
+void menu_frame_render(ObMenuFrame *self);
+
 void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
                        gboolean immediate);
 void menu_frame_select_previous(ObMenuFrame *self);
@@ -135,6 +146,6 @@ ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y);
 
 void menu_entry_frame_show_submenu(ObMenuEntryFrame *self);
 
-void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state, Time time);
+void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state);
 
 #endif