X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.h;h=23eead317678e071da0d8c1c0608b5a167486bce;hb=3a607fad9df628ab16e0f7436dfbfc9b22634003;hp=5523b0cea7341bb93c55199dc8ec7544d312f4e5;hpb=960a7f0184a84f99545fa2d3dd22cefc77f2cbc6;p=chaz%2Fopenbox

diff --git a/render/theme.h b/render/theme.h
index 5523b0ce..23eead31 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -11,8 +11,11 @@ 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;
@@ -41,16 +44,20 @@ 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;
+    RrFont *winfont_focused;
+    RrFont *winfont_unfocused;
     gint mtitlefont_height;
     RrFont *mtitlefont;
     gint mfont_height;
     RrFont *mfont;
 
+    /* style settings - pics */
+    RrPixel32 *def_win_icon; /* 48x48 RGBA */
+
     /* style settings - masks */
     RrPixmapMask *max_mask;
     RrPixmapMask *max_toggled_mask;
@@ -76,6 +83,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 +145,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