X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=6e097bd618aa699f5a35d95e2cf603125a272d7e;hb=a9567a816385f8f66ed0f827bb4af78cdb10cd6d;hp=51a227031bcb89f320201f63221037a8e49747ae;hpb=b1d44ac43ba050026fa6602ec6fd34b33366aa00;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 51a22703..6e097bd6 100644 --- a/render/theme.c +++ b/render/theme.c @@ -26,7 +26,7 @@ static void set_default_appearance(RrAppearance *a); RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) { XrmDatabase db = NULL; - RrJustify winjust, mtitlejust, mjust; + RrJustify winjust, mtitlejust; gchar *str; gchar *font_str; RrTheme *theme; @@ -56,17 +56,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->a_menu_item = RrAppearanceNew(inst, 0); + theme->a_menu_disabled = RrAppearanceNew(inst, 0); + theme->a_menu_hilite = RrAppearanceNew(inst, 0); + theme->a_menu_text_item = RrAppearanceNew(inst, 1); + theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); + theme->a_menu_text_hilite = RrAppearanceNew(inst, 1); theme->a_menu_bullet = RrAppearanceNew(inst, 1); theme->a_clear = RrAppearanceNew(inst, 0); + theme->a_clear_tex = RrAppearanceNew(inst, 1); theme->app_hilite_bg = RrAppearanceNew(inst, 0); theme->app_unhilite_bg = RrAppearanceNew(inst, 0); theme->app_hilite_label = RrAppearanceNew(inst, 1); theme->app_unhilite_label = RrAppearanceNew(inst, 1); - theme->app_icon = RrAppearanceNew(inst, 1); if (name) { db = loaddb(theme, name); @@ -87,14 +90,24 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } /* load the font stuff */ - if (!read_string(db, "window.title.xftfont", &font_str)) + if (!read_string(db, "window.focus.font", &font_str)) font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50"; - if (!(theme->winfont = RrFontOpen(inst, font_str))) { + if (!(theme->winfont_focused = RrFontOpen(inst, font_str))) { RrThemeFree(theme); return NULL; } - theme->winfont_height = RrFontHeight(theme->winfont); + theme->winfont_height = RrFontHeight(theme->winfont_focused); + + if (!read_string(db, "window.unfocus.font", &font_str)) + /* font_str will already be set to the last one */; + + if (!(theme->winfont_unfocused = RrFontOpen(inst, font_str))) { + RrThemeFree(theme); + return NULL; + } + theme->winfont_height = MAX(theme->winfont_height, + RrFontHeight(theme->winfont_unfocused)); winjust = RR_JUSTIFY_LEFT; if (read_string(db, "window.justify", &str)) { @@ -104,7 +117,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) winjust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.title.xftfont", &font_str)) + if (!read_string(db, "menu.title.font", &font_str)) font_str = "arial,sans:bold:pixelsize=12:shadow=y"; if (!(theme->mtitlefont = RrFontOpen(inst, font_str))) { @@ -121,7 +134,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) mtitlejust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.frame.xftfont", &font_str)) + if (!read_string(db, "menu.frame.font", &font_str)) font_str = "arial,sans:bold:pixelsize=11:shadow=y"; if (!(theme->mfont = RrFontOpen(inst, font_str))) { @@ -130,14 +143,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } theme->mfont_height = RrFontHeight(theme->mfont); - mjust = RR_JUSTIFY_LEFT; - if (read_string(db, "menu.frame.justify", &str)) { - if (!g_ascii_strcasecmp(str, "right")) - mjust = RR_JUSTIFY_RIGHT; - else if (!g_ascii_strcasecmp(str, "center")) - mjust = RR_JUSTIFY_CENTER; - } - /* load direct dimensions */ if (!read_int(db, "menuOverlap", &theme->menu_overlap) || theme->menu_overlap < 0 || theme->menu_overlap > 20) @@ -244,7 +249,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "menu.frame.textColor", &theme->menu_color)) theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "menu.bullet.picColor", &theme->menu_color)) + "menu.bullet.picColor", &theme->menu_bullet_color)) theme->menu_bullet_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, "menu.frame.disableColor", &theme->menu_disabled_color)) @@ -273,12 +278,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } } else { { - char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; - theme->max_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; + theme->max_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); } { - char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; - theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; + theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); } theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); @@ -302,8 +307,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } } else { { - char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; - theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; + theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); } theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask); theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask); @@ -330,12 +335,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } } else { { - char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; - theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; + theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); } { - char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 }; - theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 }; + theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7, + (char*)data); } theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); @@ -362,12 +368,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } } else { { - char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; - theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; + theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); } { - char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f }; - theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f }; + theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7, + (char*)data); } theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); @@ -389,8 +396,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } } else { { - char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; - theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; + theme->close_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); } theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); @@ -398,8 +405,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) { - char data[] = { 0x18, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x18 }; - theme->menu_bullet_mask = RrPixmapMaskNew(inst, 8, 8, data); + guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; + theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (char*)data); } /* read the decoration textures */ @@ -491,14 +498,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "window.button.toggled.focus", theme->a_toggled_focused_max, TRUE)) + { + RrAppearanceFree(theme->a_toggled_focused_max); theme->a_toggled_focused_max = RrAppearanceCopy(theme->a_focused_pressed_max); + } if (!read_appearance(db, inst, "window.button.toggled.unfocus", theme->a_toggled_unfocused_max, TRUE)) + { + RrAppearanceFree(theme->a_toggled_unfocused_max); theme->a_toggled_unfocused_max = RrAppearanceCopy(theme->a_unfocused_pressed_max); + } if (!read_appearance(db, inst, "window.button.focus", theme->a_focused_unpressed_max, @@ -513,14 +526,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "window.button.hover.focus", theme->a_hover_focused_max, TRUE)) + { + RrAppearanceFree(theme->a_hover_focused_max); theme->a_hover_focused_max = RrAppearanceCopy(theme->a_focused_unpressed_max); + } if (!read_appearance(db, inst, "window.button.hover.unfocus", theme->a_hover_unfocused_max, TRUE)) + { + RrAppearanceFree(theme->a_hover_unfocused_max); theme->a_hover_unfocused_max = RrAppearanceCopy(theme->a_unfocused_unpressed_max); + } theme->a_disabled_focused_close = RrAppearanceCopy(theme->a_disabled_focused_max); @@ -595,8 +614,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_focused_pressed_iconify = RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_icon->surface.grad = RR_SURFACE_PARENTREL; - theme->a_clear->surface.grad = RR_SURFACE_PARENTREL; + theme->a_icon->surface.grad = + theme->a_clear->surface.grad = + theme->a_clear_tex->surface.grad = + theme->a_menu_item->surface.grad = + theme->a_menu_disabled->surface.grad = + theme->a_menu_text_item->surface.grad = + theme->a_menu_text_disabled->surface.grad = + theme->a_menu_text_hilite->surface.grad = + theme->a_menu_bullet->surface.grad = RR_SURFACE_PARENTREL; /* set up the textures */ theme->a_focused_label->texture[0].type = @@ -604,7 +630,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->app_hilite_label->texture[0].data.text.font = + theme->winfont_focused; theme->a_focused_label->texture[0].data.text.color = theme->app_hilite_label->texture[0].data.text.color = theme->title_focused_color; @@ -614,7 +641,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->app_unhilite_label->texture[0].data.text.font = + theme->winfont_unfocused; theme->a_unfocused_label->texture[0].data.text.color = theme->app_unhilite_label->texture[0].data.text.color = theme->title_unfocused_color; @@ -624,24 +652,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_menu_title->texture[0].data.text.font = theme->mtitlefont; theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color; - theme->a_menu_item->surface.grad = - theme->a_menu_disabled->surface.grad = - theme->a_menu_bullet->surface.grad = - theme->app_icon->surface.grad = RR_SURFACE_PARENTREL; - - theme->a_menu_item->texture[0].type = - theme->a_menu_disabled->texture[0].type = - theme->a_menu_hilite->texture[0].type = RR_TEXTURE_TEXT; - theme->a_menu_item->texture[0].data.text.justify = - theme->a_menu_disabled->texture[0].data.text.justify = - theme->a_menu_hilite->texture[0].data.text.justify = mjust; - theme->a_menu_item->texture[0].data.text.font = - theme->a_menu_disabled->texture[0].data.text.font = - theme->a_menu_hilite->texture[0].data.text.font = theme->mfont; - theme->a_menu_item->texture[0].data.text.color = theme->menu_color; - theme->a_menu_disabled->texture[0].data.text.color = + theme->a_menu_text_item->texture[0].type = + theme->a_menu_text_disabled->texture[0].type = + theme->a_menu_text_hilite->texture[0].type = RR_TEXTURE_TEXT; + theme->a_menu_text_item->texture[0].data.text.justify = + theme->a_menu_text_disabled->texture[0].data.text.justify = + theme->a_menu_text_hilite->texture[0].data.text.justify = + RR_JUSTIFY_LEFT; + theme->a_menu_text_item->texture[0].data.text.font = + theme->a_menu_text_disabled->texture[0].data.text.font = + theme->a_menu_text_hilite->texture[0].data.text.font = theme->mfont; + theme->a_menu_text_item->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_hilite->texture[0].data.text.color = + theme->a_menu_text_hilite->texture[0].data.text.color = theme->menu_hilite_color; theme->a_menu_bullet->texture[0].data.mask.color = theme->menu_bullet_color; @@ -829,7 +853,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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; + theme->grip_width = theme->title_height * 1.5; return theme; } @@ -858,6 +882,7 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_title_color); RrColorFree(theme->menu_disabled_color); RrColorFree(theme->menu_hilite_color); + RrColorFree(theme->menu_bullet_color); RrPixmapMaskFree(theme->max_mask); RrPixmapMaskFree(theme->max_toggled_mask); @@ -884,7 +909,8 @@ void RrThemeFree(RrTheme *theme) RrPixmapMaskFree(theme->close_pressed_mask); RrPixmapMaskFree(theme->menu_bullet_mask); - RrFontClose(theme->winfont); + RrFontClose(theme->winfont_focused); + RrFontClose(theme->winfont_unfocused); RrFontClose(theme->mtitlefont); RrFontClose(theme->mfont); @@ -948,12 +974,15 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_menu_item); RrAppearanceFree(theme->a_menu_disabled); RrAppearanceFree(theme->a_menu_hilite); + RrAppearanceFree(theme->a_menu_text_item); + RrAppearanceFree(theme->a_menu_text_disabled); + RrAppearanceFree(theme->a_menu_text_hilite); RrAppearanceFree(theme->a_clear); + RrAppearanceFree(theme->a_clear_tex); RrAppearanceFree(theme->app_hilite_bg); RrAppearanceFree(theme->app_unhilite_bg); RrAppearanceFree(theme->app_hilite_label); RrAppearanceFree(theme->app_unhilite_label); - RrAppearanceFree(theme->app_icon); } }