X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=a7da009b01488af135a906e5d4c61236f1a27740;hb=ea6258ce0f8b4e7af8d44f2e540eb25ccfe8955b;hp=2ebcead3bf2925f106af93658a3cbf34b1b99c76;hpb=6e93be1d2e07ace0c21bc040cfb2e4890667d033;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 2ebcead3..a7da009b 100644 --- a/render/theme.c +++ b/render/theme.c @@ -2,254 +2,674 @@ #include "color.h" #include "font.h" #include "mask.h" +#include "theme.h" #include #include -/* style settings - geometry */ -int theme_bevel; -int theme_handle_height; -int theme_bwidth; -int theme_cbwidth; -/* style settings - colors */ -color_rgb *theme_b_color; -color_rgb *theme_cb_focused_color; -color_rgb *theme_cb_unfocused_color; -color_rgb *theme_title_focused_color; -color_rgb *theme_title_unfocused_color; -color_rgb *theme_titlebut_focused_color; -color_rgb *theme_titlebut_unfocused_color; -color_rgb *theme_menu_title_color; -color_rgb *theme_menu_color; -color_rgb *theme_menu_disabled_color; -color_rgb *theme_menu_hilite_color; -/* style settings - fonts */ -int theme_winfont_height; -ObFont *theme_winfont; -gboolean theme_winfont_shadow; -int theme_winfont_shadow_offset; -int theme_winfont_shadow_tint; -int theme_mtitlefont_height; -ObFont *theme_mtitlefont; -gboolean theme_mtitlefont_shadow; -int theme_mtitlefont_shadow_offset; -int theme_mtitlefont_shadow_tint; -int theme_mfont_height; -ObFont *theme_mfont; -gboolean theme_mfont_shadow; -int theme_mfont_shadow_offset; -int theme_mfont_shadow_tint; -/* style settings - title layout */ -char *theme_title_layout; -/* style settings - masks */ -pixmap_mask *theme_max_set_mask; -pixmap_mask *theme_max_unset_mask; -pixmap_mask *theme_iconify_mask; -pixmap_mask *theme_desk_set_mask; -pixmap_mask *theme_desk_unset_mask; -pixmap_mask *theme_shade_set_mask; -pixmap_mask *theme_shade_unset_mask; -pixmap_mask *theme_close_mask; - -/* global appearances */ -Appearance *theme_a_focused_unpressed_max; -Appearance *theme_a_focused_pressed_max; -Appearance *theme_a_focused_pressed_set_max; -Appearance *theme_a_unfocused_unpressed_max; -Appearance *theme_a_unfocused_pressed_max; -Appearance *theme_a_unfocused_pressed_set_max; -Appearance *theme_a_focused_unpressed_close; -Appearance *theme_a_focused_pressed_close; -Appearance *theme_a_unfocused_unpressed_close; -Appearance *theme_a_unfocused_pressed_close; -Appearance *theme_a_focused_unpressed_desk; -Appearance *theme_a_focused_pressed_desk; -Appearance *theme_a_focused_pressed_set_desk; -Appearance *theme_a_unfocused_unpressed_desk; -Appearance *theme_a_unfocused_pressed_desk; -Appearance *theme_a_unfocused_pressed_set_desk; -Appearance *theme_a_focused_unpressed_shade; -Appearance *theme_a_focused_pressed_shade; -Appearance *theme_a_focused_pressed_set_shade; -Appearance *theme_a_unfocused_unpressed_shade; -Appearance *theme_a_unfocused_pressed_shade; -Appearance *theme_a_unfocused_pressed_set_shade; -Appearance *theme_a_focused_unpressed_iconify; -Appearance *theme_a_focused_pressed_iconify; -Appearance *theme_a_unfocused_unpressed_iconify; -Appearance *theme_a_unfocused_pressed_iconify; -Appearance *theme_a_focused_grip; -Appearance *theme_a_unfocused_grip; -Appearance *theme_a_focused_title; -Appearance *theme_a_unfocused_title; -Appearance *theme_a_focused_label; -Appearance *theme_a_unfocused_label; -Appearance *theme_a_icon; /* always parentrelative, so no focused/unfocused */ -Appearance *theme_a_focused_handle; -Appearance *theme_a_unfocused_handle; -Appearance *theme_a_menu_title; -Appearance *theme_a_menu; -Appearance *theme_a_menu_item; -Appearance *theme_a_menu_disabled; -Appearance *theme_a_menu_hilite; - -Appearance *theme_app_hilite_bg; -Appearance *theme_app_unhilite_bg; -Appearance *theme_app_hilite_label; -Appearance *theme_app_unhilite_label; -Appearance *theme_app_icon; - -void theme_startup() +static XrmDatabase loaddb(RrTheme *theme, char *name); +static gboolean read_int(XrmDatabase db, char *rname, int *value); +static gboolean read_string(XrmDatabase db, char *rname, char **value); +static gboolean read_color(XrmDatabase db, const RrInstance *inst, + gchar *rname, RrColor **value); +static gboolean read_mask(const RrInstance *inst, + gchar *maskname, RrTheme *theme, + RrPixmapMask **value); +static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, + gchar *rname, RrAppearance *value); +static void set_default_appearance(RrAppearance *a); + +RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) { - theme_b_color = theme_cb_unfocused_color = theme_cb_focused_color = - theme_title_unfocused_color = theme_title_focused_color = - theme_titlebut_unfocused_color = theme_titlebut_focused_color = - theme_menu_color = theme_menu_title_color = theme_menu_disabled_color = - theme_menu_hilite_color = NULL; - theme_winfont = theme_mtitlefont = theme_mfont = NULL; - theme_title_layout = NULL; - theme_max_set_mask = theme_max_unset_mask = NULL; - theme_desk_set_mask = theme_desk_unset_mask = NULL; - theme_shade_set_mask = theme_shade_unset_mask = NULL; - theme_iconify_mask = theme_close_mask = NULL; - - theme_a_focused_unpressed_max = appearance_new(1); - theme_a_focused_pressed_max = appearance_new(1); - theme_a_focused_pressed_set_max = appearance_new(1); - theme_a_unfocused_unpressed_max = appearance_new(1); - theme_a_unfocused_pressed_max = appearance_new(1); - theme_a_unfocused_pressed_set_max = appearance_new(1); - theme_a_focused_unpressed_close = NULL; - theme_a_focused_pressed_close = NULL; - theme_a_unfocused_unpressed_close = NULL; - theme_a_unfocused_pressed_close = NULL; - theme_a_focused_unpressed_desk = NULL; - theme_a_focused_pressed_desk = NULL; - theme_a_focused_pressed_set_desk = NULL; - theme_a_unfocused_unpressed_desk = NULL; - theme_a_unfocused_pressed_desk = NULL; - theme_a_unfocused_pressed_set_desk = NULL; - theme_a_focused_unpressed_shade = NULL; - theme_a_focused_pressed_shade = NULL; - theme_a_focused_pressed_set_shade = NULL; - theme_a_unfocused_unpressed_shade = NULL; - theme_a_unfocused_pressed_shade = NULL; - theme_a_unfocused_pressed_set_shade = NULL; - theme_a_focused_unpressed_iconify = NULL; - theme_a_focused_pressed_iconify = NULL; - theme_a_unfocused_unpressed_iconify = NULL; - theme_a_unfocused_pressed_iconify = NULL; - theme_a_focused_grip = appearance_new(0); - theme_a_unfocused_grip = appearance_new(0); - theme_a_focused_title = appearance_new(0); - theme_a_unfocused_title = appearance_new(0); - theme_a_focused_label = appearance_new(1); - theme_a_unfocused_label = appearance_new(1); - theme_a_icon = appearance_new(1); - theme_a_focused_handle = appearance_new(0); - theme_a_unfocused_handle = appearance_new(0); - theme_a_menu = appearance_new(0); - theme_a_menu_title = appearance_new(1); - theme_a_menu_item = appearance_new(1); - theme_a_menu_disabled = appearance_new(1); - theme_a_menu_hilite = appearance_new(1); - - theme_app_hilite_bg = appearance_new(0); - theme_app_unhilite_bg = appearance_new(0); - theme_app_hilite_label = appearance_new(1); - theme_app_unhilite_label = appearance_new(1); - theme_app_icon = appearance_new(1); + XrmDatabase db = NULL; + RrJustify winjust, mtitlejust, mjust; + gchar *str; + gchar *font_str; + RrTheme *theme; + + theme = g_new0(RrTheme, 1); + + theme->inst = inst; + + theme->a_disabled_focused_max = RrAppearanceNew(inst, 1); + theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1); + theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1); + theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); + theme->a_focused_pressed_set_max = RrAppearanceNew(inst, 1); + theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); + theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1); + theme->a_unfocused_pressed_set_max = RrAppearanceNew(inst, 1); + theme->a_focused_grip = RrAppearanceNew(inst, 0); + theme->a_unfocused_grip = RrAppearanceNew(inst, 0); + theme->a_focused_title = RrAppearanceNew(inst, 0); + theme->a_unfocused_title = RrAppearanceNew(inst, 0); + theme->a_focused_label = RrAppearanceNew(inst, 1); + theme->a_unfocused_label = RrAppearanceNew(inst, 1); + theme->a_icon = RrAppearanceNew(inst, 1); + theme->a_focused_handle = RrAppearanceNew(inst, 0); + theme->a_unfocused_handle = RrAppearanceNew(inst, 0); + theme->a_menu = RrAppearanceNew(inst, 0); + theme->a_menu_title = RrAppearanceNew(inst, 1); + theme->a_menu_item = RrAppearanceNew(inst, 1); + theme->a_menu_disabled = RrAppearanceNew(inst, 1); + theme->a_menu_hilite = RrAppearanceNew(inst, 1); + + theme->app_hilite_bg = RrAppearanceNew(inst, 0); + theme->app_unhilite_bg = RrAppearanceNew(inst, 0); + theme->app_hilite_label = RrAppearanceNew(inst, 1); + theme->app_unhilite_label = RrAppearanceNew(inst, 1); + theme->app_icon = RrAppearanceNew(inst, 1); + + if (name) { + db = loaddb(theme, name); + if (db == NULL) { + g_warning("Failed to load the theme '%s'", name); + g_message("Falling back to the default: '%s'", DEFAULT_THEME); + } else + theme->name = g_path_get_basename(name); + } + if (db == NULL) { + db = loaddb(theme, DEFAULT_THEME); + if (db == NULL) { + g_warning("Failed to load the theme '%s'.", DEFAULT_THEME); + return NULL; + } else + theme->name = g_path_get_basename(DEFAULT_THEME); + } + + /* load the font stuff */ + if (!read_string(db, "window.title.xftfont", &font_str)) + font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50"; + + if (!(theme->winfont = RrFontOpen(inst, font_str))) { + RrThemeFree(theme); + return NULL; + } + theme->winfont_height = RrFontHeight(theme->winfont); + + winjust = RR_JUSTIFY_LEFT; + if (read_string(db, "window.justify", &str)) { + if (!g_ascii_strcasecmp(str, "right")) + winjust = RR_JUSTIFY_RIGHT; + else if (!g_ascii_strcasecmp(str, "center")) + winjust = RR_JUSTIFY_CENTER; + } + + if (!read_string(db, "menu.title.xftfont", &font_str)) + font_str = "arial,sans:bold:pixelsize=12:shadow=y"; + + if (!(theme->mtitlefont = RrFontOpen(inst, font_str))) { + RrThemeFree(theme); + return NULL; + } + theme->mtitlefont_height = RrFontHeight(theme->mtitlefont); + + mtitlejust = RR_JUSTIFY_LEFT; + if (read_string(db, "menu.title.justify", &str)) { + if (!g_ascii_strcasecmp(str, "right")) + mtitlejust = RR_JUSTIFY_RIGHT; + else if (!g_ascii_strcasecmp(str, "center")) + mtitlejust = RR_JUSTIFY_CENTER; + } + + if (!read_string(db, "menu.frame.xftfont", &font_str)) + font_str = "arial,sans:bold:pixelsize=11:shadow=y"; + + if (!(theme->mfont = RrFontOpen(inst, font_str))) { + RrThemeFree(theme); + return NULL; + } + theme->mfont_height = RrFontHeight(theme->mfont); + + mjust = RR_JUSTIFY_LEFT; + if (read_string(db, "menu.frame.justify", &str)) { + if (!g_ascii_strcasecmp(str, "right")) + mjust = RR_JUSTIFY_RIGHT; + else if (!g_ascii_strcasecmp(str, "center")) + mjust = RR_JUSTIFY_CENTER; + } + + /* load the title layout */ + if (!read_string(db, "window.title.layout", &font_str)) + font_str = "NLIMC"; + theme->title_layout = g_strdup(font_str); + + /* load direct dimensions */ + if (!read_int(db, "menuOverlap", &theme->menu_overlap) || + theme->menu_overlap < 0 || theme->menu_overlap > 20) + theme->handle_height = 0; + if (!read_int(db, "handleWidth", &theme->handle_height) || + theme->handle_height < 0 || theme->handle_height > 100) + theme->handle_height = 6; + if (!read_int(db, "bevelWidth", &theme->bevel) || + theme->bevel <= 0 || theme->bevel > 100) theme->bevel = 3; + if (!read_int(db, "borderWidth", &theme->bwidth) || + theme->bwidth < 0 || theme->bwidth > 100) theme->bwidth = 1; + if (!read_int(db, "frameWidth", &theme->cbwidth) || + theme->cbwidth < 0 || theme->cbwidth > 100) + theme->cbwidth = theme->bevel; + + /* load colors */ + if (!read_color(db, inst, + "borderColor", &theme->b_color)) + theme->b_color = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, + "window.frame.focusColor", &theme->cb_focused_color)) + theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.frame.unfocusColor",&theme->cb_unfocused_color)) + theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.label.focus.textColor", + &theme->title_focused_color)) + theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); + if (!read_color(db, inst, + "window.label.unfocus.textColor", + &theme->title_unfocused_color)) + theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.button.focus.picColor", + &theme->titlebut_focused_color)) + theme->titlebut_focused_color = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, + "window.button.unfocus.picColor", + &theme->titlebut_unfocused_color)) + theme->titlebut_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.button.disabled.focus.picColor", + &theme->titlebut_disabled_focused_color)) + theme->titlebut_disabled_focused_color = + RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.button.disabled.unfocus.picColor", + &theme->titlebut_disabled_unfocused_color)) + theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, + "menu.title.textColor", &theme->menu_title_color)) + theme->menu_title_color = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, + "menu.frame.textColor", &theme->menu_color)) + theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "menu.frame.disableColor", &theme->menu_disabled_color)) + theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, + "menu.hilite.textColor", &theme->menu_hilite_color)) + theme->menu_hilite_color = RrColorNew(inst, 0, 0, 0); + + if (read_mask(inst, "max.xbm", theme, &theme->max_unset_mask)){ + if (!read_mask(inst, "max_t.xbm", theme, &theme->max_set_mask)) { + theme->max_set_mask = RrPixmapMaskCopy(theme->max_unset_mask); + } + } else { + { + char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; + theme->max_unset_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + { + char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; + theme->max_set_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + } + if (!read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) { + char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; + theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + + if (read_mask(inst, "stick.xbm", theme, &theme->desk_unset_mask)) { + if (!read_mask(inst, "stick_t.xbm", theme, &theme->desk_set_mask)) { + theme->desk_set_mask = + RrPixmapMaskCopy(theme->desk_unset_mask); + } + } else { + { + char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; + theme->desk_unset_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + { + char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 }; + theme->desk_set_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + } + + if (read_mask(inst, "shade.xbm", theme, &theme->shade_unset_mask)) { + if (!read_mask(inst, "shade_t.xbm", theme, &theme->shade_set_mask)) { + theme->shade_set_mask = + RrPixmapMaskCopy(theme->shade_unset_mask); + } + } else { + { + char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; + theme->shade_unset_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + { + char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f }; + theme->shade_set_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + } + + if (!read_mask(inst, "close.xbm", theme, &theme->close_mask)) { + char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; + theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + + /* read the decoration textures */ + if (!read_appearance(db, inst, + "window.title.focus", theme->a_focused_title)) + set_default_appearance(theme->a_focused_title); + if (!read_appearance(db, inst, + "window.title.unfocus", theme->a_unfocused_title)) + set_default_appearance(theme->a_unfocused_title); + if (!read_appearance(db, inst, + "window.label.focus", theme->a_focused_label)) + set_default_appearance(theme->a_focused_label); + if (!read_appearance(db, inst, + "window.label.unfocus", theme->a_unfocused_label)) + set_default_appearance(theme->a_unfocused_label); + if (!read_appearance(db, inst, + "window.handle.focus", theme->a_focused_handle)) + set_default_appearance(theme->a_focused_handle); + if (!read_appearance(db, inst, + "window.handle.unfocus",theme->a_unfocused_handle)) + set_default_appearance(theme->a_unfocused_handle); + if (!read_appearance(db, inst, + "window.grip.focus", theme->a_focused_grip)) + set_default_appearance(theme->a_focused_grip); + if (!read_appearance(db, inst, + "window.grip.unfocus", theme->a_unfocused_grip)) + set_default_appearance(theme->a_unfocused_grip); + if (!read_appearance(db, inst, + "menu.frame", theme->a_menu)) + set_default_appearance(theme->a_menu); + if (!read_appearance(db, inst, + "menu.title", theme->a_menu_title)) + set_default_appearance(theme->a_menu_title); + if (!read_appearance(db, inst, + "menu.hilite", theme->a_menu_hilite)) + set_default_appearance(theme->a_menu_hilite); + + /* read the appearances for rendering non-decorations */ + if (!read_appearance(db, inst, + "window.title.focus", theme->app_hilite_bg)) + set_default_appearance(theme->app_hilite_bg); + if (!read_appearance(db, inst, + "window.label.focus", theme->app_hilite_label)) + set_default_appearance(theme->app_hilite_label); + if (!read_appearance(db, inst, + "window.title.unfocus", theme->app_unhilite_bg)) + set_default_appearance(theme->app_unhilite_bg); + if (!read_appearance(db, inst, + "window.label.unfocus", theme->app_unhilite_label)) + set_default_appearance(theme->app_unhilite_label); + + /* read buttons textures */ + if (!read_appearance(db, inst, + "window.button.disabled.focus", + theme->a_disabled_focused_max)) + set_default_appearance(theme->a_disabled_focused_max); + if (!read_appearance(db, inst, + "window.button.disabled.unfocus", + theme->a_disabled_unfocused_max)) + set_default_appearance(theme->a_disabled_unfocused_max); + if (!read_appearance(db, inst, + "window.button.pressed.focus", + theme->a_focused_pressed_max)) + if (!read_appearance(db, inst, + "window.button.pressed", + theme->a_focused_pressed_max)) + set_default_appearance(theme->a_focused_pressed_max); + if (!read_appearance(db, inst, + "window.button.pressed.unfocus", + theme->a_unfocused_pressed_max)) + if (!read_appearance(db, inst, + "window.button.pressed", + theme->a_unfocused_pressed_max)) + set_default_appearance(theme->a_unfocused_pressed_max); + if (!read_appearance(db, inst, + "window.button.focus", + theme->a_focused_unpressed_max)) + set_default_appearance(theme->a_focused_unpressed_max); + if (!read_appearance(db, inst, + "window.button.unfocus", + theme->a_unfocused_unpressed_max)) + set_default_appearance(theme->a_unfocused_unpressed_max); + + theme->a_disabled_focused_close = + RrAppearanceCopy(theme->a_disabled_focused_max); + theme->a_disabled_unfocused_close = + RrAppearanceCopy(theme->a_disabled_unfocused_max); + theme->a_unfocused_unpressed_close = + RrAppearanceCopy(theme->a_unfocused_unpressed_max); + theme->a_unfocused_pressed_close = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + theme->a_focused_unpressed_close = + RrAppearanceCopy(theme->a_focused_unpressed_max); + theme->a_focused_pressed_close = + RrAppearanceCopy(theme->a_focused_pressed_max); + theme->a_disabled_focused_desk = + RrAppearanceCopy(theme->a_disabled_focused_max); + theme->a_disabled_unfocused_desk = + RrAppearanceCopy(theme->a_disabled_unfocused_max); + theme->a_unfocused_unpressed_desk = + RrAppearanceCopy(theme->a_unfocused_unpressed_max); + theme->a_unfocused_pressed_desk = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + theme->a_unfocused_pressed_set_desk = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + theme->a_focused_unpressed_desk = + RrAppearanceCopy(theme->a_focused_unpressed_max); + theme->a_focused_pressed_desk = + RrAppearanceCopy(theme->a_focused_pressed_max); + theme->a_focused_pressed_set_desk = + RrAppearanceCopy(theme->a_focused_pressed_max); + theme->a_disabled_focused_shade = + RrAppearanceCopy(theme->a_disabled_focused_max); + theme->a_disabled_unfocused_shade = + RrAppearanceCopy(theme->a_disabled_unfocused_max); + theme->a_unfocused_unpressed_shade = + RrAppearanceCopy(theme->a_unfocused_unpressed_max); + theme->a_unfocused_pressed_shade = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + theme->a_unfocused_pressed_set_shade = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + theme->a_focused_unpressed_shade = + RrAppearanceCopy(theme->a_focused_unpressed_max); + theme->a_focused_pressed_shade = + RrAppearanceCopy(theme->a_focused_pressed_max); + theme->a_focused_pressed_set_shade = + RrAppearanceCopy(theme->a_focused_pressed_max); + theme->a_disabled_focused_iconify = + RrAppearanceCopy(theme->a_disabled_focused_max); + theme->a_disabled_unfocused_iconify = + RrAppearanceCopy(theme->a_disabled_focused_max); + theme->a_unfocused_unpressed_iconify = + RrAppearanceCopy(theme->a_unfocused_unpressed_max); + theme->a_unfocused_pressed_iconify = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + theme->a_focused_unpressed_iconify = + RrAppearanceCopy(theme->a_focused_unpressed_max); + theme->a_focused_pressed_iconify = + RrAppearanceCopy(theme->a_focused_pressed_max); + theme->a_unfocused_pressed_set_max = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + theme->a_focused_pressed_set_max = + RrAppearanceCopy(theme->a_focused_pressed_max); + + theme->a_icon->surface.grad = RR_SURFACE_PARENTREL; + + /* set up the textures */ + theme->a_focused_label->texture[0].type = + theme->app_hilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme->a_focused_label->texture[0].data.text.justify = winjust; + theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + theme->a_focused_label->texture[0].data.text.font = + theme->app_hilite_label->texture[0].data.text.font = theme->winfont; + theme->a_focused_label->texture[0].data.text.color = + theme->app_hilite_label->texture[0].data.text.color = + theme->title_focused_color; + + theme->a_unfocused_label->texture[0].type = + theme->app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme->a_unfocused_label->texture[0].data.text.justify = winjust; + theme->app_unhilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + theme->a_unfocused_label->texture[0].data.text.font = + theme->app_unhilite_label->texture[0].data.text.font = theme->winfont; + theme->a_unfocused_label->texture[0].data.text.color = + theme->app_unhilite_label->texture[0].data.text.color = + theme->title_unfocused_color; + + theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT; + theme->a_menu_title->texture[0].data.text.justify = mtitlejust; + theme->a_menu_title->texture[0].data.text.font = theme->mtitlefont; + theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color; + + theme->a_menu_item->surface.grad = + theme->a_menu_disabled->surface.grad = + theme->app_icon->surface.grad = RR_SURFACE_PARENTREL; + + theme->a_menu_item->texture[0].type = + theme->a_menu_disabled->texture[0].type = + theme->a_menu_hilite->texture[0].type = RR_TEXTURE_TEXT; + theme->a_menu_item->texture[0].data.text.justify = + theme->a_menu_disabled->texture[0].data.text.justify = + theme->a_menu_hilite->texture[0].data.text.justify = mjust; + theme->a_menu_item->texture[0].data.text.font = + theme->a_menu_disabled->texture[0].data.text.font = + theme->a_menu_hilite->texture[0].data.text.font = theme->mfont; + theme->a_menu_item->texture[0].data.text.color = theme->menu_color; + theme->a_menu_disabled->texture[0].data.text.color = + theme->menu_disabled_color; + theme->a_menu_hilite->texture[0].data.text.color = + theme->menu_hilite_color; + + theme->a_disabled_focused_max->texture[0].type = + theme->a_disabled_unfocused_max->texture[0].type = + theme->a_focused_unpressed_max->texture[0].type = + theme->a_focused_pressed_max->texture[0].type = + theme->a_focused_pressed_set_max->texture[0].type = + theme->a_unfocused_unpressed_max->texture[0].type = + theme->a_unfocused_pressed_max->texture[0].type = + theme->a_unfocused_pressed_set_max->texture[0].type = + theme->a_disabled_focused_close->texture[0].type = + theme->a_disabled_unfocused_close->texture[0].type = + theme->a_focused_unpressed_close->texture[0].type = + theme->a_focused_pressed_close->texture[0].type = + theme->a_unfocused_unpressed_close->texture[0].type = + theme->a_unfocused_pressed_close->texture[0].type = + theme->a_disabled_focused_desk->texture[0].type = + theme->a_disabled_unfocused_desk->texture[0].type = + theme->a_focused_unpressed_desk->texture[0].type = + theme->a_focused_pressed_desk->texture[0].type = + theme->a_focused_pressed_set_desk->texture[0].type = + theme->a_unfocused_unpressed_desk->texture[0].type = + theme->a_unfocused_pressed_desk->texture[0].type = + theme->a_unfocused_pressed_set_desk->texture[0].type = + theme->a_disabled_focused_shade->texture[0].type = + theme->a_disabled_unfocused_shade->texture[0].type = + theme->a_focused_unpressed_shade->texture[0].type = + theme->a_focused_pressed_shade->texture[0].type = + theme->a_focused_pressed_set_shade->texture[0].type = + theme->a_unfocused_unpressed_shade->texture[0].type = + theme->a_unfocused_pressed_shade->texture[0].type = + theme->a_unfocused_pressed_set_shade->texture[0].type = + theme->a_disabled_focused_iconify->texture[0].type = + theme->a_disabled_unfocused_iconify->texture[0].type = + theme->a_focused_unpressed_iconify->texture[0].type = + theme->a_focused_pressed_iconify->texture[0].type = + theme->a_unfocused_unpressed_iconify->texture[0].type = + theme->a_unfocused_pressed_iconify->texture[0].type = RR_TEXTURE_MASK; + theme->a_disabled_focused_max->texture[0].data.mask.mask = + theme->a_disabled_unfocused_max->texture[0].data.mask.mask = + theme->a_focused_unpressed_max->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = + theme->a_focused_pressed_max->texture[0].data.mask.mask = + theme->a_unfocused_pressed_max->texture[0].data.mask.mask = + theme->max_unset_mask; + theme->a_focused_pressed_set_max->texture[0].data.mask.mask = + theme->a_unfocused_pressed_set_max->texture[0].data.mask.mask = + theme->max_set_mask; + theme->a_disabled_focused_close->texture[0].data.mask.mask = + theme->a_disabled_unfocused_close->texture[0].data.mask.mask = + theme->a_focused_pressed_close->texture[0].data.mask.mask = + theme->a_unfocused_pressed_close->texture[0].data.mask.mask = + theme->a_focused_unpressed_close->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_close->texture[0].data.mask.mask = + theme->close_mask; + theme->a_disabled_focused_desk->texture[0].data.mask.mask = + theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = + theme->a_focused_unpressed_desk->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = + theme->a_focused_pressed_desk->texture[0].data.mask.mask = + theme->a_unfocused_pressed_desk->texture[0].data.mask.mask = + theme->desk_unset_mask; + theme->a_focused_pressed_set_desk->texture[0].data.mask.mask = + theme->a_unfocused_pressed_set_desk->texture[0].data.mask.mask = + theme->desk_set_mask; + theme->a_disabled_focused_shade->texture[0].data.mask.mask = + theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = + theme->a_focused_unpressed_shade->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = + theme->a_focused_pressed_shade->texture[0].data.mask.mask = + theme->a_unfocused_pressed_shade->texture[0].data.mask.mask = + theme->shade_unset_mask; + theme->a_focused_pressed_set_shade->texture[0].data.mask.mask = + theme->a_unfocused_pressed_set_shade->texture[0].data.mask.mask = + theme->shade_set_mask; + theme->a_disabled_focused_iconify->texture[0].data.mask.mask = + theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = + theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = + theme->a_focused_pressed_iconify->texture[0].data.mask.mask = + theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask = + theme->iconify_mask; + theme->a_disabled_focused_max->texture[0].data.mask.color = + theme->a_disabled_focused_close->texture[0].data.mask.color = + theme->a_disabled_focused_desk->texture[0].data.mask.color = + theme->a_disabled_focused_shade->texture[0].data.mask.color = + theme->a_disabled_focused_iconify->texture[0].data.mask.color = + theme->titlebut_disabled_focused_color; + theme->a_disabled_unfocused_max->texture[0].data.mask.color = + theme->a_disabled_unfocused_close->texture[0].data.mask.color = + theme->a_disabled_unfocused_desk->texture[0].data.mask.color = + theme->a_disabled_unfocused_shade->texture[0].data.mask.color = + theme->a_disabled_unfocused_iconify->texture[0].data.mask.color = + theme->titlebut_disabled_unfocused_color; + theme->a_focused_unpressed_max->texture[0].data.mask.color = + theme->a_focused_pressed_max->texture[0].data.mask.color = + theme->a_focused_pressed_set_max->texture[0].data.mask.color = + theme->a_focused_unpressed_close->texture[0].data.mask.color = + theme->a_focused_pressed_close->texture[0].data.mask.color = + theme->a_focused_unpressed_desk->texture[0].data.mask.color = + theme->a_focused_pressed_desk->texture[0].data.mask.color = + theme->a_focused_pressed_set_desk->texture[0].data.mask.color = + theme->a_focused_unpressed_shade->texture[0].data.mask.color = + theme->a_focused_pressed_shade->texture[0].data.mask.color = + theme->a_focused_pressed_set_shade->texture[0].data.mask.color = + theme->a_focused_unpressed_iconify->texture[0].data.mask.color = + theme->a_focused_pressed_iconify->texture[0].data.mask.color = + theme->titlebut_focused_color; + theme->a_unfocused_unpressed_max->texture[0].data.mask.color = + theme->a_unfocused_pressed_max->texture[0].data.mask.color = + theme->a_unfocused_pressed_set_max->texture[0].data.mask.color = + theme->a_unfocused_unpressed_close->texture[0].data.mask.color = + theme->a_unfocused_pressed_close->texture[0].data.mask.color = + theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = + theme->a_unfocused_pressed_desk->texture[0].data.mask.color = + theme->a_unfocused_pressed_set_desk->texture[0].data.mask.color = + theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = + theme->a_unfocused_pressed_shade->texture[0].data.mask.color = + theme->a_unfocused_pressed_set_shade->texture[0].data.mask.color = + theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = + theme->a_unfocused_pressed_iconify->texture[0].data.mask.color = + theme->titlebut_unfocused_color; + + XrmDestroyDatabase(db); + + theme->label_height = theme->winfont_height; + theme->title_height = theme->label_height + theme->bevel * 2; + theme->button_size = theme->label_height - 2; + theme->grip_width = theme->button_size * 2; + + return theme; } -void theme_shutdown() +void RrThemeFree(RrTheme *theme) { - color_free(theme_b_color); - color_free(theme_cb_unfocused_color); - color_free(theme_cb_focused_color); - color_free(theme_title_unfocused_color); - color_free(theme_title_focused_color); - color_free(theme_titlebut_unfocused_color); - color_free(theme_titlebut_focused_color); - color_free(theme_menu_color); - color_free(theme_menu_title_color); - color_free(theme_menu_disabled_color); - color_free(theme_menu_hilite_color); - - pixmap_mask_free(theme_max_set_mask); - pixmap_mask_free(theme_max_unset_mask); - pixmap_mask_free(theme_desk_set_mask); - pixmap_mask_free(theme_desk_unset_mask); - pixmap_mask_free(theme_shade_set_mask); - pixmap_mask_free(theme_shade_unset_mask); - pixmap_mask_free(theme_iconify_mask); - pixmap_mask_free(theme_close_mask); - - font_close(theme_winfont); - font_close(theme_mtitlefont); - font_close(theme_mfont); - - g_free(theme_title_layout); - - appearance_free(theme_a_focused_unpressed_max); - appearance_free(theme_a_focused_pressed_max); - appearance_free(theme_a_focused_pressed_set_max); - appearance_free(theme_a_unfocused_unpressed_max); - appearance_free(theme_a_unfocused_pressed_max); - appearance_free(theme_a_unfocused_pressed_set_max); - appearance_free(theme_a_focused_unpressed_close); - appearance_free(theme_a_focused_pressed_close); - appearance_free(theme_a_unfocused_unpressed_close); - appearance_free(theme_a_unfocused_pressed_close); - appearance_free(theme_a_focused_unpressed_desk); - appearance_free(theme_a_focused_pressed_desk); - appearance_free(theme_a_unfocused_unpressed_desk); - appearance_free(theme_a_unfocused_pressed_desk); - appearance_free(theme_a_focused_unpressed_shade); - appearance_free(theme_a_focused_pressed_shade); - appearance_free(theme_a_unfocused_unpressed_shade); - appearance_free(theme_a_unfocused_pressed_shade); - appearance_free(theme_a_focused_unpressed_iconify); - appearance_free(theme_a_focused_pressed_iconify); - appearance_free(theme_a_unfocused_unpressed_iconify); - appearance_free(theme_a_unfocused_pressed_iconify); - appearance_free(theme_a_focused_grip); - appearance_free(theme_a_unfocused_grip); - appearance_free(theme_a_focused_title); - appearance_free(theme_a_unfocused_title); - appearance_free(theme_a_focused_label); - appearance_free(theme_a_unfocused_label); - appearance_free(theme_a_icon); - appearance_free(theme_a_focused_handle); - appearance_free(theme_a_unfocused_handle); - appearance_free(theme_a_menu); - appearance_free(theme_a_menu_title); - appearance_free(theme_a_menu_item); - appearance_free(theme_a_menu_disabled); - appearance_free(theme_a_menu_hilite); - appearance_free(theme_app_hilite_bg); - appearance_free(theme_app_unhilite_bg); - appearance_free(theme_app_hilite_label); - appearance_free(theme_app_unhilite_label); - appearance_free(theme_app_icon); + if (theme) { + g_free(theme->name); + + RrColorFree(theme->b_color); + RrColorFree(theme->cb_unfocused_color); + RrColorFree(theme->cb_focused_color); + RrColorFree(theme->title_unfocused_color); + RrColorFree(theme->title_focused_color); + RrColorFree(theme->titlebut_unfocused_color); + RrColorFree(theme->titlebut_focused_color); + RrColorFree(theme->menu_color); + RrColorFree(theme->menu_title_color); + RrColorFree(theme->menu_disabled_color); + RrColorFree(theme->menu_hilite_color); + + RrPixmapMaskFree(theme->max_set_mask); + RrPixmapMaskFree(theme->max_unset_mask); + RrPixmapMaskFree(theme->desk_set_mask); + RrPixmapMaskFree(theme->desk_unset_mask); + RrPixmapMaskFree(theme->shade_set_mask); + RrPixmapMaskFree(theme->shade_unset_mask); + RrPixmapMaskFree(theme->iconify_mask); + RrPixmapMaskFree(theme->close_mask); + + RrFontClose(theme->winfont); + RrFontClose(theme->mtitlefont); + RrFontClose(theme->mfont); + + g_free(theme->title_layout); + + RrAppearanceFree(theme->a_focused_unpressed_max); + RrAppearanceFree(theme->a_focused_pressed_max); + RrAppearanceFree(theme->a_focused_pressed_set_max); + RrAppearanceFree(theme->a_unfocused_unpressed_max); + RrAppearanceFree(theme->a_unfocused_pressed_max); + RrAppearanceFree(theme->a_unfocused_pressed_set_max); + RrAppearanceFree(theme->a_focused_unpressed_close); + RrAppearanceFree(theme->a_focused_pressed_close); + RrAppearanceFree(theme->a_unfocused_unpressed_close); + RrAppearanceFree(theme->a_unfocused_pressed_close); + RrAppearanceFree(theme->a_focused_unpressed_desk); + RrAppearanceFree(theme->a_focused_pressed_desk); + RrAppearanceFree(theme->a_unfocused_unpressed_desk); + RrAppearanceFree(theme->a_unfocused_pressed_desk); + RrAppearanceFree(theme->a_focused_unpressed_shade); + RrAppearanceFree(theme->a_focused_pressed_shade); + RrAppearanceFree(theme->a_unfocused_unpressed_shade); + RrAppearanceFree(theme->a_unfocused_pressed_shade); + RrAppearanceFree(theme->a_focused_unpressed_iconify); + RrAppearanceFree(theme->a_focused_pressed_iconify); + RrAppearanceFree(theme->a_unfocused_unpressed_iconify); + RrAppearanceFree(theme->a_unfocused_pressed_iconify); + RrAppearanceFree(theme->a_focused_grip); + RrAppearanceFree(theme->a_unfocused_grip); + RrAppearanceFree(theme->a_focused_title); + RrAppearanceFree(theme->a_unfocused_title); + RrAppearanceFree(theme->a_focused_label); + RrAppearanceFree(theme->a_unfocused_label); + RrAppearanceFree(theme->a_icon); + RrAppearanceFree(theme->a_focused_handle); + RrAppearanceFree(theme->a_unfocused_handle); + RrAppearanceFree(theme->a_menu); + RrAppearanceFree(theme->a_menu_title); + RrAppearanceFree(theme->a_menu_item); + RrAppearanceFree(theme->a_menu_disabled); + RrAppearanceFree(theme->a_menu_hilite); + RrAppearanceFree(theme->app_hilite_bg); + RrAppearanceFree(theme->app_unhilite_bg); + RrAppearanceFree(theme->app_hilite_label); + RrAppearanceFree(theme->app_unhilite_label); + RrAppearanceFree(theme->app_icon); + } } -static XrmDatabase loaddb(char *theme) +static XrmDatabase loaddb(RrTheme *theme, char *name) { XrmDatabase db; - db = XrmGetFileDatabase(theme); + if ((db = XrmGetFileDatabase(name))) + theme->path = g_path_get_dirname(name); if (db == NULL) { char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - theme, NULL); - db = XrmGetFileDatabase(s); + name, NULL); + if ((db = XrmGetFileDatabase(s))) + theme->path = g_path_get_dirname(s); g_free(s); } if (db == NULL) { - char *s = g_build_filename(THEMEDIR, theme, NULL); - db = XrmGetFileDatabase(s); - g_free(s); + char *s = g_build_filename(THEMEDIR, name, NULL); + if ((db = XrmGetFileDatabase(s))) + theme->path = g_path_get_dirname(s); + g_free(s); } + return db; } @@ -295,7 +715,7 @@ static gboolean read_string(XrmDatabase db, char *rname, char **value) if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - *value = g_strdup(retvalue.addr); + *value = retvalue.addr; ret = TRUE; } @@ -303,7 +723,8 @@ static gboolean read_string(XrmDatabase db, char *rname, char **value) return ret; } -static gboolean read_color(XrmDatabase db, char *rname, color_rgb **value) +static gboolean read_color(XrmDatabase db, const RrInstance *inst, + gchar *rname, RrColor **value) { gboolean ret = FALSE; char *rclass = create_class_name(rname); @@ -312,7 +733,7 @@ static gboolean read_color(XrmDatabase db, char *rname, color_rgb **value) if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - color_rgb *c = color_parse(retvalue.addr); + RrColor *c = RrColorParse(inst, retvalue.addr); if (c != NULL) { *value = c; ret = TRUE; @@ -323,66 +744,49 @@ static gboolean read_color(XrmDatabase db, char *rname, color_rgb **value) return ret; } -static gboolean read_mask(XrmDatabase db, char *rname, char *theme, - pixmap_mask **value) +static gboolean read_mask(const RrInstance *inst, + gchar *maskname, RrTheme *theme, + RrPixmapMask **value) { gboolean ret = FALSE; - char *rclass = create_class_name(rname); - char *rettype; char *s; - char *button_dir; - XrmValue retvalue; + char *data_dir; int hx, hy; /* ignored */ unsigned int w, h; unsigned char *b; - - if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && - retvalue.addr != NULL) { - - button_dir = g_strdup_printf("%s_data", theme); - s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - button_dir, retvalue.addr, NULL); + data_dir = g_strdup_printf("%s_data", theme->name); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) + s = g_build_filename(g_get_home_dir(), ".openbox", "themes", + data_dir, maskname, NULL); + if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) + ret = TRUE; + else { + g_free(s); + s = g_build_filename(THEMEDIR, data_dir, maskname, NULL); + if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) ret = TRUE; else { g_free(s); - s = g_build_filename(THEMEDIR, button_dir, retvalue.addr, NULL); - + s = g_build_filename(theme->path, data_dir, maskname, NULL); if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) ret = TRUE; - else { - char *themename; - - g_free(s); - themename = g_path_get_basename(theme); - s = g_strdup_printf("%s/%s_data/%s", theme, - themename, retvalue.addr); - g_free(themename); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == - BitmapSuccess) - ret = TRUE; - else - g_message("Unable to find bitmap '%s'", retvalue.addr); - } } + } - if (ret) { - *value = pixmap_mask_new(w, h, (char*)b); - XFree(b); - } - - g_free(s); - g_free(button_dir); + if (ret) { + *value = RrPixmapMaskNew(inst, w, h, (char*)b); + XFree(b); } + + g_free(s); + g_free(data_dir); - g_free(rclass); return ret; } -static void parse_appearance(char *tex, SurfaceColorType *grad, - ReliefType *relief, BevelType *bevel, +static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, + RrReliefType *relief, RrBevelType *bevel, gboolean *interlaced, gboolean *border) { char *t; @@ -392,45 +796,39 @@ static void parse_appearance(char *tex, SurfaceColorType *grad, *t = g_ascii_tolower(*t); if (strstr(tex, "parentrelative") != NULL) { - *grad = Background_ParentRelative; + *grad = RR_SURFACE_PARENTREL; } else { if (strstr(tex, "gradient") != NULL) { if (strstr(tex, "crossdiagonal") != NULL) - *grad = Background_CrossDiagonal; - else if (strstr(tex, "rectangle") != NULL) - *grad = Background_Rectangle; + *grad = RR_SURFACE_CROSS_DIAGONAL; else if (strstr(tex, "pyramid") != NULL) - *grad = Background_Pyramid; - else if (strstr(tex, "pipecross") != NULL) - *grad = Background_PipeCross; - else if (strstr(tex, "elliptic") != NULL) - *grad = Background_Rectangle; + *grad = RR_SURFACE_PYRAMID; else if (strstr(tex, "horizontal") != NULL) - *grad = Background_Horizontal; + *grad = RR_SURFACE_HORIZONTAL; else if (strstr(tex, "vertical") != NULL) - *grad = Background_Vertical; + *grad = RR_SURFACE_VERTICAL; else - *grad = Background_Diagonal; + *grad = RR_SURFACE_DIAGONAL; } else { - *grad = Background_Solid; + *grad = RR_SURFACE_SOLID; } if (strstr(tex, "sunken") != NULL) - *relief = Sunken; + *relief = RR_RELIEF_SUNKEN; else if (strstr(tex, "flat") != NULL) - *relief = Flat; + *relief = RR_RELIEF_FLAT; else - *relief = Raised; + *relief = RR_RELIEF_RAISED; *border = FALSE; - if (*relief == Flat) { + if (*relief == RR_RELIEF_FLAT) { if (strstr(tex, "border") != NULL) *border = TRUE; } else { if (strstr(tex, "bevel2") != NULL) - *bevel = Bevel2; + *bevel = RR_BEVEL_2; else - *bevel = Bevel1; + *bevel = RR_BEVEL_1; } if (strstr(tex, "interlaced") != NULL) @@ -441,7 +839,8 @@ static void parse_appearance(char *tex, SurfaceColorType *grad, } -static gboolean read_appearance(XrmDatabase db, char *rname, Appearance *value) +static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, + gchar *rname, RrAppearance *value) { gboolean ret = FALSE; char *rclass = create_class_name(rname), *cname, *ctoname, *bcname; @@ -460,14 +859,14 @@ static gboolean read_appearance(XrmDatabase db, char *rname, Appearance *value) &value->surface.bevel, &value->surface.interlaced, &value->surface.border); - if (!read_color(db, cname, &value->surface.primary)) - value->surface.primary = color_new(0, 0, 0); - if (!read_color(db, ctoname, &value->surface.secondary)) - value->surface.secondary = color_new(0, 0, 0); + if (!read_color(db, inst, cname, &value->surface.primary)) + value->surface.primary = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, ctoname, &value->surface.secondary)) + value->surface.secondary = RrColorNew(inst, 0, 0, 0); if (value->surface.border) - if (!read_color(db, bcname, + if (!read_color(db, inst, bcname, &value->surface.border_color)) - value->surface.border_color = color_new(0, 0, 0); + value->surface.border_color = RrColorNew(inst, 0, 0, 0); ret = TRUE; } @@ -478,508 +877,13 @@ static gboolean read_appearance(XrmDatabase db, char *rname, Appearance *value) return ret; } -static void set_default_appearance(Appearance *a) +static void set_default_appearance(RrAppearance *a) { - a->surface.grad = Background_Solid; - a->surface.relief = Flat; - a->surface.bevel = Bevel1; + a->surface.grad = RR_SURFACE_SOLID; + a->surface.relief = RR_RELIEF_FLAT; + a->surface.bevel = RR_BEVEL_1; a->surface.interlaced = FALSE; a->surface.border = FALSE; - a->surface.primary = color_new(0, 0, 0); - a->surface.secondary = color_new(0, 0, 0); -} - -char *theme_load(char *theme) -{ - XrmDatabase db = NULL; - char *loaded = NULL; - Justify winjust, mtitlejust, mjust; - char *str; - char *font_str; - - if (theme) { - db = loaddb(theme); - if (db == NULL) { - g_warning("Failed to load the theme '%s'", theme); - g_message("Falling back to the default: '%s'", DEFAULT_THEME); - } else - loaded = g_strdup(theme); - } - if (db == NULL) { - db = loaddb(DEFAULT_THEME); - if (db == NULL) { - g_warning("Failed to load the theme '%s'.", DEFAULT_THEME); - return NULL; - } else - loaded = g_strdup(DEFAULT_THEME); - } - - /* load the font stuff */ - font_str = "arial:bold:pixelsize=10:minsize"; - - theme_winfont_shadow = FALSE; - if (read_string(db, "window.xft.flags", &str)) { - if (g_strrstr(str, "shadow")) - theme_winfont_shadow = TRUE; - g_free(str); - } - - if (!read_int(db, "window.xft.shadow.offset", - &theme_winfont_shadow_offset)) - theme_winfont_shadow_offset = 1; - if (!read_int(db, "window.xft.shadow.tint", - &theme_winfont_shadow_tint) || - theme_winfont_shadow_tint < 100 || theme_winfont_shadow_tint > 100) - theme_winfont_shadow_tint = 25; - - theme_winfont = font_open(font_str); - theme_winfont_height = font_height(theme_winfont, theme_winfont_shadow, - theme_winfont_shadow_offset); - - winjust = Justify_Left; - if (read_string(db, "window.justify", &str)) { - if (!g_ascii_strcasecmp(str, "right")) - winjust = Justify_Right; - else if (!g_ascii_strcasecmp(str, "center")) - winjust = Justify_Center; - g_free(str); - } - - font_str = "arial-10:bold"; - - theme_mtitlefont_shadow = FALSE; - if (read_string(db, "menu.title.xft.flags", &str)) { - if (g_strrstr(str, "shadow")) - theme_mtitlefont_shadow = TRUE; - g_free(str); - } - - if (!read_int(db, "menu.title.xft.shadow.offset", - &theme_mtitlefont_shadow_offset)) - theme_mtitlefont_shadow_offset = 1; - if (!read_int(db, "menu.title.xft.shadow.tint", - &theme_mtitlefont_shadow_tint) || - theme_mtitlefont_shadow_tint < 100 || - theme_mtitlefont_shadow_tint > 100) - theme_mtitlefont_shadow_tint = 25; - - theme_mtitlefont = font_open(font_str); - theme_mtitlefont_height = font_height(theme_mtitlefont, - theme_mtitlefont_shadow, - theme_mtitlefont_shadow_offset); - - mtitlejust = Justify_Left; - if (read_string(db, "menu.title.justify", &str)) { - if (!g_ascii_strcasecmp(str, "right")) - mtitlejust = Justify_Right; - else if (!g_ascii_strcasecmp(str, "center")) - mtitlejust = Justify_Center; - g_free(str); - } - - font_str = "arial-8"; - - theme_mfont_shadow = FALSE; - if (read_string(db, "menu.frame.xft.flags", &str)) { - if (g_strrstr(str, "shadow")) - theme_mfont_shadow = TRUE; - g_free(str); - } - - if (!read_int(db, "menu.frame.xft.shadow.offset", - &theme_mfont_shadow_offset)) - theme_mfont_shadow_offset = 1; - if (!read_int(db, "menu.frame.xft.shadow.tint", - &theme_mfont_shadow_tint) || - theme_mfont_shadow_tint < 100 || - theme_mfont_shadow_tint > 100) - theme_mfont_shadow_tint = 25; - - theme_mfont = font_open(font_str); - theme_mfont_height = font_height(theme_mfont, theme_mfont_shadow, - theme_mfont_shadow_offset); - - mjust = Justify_Left; - if (read_string(db, "menu.frame.justify", &str)) { - if (!g_ascii_strcasecmp(str, "right")) - mjust = Justify_Right; - else if (!g_ascii_strcasecmp(str, "center")) - mjust = Justify_Center; - g_free(str); - } - - /* load the title layout */ - theme_title_layout = g_strdup("NLIMC"); - - if (!read_int(db, "handleWidth", &theme_handle_height) || - theme_handle_height < 0 || theme_handle_height > 100) - theme_handle_height = 6; - if (!read_int(db, "bevelWidth", &theme_bevel) || - theme_bevel <= 0 || theme_bevel > 100) theme_bevel = 3; - if (!read_int(db, "borderWidth", &theme_bwidth) || - theme_bwidth < 0 || theme_bwidth > 100) theme_bwidth = 1; - if (!read_int(db, "frameWidth", &theme_cbwidth) || - theme_cbwidth < 0 || theme_cbwidth > 100) theme_cbwidth = theme_bevel; - - /* load colors */ - if (!read_color(db, "borderColor", &theme_b_color)) - theme_b_color = color_new(0, 0, 0); - if (!read_color(db, "window.frame.focusColor", &theme_cb_focused_color)) - theme_cb_focused_color = color_new(0xff, 0xff, 0xff); - if (!read_color(db, "window.frame.unfocusColor",&theme_cb_unfocused_color)) - theme_cb_unfocused_color = color_new(0xff, 0xff, 0xff); - if (!read_color(db, "window.label.focus.textColor", - &theme_title_focused_color)) - theme_title_focused_color = color_new(0x0, 0x0, 0x0); - if (!read_color(db, "window.label.unfocus.textColor", - &theme_title_unfocused_color)) - theme_title_unfocused_color = color_new(0xff, 0xff, 0xff); - if (!read_color(db, "window.button.focus.picColor", - &theme_titlebut_focused_color)) - theme_titlebut_focused_color = color_new(0, 0, 0); - if (!read_color(db, "window.button.unfocus.picColor", - &theme_titlebut_unfocused_color)) - theme_titlebut_unfocused_color = color_new(0xff, 0xff, 0xff); - if (!read_color(db, "menu.title.textColor", &theme_menu_title_color)) - theme_menu_title_color = color_new(0, 0, 0); - if (!read_color(db, "menu.frame.textColor", &theme_menu_color)) - theme_menu_color = color_new(0xff, 0xff, 0xff); - if (!read_color(db, "menu.frame.disableColor", &theme_menu_disabled_color)) - theme_menu_disabled_color = color_new(0, 0, 0); - if (!read_color(db, "menu.hilite.textColor", &theme_menu_hilite_color)) - theme_menu_hilite_color = color_new(0, 0, 0); - - if (read_mask(db, "window.button.max.mask", theme, &theme_max_unset_mask)){ - if (!read_mask(db, "window.button.max.toggled.mask", theme, - &theme_max_set_mask)) { - theme_max_set_mask = pixmap_mask_copy(theme_max_unset_mask); - } - } else { - { - char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; - theme_max_unset_mask = pixmap_mask_new(7, 7, data); - } - { - char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; - theme_max_set_mask = pixmap_mask_new(7, 7, data); - } - } - - if (!read_mask(db, "window.button.icon.mask", theme, - &theme_iconify_mask)) { - char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; - theme_iconify_mask = pixmap_mask_new(7, 7, data); - } - - if (read_mask(db, "window.button.stick.mask", theme, - &theme_desk_unset_mask)) { - if (!read_mask(db, "window.button.stick.toggled.mask", theme, - &theme_desk_set_mask)) { - theme_desk_set_mask = - pixmap_mask_copy(theme_desk_unset_mask); - } - } else { - { - char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; - theme_desk_unset_mask = pixmap_mask_new(7, 7, data); - } - { - char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 }; - theme_desk_set_mask = pixmap_mask_new(7, 7, data); - } - } - - if (read_mask(db, "window.button.shade.mask", theme, - &theme_shade_unset_mask)) { - if (!read_mask(db, "window.button.shade.toggled.mask", theme, - &theme_shade_set_mask)) { - theme_shade_set_mask = - pixmap_mask_copy(theme_shade_unset_mask); - } - } else { - { - char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; - theme_shade_unset_mask = pixmap_mask_new(7, 7, data); - } - { - char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f }; - theme_shade_set_mask = pixmap_mask_new(7, 7, data); - } - } - - if (!read_mask(db, "window.button.close.mask", theme, - &theme_close_mask)) { - char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; - theme_close_mask = pixmap_mask_new(7, 7, data); - } - - /* read the decoration textures */ - if (!read_appearance(db, "window.title.focus", theme_a_focused_title)) - set_default_appearance(theme_a_focused_title); - if (!read_appearance(db, "window.title.unfocus", theme_a_unfocused_title)) - set_default_appearance(theme_a_unfocused_title); - if (!read_appearance(db, "window.label.focus", theme_a_focused_label)) - set_default_appearance(theme_a_focused_label); - if (!read_appearance(db, "window.label.unfocus", theme_a_unfocused_label)) - set_default_appearance(theme_a_unfocused_label); - if (!read_appearance(db, "window.handle.focus", theme_a_focused_handle)) - set_default_appearance(theme_a_focused_handle); - if (!read_appearance(db, "window.handle.unfocus",theme_a_unfocused_handle)) - set_default_appearance(theme_a_unfocused_handle); - if (!read_appearance(db, "window.grip.focus", theme_a_focused_grip)) - set_default_appearance(theme_a_focused_grip); - if (!read_appearance(db, "window.grip.unfocus", theme_a_unfocused_grip)) - set_default_appearance(theme_a_unfocused_grip); - if (!read_appearance(db, "menu.frame", theme_a_menu)) - set_default_appearance(theme_a_menu); - if (!read_appearance(db, "menu.title", theme_a_menu_title)) - set_default_appearance(theme_a_menu_title); - if (!read_appearance(db, "menu.hilite", theme_a_menu_hilite)) - set_default_appearance(theme_a_menu_hilite); - - /* read the appearances for rendering non-decorations */ - if (!read_appearance(db, "window.title.focus", theme_app_hilite_bg)) - set_default_appearance(theme_app_hilite_bg); - if (!read_appearance(db, "window.label.focus", theme_app_hilite_label)) - set_default_appearance(theme_app_hilite_label); - if (!read_appearance(db, "window.title.unfocus", theme_app_unhilite_bg)) - set_default_appearance(theme_app_unhilite_bg); - if (!read_appearance(db, "window.label.unfocus", theme_app_unhilite_label)) - set_default_appearance(theme_app_unhilite_label); - - /* read buttons textures */ - if (!read_appearance(db, "window.button.pressed.focus", - theme_a_focused_pressed_max)) - if (!read_appearance(db, "window.button.pressed", - theme_a_focused_pressed_max)) - set_default_appearance(theme_a_focused_pressed_max); - if (!read_appearance(db, "window.button.pressed.unfocus", - theme_a_unfocused_pressed_max)) - if (!read_appearance(db, "window.button.pressed", - theme_a_unfocused_pressed_max)) - set_default_appearance(theme_a_unfocused_pressed_max); - if (!read_appearance(db, "window.button.focus", - theme_a_focused_unpressed_max)) - set_default_appearance(theme_a_focused_unpressed_max); - if (!read_appearance(db, "window.button.unfocus", - theme_a_unfocused_unpressed_max)) - set_default_appearance(theme_a_unfocused_unpressed_max); - - theme_a_unfocused_unpressed_close = - appearance_copy(theme_a_unfocused_unpressed_max); - theme_a_unfocused_pressed_close = - appearance_copy(theme_a_unfocused_pressed_max); - theme_a_focused_unpressed_close = - appearance_copy(theme_a_focused_unpressed_max); - theme_a_focused_pressed_close = - appearance_copy(theme_a_focused_pressed_max); - theme_a_unfocused_unpressed_desk = - appearance_copy(theme_a_unfocused_unpressed_max); - theme_a_unfocused_pressed_desk = - appearance_copy(theme_a_unfocused_pressed_max); - theme_a_unfocused_pressed_set_desk = - appearance_copy(theme_a_unfocused_pressed_max); - theme_a_focused_unpressed_desk = - appearance_copy(theme_a_focused_unpressed_max); - theme_a_focused_pressed_desk = - appearance_copy(theme_a_focused_pressed_max); - theme_a_focused_pressed_set_desk = - appearance_copy(theme_a_focused_pressed_max); - theme_a_unfocused_unpressed_shade = - appearance_copy(theme_a_unfocused_unpressed_max); - theme_a_unfocused_pressed_shade = - appearance_copy(theme_a_unfocused_pressed_max); - theme_a_unfocused_pressed_set_shade = - appearance_copy(theme_a_unfocused_pressed_max); - theme_a_focused_unpressed_shade = - appearance_copy(theme_a_focused_unpressed_max); - theme_a_focused_pressed_shade = - appearance_copy(theme_a_focused_pressed_max); - theme_a_focused_pressed_set_shade = - appearance_copy(theme_a_focused_pressed_max); - theme_a_unfocused_unpressed_iconify = - appearance_copy(theme_a_unfocused_unpressed_max); - theme_a_unfocused_pressed_iconify = - appearance_copy(theme_a_unfocused_pressed_max); - theme_a_focused_unpressed_iconify = - appearance_copy(theme_a_focused_unpressed_max); - theme_a_focused_pressed_iconify = - appearance_copy(theme_a_focused_pressed_max); - theme_a_unfocused_pressed_set_max = - appearance_copy(theme_a_unfocused_pressed_max); - theme_a_focused_pressed_set_max = - appearance_copy(theme_a_focused_pressed_max); - - theme_a_icon->surface.grad = Background_ParentRelative; - - /* set up the textures */ - theme_a_focused_label->texture[0].type = - theme_app_hilite_label->texture[0].type = Text; - theme_a_focused_label->texture[0].data.text.justify = winjust; - theme_app_hilite_label->texture[0].data.text.justify = Justify_Left; - theme_a_focused_label->texture[0].data.text.font = - theme_app_hilite_label->texture[0].data.text.font = theme_winfont; - theme_a_focused_label->texture[0].data.text.shadow = - theme_app_hilite_label->texture[0].data.text.shadow = - theme_winfont_shadow; - theme_a_focused_label->texture[0].data.text.offset = - theme_app_hilite_label->texture[0].data.text.offset = - theme_winfont_shadow_offset; - theme_a_focused_label->texture[0].data.text.tint = - theme_app_hilite_label->texture[0].data.text.tint = - theme_winfont_shadow_tint; - theme_a_focused_label->texture[0].data.text.color = - theme_app_hilite_label->texture[0].data.text.color = - theme_title_focused_color; - - theme_a_unfocused_label->texture[0].type = - theme_app_unhilite_label->texture[0].type = Text; - theme_a_unfocused_label->texture[0].data.text.justify = winjust; - theme_app_unhilite_label->texture[0].data.text.justify = Justify_Left; - theme_a_unfocused_label->texture[0].data.text.font = - theme_app_unhilite_label->texture[0].data.text.font = theme_winfont; - theme_a_unfocused_label->texture[0].data.text.shadow = - theme_app_unhilite_label->texture[0].data.text.shadow = - theme_winfont_shadow; - theme_a_unfocused_label->texture[0].data.text.offset = - theme_app_unhilite_label->texture[0].data.text.offset = - theme_winfont_shadow_offset; - theme_a_unfocused_label->texture[0].data.text.tint = - theme_app_unhilite_label->texture[0].data.text.tint = - theme_winfont_shadow_tint; - theme_a_unfocused_label->texture[0].data.text.color = - theme_app_unhilite_label->texture[0].data.text.color = - theme_title_unfocused_color; - - theme_a_menu_title->texture[0].type = Text; - theme_a_menu_title->texture[0].data.text.justify = mtitlejust; - theme_a_menu_title->texture[0].data.text.font = theme_mtitlefont; - theme_a_menu_title->texture[0].data.text.shadow = theme_mtitlefont_shadow; - theme_a_menu_title->texture[0].data.text.offset = - theme_mtitlefont_shadow_offset; - theme_a_menu_title->texture[0].data.text.tint = - theme_mtitlefont_shadow_tint; - theme_a_menu_title->texture[0].data.text.color = theme_menu_title_color; - - theme_a_menu_item->surface.grad = - theme_a_menu_disabled->surface.grad = - theme_app_icon->surface.grad = Background_ParentRelative; - - theme_a_menu_item->texture[0].type = - theme_a_menu_disabled->texture[0].type = - theme_a_menu_hilite->texture[0].type = Text; - theme_a_menu_item->texture[0].data.text.justify = - theme_a_menu_disabled->texture[0].data.text.justify = - theme_a_menu_hilite->texture[0].data.text.justify = mjust; - theme_a_menu_item->texture[0].data.text.font = - theme_a_menu_disabled->texture[0].data.text.font = - theme_a_menu_hilite->texture[0].data.text.font = theme_mfont; - theme_a_menu_item->texture[0].data.text.shadow = - theme_a_menu_disabled->texture[0].data.text.shadow = - theme_a_menu_hilite->texture[0].data.text.shadow = theme_mfont_shadow; - theme_a_menu_item->texture[0].data.text.offset = - theme_a_menu_disabled->texture[0].data.text.offset = - theme_a_menu_hilite->texture[0].data.text.offset = - theme_mfont_shadow_offset; - theme_a_menu_item->texture[0].data.text.tint = - theme_a_menu_disabled->texture[0].data.text.tint = - theme_a_menu_hilite->texture[0].data.text.tint = - theme_mfont_shadow_tint; - theme_a_menu_item->texture[0].data.text.color = theme_menu_color; - theme_a_menu_disabled->texture[0].data.text.color = - theme_menu_disabled_color; - theme_a_menu_hilite->texture[0].data.text.color = theme_menu_hilite_color; - - theme_a_focused_unpressed_max->texture[0].type = - theme_a_focused_pressed_max->texture[0].type = - theme_a_focused_pressed_set_max->texture[0].type = - theme_a_unfocused_unpressed_max->texture[0].type = - theme_a_unfocused_pressed_max->texture[0].type = - theme_a_unfocused_pressed_set_max->texture[0].type = - theme_a_focused_unpressed_close->texture[0].type = - theme_a_focused_pressed_close->texture[0].type = - theme_a_unfocused_unpressed_close->texture[0].type = - theme_a_unfocused_pressed_close->texture[0].type = - theme_a_focused_unpressed_desk->texture[0].type = - theme_a_focused_pressed_desk->texture[0].type = - theme_a_focused_pressed_set_desk->texture[0].type = - theme_a_unfocused_unpressed_desk->texture[0].type = - theme_a_unfocused_pressed_desk->texture[0].type = - theme_a_unfocused_pressed_set_desk->texture[0].type = - theme_a_focused_unpressed_shade->texture[0].type = - theme_a_focused_pressed_shade->texture[0].type = - theme_a_focused_pressed_set_shade->texture[0].type = - theme_a_unfocused_unpressed_shade->texture[0].type = - theme_a_unfocused_pressed_shade->texture[0].type = - theme_a_unfocused_pressed_set_shade->texture[0].type = - theme_a_focused_unpressed_iconify->texture[0].type = - theme_a_focused_pressed_iconify->texture[0].type = - theme_a_unfocused_unpressed_iconify->texture[0].type = - theme_a_unfocused_pressed_iconify->texture[0].type = Bitmask; - theme_a_focused_unpressed_max->texture[0].data.mask.mask = - theme_a_unfocused_unpressed_max->texture[0].data.mask.mask = - theme_a_focused_pressed_max->texture[0].data.mask.mask = - theme_a_unfocused_pressed_max->texture[0].data.mask.mask = - theme_max_unset_mask; - theme_a_focused_pressed_set_max->texture[0].data.mask.mask = - theme_a_unfocused_pressed_set_max->texture[0].data.mask.mask = - theme_max_set_mask; - theme_a_focused_pressed_close->texture[0].data.mask.mask = - theme_a_unfocused_pressed_close->texture[0].data.mask.mask = - theme_a_focused_unpressed_close->texture[0].data.mask.mask = - theme_a_unfocused_unpressed_close->texture[0].data.mask.mask = - theme_close_mask; - theme_a_focused_unpressed_desk->texture[0].data.mask.mask = - theme_a_unfocused_unpressed_desk->texture[0].data.mask.mask = - theme_a_focused_pressed_desk->texture[0].data.mask.mask = - theme_a_unfocused_pressed_desk->texture[0].data.mask.mask = - theme_desk_unset_mask; - theme_a_focused_pressed_set_desk->texture[0].data.mask.mask = - theme_a_unfocused_pressed_set_desk->texture[0].data.mask.mask = - theme_desk_set_mask; - theme_a_focused_unpressed_shade->texture[0].data.mask.mask = - theme_a_unfocused_unpressed_shade->texture[0].data.mask.mask = - theme_a_focused_pressed_shade->texture[0].data.mask.mask = - theme_a_unfocused_pressed_shade->texture[0].data.mask.mask = - theme_shade_unset_mask; - theme_a_focused_pressed_set_shade->texture[0].data.mask.mask = - theme_a_unfocused_pressed_set_shade->texture[0].data.mask.mask = - theme_shade_set_mask; - theme_a_focused_unpressed_iconify->texture[0].data.mask.mask = - theme_a_unfocused_unpressed_iconify->texture[0].data.mask.mask = - theme_a_focused_pressed_iconify->texture[0].data.mask.mask = - theme_a_unfocused_pressed_iconify->texture[0].data.mask.mask = - theme_iconify_mask; - theme_a_focused_unpressed_max->texture[0].data.mask.color = - theme_a_focused_pressed_max->texture[0].data.mask.color = - theme_a_focused_pressed_set_max->texture[0].data.mask.color = - theme_a_focused_unpressed_close->texture[0].data.mask.color = - theme_a_focused_pressed_close->texture[0].data.mask.color = - theme_a_focused_unpressed_desk->texture[0].data.mask.color = - theme_a_focused_pressed_desk->texture[0].data.mask.color = - theme_a_focused_pressed_set_desk->texture[0].data.mask.color = - theme_a_focused_unpressed_shade->texture[0].data.mask.color = - theme_a_focused_pressed_shade->texture[0].data.mask.color = - theme_a_focused_pressed_set_shade->texture[0].data.mask.color = - theme_a_focused_unpressed_iconify->texture[0].data.mask.color = - theme_a_focused_pressed_iconify->texture[0].data.mask.color = - theme_titlebut_focused_color; - theme_a_unfocused_unpressed_max->texture[0].data.mask.color = - theme_a_unfocused_pressed_max->texture[0].data.mask.color = - theme_a_unfocused_pressed_set_max->texture[0].data.mask.color = - theme_a_unfocused_unpressed_close->texture[0].data.mask.color = - theme_a_unfocused_pressed_close->texture[0].data.mask.color = - theme_a_unfocused_unpressed_desk->texture[0].data.mask.color = - theme_a_unfocused_pressed_desk->texture[0].data.mask.color = - theme_a_unfocused_pressed_set_desk->texture[0].data.mask.color = - theme_a_unfocused_unpressed_shade->texture[0].data.mask.color = - theme_a_unfocused_pressed_shade->texture[0].data.mask.color = - theme_a_unfocused_pressed_set_shade->texture[0].data.mask.color = - theme_a_unfocused_unpressed_iconify->texture[0].data.mask.color = - theme_a_unfocused_pressed_iconify->texture[0].data.mask.color = - theme_titlebut_unfocused_color; - - XrmDestroyDatabase(db); - - return loaded; + a->surface.primary = RrColorNew(a->inst, 0, 0, 0); + a->surface.secondary = RrColorNew(a->inst, 0, 0, 0); }