summaryrefslogtreecommitdiff
path: root/openbox/menuframe.h
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/menuframe.h')
-rw-r--r--openbox/menuframe.h22
1 files changed, 4 insertions, 18 deletions
diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index ea1003de..daac34d2 100644
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -38,7 +38,7 @@ extern GList *menu_frame_visible;
struct _ObMenuFrame
{
/* stuff to be an ObWindow */
- ObWindow type;
+ ObWindow obwin;
Window window;
struct _ObMenu *menu;
@@ -71,7 +71,9 @@ struct _ObMenuFrame
gint monitor; /* monitor on which to show the menu in xinerama */
- RrAppearance *a_title;
+ /* We make a copy of this for each menu, so that we don't have to re-render
+ the background of the entire menu each time we render an item inside it.
+ */
RrAppearance *a_items;
gboolean got_press; /* don't allow a KeyRelease event to run things in the
@@ -94,22 +96,6 @@ struct _ObMenuEntryFrame
Window icon;
Window text;
Window bullet;
-
- RrAppearance *a_normal;
- RrAppearance *a_selected;
- RrAppearance *a_disabled;
- RrAppearance *a_disabled_selected;
-
- RrAppearance *a_icon;
- RrAppearance *a_mask;
- RrAppearance *a_bullet_normal;
- RrAppearance *a_bullet_selected;
- RrAppearance *a_separator;
- RrAppearance *a_text_normal;
- RrAppearance *a_text_selected;
- RrAppearance *a_text_disabled;
- RrAppearance *a_text_disabled_selected;
- RrAppearance *a_text_title;
};
extern GHashTable *menu_frame_map;