X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=991dfd1c9f6f9964a8b3108fbfda05d595ee02b0;hb=b1f5555218ecaa3827450125dc47b4bf0d404ee4;hp=d6f248ce9b2c7a99ed739c610045b8c4e224f78c;hpb=5cf61ee02354c1c9f80c11f3796afc4b948055d6;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index d6f248ce..991dfd1c 100644 --- a/render/theme.c +++ b/render/theme.c @@ -2,188 +2,699 @@ #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; -/* style settings - fonts */ -int theme_winfont_height; -ObFont *theme_winfont; -gboolean theme_winfont_shadow; -int theme_winfont_shadow_offset; -int theme_winfont_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_app_hilite_label; -Appearance *theme_app_unhilite_label; - -void theme_startup() +static XrmDatabase loaddb(char *theme); +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, color_rgb **value); +static gboolean read_mask(XrmDatabase db, const RrInstance *inst, + gchar *rname, gchar *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 = NULL; - theme_winfont = 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(Surface_Planar, 1); - theme_a_focused_pressed_max = appearance_new(Surface_Planar, 1); - theme_a_focused_pressed_set_max = appearance_new(Surface_Planar, 1); - theme_a_unfocused_unpressed_max = appearance_new(Surface_Planar, 1); - theme_a_unfocused_pressed_max = appearance_new(Surface_Planar, 1); - theme_a_unfocused_pressed_set_max = appearance_new(Surface_Planar, 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(Surface_Planar, 0); - theme_a_unfocused_grip = appearance_new(Surface_Planar, 0); - theme_a_focused_title = appearance_new(Surface_Planar, 0); - theme_a_unfocused_title = appearance_new(Surface_Planar, 0); - theme_a_focused_label = appearance_new(Surface_Planar, 1); - theme_a_unfocused_label = appearance_new(Surface_Planar, 1); - theme_a_icon = appearance_new(Surface_Planar, 1); - theme_a_focused_handle = appearance_new(Surface_Planar, 0); - theme_a_unfocused_handle = appearance_new(Surface_Planar, 0); - theme_app_hilite_label = appearance_new(Surface_Planar, 1); - theme_app_unhilite_label = appearance_new(Surface_Planar, 1); + XrmDatabase db = NULL; + RrJustify winjust, mtitlejust, mjust; + gchar *str; + gchar *font_str; + RrTheme *theme; + + theme = g_new(RrTheme, 1); + + theme->inst = inst; + + 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 = 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_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 = 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(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_strdup(name); + } + if (db == NULL) { + db = loaddb(DEFAULT_THEME); + if (db == NULL) { + g_warning("Failed to load the theme '%s'.", DEFAULT_THEME); + return NULL; + } else + theme->name = g_strdup(DEFAULT_THEME); + } + + /* load the font stuff */ + font_str = "arial:bold:pixelsize=10"; + + 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(inst, font_str); + theme->winfont_height = font_height(theme->winfont, theme->winfont_shadow, + theme->winfont_shadow_offset); + + 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; + 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(inst, font_str); + theme->mtitlefont_height = font_height(theme->mtitlefont, + theme->mtitlefont_shadow, + theme->mtitlefont_shadow_offset); + + 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; + 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(inst, font_str); + theme->mfont_height = font_height(theme->mfont, theme->mfont_shadow, + theme->mfont_shadow_offset); + + 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; + 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, 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, + "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(db, inst, + "window.button.max.mask", name, &theme->max_unset_mask)){ + if (!read_mask(db, inst, + "window.button.max.toggled.mask", name, + &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(db, inst, + "window.button.icon.mask", name, + &theme->iconify_mask)) { + char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; + theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + + if (read_mask(db, inst, + "window.button.stick.mask", name, + &theme->desk_unset_mask)) { + if (!read_mask(db, inst, "window.button.stick.toggled.mask", name, + &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(db, inst, "window.button.shade.mask", name, + &theme->shade_unset_mask)) { + if (!read_mask(db, inst, "window.button.shade.toggled.mask", name, + &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(db, inst, "window.button.close.mask", name, + &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.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_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_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_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_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.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 = 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.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 = 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.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 = 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.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 = RR_TEXTURE_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_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); + + 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); - - 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); - 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_app_hilite_label); - appearance_free(theme_app_unhilite_label); + 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); + + font_close(theme->winfont); + font_close(theme->mtitlefont); + font_close(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) @@ -255,7 +766,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, color_rgb **value) { gboolean ret = FALSE; char *rclass = create_class_name(rname); @@ -264,7 +776,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); + color_rgb *c = RrColorParse(inst, retvalue.addr); if (c != NULL) { *value = c; ret = TRUE; @@ -275,8 +787,9 @@ 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(XrmDatabase db, const RrInstance *inst, + gchar *rname, gchar *theme, + RrPixmapMask **value) { gboolean ret = FALSE; char *rclass = create_class_name(rname); @@ -291,7 +804,7 @@ static gboolean read_mask(XrmDatabase db, char *rname, char *theme, if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - button_dir = g_strdup_printf("%s_buttons", theme); + button_dir = g_strdup_printf("%s_data", theme); s = g_build_filename(g_get_home_dir(), ".openbox", "themes", button_dir, retvalue.addr, NULL); @@ -309,7 +822,7 @@ static gboolean read_mask(XrmDatabase db, char *rname, char *theme, g_free(s); themename = g_path_get_basename(theme); - s = g_strdup_printf("%s/%s_buttons/%s", theme, + s = g_strdup_printf("%s/%s_data/%s", theme, themename, retvalue.addr); g_free(themename); if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == @@ -321,7 +834,7 @@ static gboolean read_mask(XrmDatabase db, char *rname, char *theme, } if (ret) { - *value = pixmap_mask_new(w, h, (char*)b); + *value = RrPixmapMaskNew(inst, w, h, (char*)b); XFree(b); } @@ -333,8 +846,8 @@ static gboolean read_mask(XrmDatabase db, char *rname, char *theme, 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; @@ -344,45 +857,45 @@ 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; + *grad = RR_SURFACE_CROSS_DIAGONAL; else if (strstr(tex, "rectangle") != NULL) - *grad = Background_Rectangle; + *grad = RR_SURFACE_RECTANGLE; else if (strstr(tex, "pyramid") != NULL) - *grad = Background_Pyramid; + *grad = RR_SURFACE_PYRAMID; else if (strstr(tex, "pipecross") != NULL) - *grad = Background_PipeCross; + *grad = RR_SURFACE_PIPECROSS; else if (strstr(tex, "elliptic") != NULL) - *grad = Background_Elliptic; + *grad = RR_SURFACE_PIPECROSS; 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) @@ -393,7 +906,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; @@ -407,19 +921,19 @@ static gboolean read_appearance(XrmDatabase db, char *rname, Appearance *value) if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { parse_appearance(retvalue.addr, - &value->surface.data.planar.grad, - &value->surface.data.planar.relief, - &value->surface.data.planar.bevel, - &value->surface.data.planar.interlaced, - &value->surface.data.planar.border); - if (!read_color(db, cname, &value->surface.data.planar.primary)) - value->surface.data.planar.primary = color_new(0, 0, 0); - if (!read_color(db, ctoname, &value->surface.data.planar.secondary)) - value->surface.data.planar.secondary = color_new(0, 0, 0); - if (value->surface.data.planar.border) - if (!read_color(db, bcname, - &value->surface.data.planar.border_color)) - value->surface.data.planar.border_color = color_new(0, 0, 0); + &value->surface.grad, + &value->surface.relief, + &value->surface.bevel, + &value->surface.interlaced, + &value->surface.border); + 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, inst, bcname, + &value->surface.border_color)) + value->surface.border_color = RrColorNew(inst, 0, 0, 0); ret = TRUE; } @@ -430,390 +944,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.data.planar.grad = Background_Solid; - a->surface.data.planar.relief = Flat; - a->surface.data.planar.bevel = Bevel1; - a->surface.data.planar.interlaced = FALSE; - a->surface.data.planar.border = FALSE; - a->surface.data.planar.primary = color_new(0, 0, 0); - a->surface.data.planar.secondary = color_new(0, 0, 0); -} - -char *theme_load(char *theme) -{ - XrmDatabase db = NULL; - char *loaded = NULL; - Justify winjust; - char *winjust_str; - char *winfont_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 */ - winfont_str = "arial-8:bold"; - theme_winfont_shadow = FALSE; - theme_winfont_shadow_offset = 1; - theme_winfont_shadow_tint = 25; - - theme_winfont = font_open(winfont_str); - theme_winfont_height = font_height(theme_winfont, theme_winfont_shadow, - theme_winfont_shadow_offset); - - winjust = Justify_Left; - if (read_string(db, "window.justify", &winjust_str)) { - if (!g_ascii_strcasecmp(winjust_str, "right")) - winjust = Justify_Right; - else if (!g_ascii_strcasecmp(winjust_str, "center")) - winjust = Justify_Center; - g_free(winjust_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; - - 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_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); - - /* read the appearances for rendering non-decorations. these cannot be - parent-relative */ - if (theme_a_focused_label->surface.data.planar.grad != - Background_ParentRelative) { - if (!read_appearance(db, "window.label.focus", theme_app_hilite_label)) - set_default_appearance(theme_app_hilite_label); - } else { - if (!read_appearance(db, "window.title.focus", theme_app_hilite_label)) - set_default_appearance(theme_app_hilite_label); - } - if (theme_a_unfocused_label->surface.data.planar.grad != - Background_ParentRelative) { - if (!read_appearance(db, "window.label.unfocus", - theme_app_unhilite_label)) - set_default_appearance(theme_app_unhilite_label); - } else { - if (!read_appearance(db, "window.title.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.data.planar.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 = - theme_app_hilite_label->texture[0].data.text.justify = winjust; - 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 = - theme_app_unhilite_label->texture[0].data.text.justify = winjust; - 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_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.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 = RrColorNew(a->inst, 0, 0, 0); + a->surface.secondary = RrColorNew(a->inst, 0, 0, 0); }