api cleanups for render/theme.h

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index 5523b0cea7341bb93c55199dc8ec7544d312f4e5..5b7b932ad88fc266439a9f206f5f6683727c80f5 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -11,13 +11,17 @@ struct _RrTheme {
 
     const RrInstance *inst;
 
+    /* style settings - optional decor */
+    gboolean show_handle;
+
     /* style settings - geometry */
-    gint bevel;
+    gint padding;
     gint handle_height;
     gint bwidth;
     gint cbwidth;
     gint label_height;
     gint title_height;
+    gint menu_title_height;
     gint button_size;
     gint grip_width;
     gint menu_overlap;
@@ -41,15 +45,19 @@ struct _RrTheme {
     RrColor *menu_title_color;
     RrColor *menu_color;
     RrColor *menu_disabled_color;
-    RrColor *menu_hilite_color;
+    RrColor *menu_selected_color;
 
     /* style settings - fonts */
-    gint winfont_height;
-    RrFont *winfont;
-    gint mtitlefont_height;
-    RrFont *mtitlefont;
-    gint mfont_height;
-    RrFont *mfont;
+    gint win_font_height;
+    RrFont *win_font_focused;
+    RrFont *win_font_unfocused;
+    gint menu_title_font_height;
+    RrFont *menu_title_font;
+    gint menu_font_height;
+    RrFont *menu_font;
+
+    /* style settings - pics */
+    RrPixel32 *def_win_icon; /* 48x48 RGBA */
 
     /* style settings - masks */
     RrPixmapMask *max_mask;
@@ -76,6 +84,9 @@ struct _RrTheme {
     RrPixmapMask *close_disabled_mask;
     RrPixmapMask *close_pressed_mask;
 
+    RrPixmapMask *menu_bullet_mask; /* submenu pointer */
+    RrPixmapMask *menu_toggle_mask; /* menu boolean */
+
     /* global appearances */
     RrAppearance *a_disabled_focused_max;
     RrAppearance *a_disabled_unfocused_max;
@@ -135,19 +146,27 @@ struct _RrTheme {
     RrAppearance *a_unfocused_handle;
     RrAppearance *a_menu_title;
     RrAppearance *a_menu;
-    RrAppearance *a_menu_item;
+    RrAppearance *a_menu_normal;
     RrAppearance *a_menu_disabled;
-    RrAppearance *a_menu_hilite;
-    RrAppearance *a_clear;
+    RrAppearance *a_menu_selected;
+    RrAppearance *a_menu_text_normal;
+    RrAppearance *a_menu_text_disabled;
+    RrAppearance *a_menu_text_selected;
+    RrAppearance *a_menu_bullet_normal;
+    RrAppearance *a_menu_bullet_selected;
+    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_hilite_fg; /* never parent relative */
+    RrAppearance *app_unhilite_fg; /* never parent relative */
+    RrAppearance *app_hilite_label; /* can be parent relative */
+    RrAppearance *app_unhilite_label; /* can be parent relative */
+
 };
 
-RrTheme *RrThemeNew(const RrInstance *inst, gchar *theme);
+RrTheme* RrThemeNew(const RrInstance *inst, gchar *theme);
 void RrThemeFree(RrTheme *theme);
 
 #endif