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

diff --git a/render/theme.h b/render/theme.h
index 5523b0ce..c93eb843 100644
--- 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;
@@ -40,12 +43,14 @@ struct _RrTheme {
     RrColor *titlebut_unfocused_unpressed_color;
     RrColor *menu_title_color;
     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;
-    RrFont *winfont;
+    RrFont *winfont_focused;
+    RrFont *winfont_unfocused;
     gint mtitlefont_height;
     RrFont *mtitlefont;
     gint mfont_height;
@@ -76,6 +81,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;
@@ -137,14 +145,19 @@ struct _RrTheme {
     RrAppearance *a_menu;
     RrAppearance *a_menu_item;
     RrAppearance *a_menu_disabled;
-    RrAppearance *a_menu_hilite;
-    RrAppearance *a_clear;
+    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;     /* 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;
+
 };
 
 RrTheme *RrThemeNew(const RrInstance *inst, gchar *theme);