X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=render%2Ftheme.c;h=cd867742a0f48e5bf69b381255c29ab53fd8a9a4;hb=f33bbca9e6dfa55862de54501c07af635d56c137;hp=71770f8356f9e7cbf95a3fd4b567a2351c7caa20;hpb=baa236094f410c8b7eacc3f03af5c74eefb2231b;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 71770f83..cd867742 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; @@ -35,6 +35,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->inst = inst; + theme->show_handle = TRUE; + theme->a_disabled_focused_max = RrAppearanceNew(inst, 1); theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1); theme->a_hover_focused_max = RrAppearanceNew(inst, 1); @@ -56,17 +58,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_selected = RrAppearanceNew(inst, 0); + theme->a_menu_text_item = RrAppearanceNew(inst, 1); + theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); + theme->a_menu_text_selected = 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); + theme->app_selected_bg = RrAppearanceNew(inst, 0); + theme->app_unselected_bg = RrAppearanceNew(inst, 0); + theme->app_selected_label = RrAppearanceNew(inst, 1); + theme->app_unselected_label = RrAppearanceNew(inst, 1); if (name) { db = loaddb(theme, name); @@ -87,7 +92,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))) { @@ -96,7 +101,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))) { @@ -107,7 +112,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")) @@ -131,7 +136,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))) { @@ -140,25 +145,22 @@ 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) - theme->handle_height = 0; - if (!read_int(db, "handleWidth", &theme->handle_height) || - theme->handle_height < 0 || theme->handle_height > 100) + theme->menu_overlap = 0; + if (!read_int(db, "handleWidth", &theme->handle_height)) + theme->handle_height = 6; + if (!theme->handle_height) + theme->show_handle = FALSE; + if (theme->handle_height <= 0 || theme->handle_height > 100) theme->handle_height = 6; if (!read_int(db, "bevelWidth", &theme->bevel) || - theme->bevel <= 0 || theme->bevel > 100) theme->bevel = 3; + theme->bevel <= 0 || theme->bevel > 100) + theme->bevel = 3; if (!read_int(db, "borderWidth", &theme->bwidth) || - theme->bwidth < 0 || theme->bwidth > 100) theme->bwidth = 1; + theme->bwidth < 0 || theme->bwidth > 100) + theme->bwidth = 1; if (!read_int(db, "frameWidth", &theme->cbwidth) || theme->cbwidth < 0 || theme->cbwidth > 100) theme->cbwidth = theme->bevel; @@ -182,16 +184,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, @@ -199,7 +201,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, @@ -207,16 +209,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, @@ -224,7 +226,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, @@ -232,7 +234,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, @@ -240,7 +242,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, @@ -251,17 +253,17 @@ 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)) + "menu.bullet.imageColor", &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_mask(inst, "max.xbm", theme, &theme->max_mask)) { @@ -410,8 +412,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) { - guchar data[] = { 0x18, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x18 }; - theme->menu_bullet_mask = RrPixmapMaskNew(inst, 8, 8, (char*)data); + guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; + theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (char*)data); } /* read the decoration textures */ @@ -448,7 +450,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, @@ -456,27 +458,27 @@ 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, - "window.title.focus", theme->app_hilite_bg, + "window.title.focus", theme->app_selected_bg, FALSE)) - set_default_appearance(theme->app_hilite_bg); + set_default_appearance(theme->app_selected_bg); if (!read_appearance(db, inst, - "window.label.focus", theme->app_hilite_label, + "window.label.focus", theme->app_selected_label, TRUE)) - set_default_appearance(theme->app_hilite_label); + set_default_appearance(theme->app_selected_label); if (!read_appearance(db, inst, - "window.title.unfocus", theme->app_unhilite_bg, + "window.title.unfocus", theme->app_unselected_bg, FALSE)) - set_default_appearance(theme->app_unhilite_bg); + set_default_appearance(theme->app_unselected_bg); if (!read_appearance(db, inst, - "window.label.unfocus", theme->app_unhilite_label, + "window.label.unfocus", theme->app_unselected_label, TRUE)) - set_default_appearance(theme->app_unhilite_label); + set_default_appearance(theme->app_unselected_label); /* read buttons textures */ if (!read_appearance(db, inst, @@ -503,14 +505,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, @@ -525,14 +533,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); @@ -607,30 +621,38 @@ 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_selected->surface.grad = + theme->a_menu_bullet->surface.grad = RR_SURFACE_PARENTREL; /* set up the textures */ theme->a_focused_label->texture[0].type = - theme->app_hilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme->app_selected_label->texture[0].type = RR_TEXTURE_TEXT; theme->a_focused_label->texture[0].data.text.justify = winjust; - theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + theme->app_selected_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->app_selected_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->app_selected_label->texture[0].data.text.color = theme->title_focused_color; theme->a_unfocused_label->texture[0].type = - theme->app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme->app_unselected_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_unselected_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->app_unselected_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->app_unselected_label->texture[0].data.text.color = theme->title_unfocused_color; theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT; @@ -638,25 +660,21 @@ 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_selected->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_selected->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_selected->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->menu_hilite_color; + theme->a_menu_text_selected->texture[0].data.text.color = + theme->menu_selected_color; theme->a_menu_bullet->texture[0].data.mask.color = theme->menu_bullet_color; @@ -843,7 +861,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; } @@ -871,7 +889,8 @@ 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_selected_color); + RrColorFree(theme->menu_bullet_color); RrPixmapMaskFree(theme->max_mask); RrPixmapMaskFree(theme->max_toggled_mask); @@ -962,13 +981,16 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_menu_title); RrAppearanceFree(theme->a_menu_item); RrAppearanceFree(theme->a_menu_disabled); - RrAppearanceFree(theme->a_menu_hilite); + RrAppearanceFree(theme->a_menu_selected); + RrAppearanceFree(theme->a_menu_text_item); + RrAppearanceFree(theme->a_menu_text_disabled); + RrAppearanceFree(theme->a_menu_text_selected); RrAppearanceFree(theme->a_clear); - RrAppearanceFree(theme->app_hilite_bg); - RrAppearanceFree(theme->app_unhilite_bg); - RrAppearanceFree(theme->app_hilite_label); - RrAppearanceFree(theme->app_unhilite_label); - RrAppearanceFree(theme->app_icon); + RrAppearanceFree(theme->a_clear_tex); + RrAppearanceFree(theme->app_selected_bg); + RrAppearanceFree(theme->app_unselected_bg); + RrAppearanceFree(theme->app_selected_label); + RrAppearanceFree(theme->app_unselected_label); } } @@ -1149,13 +1171,15 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, gboolean allow_trans) { gboolean ret = FALSE; - char *rclass = create_class_name(rname), *cname, *ctoname, *bcname; + char *rclass = create_class_name(rname); + char *cname, *ctoname, *bcname, *icname; char *rettype; XrmValue retvalue; cname = g_strconcat(rname, ".color", NULL); ctoname = g_strconcat(rname, ".colorTo", NULL); bcname = g_strconcat(rname, ".borderColor", NULL); + icname = g_strconcat(rname, ".interlaceColor", NULL); if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { @@ -1174,9 +1198,14 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, if (!read_color(db, inst, bcname, &value->surface.border_color)) value->surface.border_color = RrColorNew(inst, 0, 0, 0); + if (value->surface.interlaced) + if (!read_color(db, inst, icname, + &value->surface.interlace_color)) + value->surface.interlace_color = RrColorNew(inst, 0, 0, 0); ret = TRUE; } + g_free(icname); g_free(bcname); g_free(ctoname); g_free(cname);