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);
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);
}
/* 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))) {
}
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))) {
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"))
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))) {
/* 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;
&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,
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,
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,
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,
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,
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,
"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)) {
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,
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,
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 =
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;
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 =
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 =
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 =
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;
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);
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);
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) {
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);
projects / chaz / openbox / blobdiff