RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
{
XrmDatabase db = NULL;
- RrJustify winjust, mtitlejust, mjust;
+ RrJustify winjust, mtitlejust;
gchar *str;
gchar *font_str;
RrTheme *theme;
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_hover_unfocused_max = RrAppearanceNew(inst, 1);
+ theme->a_toggled_focused_max = RrAppearanceNew(inst, 1);
+ theme->a_toggled_unfocused_max = RrAppearanceNew(inst, 1);
theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1);
theme->a_focused_pressed_max = RrAppearanceNew(inst, 1);
- theme->a_focused_pressed_set_max = RrAppearanceNew(inst, 1);
theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1);
theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1);
- theme->a_unfocused_pressed_set_max = RrAppearanceNew(inst, 1);
theme->a_focused_grip = RrAppearanceNew(inst, 0);
theme->a_unfocused_grip = RrAppearanceNew(inst, 0);
theme->a_focused_title = RrAppearanceNew(inst, 0);
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->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->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_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);
}
/* load the font stuff */
- if (!read_string(db, "window.title.xftfont", &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 = 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.label.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)) {
+ 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"))
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))) {
mtitlejust = RR_JUSTIFY_CENTER;
}
- if (!read_string(db, "menu.frame.xftfont", &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))) {
}
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;
&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->r,
theme->titlebut_unfocused_unpressed_color->g,
theme->titlebut_unfocused_unpressed_color->b);
+ if (!read_color(db, inst,
+ "window.button.toggled.focus.imageColor",
+ &theme->titlebut_toggled_focused_color))
+ theme->titlebut_toggled_focused_color =
+ RrColorNew(inst,
+ theme->titlebut_focused_pressed_color->r,
+ theme->titlebut_focused_pressed_color->g,
+ theme->titlebut_focused_pressed_color->b);
+ if (!read_color(db, inst,
+ "window.button.toggled.unfocus.imageColor",
+ &theme->titlebut_toggled_unfocused_color))
+ theme->titlebut_toggled_unfocused_color =
+ RrColorNew(inst,
+ theme->titlebut_unfocused_pressed_color->r,
+ theme->titlebut_unfocused_pressed_color->g,
+ theme->titlebut_unfocused_pressed_color->b);
if (!read_color(db, 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.frame.disableColor", &theme->menu_disabled_color))
+ "menu.bullet.imageColor", &theme->menu_bullet_color))
+ theme->menu_bullet_color = RrColorNew(inst, 0, 0, 0);
+ if (!read_color(db, inst,
+ "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);
-
- if (read_mask(inst, "max.xbm", theme, &theme->max_unset_mask)) {
- if (!read_mask(inst, "max_toggled.xbm", theme, &theme->max_set_mask)) {
- theme->max_set_mask = RrPixmapMaskCopy(theme->max_unset_mask);
+ "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)) {
+ if (!read_mask(inst, "max_pressed.xbm", theme,
+ &theme->max_pressed_mask)) {
+ theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
+ }
+ if (!read_mask(inst, "max_toggled.xbm", theme,
+ &theme->max_toggled_mask)) {
+ theme->max_toggled_mask =
+ RrPixmapMaskCopy(theme->max_pressed_mask);
}
if (!read_mask(inst, "max_disabled.xbm", theme,
&theme->max_disabled_mask)) {
- theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_unset_mask);
+ theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
}
if (!read_mask(inst, "max_hover.xbm", theme, &theme->max_hover_mask)) {
- theme->max_hover_mask = RrPixmapMaskCopy(theme->max_unset_mask);
+ theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
}
} else {
{
- char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
- theme->max_unset_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_set_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_disabled_mask = RrPixmapMaskCopy(theme->max_unset_mask);
- theme->max_hover_mask = RrPixmapMaskCopy(theme->max_unset_mask);
+ theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
+ theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
+ theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
}
if (read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) {
+ if (!read_mask(inst, "iconify_pressed.xbm", theme,
+ &theme->iconify_pressed_mask)) {
+ theme->iconify_pressed_mask =
+ RrPixmapMaskCopy(theme->iconify_mask);
+ }
if (!read_mask(inst, "iconify_disabled.xbm", theme,
&theme->iconify_disabled_mask)) {
theme->iconify_disabled_mask =
}
if (!read_mask(inst, "iconify_hover.xbm", theme,
&theme->iconify_hover_mask)) {
- theme->iconify_hover_mask =
- RrPixmapMaskCopy(theme->iconify_mask);
+ theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
}
} 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);
theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
}
- if (read_mask(inst, "stick.xbm", theme, &theme->desk_unset_mask)) {
- if (!read_mask(inst, "stick_toggled.xbm", theme,
- &theme->desk_set_mask)) {
- theme->desk_set_mask =
- RrPixmapMaskCopy(theme->desk_unset_mask);
+ if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) {
+ if (!read_mask(inst, "desk_pressed.xbm", theme,
+ &theme->desk_pressed_mask)) {
+ theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+ }
+ if (!read_mask(inst, "desk_toggled.xbm", theme,
+ &theme->desk_toggled_mask)) {
+ theme->desk_toggled_mask =
+ RrPixmapMaskCopy(theme->desk_pressed_mask);
+ }
+ if (!read_mask(inst, "desk_disabled.xbm", theme,
+ &theme->desk_disabled_mask)) {
+ theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+ }
+ if (!read_mask(inst, "desk_hover.xbm", theme,
+ &theme->desk_hover_mask)) {
+ theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
}
} else {
{
- char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
- theme->desk_unset_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_set_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);
+ theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
}
- if (read_mask(inst, "shade.xbm", theme, &theme->shade_unset_mask)) {
+ if (read_mask(inst, "shade.xbm", theme, &theme->shade_mask)) {
+ if (!read_mask(inst, "shade_pressed.xbm", theme,
+ &theme->shade_pressed_mask)) {
+ theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
+ }
if (!read_mask(inst, "shade_toggled.xbm", theme,
- &theme->shade_set_mask)) {
- theme->shade_set_mask =
- RrPixmapMaskCopy(theme->shade_unset_mask);
+ &theme->shade_toggled_mask)) {
+ theme->shade_toggled_mask =
+ RrPixmapMaskCopy(theme->shade_pressed_mask);
}
if (!read_mask(inst, "shade_disabled.xbm", theme,
&theme->shade_disabled_mask)) {
- theme->shade_disabled_mask =
- RrPixmapMaskCopy(theme->shade_unset_mask);
+ theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
}
if (!read_mask(inst, "shade_hover.xbm", theme,
&theme->shade_hover_mask)) {
- theme->shade_hover_mask =
- RrPixmapMaskCopy(theme->shade_unset_mask);
+ theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
}
} else {
{
- char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
- theme->shade_unset_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_set_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_disabled_mask = RrPixmapMaskCopy(theme->shade_unset_mask);
- theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_unset_mask);
+ theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
+ theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
+ theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
}
if (read_mask(inst, "close.xbm", theme, &theme->close_mask)) {
+ if (!read_mask(inst, "close_pressed.xbm", theme,
+ &theme->close_pressed_mask)) {
+ theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
+ }
if (!read_mask(inst, "close_disabled.xbm", theme,
&theme->close_disabled_mask)) {
theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
}
} 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);
theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
- }
+ }
+
+ if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) {
+ guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 };
+ theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (char*)data);
+ }
/* read the decoration textures */
if (!read_appearance(db, inst,
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,
- "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,
"window.button.pressed.focus",
theme->a_focused_pressed_max,
TRUE))
- if (!read_appearance(db, inst,
- "window.button.pressed",
- theme->a_focused_pressed_max,
- TRUE))
- set_default_appearance(theme->a_focused_pressed_max);
+ set_default_appearance(theme->a_focused_pressed_max);
if (!read_appearance(db, inst,
"window.button.pressed.unfocus",
theme->a_unfocused_pressed_max,
TRUE))
- if (!read_appearance(db, inst,
- "window.button.pressed",
- theme->a_unfocused_pressed_max,
- TRUE))
- set_default_appearance(theme->a_unfocused_pressed_max);
+ set_default_appearance(theme->a_unfocused_pressed_max);
+ if (!read_appearance(db, inst,
+ "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,
"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);
theme->a_hover_focused_desk =
RrAppearanceCopy(theme->a_hover_focused_max);
theme->a_hover_unfocused_desk =
- RrAppearanceCopy(theme->a_hover_unfocused_max);
+ RrAppearanceCopy(theme->a_hover_unfocused_max);
+ theme->a_toggled_focused_desk =
+ RrAppearanceCopy(theme->a_toggled_focused_max);
+ theme->a_toggled_unfocused_desk =
+ RrAppearanceCopy(theme->a_toggled_unfocused_max);
theme->a_unfocused_unpressed_desk =
RrAppearanceCopy(theme->a_unfocused_unpressed_max);
theme->a_unfocused_pressed_desk =
RrAppearanceCopy(theme->a_unfocused_pressed_max);
- theme->a_unfocused_pressed_set_desk =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
theme->a_focused_unpressed_desk =
RrAppearanceCopy(theme->a_focused_unpressed_max);
theme->a_focused_pressed_desk =
RrAppearanceCopy(theme->a_focused_pressed_max);
- theme->a_focused_pressed_set_desk =
- RrAppearanceCopy(theme->a_focused_pressed_max);
theme->a_disabled_focused_shade =
RrAppearanceCopy(theme->a_disabled_focused_max);
theme->a_disabled_unfocused_shade =
RrAppearanceCopy(theme->a_hover_focused_max);
theme->a_hover_unfocused_shade =
RrAppearanceCopy(theme->a_hover_unfocused_max);
+ theme->a_toggled_focused_shade =
+ RrAppearanceCopy(theme->a_toggled_focused_max);
+ theme->a_toggled_unfocused_shade =
+ RrAppearanceCopy(theme->a_toggled_unfocused_max);
theme->a_unfocused_unpressed_shade =
RrAppearanceCopy(theme->a_unfocused_unpressed_max);
theme->a_unfocused_pressed_shade =
RrAppearanceCopy(theme->a_unfocused_pressed_max);
- theme->a_unfocused_pressed_set_shade =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
theme->a_focused_unpressed_shade =
RrAppearanceCopy(theme->a_focused_unpressed_max);
theme->a_focused_pressed_shade =
RrAppearanceCopy(theme->a_focused_pressed_max);
- theme->a_focused_pressed_set_shade =
- RrAppearanceCopy(theme->a_focused_pressed_max);
theme->a_disabled_focused_iconify =
RrAppearanceCopy(theme->a_disabled_focused_max);
theme->a_disabled_unfocused_iconify =
RrAppearanceCopy(theme->a_focused_unpressed_max);
theme->a_focused_pressed_iconify =
RrAppearanceCopy(theme->a_focused_pressed_max);
- theme->a_unfocused_pressed_set_max =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
- theme->a_focused_pressed_set_max =
- RrAppearanceCopy(theme->a_focused_pressed_max);
- theme->a_icon->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->winfont;
+ 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->winfont;
+ 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;
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->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;
theme->a_disabled_focused_max->texture[0].type =
theme->a_disabled_unfocused_max->texture[0].type =
theme->a_hover_focused_max->texture[0].type =
theme->a_hover_unfocused_max->texture[0].type =
+ theme->a_toggled_focused_max->texture[0].type =
+ theme->a_toggled_unfocused_max->texture[0].type =
theme->a_focused_unpressed_max->texture[0].type =
theme->a_focused_pressed_max->texture[0].type =
- theme->a_focused_pressed_set_max->texture[0].type =
theme->a_unfocused_unpressed_max->texture[0].type =
theme->a_unfocused_pressed_max->texture[0].type =
- theme->a_unfocused_pressed_set_max->texture[0].type =
theme->a_disabled_focused_close->texture[0].type =
theme->a_disabled_unfocused_close->texture[0].type =
theme->a_hover_focused_close->texture[0].type =
theme->a_disabled_unfocused_desk->texture[0].type =
theme->a_hover_focused_desk->texture[0].type =
theme->a_hover_unfocused_desk->texture[0].type =
+ theme->a_toggled_focused_desk->texture[0].type =
+ theme->a_toggled_unfocused_desk->texture[0].type =
theme->a_focused_unpressed_desk->texture[0].type =
theme->a_focused_pressed_desk->texture[0].type =
- theme->a_focused_pressed_set_desk->texture[0].type =
theme->a_unfocused_unpressed_desk->texture[0].type =
theme->a_unfocused_pressed_desk->texture[0].type =
- theme->a_unfocused_pressed_set_desk->texture[0].type =
theme->a_disabled_focused_shade->texture[0].type =
theme->a_disabled_unfocused_shade->texture[0].type =
theme->a_hover_focused_shade->texture[0].type =
theme->a_hover_unfocused_shade->texture[0].type =
+ theme->a_toggled_focused_shade->texture[0].type =
+ theme->a_toggled_unfocused_shade->texture[0].type =
theme->a_focused_unpressed_shade->texture[0].type =
theme->a_focused_pressed_shade->texture[0].type =
- theme->a_focused_pressed_set_shade->texture[0].type =
theme->a_unfocused_unpressed_shade->texture[0].type =
theme->a_unfocused_pressed_shade->texture[0].type =
- theme->a_unfocused_pressed_set_shade->texture[0].type =
theme->a_disabled_focused_iconify->texture[0].type =
theme->a_disabled_unfocused_iconify->texture[0].type =
theme->a_hover_focused_iconify->texture[0].type =
theme->a_focused_unpressed_iconify->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 = RR_TEXTURE_MASK;
+ theme->a_unfocused_pressed_iconify->texture[0].type =
+ theme->a_menu_bullet->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->max_disabled_mask;
theme->a_hover_focused_max->texture[0].data.mask.mask =
theme->a_hover_unfocused_max->texture[0].data.mask.mask =
theme->max_hover_mask;
+ theme->a_focused_pressed_max->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_max->texture[0].data.mask.mask =
+ theme->max_pressed_mask;
theme->a_focused_unpressed_max->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_max->texture[0].data.mask.mask =
- theme->a_focused_pressed_max->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_max->texture[0].data.mask.mask =
- theme->max_unset_mask;
- theme->a_focused_pressed_set_max->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_set_max->texture[0].data.mask.mask =
- theme->max_set_mask;
+ theme->max_mask;
+ theme->a_toggled_focused_max->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_max->texture[0].data.mask.mask =
+ theme->max_toggled_mask;
theme->a_disabled_focused_close->texture[0].data.mask.mask =
theme->a_disabled_unfocused_close->texture[0].data.mask.mask =
theme->close_disabled_mask;
theme->close_hover_mask;
theme->a_focused_pressed_close->texture[0].data.mask.mask =
theme->a_unfocused_pressed_close->texture[0].data.mask.mask =
- theme->a_focused_unpressed_close->texture[0].data.mask.mask =
+ theme->close_pressed_mask;
+ theme->a_focused_unpressed_close->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_close->texture[0].data.mask.mask =
theme->close_mask;
theme->a_disabled_focused_desk->texture[0].data.mask.mask =
theme->a_hover_focused_desk->texture[0].data.mask.mask =
theme->a_hover_unfocused_desk->texture[0].data.mask.mask =
theme->desk_hover_mask;
+ theme->a_focused_pressed_desk->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_desk->texture[0].data.mask.mask =
+ theme->desk_pressed_mask;
theme->a_focused_unpressed_desk->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask =
- theme->a_focused_pressed_desk->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_desk->texture[0].data.mask.mask =
- theme->desk_unset_mask;
- theme->a_focused_pressed_set_desk->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_set_desk->texture[0].data.mask.mask =
- theme->desk_set_mask;
+ theme->desk_mask;
+ theme->a_toggled_focused_desk->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_desk->texture[0].data.mask.mask =
+ theme->desk_toggled_mask;
theme->a_disabled_focused_shade->texture[0].data.mask.mask =
theme->a_disabled_unfocused_shade->texture[0].data.mask.mask =
theme->shade_disabled_mask;
theme->a_hover_focused_shade->texture[0].data.mask.mask =
theme->a_hover_unfocused_shade->texture[0].data.mask.mask =
theme->shade_hover_mask;
+ theme->a_focused_pressed_shade->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_shade->texture[0].data.mask.mask =
+ theme->shade_pressed_mask;
theme->a_focused_unpressed_shade->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask =
- theme->a_focused_pressed_shade->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_shade->texture[0].data.mask.mask =
- theme->shade_unset_mask;
- theme->a_focused_pressed_set_shade->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_set_shade->texture[0].data.mask.mask =
- theme->shade_set_mask;
+ theme->shade_mask;
+ theme->a_toggled_focused_shade->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_shade->texture[0].data.mask.mask =
+ theme->shade_toggled_mask;
theme->a_disabled_focused_iconify->texture[0].data.mask.mask =
theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask =
theme->iconify_disabled_mask;
theme->a_hover_focused_iconify->texture[0].data.mask.mask =
theme->a_hover_unfocused_iconify->texture[0].data.mask.mask =
theme->iconify_hover_mask;
+ theme->a_focused_pressed_iconify->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask =
+ theme->iconify_pressed_mask;
theme->a_focused_unpressed_iconify->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask =
- theme->a_focused_pressed_iconify->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask =
theme->iconify_mask;
+ theme->a_menu_bullet->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_disabled_focused_desk->texture[0].data.mask.color =
theme->a_hover_unfocused_shade->texture[0].data.mask.color =
theme->a_hover_unfocused_iconify->texture[0].data.mask.color =
theme->titlebut_hover_unfocused_color;
+ theme->a_toggled_focused_max->texture[0].data.mask.color =
+ theme->a_toggled_focused_desk->texture[0].data.mask.color =
+ theme->a_toggled_focused_shade->texture[0].data.mask.color =
+ theme->titlebut_toggled_focused_color;
+ theme->a_toggled_unfocused_max->texture[0].data.mask.color =
+ theme->a_toggled_unfocused_desk->texture[0].data.mask.color =
+ theme->a_toggled_unfocused_shade->texture[0].data.mask.color =
+ theme->titlebut_toggled_unfocused_color;
theme->a_focused_unpressed_max->texture[0].data.mask.color =
theme->a_focused_unpressed_close->texture[0].data.mask.color =
theme->a_focused_unpressed_desk->texture[0].data.mask.color =
theme->a_focused_unpressed_iconify->texture[0].data.mask.color =
theme->titlebut_focused_unpressed_color;
theme->a_focused_pressed_max->texture[0].data.mask.color =
- theme->a_focused_pressed_set_max->texture[0].data.mask.color =
theme->a_focused_pressed_close->texture[0].data.mask.color =
theme->a_focused_pressed_desk->texture[0].data.mask.color =
- theme->a_focused_pressed_set_desk->texture[0].data.mask.color =
theme->a_focused_pressed_shade->texture[0].data.mask.color =
- theme->a_focused_pressed_set_shade->texture[0].data.mask.color =
theme->a_focused_pressed_iconify->texture[0].data.mask.color =
theme->titlebut_focused_pressed_color;
theme->a_unfocused_unpressed_max->texture[0].data.mask.color =
theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color =
theme->titlebut_unfocused_unpressed_color;
theme->a_unfocused_pressed_max->texture[0].data.mask.color =
- theme->a_unfocused_pressed_set_max->texture[0].data.mask.color =
theme->a_unfocused_pressed_close->texture[0].data.mask.color =
theme->a_unfocused_pressed_desk->texture[0].data.mask.color =
- theme->a_unfocused_pressed_set_desk->texture[0].data.mask.color =
theme->a_unfocused_pressed_shade->texture[0].data.mask.color =
- theme->a_unfocused_pressed_set_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;
XrmDestroyDatabase(db);
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;
}
RrColorFree(theme->titlebut_disabled_unfocused_color);
RrColorFree(theme->titlebut_hover_focused_color);
RrColorFree(theme->titlebut_hover_unfocused_color);
+ RrColorFree(theme->titlebut_toggled_focused_color);
+ RrColorFree(theme->titlebut_toggled_unfocused_color);
RrColorFree(theme->titlebut_unfocused_pressed_color);
RrColorFree(theme->titlebut_focused_pressed_color);
RrColorFree(theme->titlebut_unfocused_unpressed_color);
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_set_mask);
- RrPixmapMaskFree(theme->max_unset_mask);
+ RrPixmapMaskFree(theme->max_mask);
+ RrPixmapMaskFree(theme->max_toggled_mask);
RrPixmapMaskFree(theme->max_disabled_mask);
RrPixmapMaskFree(theme->max_hover_mask);
- RrPixmapMaskFree(theme->desk_set_mask);
- RrPixmapMaskFree(theme->desk_unset_mask);
+ RrPixmapMaskFree(theme->max_pressed_mask);
+ RrPixmapMaskFree(theme->desk_mask);
+ RrPixmapMaskFree(theme->desk_toggled_mask);
RrPixmapMaskFree(theme->desk_disabled_mask);
RrPixmapMaskFree(theme->desk_hover_mask);
- RrPixmapMaskFree(theme->shade_set_mask);
- RrPixmapMaskFree(theme->shade_unset_mask);
+ RrPixmapMaskFree(theme->desk_pressed_mask);
+ RrPixmapMaskFree(theme->shade_mask);
+ RrPixmapMaskFree(theme->shade_toggled_mask);
RrPixmapMaskFree(theme->shade_disabled_mask);
RrPixmapMaskFree(theme->shade_hover_mask);
+ RrPixmapMaskFree(theme->shade_pressed_mask);
RrPixmapMaskFree(theme->iconify_mask);
RrPixmapMaskFree(theme->iconify_disabled_mask);
RrPixmapMaskFree(theme->iconify_hover_mask);
+ RrPixmapMaskFree(theme->iconify_pressed_mask);
RrPixmapMaskFree(theme->close_mask);
RrPixmapMaskFree(theme->close_disabled_mask);
RrPixmapMaskFree(theme->close_hover_mask);
+ 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);
RrAppearanceFree(theme->a_disabled_unfocused_max);
RrAppearanceFree(theme->a_hover_focused_max);
RrAppearanceFree(theme->a_hover_unfocused_max);
+ RrAppearanceFree(theme->a_toggled_focused_max);
+ RrAppearanceFree(theme->a_toggled_unfocused_max);
RrAppearanceFree(theme->a_focused_unpressed_max);
RrAppearanceFree(theme->a_focused_pressed_max);
- RrAppearanceFree(theme->a_focused_pressed_set_max);
RrAppearanceFree(theme->a_unfocused_unpressed_max);
RrAppearanceFree(theme->a_unfocused_pressed_max);
- RrAppearanceFree(theme->a_unfocused_pressed_set_max);
RrAppearanceFree(theme->a_disabled_focused_close);
RrAppearanceFree(theme->a_disabled_unfocused_close);
RrAppearanceFree(theme->a_hover_focused_close);
RrAppearanceFree(theme->a_disabled_unfocused_desk);
RrAppearanceFree(theme->a_hover_focused_desk);
RrAppearanceFree(theme->a_hover_unfocused_desk);
+ RrAppearanceFree(theme->a_toggled_focused_desk);
+ RrAppearanceFree(theme->a_toggled_unfocused_desk);
RrAppearanceFree(theme->a_focused_unpressed_desk);
RrAppearanceFree(theme->a_focused_pressed_desk);
RrAppearanceFree(theme->a_unfocused_unpressed_desk);
RrAppearanceFree(theme->a_disabled_unfocused_shade);
RrAppearanceFree(theme->a_hover_focused_shade);
RrAppearanceFree(theme->a_hover_unfocused_shade);
+ RrAppearanceFree(theme->a_toggled_focused_shade);
+ RrAppearanceFree(theme->a_toggled_unfocused_shade);
RrAppearanceFree(theme->a_focused_unpressed_shade);
RrAppearanceFree(theme->a_focused_pressed_shade);
RrAppearanceFree(theme->a_unfocused_unpressed_shade);
RrAppearanceFree(theme->a_menu_title);
RrAppearanceFree(theme->a_menu_item);
RrAppearanceFree(theme->a_menu_disabled);
- RrAppearanceFree(theme->a_menu_hilite);
- 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_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->a_clear_tex);
+ RrAppearanceFree(theme->app_selected_bg);
+ RrAppearanceFree(theme->app_unselected_bg);
+ RrAppearanceFree(theme->app_selected_label);
+ RrAppearanceFree(theme->app_unselected_label);
}
}
{
XrmDatabase db;
- char *s = g_build_filename(name, "themerc", NULL);
+ char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
+ name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
if (db == NULL) {
- char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- name, "themerc", NULL);
+ char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
}
if (db == NULL) {
- char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
+ char *s = g_build_filename(name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
unsigned int w, h;
unsigned char *b;
- s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- theme->name, maskname, NULL);
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
+ s = g_build_filename(theme->path, maskname, NULL);
+ if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) {
ret = TRUE;
- else {
- g_free(s);
- s = g_build_filename(THEMEDIR, theme->name, maskname, NULL);
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
- ret = TRUE;
- else {
- g_free(s);
- s = g_build_filename(theme->path, maskname, NULL);
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
- ret = TRUE;
- }
- }
-
- if (ret) {
*value = RrPixmapMaskNew(inst, w, h, (char*)b);
XFree(b);
}
-
g_free(s);
return ret;
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);