X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=106130e1e28f0d59d97e58e097bd0963dcd5ccbe;hb=0a459f7a57f765d6e32dabacf6ff826cc66ff641;hp=1a38093a3c888d3de9758fed1a993e41294e9054;hpb=dbe2851b910dcdb02afbb744dbb2926286ab8f65;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 1a38093a..106130e1 100644 --- a/render/theme.c +++ b/render/theme.c @@ -27,7 +27,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) gchar *font_str; RrTheme *theme; - theme = g_new(RrTheme, 1); + theme = g_new0(RrTheme, 1); theme->inst = inst; @@ -108,26 +108,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } /* load the font stuff */ - font_str = "arial:bold:pixelsize=10"; + if (!read_string(db, "window.title.xftfont", &font_str)) + font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50"; - 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 (!(theme->winfont = RrFontOpen(inst, font_str))) { + RrThemeFree(theme); + return NULL; } - - 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 = RrFontOpen(inst, font_str); - theme->winfont_height = RrFontHeight(theme->winfont, theme->winfont_shadow, - theme->winfont_shadow_offset); + theme->winfont_height = RrFontHeight(theme->winfont); winjust = RR_JUSTIFY_LEFT; if (read_string(db, "window.justify", &str)) { @@ -135,31 +123,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) winjust = RR_JUSTIFY_RIGHT; else if (!g_ascii_strcasecmp(str, "center")) winjust = RR_JUSTIFY_CENTER; - g_free(str); } - font_str = "arial-10:bold"; + if (!read_string(db, "menu.title.xftfont", &font_str)) + font_str = "arial,sans:bold:pixelsize=12:shadow=y"; - 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 (!(theme->mtitlefont = RrFontOpen(inst, font_str))) { + RrThemeFree(theme); + return NULL; } - - 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 = RrFontOpen(inst, font_str); - theme->mtitlefont_height = RrFontHeight(theme->mtitlefont, - theme->mtitlefont_shadow, - theme->mtitlefont_shadow_offset); + theme->mtitlefont_height = RrFontHeight(theme->mtitlefont); mtitlejust = RR_JUSTIFY_LEFT; if (read_string(db, "menu.title.justify", &str)) { @@ -167,30 +140,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) mtitlejust = RR_JUSTIFY_RIGHT; else if (!g_ascii_strcasecmp(str, "center")) mtitlejust = RR_JUSTIFY_CENTER; - g_free(str); } - font_str = "arial-8"; + if (!read_string(db, "menu.frame.xftfont", &font_str)) + font_str = "arial,sans:bold:pixelsize=11:shadow=y"; - 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 (!(theme->mfont = RrFontOpen(inst, font_str))) { + RrThemeFree(theme); + return NULL; } - - 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 = RrFontOpen(inst, font_str); - theme->mfont_height = RrFontHeight(theme->mfont, theme->mfont_shadow, - theme->mfont_shadow_offset); + theme->mfont_height = RrFontHeight(theme->mfont); mjust = RR_JUSTIFY_LEFT; if (read_string(db, "menu.frame.justify", &str)) { @@ -198,12 +157,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_string(db, "window.title.layout", &font_str)) + font_str = "NLIMC"; + theme->title_layout = g_strdup(font_str); + /* load direct dimensions */ if (!read_int(db, "handleWidth", &theme->handle_height) || theme->handle_height < 0 || theme->handle_height > 100) theme->handle_height = 6; @@ -449,15 +410,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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; @@ -468,15 +420,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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; @@ -484,11 +427,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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 = @@ -504,18 +442,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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; @@ -758,7 +684,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; } @@ -795,7 +721,7 @@ static gboolean read_mask(XrmDatabase db, const RrInstance *inst, char *rclass = create_class_name(rname); char *rettype; char *s; - char *button_dir; + char *data_dir; XrmValue retvalue; int hx, hy; /* ignored */ unsigned int w, h; @@ -804,16 +730,16 @@ static gboolean read_mask(XrmDatabase db, const RrInstance *inst, if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - button_dir = g_strdup_printf("%s_data", theme); + data_dir = g_strdup_printf("%s_data", theme); s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - button_dir, retvalue.addr, NULL); + data_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); + s = g_build_filename(THEMEDIR, data_dir, retvalue.addr, NULL); if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) ret = TRUE; @@ -839,7 +765,7 @@ static gboolean read_mask(XrmDatabase db, const RrInstance *inst, } g_free(s); - g_free(button_dir); + g_free(data_dir); } g_free(rclass); @@ -862,14 +788,8 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, if (strstr(tex, "gradient") != NULL) { if (strstr(tex, "crossdiagonal") != NULL) *grad = RR_SURFACE_CROSS_DIAGONAL; - else if (strstr(tex, "rectangle") != NULL) - *grad = RR_SURFACE_RECTANGLE; else if (strstr(tex, "pyramid") != NULL) *grad = RR_SURFACE_PYRAMID; - else if (strstr(tex, "pipecross") != NULL) - *grad = RR_SURFACE_PIPECROSS; - else if (strstr(tex, "elliptic") != NULL) - *grad = RR_SURFACE_PIPECROSS; else if (strstr(tex, "horizontal") != NULL) *grad = RR_SURFACE_HORIZONTAL; else if (strstr(tex, "vertical") != NULL)