don't take KeyRelease events for menus until they receive a KeyPress event first...

[chaz/openbox] / openbox / menuframe.h

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 0ce96158ae84fef0532c2cbf1f23374f232f4137..069759721e0c0b8a437156d2afe9dc69f3d10464 100644 (file)
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -73,13 +73,15 @@ struct _ObMenuFrame
 
     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
 {
-    /* if this is true then it doesn't have an entry to point to */
-    gboolean more;
-
     struct _ObMenuEntry *entry;
     ObMenuFrame *frame;
 
@@ -128,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);
@@ -143,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