X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=engines%2Fopenbox%2Ftheme.c;h=154aae83900cd105141674375910de642f5953ab;hb=9ff6ea27b193bde39b79ff465cbae699f4322afa;hp=18a04e8f049e90b0445f257a5e4a6506883d9c8a;hpb=717c0fa62c1a725b6cb2903574ef9738bd6df0c3;p=chaz%2Fopenbox diff --git a/engines/openbox/theme.c b/engines/openbox/theme.c index 18a04e8f..154aae83 100644 --- a/engines/openbox/theme.c +++ b/engines/openbox/theme.c @@ -1,5 +1,6 @@ #include "openbox.h" -#include "../../kernel/themerc.h" +#include "../../kernel/config.h" +#include "../../kernel/openbox.h" #include #include @@ -95,7 +96,7 @@ gboolean read_string(XrmDatabase db, char *rname, char **value) if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - *value = retvalue.addr; + *value = g_strdup(retvalue.addr); ret = TRUE; } @@ -123,9 +124,65 @@ gboolean read_color(XrmDatabase db, char *rname, color_rgb **value) return ret; } +gboolean read_mask(XrmDatabase db, char *rname, pixmap_mask **value) +{ + gboolean ret = FALSE; + char *rclass = create_class_name(rname); + char *rettype; + char *s; + char *button_dir; + XrmValue retvalue; + int hx, hy; /* ignored */ + unsigned int w, h; + unsigned char *b; + ConfigValue theme; + + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && + retvalue.addr != NULL) { + if (!config_get("theme", Config_String, &theme)) + g_assert_not_reached(); /* where's the default!? its not set? */ + + button_dir = g_strdup_printf("%s_buttons", theme.string); + + s = g_build_filename(g_get_home_dir(), ".openbox", "themes", + "openbox", button_dir, retvalue.addr, 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); + + if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) + ret = TRUE; + else { + g_free(s); + s = g_strdup_printf("%s_buttons/%s", theme.string, + theme.string); + if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == + BitmapSuccess) + ret = TRUE; + else + g_message("Unable to find bitmap '%s'", s); + } + } + + if (ret) { + *value = pixmap_mask_new(w, h, (char*)b); + XFree(b); + } + + g_free(s); + g_free(button_dir); + } + + g_free(rclass); + return ret; +} + static void parse_appearance(char *tex, SurfaceColorType *grad, - ReliefType *relief, BevelType *bevel, - gboolean *interlaced, gboolean *border) + ReliefType *relief, BevelType *bevel, + gboolean *interlaced, gboolean *border) { char *t; @@ -234,11 +291,14 @@ void set_default_appearance(Appearance *a) gboolean load() { XrmDatabase db = NULL; + Justify winjust; + char *winjuststr; + ConfigValue theme, shadow, offset, font; - if (themerc_theme != NULL) { - db = loaddb(themerc_theme); + if (config_get("theme", Config_String, &theme)) { + db = loaddb(theme.string); if (db == NULL) { - g_warning("Failed to load the theme '%s'", themerc_theme); + g_warning("Failed to load the theme '%s'", theme.string); g_message("Falling back to the default: '%s'", DEFAULT_THEME); } } @@ -248,15 +308,41 @@ gboolean load() g_warning("Failed to load the theme '%s'.", DEFAULT_THEME); return FALSE; } + /* change to reflect what was actually loaded */ + theme.string = DEFAULT_THEME; + config_set("theme", Config_String, theme); } - /* load the font, not from the theme file tho, its in themerc_font */ - s_winfont_shadow = 1; /* XXX read from themrc */ - s_winfont_shadow_offset = 2; /* XXX read from themerc */ - s_winfont = font_open(themerc_font); + /* load the font, not from the theme file tho, its in the config */ + + if (!config_get("font.shadow", Config_Bool, &shadow)) { + shadow.bool = TRUE; /* default */ + config_set("font.shadow", Config_Bool, shadow); + } + s_winfont_shadow = shadow.bool; + if (!config_get("font.shadow.offset", Config_Integer, &offset) || + offset.integer < 0 || offset.integer >= 10) { + offset.integer = 1; /* default */ + config_set("font.shadow.offset", Config_Integer, offset); + } + s_winfont_shadow_offset = offset.integer; + if (!config_get("font", Config_String, &font)) { + font.string = DEFAULT_FONT; + config_set("font", Config_String, font); + } + s_winfont = font_open(font.string); s_winfont_height = font_height(s_winfont, s_winfont_shadow, s_winfont_shadow_offset); + winjust = Justify_Left; + if (read_string(db, "window.justify", &winjuststr)) { + if (!g_ascii_strcasecmp(winjuststr, "right")) + winjust = Justify_Right; + else if (!g_ascii_strcasecmp(winjuststr, "center")) + winjust = Justify_Center; + g_free(winjuststr); + } + if (!read_int(db, "handleWidth", &s_handle_height) || s_handle_height < 0 || s_handle_height > 100) s_handle_height = 6; if (!read_int(db, "bevelWidth", &s_bevel) || @@ -278,6 +364,29 @@ gboolean load() if (!read_color(db, "window.label.unfocus.textColor", &s_title_unfocused_color)) s_title_unfocused_color = color_new(0xff, 0xff, 0xff); + if (!read_color(db, "window.button.focus.picColor", + &s_titlebut_focused_color)) + s_titlebut_focused_color = color_new(0, 0, 0); + if (!read_color(db, "window.button.unfocus.picColor", + &s_titlebut_unfocused_color)) + s_titlebut_unfocused_color = color_new(0xff, 0xff, 0xff); + + if (!read_mask(db, "window.button.max.mask", &s_max_mask)) { + char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; + s_max_mask = pixmap_mask_new(7, 7, data); + } + if (!read_mask(db, "window.button.icon.mask", &s_icon_mask)) { + char data[] = { 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e }; + s_icon_mask = pixmap_mask_new(7, 7, data); + } + if (!read_mask(db, "window.button.stick.mask", &s_desk_mask)) { + char data[] = { 0x00, 0x36, 0x36, 0x00, 0x36, 0x36, 0x00 }; + s_desk_mask = pixmap_mask_new(7, 7, data); + } + if (!read_mask(db, "window.button.close.mask", &s_close_mask)) { + char data[] = { 0x22, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x22 }; + s_close_mask = pixmap_mask_new(7, 7, data); + } if (!read_appearance(db, "window.title.focus", a_focused_title)) set_default_appearance(a_focused_title); @@ -299,7 +408,7 @@ gboolean load() if (!read_appearance(db, "window.button.pressed.focus", a_focused_pressed_max)) if (!read_appearance(db, "window.button.pressed", - a_focused_pressed_max)) + a_focused_pressed_max)) set_default_appearance(a_focused_pressed_max); if (!read_appearance(db, "window.button.pressed.unfocus", a_unfocused_pressed_max)) @@ -308,10 +417,10 @@ gboolean load() set_default_appearance(a_unfocused_pressed_max); if (!read_appearance(db, "window.button.focus", a_focused_unpressed_max)) - set_default_appearance(a_focused_unpressed_max); + set_default_appearance(a_focused_unpressed_max); if (!read_appearance(db, "window.button.unfocus", a_unfocused_unpressed_max)) - set_default_appearance(a_unfocused_unpressed_max); + set_default_appearance(a_unfocused_unpressed_max); a_unfocused_unpressed_close = appearance_copy(a_unfocused_unpressed_max); a_unfocused_pressed_close = appearance_copy(a_unfocused_pressed_max); @@ -328,21 +437,72 @@ gboolean load() a_icon->surface.data.planar.grad = Background_ParentRelative; - /* XXX load the button masks */ - /* set up the textures */ a_focused_label->texture[0].type = Text; + a_focused_label->texture[0].data.text.justify = winjust; a_focused_label->texture[0].data.text.font = s_winfont; a_focused_label->texture[0].data.text.shadow = s_winfont_shadow; a_focused_label->texture[0].data.text.offset = s_winfont_shadow_offset; a_focused_label->texture[0].data.text.color = s_title_focused_color; a_unfocused_label->texture[0].type = Text; + a_unfocused_label->texture[0].data.text.justify = winjust; a_unfocused_label->texture[0].data.text.font = s_winfont; a_unfocused_label->texture[0].data.text.shadow = s_winfont_shadow; a_unfocused_label->texture[0].data.text.offset = s_winfont_shadow_offset; a_unfocused_label->texture[0].data.text.color = s_title_unfocused_color; + a_focused_unpressed_max->texture[0].type = + a_focused_pressed_max->texture[0].type = + a_unfocused_unpressed_max->texture[0].type = + a_unfocused_pressed_max->texture[0].type = + a_focused_unpressed_close->texture[0].type = + a_focused_pressed_close->texture[0].type = + a_unfocused_unpressed_close->texture[0].type = + a_unfocused_pressed_close->texture[0].type = + a_focused_unpressed_desk->texture[0].type = + a_focused_pressed_desk->texture[0].type = + a_unfocused_unpressed_desk->texture[0].type = + a_unfocused_pressed_desk->texture[0].type = + a_focused_unpressed_iconify->texture[0].type = + a_focused_pressed_iconify->texture[0].type = + a_unfocused_unpressed_iconify->texture[0].type = + a_unfocused_pressed_iconify->texture[0].type = Bitmask; + a_focused_unpressed_max->texture[0].data.mask.mask = + a_focused_pressed_max->texture[0].data.mask.mask = + a_unfocused_unpressed_max->texture[0].data.mask.mask = + a_unfocused_pressed_max->texture[0].data.mask.mask = s_max_mask; + a_focused_unpressed_close->texture[0].data.mask.mask = + a_focused_pressed_close->texture[0].data.mask.mask = + a_unfocused_unpressed_close->texture[0].data.mask.mask = + a_unfocused_pressed_close->texture[0].data.mask.mask = s_close_mask; + a_focused_unpressed_desk->texture[0].data.mask.mask = + a_focused_pressed_desk->texture[0].data.mask.mask = + a_unfocused_unpressed_desk->texture[0].data.mask.mask = + a_unfocused_pressed_desk->texture[0].data.mask.mask = s_desk_mask; + a_focused_unpressed_iconify->texture[0].data.mask.mask = + a_focused_pressed_iconify->texture[0].data.mask.mask = + a_unfocused_unpressed_iconify->texture[0].data.mask.mask = + a_unfocused_pressed_iconify->texture[0].data.mask.mask = s_icon_mask; + a_focused_unpressed_max->texture[0].data.mask.color = + a_focused_pressed_max->texture[0].data.mask.color = + a_focused_unpressed_close->texture[0].data.mask.color = + a_focused_pressed_close->texture[0].data.mask.color = + a_focused_unpressed_desk->texture[0].data.mask.color = + a_focused_pressed_desk->texture[0].data.mask.color = + a_focused_unpressed_iconify->texture[0].data.mask.color = + a_focused_pressed_iconify->texture[0].data.mask.color = + s_titlebut_focused_color; + a_unfocused_unpressed_max->texture[0].data.mask.color = + a_unfocused_pressed_max->texture[0].data.mask.color = + a_unfocused_unpressed_close->texture[0].data.mask.color = + a_unfocused_pressed_close->texture[0].data.mask.color = + a_unfocused_unpressed_desk->texture[0].data.mask.color = + a_unfocused_pressed_desk->texture[0].data.mask.color = + a_unfocused_unpressed_iconify->texture[0].data.mask.color = + a_unfocused_pressed_iconify->texture[0].data.mask.color = + s_titlebut_unfocused_color; + XrmDestroyDatabase(db); return TRUE; }