X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=756af167a7d51279565b0ba925e244aa70f8f93e;hb=f1ad68d05bf22bec99f8e1a749fc86bfe16df5af;hp=a80777ba75bcbc5c3a81e91f64c3bc107a83153a;hpb=f507432c86bb54ab682805719fb730559f9e08e5;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index a80777ba..756af167 100644 --- a/render/theme.c +++ b/render/theme.c @@ -48,7 +48,7 @@ static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[]); static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[], gint *integer, gint lower, gint upper); static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[], - const gchar **string); + gchar **string); static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[], RrColor **color, gchar *alpha); static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[], @@ -66,12 +66,13 @@ static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, RrFont *active_window_font, RrFont *inactive_window_font, - RrFont *menu_title_font, RrFont *menu_item_font) + RrFont *menu_title_font, RrFont *menu_item_font, + RrFont *osd_font) { ParseState ps; xmlNodePtr root; RrJustify winjust, mtitlejust; - const gchar *str; + gchar *str; RrTheme *theme; if (name) { @@ -122,10 +123,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_text_title = RrAppearanceNew(inst, 1); theme->a_menu_normal = RrAppearanceNew(inst, 0); theme->a_menu_disabled = RrAppearanceNew(inst, 0); + theme->a_menu_disabled_selected = RrAppearanceNew(inst, 0); theme->a_menu_selected = RrAppearanceNew(inst, 0); theme->a_menu_text_normal = RrAppearanceNew(inst, 1); - theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); theme->a_menu_text_selected = RrAppearanceNew(inst, 1); + theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); + theme->a_menu_text_disabled_selected = RrAppearanceNew(inst, 1); theme->a_menu_bullet_normal = RrAppearanceNew(inst, 1); theme->a_menu_bullet_selected = RrAppearanceNew(inst, 1); theme->a_clear = RrAppearanceNew(inst, 0); @@ -151,6 +154,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, winjust = RR_JUSTIFY_RIGHT; else if (strcmp(str, "center") == 0) winjust = RR_JUSTIFY_CENTER; + g_free(str); } if (menu_title_font) { @@ -165,6 +169,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, mtitlejust = RR_JUSTIFY_RIGHT; else if (strcmp(str, "center") == 0) mtitlejust = RR_JUSTIFY_CENTER; + g_free(str); } if (menu_item_font) { @@ -173,6 +178,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, } else theme->menu_font = RrFontOpenDefault(inst); + if (osd_font) { + theme->osd_font = osd_font; + RrFontRef(osd_font); + } else + theme->osd_font = RrFontOpenDefault(inst); + /* load direct dimensions */ if (!FIND(int, L("menu","overlap"), &theme->menu_overlap, -100, 100)) @@ -292,17 +303,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, &theme->titlebut_toggled_focused_unpressed_color, NULL)) theme->titlebut_toggled_focused_unpressed_color = RrColorNew(inst, - theme->titlebut_focused_unpressed_color->r, - theme->titlebut_focused_unpressed_color->g, - theme->titlebut_focused_unpressed_color->b); + theme->titlebut_focused_pressed_color->r, + theme->titlebut_focused_pressed_color->g, + theme->titlebut_focused_pressed_color->b); if (!FIND(color, L("window","inactive","buttons","toggled-unpressed","image"), &theme->titlebut_toggled_unfocused_unpressed_color, NULL)) theme->titlebut_toggled_unfocused_unpressed_color = RrColorNew(inst, - theme->titlebut_unfocused_unpressed_color->r, - theme->titlebut_unfocused_unpressed_color->g, - theme->titlebut_unfocused_unpressed_color->b); + theme->titlebut_unfocused_pressed_color->r, + theme->titlebut_unfocused_pressed_color->g, + theme->titlebut_unfocused_pressed_color->b); if (!FIND(color, L("window","active","buttons","toggled-hover","image"), &theme->titlebut_toggled_hover_focused_color, NULL)) @@ -327,6 +338,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, if (!FIND(color, L("menu","disabled","primary"), &theme->menu_disabled_color, NULL)) theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); + if (!FIND(color, L("menu","activedisabled","text","primary"), + &theme->menu_disabled_selected_color, NULL)) + theme->menu_disabled_selected_color = + RrColorNew(inst, + theme->menu_disabled_color->r, + theme->menu_disabled_color->g, + theme->menu_disabled_color->b); if (!FIND(color, L("menu","active","text","primary"), &theme->menu_selected_color, NULL)) theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); @@ -385,6 +403,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->menu_text_disabled_shadow_alpha = theme->menu_text_normal_shadow_alpha; } + if (!FIND(color, L("menu","activedisabled","shadow","primary"), + &theme->menu_text_disabled_selected_shadow_color, + &theme->menu_text_disabled_selected_shadow_alpha)) + { + theme->menu_text_disabled_selected_shadow_color = + RrColorNew(inst, theme->menu_text_disabled_shadow_color->r, + theme->menu_text_disabled_shadow_color->g, + theme->menu_text_disabled_shadow_color->b); + theme->menu_text_disabled_selected_shadow_alpha = + theme->menu_text_disabled_shadow_alpha; + } /* load the image masks */ if (read_mask(&ps, "max.xbm", &theme->max_mask)) { @@ -575,6 +604,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, set_default_appearance(theme->a_menu_title); if (!FIND(appearance, L("menu", "active"), theme->a_menu_selected, TRUE)) set_default_appearance(theme->a_menu_selected); + if (!FIND(appearance, L("menu", "activedisabled"), + theme->a_menu_disabled_selected, TRUE)) + theme->a_menu_disabled_selected = + RrAppearanceCopy(theme->a_menu_selected); /* read the appearances for rendering non-decorations */ theme->osd_hilite_bg = RrAppearanceCopy(theme->a_focused_title); @@ -640,28 +673,28 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, { RrAppearanceFree(theme->a_toggled_focused_unpressed_max); theme->a_toggled_focused_unpressed_max = - RrAppearanceCopy(theme->a_focused_unpressed_max); + RrAppearanceCopy(theme->a_focused_pressed_max); } if (!FIND(appearance, L("window","inactive","buttons","toggled-unpressed"), theme->a_toggled_unfocused_unpressed_max, TRUE)) { RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max); theme->a_toggled_unfocused_unpressed_max = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); + RrAppearanceCopy(theme->a_unfocused_pressed_max); } if (!FIND(appearance, L("window","active","buttons","toggled-hover"), theme->a_toggled_hover_focused_max, TRUE)) { RrAppearanceFree(theme->a_toggled_hover_focused_max); theme->a_toggled_hover_focused_max = - RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + RrAppearanceCopy(theme->a_toggled_focused_pressed_max); } if (!FIND(appearance, L("window","inactive","buttons","toggled-hover"), theme->a_toggled_hover_unfocused_max, TRUE)) { RrAppearanceFree(theme->a_toggled_hover_unfocused_max); theme->a_toggled_hover_unfocused_max = - RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); } theme->a_disabled_focused_close = @@ -760,8 +793,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_normal->surface.grad = theme->a_menu_disabled->surface.grad = theme->a_menu_text_normal->surface.grad = - theme->a_menu_text_disabled->surface.grad = theme->a_menu_text_selected->surface.grad = + theme->a_menu_text_disabled->surface.grad = + theme->a_menu_text_disabled_selected->surface.grad = theme->a_menu_bullet_normal->surface.grad = theme->a_menu_bullet_selected->surface.grad = RR_SURFACE_PARENTREL; @@ -771,8 +805,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_focused_label->texture[0].data.text.justify = winjust; theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_focused_label->texture[0].data.text.font = - theme->osd_hilite_label->texture[0].data.text.font = theme->win_font_focused; + theme->osd_hilite_label->texture[0].data.text.font = theme->osd_font; theme->a_focused_label->texture[0].data.text.color = theme->title_focused_color; theme->osd_hilite_label->texture[0].data.text.color = @@ -833,21 +867,27 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->menu_title_shadow_alpha; theme->a_menu_text_normal->texture[0].type = + theme->a_menu_text_selected->texture[0].type = theme->a_menu_text_disabled->texture[0].type = - theme->a_menu_text_selected->texture[0].type = RR_TEXTURE_TEXT; + theme->a_menu_text_disabled_selected->texture[0].type = + RR_TEXTURE_TEXT; theme->a_menu_text_normal->texture[0].data.text.justify = - theme->a_menu_text_disabled->texture[0].data.text.justify = theme->a_menu_text_selected->texture[0].data.text.justify = + theme->a_menu_text_disabled->texture[0].data.text.justify = + theme->a_menu_text_disabled_selected->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_menu_text_normal->texture[0].data.text.font = - theme->a_menu_text_disabled->texture[0].data.text.font = theme->a_menu_text_selected->texture[0].data.text.font = + theme->a_menu_text_disabled->texture[0].data.text.font = + theme->a_menu_text_disabled_selected->texture[0].data.text.font = theme->menu_font; theme->a_menu_text_normal->texture[0].data.text.color = theme->menu_color; - theme->a_menu_text_disabled->texture[0].data.text.color = - theme->menu_disabled_color; theme->a_menu_text_selected->texture[0].data.text.color = theme->menu_selected_color; + theme->a_menu_text_disabled->texture[0].data.text.color = + theme->menu_disabled_color; + theme->a_menu_text_disabled_selected->texture[0].data.text.color = + theme->menu_disabled_selected_color; if (!FIND(shadow, L("menu","inactive","shadow","offset"), theme->a_menu_text_normal)) @@ -864,6 +904,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_x = theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_y = 0; + if (!FIND(shadow, L("menu","activedisabled","shadow","offset"), + theme->a_menu_text_disabled_selected)) + theme->a_menu_text_disabled_selected-> + texture[0].data.text.shadow_offset_x = 0; + theme->a_menu_text_disabled_selected-> + texture[0].data.text.shadow_offset_y = 0; theme->a_menu_text_normal->texture[0].data.text.shadow_color = theme->menu_text_normal_shadow_color; theme->a_menu_text_normal->texture[0].data.text.shadow_alpha = @@ -876,6 +922,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->menu_text_disabled_shadow_color; theme->a_menu_text_disabled->texture[0].data.text.shadow_alpha = theme->menu_text_disabled_shadow_alpha; + theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_color = + theme->menu_text_disabled_selected_shadow_color; + theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_alpha = + theme->menu_text_disabled_selected_shadow_alpha; theme->a_disabled_focused_max->texture[0].type = theme->a_disabled_unfocused_max->texture[0].type = @@ -1112,7 +1162,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, { gint ft, fb, fl, fr, ut, ub, ul, ur; - RrAppearance *a, *b, *c; + RrAppearance *a, *b, *c, *d; /* caluclate the font heights*/ a = theme->a_focused_label; @@ -1131,11 +1181,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, a = theme->a_menu_text_normal; b = theme->a_menu_text_selected; c = theme->a_menu_text_disabled; + d = theme->a_menu_text_disabled_selected; theme->menu_font_height = RrFontHeight(theme->menu_font, MAX(a->texture[0].data.text.shadow_offset_y, MAX(b->texture[0].data.text.shadow_offset_y, - c->texture[0].data.text.shadow_offset_y))); + MAX(c->texture[0].data.text.shadow_offset_y, + d->texture[0].data.text.shadow_offset_y + )))); RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb); RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub); @@ -1153,9 +1206,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, MAX(theme->padding * 2, ut + ub)); */ theme->title_height = theme->label_height + theme->paddingy * 2; - /* this should match the above title_height given the same font size - for both. */ - theme->menu_title_height = theme->menu_title_font_height + + + RrMargins(theme->a_menu_title, &ul, &ut, &ur, &ub); + theme->menu_title_label_height = theme->menu_title_font_height+ut+ub; + theme->menu_title_height = theme->menu_title_label_height + theme->paddingy * 2; } theme->button_size = theme->label_height - 2; @@ -1189,8 +1243,9 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->titlebut_toggled_unfocused_unpressed_color); RrColorFree(theme->menu_title_color); RrColorFree(theme->menu_color); - RrColorFree(theme->menu_disabled_color); RrColorFree(theme->menu_selected_color); + RrColorFree(theme->menu_disabled_color); + RrColorFree(theme->menu_disabled_selected_color); RrColorFree(theme->title_focused_shadow_color); RrColorFree(theme->title_unfocused_shadow_color); RrColorFree(theme->osd_color); @@ -1199,6 +1254,7 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_text_normal_shadow_color); RrColorFree(theme->menu_text_selected_shadow_color); RrColorFree(theme->menu_text_disabled_shadow_color); + RrColorFree(theme->menu_text_disabled_selected_shadow_color); g_free(theme->def_win_icon); @@ -1303,11 +1359,13 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_menu_title); RrAppearanceFree(theme->a_menu_text_title); RrAppearanceFree(theme->a_menu_normal); - RrAppearanceFree(theme->a_menu_disabled); RrAppearanceFree(theme->a_menu_selected); + RrAppearanceFree(theme->a_menu_disabled); + RrAppearanceFree(theme->a_menu_disabled_selected); RrAppearanceFree(theme->a_menu_text_normal); - RrAppearanceFree(theme->a_menu_text_disabled); RrAppearanceFree(theme->a_menu_text_selected); + RrAppearanceFree(theme->a_menu_text_disabled); + RrAppearanceFree(theme->a_menu_text_disabled_selected); RrAppearanceFree(theme->a_menu_bullet_normal); RrAppearanceFree(theme->a_menu_bullet_selected); RrAppearanceFree(theme->a_clear); @@ -1460,7 +1518,7 @@ static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[], } static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[], - const gchar **string) + gchar **string) { if ((n = find_node(n, names))) { *string = parse_string(ps->doc, n);