simplify window.h macros, and rename the window types to ObWindowClass for consistent...

[chaz/openbox] / openbox / menuframe.h

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 191bcfe8f4c5d68eb1397d7db94e56d40988199b..ea1003dedd7c119fe8a05ef673205591a1db0360 100644 (file)
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -38,7 +38,7 @@ extern GList *menu_frame_visible;
 struct _ObMenuFrame
 {
     /* stuff to be an ObWindow */
-    Window_InternalType type;
+    ObWindow type;
     Window window;
 
     struct _ObMenu *menu;
@@ -73,6 +73,11 @@ 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