1) get rid of menu titles

2) let separators have labels, when they have a label, then they will appear like a menu title used to

so if you want a menu title, you use a separator in the menu itself at the top

more style work may be needed

1 files changed, 9 insertions, 8 deletions

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index a3c359e5..9bc1bdc4 100644
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -2,7 +2,7 @@
 
    menuframe.h for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -57,23 +57,17 @@ struct _ObMenuFrame
     /* If the submenus are being drawn to the right or the left */
     gboolean direction_right;
 
-    /* If a titlebar is displayed for the menu or not (for top-level menus) */
-    gboolean show_title;
-
     /* On-screen area (including borders!) */
     Rect area;
     Strut item_margin;
     gint inner_w; /* inside the borders */
-    gint title_h; /* includes the bwidth below it */
+    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 monitor; /* monitor on which to show the menu in xinerama */
 
-    Window title;
-    Window items;
-
     RrAppearance *a_title;
     RrAppearance *a_items;
 };
@@ -83,6 +77,8 @@ struct _ObMenuEntryFrame
     struct _ObMenuEntry *entry;
     ObMenuFrame *frame;
 
+    guint ignore_enters;
+
     Rect area;
 
     Window window;
@@ -104,6 +100,11 @@ struct _ObMenuEntryFrame
     RrAppearance *a_text_selected;
 };
 
+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);
 void menu_frame_free(ObMenuFrame *self);