move logic for add/remove desktop into screen.c

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index 8f66a383f8689d77a874b1dc89075e99b2a39f76..2c35284f466b50dba4855edffc75bd57cdf1f572 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -42,6 +42,7 @@ 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;
@@ -57,8 +58,12 @@ struct _RrTheme {
     gint menu_title_height;
 
     /* style settings - colors */
-    RrColor *menu_b_color;
-    RrColor *frame_b_color;
+    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;
@@ -135,7 +140,9 @@ struct _RrTheme {
     RrPixmapMask *close_pressed_mask;
 
     RrPixmapMask *menu_bullet_mask; /* submenu pointer */
+#if 0
     RrPixmapMask *menu_toggle_mask; /* menu boolean */
+#endif
 
     /* global appearances */
     RrAppearance *a_disabled_focused_max;
@@ -227,11 +234,13 @@ struct _RrTheme {
     RrAppearance *osd_hilite_label; /* can be parent relative */
     RrAppearance *osd_unhilite_fg; /* can never be parent relative */
 
+    gchar *name;
 };
 
 /*! 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);