X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=render%2Ftheme.c;h=46636e2b7b8f22c92914b193a171658787233a20;hb=804b12d46ab9eb6cd9d5b60931ae776be160536c;hp=d8bd41f04704ff9ab7010cb0b7c937193b25ee4e;hpb=e91814e99f8e71fdf2d930acf43988110969547d;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index d8bd41f0..46636e2b 100644 --- a/render/theme.c +++ b/render/theme.c @@ -58,13 +58,14 @@ 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, 0); + theme->a_menu_normal = 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_selected = RrAppearanceNew(inst, 0); + theme->a_menu_text_normal = 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_menu_text_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); theme->a_clear_tex = RrAppearanceNew(inst, 1); @@ -92,7 +93,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } /* load the font stuff */ - if (!read_string(db, "window.focus.font", &font_str)) + if (!read_string(db, "window.label.focus.font", &font_str)) font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50"; if (!(theme->winfont_focused = RrFontOpen(inst, font_str))) { @@ -101,7 +102,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } theme->winfont_height = RrFontHeight(theme->winfont_focused); - if (!read_string(db, "window.unfocus.font", &font_str)) + if (!read_string(db, "window.label.unfocus.font", &font_str)) /* font_str will already be set to the last one */; if (!(theme->winfont_unfocused = RrFontOpen(inst, font_str))) { @@ -112,7 +113,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RrFontHeight(theme->winfont_unfocused)); winjust = RR_JUSTIFY_LEFT; - if (read_string(db, "window.justify", &str)) { + if (read_string(db, "window.label.justify", &str)) { if (!g_ascii_strcasecmp(str, "right")) winjust = RR_JUSTIFY_RIGHT; else if (!g_ascii_strcasecmp(str, "center")) @@ -136,7 +137,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) mtitlejust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.frame.font", &font_str)) + if (!read_string(db, "menu.items.font", &font_str)) font_str = "arial,sans:bold:pixelsize=11:shadow=y"; if (!(theme->mfont = RrFontOpen(inst, font_str))) { @@ -184,16 +185,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) &theme->title_unfocused_color)) theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "window.button.focus.picColor", + "window.button.focus.imageColor", &theme->titlebut_focused_unpressed_color)) theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, - "window.button.unfocus.picColor", + "window.button.unfocus.imageColor", &theme->titlebut_unfocused_unpressed_color)) theme->titlebut_unfocused_unpressed_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "window.button.pressed.focus.picColor", + "window.button.pressed.focus.imageColor", &theme->titlebut_focused_pressed_color)) theme->titlebut_focused_pressed_color = RrColorNew(inst, @@ -201,7 +202,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_focused_unpressed_color->g, theme->titlebut_focused_unpressed_color->b); if (!read_color(db, inst, - "window.button.pressed.unfocus.picColor", + "window.button.pressed.unfocus.imageColor", &theme->titlebut_unfocused_pressed_color)) theme->titlebut_unfocused_pressed_color = RrColorNew(inst, @@ -209,16 +210,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_unfocused_unpressed_color->g, theme->titlebut_unfocused_unpressed_color->b); if (!read_color(db, inst, - "window.button.disabled.focus.picColor", + "window.button.disabled.focus.imageColor", &theme->titlebut_disabled_focused_color)) theme->titlebut_disabled_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "window.button.disabled.unfocus.picColor", + "window.button.disabled.unfocus.imageColor", &theme->titlebut_disabled_unfocused_color)) theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, - "window.button.hover.focus.picColor", + "window.button.hover.focus.imageColor", &theme->titlebut_hover_focused_color)) theme->titlebut_hover_focused_color = RrColorNew(inst, @@ -226,7 +227,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_focused_unpressed_color->g, theme->titlebut_focused_unpressed_color->b); if (!read_color(db, inst, - "window.button.hover.unfocus.picColor", + "window.button.hover.unfocus.imageColor", &theme->titlebut_hover_unfocused_color)) theme->titlebut_hover_unfocused_color = RrColorNew(inst, @@ -234,7 +235,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_unfocused_unpressed_color->g, theme->titlebut_unfocused_unpressed_color->b); if (!read_color(db, inst, - "window.button.toggled.focus.picColor", + "window.button.toggled.focus.imageColor", &theme->titlebut_toggled_focused_color)) theme->titlebut_toggled_focused_color = RrColorNew(inst, @@ -242,7 +243,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_focused_pressed_color->g, theme->titlebut_focused_pressed_color->b); if (!read_color(db, inst, - "window.button.toggled.unfocus.picColor", + "window.button.toggled.unfocus.imageColor", &theme->titlebut_toggled_unfocused_color)) theme->titlebut_toggled_unfocused_color = RrColorNew(inst, @@ -253,17 +254,29 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "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)) + "menu.items.textColor", &theme->menu_color)) theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "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)) + "menu.disabled.textColor", &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); + "menu.selected.textColor", &theme->menu_selected_color)) + theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, + "menu.bullet.imageColor", + &theme->menu_bullet_normal_color)) + theme->menu_bullet_normal_color = RrColorNew(inst, + theme->menu_color->r, + theme->menu_color->g, + theme->menu_color->b); + if (!read_color(db, inst, + "menu.bullet.selected.imageColor", + &theme->menu_bullet_selected_color)) + theme->menu_bullet_selected_color = + RrColorNew(inst, + theme->menu_selected_color->r, + theme->menu_selected_color->g, + theme->menu_selected_color->b); if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) { @@ -450,7 +463,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) TRUE)) set_default_appearance(theme->a_unfocused_grip); if (!read_appearance(db, inst, - "menu.frame", theme->a_menu, + "menu.items", theme->a_menu, FALSE)) set_default_appearance(theme->a_menu); if (!read_appearance(db, inst, @@ -458,9 +471,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) FALSE)) set_default_appearance(theme->a_menu_title); if (!read_appearance(db, inst, - "menu.hilite", theme->a_menu_hilite, + "menu.selected", theme->a_menu_selected, TRUE)) - set_default_appearance(theme->a_menu_hilite); + set_default_appearance(theme->a_menu_selected); /* read the appearances for rendering non-decorations */ if (!read_appearance(db, inst, @@ -624,12 +637,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_normal->surface.grad = theme->a_menu_disabled->surface.grad = - theme->a_menu_text_item->surface.grad = + theme->a_menu_text_normal->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; + theme->a_menu_text_selected->surface.grad = + theme->a_menu_bullet_normal->surface.grad = + theme->a_menu_bullet_selected->surface.grad = RR_SURFACE_PARENTREL; /* set up the textures */ theme->a_focused_label->texture[0].type = @@ -646,7 +660,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->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_unfocused; @@ -659,23 +674,25 @@ 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_text_item->texture[0].type = + theme->a_menu_text_normal->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_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_hilite->texture[0].data.text.justify = + theme->a_menu_text_selected->texture[0].data.text.justify = RR_JUSTIFY_LEFT; - theme->a_menu_text_item->texture[0].data.text.font = + theme->a_menu_text_normal->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_selected->texture[0].data.text.font = theme->mfont; + 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_hilite->texture[0].data.text.color = - theme->menu_hilite_color; - theme->a_menu_bullet->texture[0].data.mask.color = - theme->menu_bullet_color; + theme->a_menu_text_selected->texture[0].data.text.color = + theme->menu_selected_color; + theme->a_menu_bullet_normal->texture[0].data.mask.color = + theme->menu_bullet_normal_color; + theme->a_menu_bullet_selected->texture[0].data.mask.color = + theme->menu_bullet_selected_color; theme->a_disabled_focused_max->texture[0].type = theme->a_disabled_unfocused_max->texture[0].type = @@ -723,7 +740,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_focused_pressed_iconify->texture[0].type = theme->a_unfocused_unpressed_iconify->texture[0].type = theme->a_unfocused_pressed_iconify->texture[0].type = - theme->a_menu_bullet->texture[0].type = RR_TEXTURE_MASK; + theme->a_menu_bullet_normal->texture[0].type = + theme->a_menu_bullet_selected->texture[0].type = RR_TEXTURE_MASK; theme->a_disabled_focused_max->texture[0].data.mask.mask = theme->a_disabled_unfocused_max->texture[0].data.mask.mask = @@ -794,7 +812,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = theme->iconify_mask; - theme->a_menu_bullet->texture[0].data.mask.mask = + theme->a_menu_bullet_normal->texture[0].data.mask.mask = + theme->a_menu_bullet_selected->texture[0].data.mask.mask = theme->menu_bullet_mask; theme->a_disabled_focused_max->texture[0].data.mask.color = theme->a_disabled_focused_close->texture[0].data.mask.color = @@ -852,12 +871,22 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_unfocused_pressed_shade->texture[0].data.mask.color = theme->a_unfocused_pressed_iconify->texture[0].data.mask.color = theme->titlebut_unfocused_pressed_color; - theme->a_menu_bullet->texture[0].data.mask.color = - theme->menu_bullet_color; + theme->a_menu_bullet_normal->texture[0].data.mask.color = + theme->menu_bullet_normal_color; + theme->a_menu_bullet_selected->texture[0].data.mask.color = + theme->menu_bullet_selected_color; XrmDestroyDatabase(db); - theme->label_height = theme->winfont_height; + { + gint fl, ft, fr, fb; + gint ul, ut, ur, ub; + + RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb); + RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub); + theme->label_height = theme->winfont_height + + MAX(ft + fb, ut + ub); + } theme->title_height = theme->label_height + theme->bevel * 2; theme->button_size = theme->label_height - 2; theme->grip_width = theme->title_height * 1.5; @@ -888,8 +917,9 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_color); RrColorFree(theme->menu_title_color); RrColorFree(theme->menu_disabled_color); - RrColorFree(theme->menu_hilite_color); - RrColorFree(theme->menu_bullet_color); + RrColorFree(theme->menu_selected_color); + RrColorFree(theme->menu_bullet_normal_color); + RrColorFree(theme->menu_bullet_selected_color); RrPixmapMaskFree(theme->max_mask); RrPixmapMaskFree(theme->max_toggled_mask); @@ -978,12 +1008,14 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_unfocused_handle); RrAppearanceFree(theme->a_menu); RrAppearanceFree(theme->a_menu_title); - RrAppearanceFree(theme->a_menu_item); + RrAppearanceFree(theme->a_menu_normal); RrAppearanceFree(theme->a_menu_disabled); - RrAppearanceFree(theme->a_menu_hilite); - RrAppearanceFree(theme->a_menu_text_item); + RrAppearanceFree(theme->a_menu_selected); + RrAppearanceFree(theme->a_menu_text_normal); RrAppearanceFree(theme->a_menu_text_disabled); - RrAppearanceFree(theme->a_menu_text_hilite); + RrAppearanceFree(theme->a_menu_text_selected); + RrAppearanceFree(theme->a_menu_bullet_normal); + RrAppearanceFree(theme->a_menu_bullet_selected); RrAppearanceFree(theme->a_clear); RrAppearanceFree(theme->a_clear_tex); RrAppearanceFree(theme->app_hilite_bg);