couple more xrdb theme format cleanups:

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index db5eb3aac5df8097f73df2ffb164219c11120da4..b4d7cd1dcb92434a7ea02d27c09b01f66609f04d 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -11,6 +11,9 @@ struct _RrTheme {
 
     const RrInstance *inst;
 
+    /* style settings - optional decor */
+    gboolean show_handle;
+
     /* style settings - geometry */
     gint bevel;
     gint handle_height;
@@ -42,7 +45,7 @@ struct _RrTheme {
     RrColor *menu_color;
     RrColor *menu_bullet_color;
     RrColor *menu_disabled_color;
-    RrColor *menu_hilite_color;
+    RrColor *menu_selected_color;
 
     /* style settings - fonts */
     gint winfont_height;
@@ -142,15 +145,18 @@ struct _RrTheme {
     RrAppearance *a_menu;
     RrAppearance *a_menu_item;
     RrAppearance *a_menu_disabled;
-    RrAppearance *a_menu_hilite;
+    RrAppearance *a_menu_selected;
+    RrAppearance *a_menu_text_item;
+    RrAppearance *a_menu_text_disabled;
+    RrAppearance *a_menu_text_selected;
     RrAppearance *a_menu_bullet;
-    RrAppearance *a_clear;
+    RrAppearance *a_clear;     /* clear with no texture */
+    RrAppearance *a_clear_tex; /* clear with a texture */
 
-    RrAppearance *app_hilite_bg;
-    RrAppearance *app_unhilite_bg;
-    RrAppearance *app_hilite_label;
-    RrAppearance *app_unhilite_label;
-    RrAppearance *app_icon;
+    RrAppearance *app_selected_bg;
+    RrAppearance *app_unselected_bg;
+    RrAppearance *app_selected_label;
+    RrAppearance *app_unselected_label;
 
 };