Introducing the icon cache.

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index 64c3abcf9e354af146e73f4c4a1b385028e5d708..5b4e785e80527499a04bb77b66c0f0d549b9dd89 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -41,9 +41,8 @@ struct _RrTheme {
     gint paddingy;
     gint handle_height;
     gint fbwidth; /*!< frame border width */
-    gint tswidth; /*!< title separator width - between the titlebar and the
-                    client */
     gint mbwidth; /*!< menu border width */
+    gint obwidth; /*!< osd border width */
     gint cbwidthx;
     gint cbwidthy;
     gint menu_overlap;
@@ -60,8 +59,11 @@ struct _RrTheme {
 
     /* style settings - colors */
     RrColor *menu_border_color;
+    RrColor *osd_border_color;
     RrColor *frame_focused_border_color;
     RrColor *frame_unfocused_border_color;
+    RrColor *title_separator_focused_color;
+    RrColor *title_separator_unfocused_color;
     RrColor *cb_focused_color;
     RrColor *cb_unfocused_color;
     RrColor *title_focused_color;
@@ -104,7 +106,9 @@ struct _RrTheme {
     gchar    menu_text_disabled_selected_shadow_alpha;
 
     /* style settings - pics */
-    RrPixel32 *def_win_icon; /* 48x48 RGBA */
+    RrPixel32 *def_win_icon; /* RGBA */
+    gint       def_win_icon_w;
+    gint       def_win_icon_h;
 
     /* style settings - masks */
     RrPixmapMask *max_mask;
@@ -142,6 +146,9 @@ struct _RrTheme {
     RrPixmapMask *menu_toggle_mask; /* menu boolean */
 #endif
 
+    RrPixmapMask *down_arrow_mask;
+    RrPixmapMask *up_arrow_mask;
+
     /* global appearances */
     RrAppearance *a_disabled_focused_max;
     RrAppearance *a_disabled_unfocused_max;