Merge branch 'backport' into work

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index dda67071a91e24d3301493c5fd3d8ad11019d0a0..9b2d663ed464ce9a57814e25591e660dffcb4d8f 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -42,9 +42,11 @@ struct _RrTheme {
     gint handle_height;
     gint fbwidth; /*!< frame border width */
     gint mbwidth; /*!< menu border width */
+    gint obwidth; /*!< osd border width */
     gint cbwidthx;
     gint cbwidthy;
-    gint menu_overlap;
+    gint menu_overlap_x;
+    gint menu_overlap_y;
     /* these ones are calculated, not set directly by the theme file */
     gint win_font_height;
     gint menu_title_font_height;
@@ -58,8 +60,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;
@@ -102,7 +107,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;
@@ -140,6 +147,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;
@@ -235,7 +245,8 @@ struct _RrTheme {
 
 /*! The font values are all optional. If a NULL is used for any of them, then
   the default font will be used. */
-RrTheme* RrThemeNew(const RrInstance *inst, gchar *theme,
+RrTheme* RrThemeNew(const RrInstance *inst, const gchar *theme,
+                    gboolean allow_fallback,
                     RrFont *active_window_font, RrFont *inactive_window_font,
                     RrFont *menu_title_font, RrFont *menu_item_font,
                     RrFont *osd_font);