X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.h;h=acf17c3e385bfe1824654a550bfc03201777a732;hb=e9a8e272c06fd0cc1a2d93418d261886e786b16f;hp=a60d5cac431973f636f05a34fe727027c90fc439;hpb=b1f5555218ecaa3827450125dc47b4bf0d404ee4;p=chaz%2Fopenbox

diff --git a/render/theme.h b/render/theme.h
index a60d5cac..acf17c3e 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -2,13 +2,11 @@
 #define __theme_h
 
 #include "render.h"
-#include "color.h"
-#include "font.h"
-#include "mask.h"
 
 typedef struct _RrTheme RrTheme;
 
 struct _RrTheme {
+    gchar *path;
     gchar *name;
 
     const RrInstance *inst;
@@ -24,34 +22,27 @@ struct _RrTheme {
     gint grip_width;
 
     /* style settings - colors */
-    color_rgb *b_color;
-    color_rgb *cb_focused_color;
-    color_rgb *cb_unfocused_color;
-    color_rgb *title_focused_color;
-    color_rgb *title_unfocused_color;
-    color_rgb *titlebut_focused_color;
-    color_rgb *titlebut_unfocused_color;
-    color_rgb *menu_title_color;
-    color_rgb *menu_color;
-    color_rgb *menu_disabled_color;
-    color_rgb *menu_hilite_color;
+    RrColor *b_color;
+    RrColor *cb_focused_color;
+    RrColor *cb_unfocused_color;
+    RrColor *title_focused_color;
+    RrColor *title_unfocused_color;
+    RrColor *titlebut_disabled_focused_color;
+    RrColor *titlebut_disabled_unfocused_color;
+    RrColor *titlebut_focused_color;
+    RrColor *titlebut_unfocused_color;
+    RrColor *menu_title_color;
+    RrColor *menu_color;
+    RrColor *menu_disabled_color;
+    RrColor *menu_hilite_color;
 
     /* style settings - fonts */
     gint winfont_height;
     RrFont *winfont;
-    gboolean winfont_shadow;
-    gint winfont_shadow_offset;
-    gint winfont_shadow_tint;
     gint mtitlefont_height;
     RrFont *mtitlefont;
-    gboolean mtitlefont_shadow;
-    gint mtitlefont_shadow_offset;
-    gint mtitlefont_shadow_tint;
     gint mfont_height;
     RrFont *mfont;
-    gboolean mfont_shadow;
-    gint mfont_shadow_offset;
-    gint mfont_shadow_tint;
 
     /* style settings - title layout */
     gchar *title_layout;
@@ -67,28 +58,38 @@ struct _RrTheme {
     RrPixmapMask *close_mask;
 
     /* global appearances */
+    RrAppearance *a_disabled_focused_max;
+    RrAppearance *a_disabled_unfocused_max;
     RrAppearance *a_focused_unpressed_max;
     RrAppearance *a_focused_pressed_max;
     RrAppearance *a_focused_pressed_set_max;
     RrAppearance *a_unfocused_unpressed_max;
     RrAppearance *a_unfocused_pressed_max;
     RrAppearance *a_unfocused_pressed_set_max;
+    RrAppearance *a_disabled_focused_close;
+    RrAppearance *a_disabled_unfocused_close;
     RrAppearance *a_focused_unpressed_close;
     RrAppearance *a_focused_pressed_close;
     RrAppearance *a_unfocused_unpressed_close;
     RrAppearance *a_unfocused_pressed_close;
+    RrAppearance *a_disabled_focused_desk;
+    RrAppearance *a_disabled_unfocused_desk;
     RrAppearance *a_focused_unpressed_desk;
     RrAppearance *a_focused_pressed_desk;
     RrAppearance *a_focused_pressed_set_desk;
     RrAppearance *a_unfocused_unpressed_desk;
     RrAppearance *a_unfocused_pressed_desk;
     RrAppearance *a_unfocused_pressed_set_desk;
+    RrAppearance *a_disabled_focused_shade;
+    RrAppearance *a_disabled_unfocused_shade;
     RrAppearance *a_focused_unpressed_shade;
     RrAppearance *a_focused_pressed_shade;
     RrAppearance *a_focused_pressed_set_shade;
     RrAppearance *a_unfocused_unpressed_shade;
     RrAppearance *a_unfocused_pressed_shade;
     RrAppearance *a_unfocused_pressed_set_shade;
+    RrAppearance *a_disabled_focused_iconify;
+    RrAppearance *a_disabled_unfocused_iconify;
     RrAppearance *a_focused_unpressed_iconify;
     RrAppearance *a_focused_pressed_iconify;
     RrAppearance *a_unfocused_unpressed_iconify;