RrAppearanceFree(x_var); \
x_var = RrAppearanceCopy(x_defval); }
+#define READ_APPEARANCE_COPY_TEXTURES(x_resstr, x_var, x_parrel, x_defval, n_tex) \
+ if (!read_appearance(db, inst, x_resstr, x_var, x_parrel)) {\
+ RrAppearanceFree(x_var); \
+ x_var = RrAppearanceCopy(x_defval); \
+ RrAppearanceRemoveTextures(x_var); \
+ RrAppearanceAddTextures(x_var, 5); }
+
#define READ_APPEARANCE_(x_res1, x_res2, x_var, x_parrel, x_defval) \
if (!read_appearance(db, inst, x_res1, x_var, x_parrel) && \
!read_appearance(db, inst, x_res2, x_var, x_parrel)) {\
a_unfocused_pressed_tmp = RrAppearanceNew(inst, 1);
/* initialize theme */
- theme = g_slice_new0(RrTheme, 1);
+ theme = g_slice_new0(RrTheme);
theme->inst = inst;
theme->name = g_strdup(name ? name : DEFAULT_THEME);
theme->osd_hilite_bg = RrAppearanceNew(inst, 0);
theme->osd_unhilite_label = RrAppearanceNew(inst, 1);
theme->osd_unhilite_bg = RrAppearanceNew(inst, 0);
+ theme->osd_unpressed_button = RrAppearanceNew(inst, 1);
+ theme->osd_pressed_button = RrAppearanceNew(inst, 5);
+ theme->osd_focused_button = RrAppearanceNew(inst, 5);
/* load the font stuff */
theme->win_font_focused = get_font(active_window_font,
READ_COLOR("window.active.label.text.color", theme->title_focused_color,
RrColorNew(inst, 0x0, 0x0, 0x0));
- READ_COLOR_("osd.active.label.text.color",
- "osd.label.text.color",
- theme->osd_color, RrColorCopy(theme->title_focused_color));
-
READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color,
RrColorCopy(theme->title_unfocused_color));
- READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color,
- RrColorNew(inst, 0xff, 0xff, 0xff));
+ READ_COLOR_("osd.active.label.text.color",
+ "osd.label.text.color",
+ theme->osd_text_active_color, RrColorCopy(theme->title_focused_color));
- READ_COLOR("window.inactive.label.text.color",
- theme->title_unfocused_color,
+ READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color,
RrColorNew(inst, 0xff, 0xff, 0xff));
READ_COLOR("window.active.button.unpressed.image.color",
READ_COLOR("menu.items.text.color", theme->menu_color,
RrColorNew(inst, 0xff, 0xff, 0xff));
+ READ_COLOR("menu.bullet.image.color", theme->menu_bullet_color,
+ RrColorCopy(theme->menu_color));
+
READ_COLOR("menu.items.disabled.text.color", theme->menu_disabled_color,
RrColorNew(inst, 0, 0, 0));
READ_COLOR("menu.separator.color", theme->menu_sep_color,
RrColorCopy(theme->menu_color));
-
+
+ READ_COLOR("menu.bullet.selected.image.color",
+ theme->menu_bullet_selected_color,
+ RrColorCopy(theme->menu_selected_color));
+
+ READ_COLOR("osd.button.unpressed.text.color", theme->osd_unpressed_color,
+ RrColorCopy(theme->osd_text_active_color));
+ READ_COLOR("osd.button.pressed.text.color", theme->osd_pressed_color,
+ RrColorCopy(theme->osd_text_active_color));
+ READ_COLOR("osd.button.focused.text.color", theme->osd_focused_color,
+ RrColorCopy(theme->osd_text_active_color));
+ READ_COLOR("osd.button.pressed.box.color", theme->osd_pressed_lineart,
+ RrColorCopy(theme->titlebut_focused_pressed_color));
+ READ_COLOR("osd.button.focused.box.color", theme->osd_focused_lineart,
+ RrColorCopy(theme->titlebut_hover_focused_color));
+
/* load the image masks */
/* maximize button masks */
read_button_colors(db, inst, theme, theme->btn_max, "max");
/* bases: unpressed, pressed, disabled */
- READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.max.unpressed.bg",
theme->btn_max->a_focused_unpressed, TRUE,
a_focused_unpressed_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-max.unpressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.max.unpressed.bg",
theme->btn_max->a_unfocused_unpressed, TRUE,
a_unfocused_unpressed_tmp);
- READ_APPEARANCE_COPY("window.active.button-max.pressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.max.pressed.bg",
theme->btn_max->a_focused_pressed, TRUE,
a_focused_pressed_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg",
theme->btn_max->a_unfocused_pressed, TRUE,
a_unfocused_pressed_tmp);
- READ_APPEARANCE_COPY("window.active.button-max.disabled.bg",
+ READ_APPEARANCE_COPY("window.active.button.max.disabled.bg",
theme->btn_max->a_disabled_focused, TRUE,
a_disabled_focused_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-max.disabled.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.max.disabled.bg",
theme->btn_max->a_disabled_unfocused, TRUE,
a_disabled_unfocused_tmp);
/* hover */
- READ_APPEARANCE_COPY("window.active.button-max.hover.bg",
+ READ_APPEARANCE_COPY("window.active.button.max.hover.bg",
theme->btn_max->a_hover_focused, TRUE,
theme->btn_max->a_focused_unpressed);
- READ_APPEARANCE_COPY("window.inactive.button-max.hover.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.max.hover.bg",
theme->btn_max->a_hover_unfocused, TRUE,
theme->btn_max->a_unfocused_unpressed);
/* toggled unpressed */
- READ_APPEARANCE_("window.active.button-max.toggled.unpressed.bg",
- "window.active.button-max.toggled.bg",
+ READ_APPEARANCE_("window.active.button.max.toggled.unpressed.bg",
+ "window.active.button.max.toggled.bg",
theme->btn_max->a_toggled_focused_unpressed, TRUE,
theme->btn_max->a_focused_pressed);
- READ_APPEARANCE_("window.inactive.button-max.toggled.unpressed.bg",
- "window.inactive.button-max.toggled.bg",
+ READ_APPEARANCE_("window.inactive.button.max.toggled.unpressed.bg",
+ "window.inactive.button.max.toggled.bg",
theme->btn_max->a_toggled_unfocused_unpressed, TRUE,
theme->btn_max->a_unfocused_pressed);
/* toggled pressed */
- READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.max.toggled.pressed.bg",
theme->btn_max->a_toggled_focused_pressed, TRUE,
theme->btn_max->a_focused_pressed);
- READ_APPEARANCE_COPY("window.inactive.button-max.toggled.pressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.max.toggled.pressed.bg",
theme->btn_max->a_toggled_unfocused_pressed, TRUE,
theme->btn_max->a_unfocused_pressed);
/* toggled hover */
- READ_APPEARANCE_COPY("window.active.button-max.toggled.hover.bg",
+ READ_APPEARANCE_COPY("window.active.button.max.toggled.hover.bg",
theme->btn_max->a_toggled_hover_focused, TRUE,
theme->btn_max->a_toggled_focused_unpressed);
- READ_APPEARANCE_COPY("window.inactive.button-max.toggled.hover.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.max.toggled.hover.bg",
theme->btn_max->a_toggled_hover_unfocused, TRUE,
theme->btn_max->a_toggled_unfocused_unpressed);
/* close button */
read_button_colors(db, inst, theme, theme->btn_close, "close");
- READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.close.unpressed.bg",
theme->btn_close->a_focused_unpressed, TRUE,
a_focused_unpressed_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-close.unpressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.close.unpressed.bg",
theme->btn_close->a_unfocused_unpressed, TRUE,
a_unfocused_unpressed_tmp);
- READ_APPEARANCE_COPY("window.active.button-close.pressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.close.pressed.bg",
theme->btn_close->a_focused_pressed, TRUE,
a_focused_pressed_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-close.pressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.close.pressed.bg",
theme->btn_close->a_unfocused_pressed, TRUE,
a_unfocused_pressed_tmp);
- READ_APPEARANCE_COPY("window.active.button-close.disabled.bg",
+ READ_APPEARANCE_COPY("window.active.button.close.disabled.bg",
theme->btn_close->a_disabled_focused, TRUE,
a_disabled_focused_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-close.disabled.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.close.disabled.bg",
theme->btn_close->a_disabled_unfocused, TRUE,
a_disabled_unfocused_tmp);
- READ_APPEARANCE_COPY("window.active.button-close.hover.bg",
+ READ_APPEARANCE_COPY("window.active.button.close.hover.bg",
theme->btn_close->a_hover_focused, TRUE,
theme->btn_close->a_focused_unpressed);
- READ_APPEARANCE_COPY("window.inactive.button-close.hover.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.close.hover.bg",
theme->btn_close->a_hover_unfocused, TRUE,
theme->btn_close->a_unfocused_unpressed);
read_button_colors(db, inst, theme, theme->btn_desk, "desk");
/* bases: unpressed, pressed, disabled */
- READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.desk.unpressed.bg",
theme->btn_desk->a_focused_unpressed, TRUE,
a_focused_unpressed_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-desk.unpressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.desk.unpressed.bg",
theme->btn_desk->a_unfocused_unpressed, TRUE,
a_unfocused_unpressed_tmp);
- READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg",
theme->btn_desk->a_focused_pressed, TRUE,
a_focused_pressed_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg",
theme->btn_desk->a_unfocused_pressed, TRUE,
a_unfocused_pressed_tmp);
- READ_APPEARANCE_COPY("window.active.button-desk.disabled.bg",
+ READ_APPEARANCE_COPY("window.active.button.desk.disabled.bg",
theme->btn_desk->a_disabled_focused, TRUE,
a_disabled_focused_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-desk.disabled.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.desk.disabled.bg",
theme->btn_desk->a_disabled_unfocused, TRUE,
a_disabled_unfocused_tmp);
/* hover */
- READ_APPEARANCE_COPY("window.active.button-desk.hover.bg",
+ READ_APPEARANCE_COPY("window.active.button.desk.hover.bg",
theme->btn_desk->a_hover_focused, TRUE,
theme->btn_desk->a_focused_unpressed);
- READ_APPEARANCE_COPY("window.inactive.button-desk.hover.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.desk.hover.bg",
theme->btn_desk->a_hover_unfocused, TRUE,
theme->btn_desk->a_unfocused_unpressed);
/* toggled unpressed */
- READ_APPEARANCE_("window.active.button-desk.toggled.unpressed.bg",
- "window.active.button-desk.toggled.bg",
+ READ_APPEARANCE_("window.active.button.desk.toggled.unpressed.bg",
+ "window.active.button.desk.toggled.bg",
theme->btn_desk->a_toggled_focused_unpressed, TRUE,
theme->btn_desk->a_focused_pressed);
- READ_APPEARANCE_("window.inactive.button-desk.toggled.unpressed.bg",
- "window.inactive.button-desk.toggled.bg",
+ READ_APPEARANCE_("window.inactive.button.desk.toggled.unpressed.bg",
+ "window.inactive.button.desk.toggled.bg",
theme->btn_desk->a_toggled_unfocused_unpressed, TRUE,
theme->btn_desk->a_unfocused_pressed);
/* toggled pressed */
- READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.desk.toggled.pressed.bg",
theme->btn_desk->a_toggled_focused_pressed, TRUE,
theme->btn_desk->a_focused_pressed);
- READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.pressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.pressed.bg",
theme->btn_desk->a_toggled_unfocused_pressed, TRUE,
theme->btn_desk->a_unfocused_pressed);
/* toggled hover */
- READ_APPEARANCE_COPY("window.active.button-desk.toggled.hover.bg",
+ READ_APPEARANCE_COPY("window.active.button.desk.toggled.hover.bg",
theme->btn_desk->a_toggled_hover_focused, TRUE,
theme->btn_desk->a_toggled_focused_unpressed);
- READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.hover.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.hover.bg",
theme->btn_desk->a_toggled_hover_unfocused, TRUE,
theme->btn_desk->a_toggled_unfocused_unpressed);
read_button_colors(db, inst, theme, theme->btn_shade, "shade");
/* bases: unpressed, pressed, disabled */
- READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.shade.unpressed.bg",
theme->btn_shade->a_focused_unpressed, TRUE,
a_focused_unpressed_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-shade.unpressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.shade.unpressed.bg",
theme->btn_shade->a_unfocused_unpressed, TRUE,
a_unfocused_unpressed_tmp);
- READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg",
theme->btn_shade->a_focused_pressed, TRUE,
a_focused_pressed_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg",
theme->btn_shade->a_unfocused_pressed, TRUE,
a_unfocused_pressed_tmp);
- READ_APPEARANCE_COPY("window.active.button-shade.disabled.bg",
+ READ_APPEARANCE_COPY("window.active.button.shade.disabled.bg",
theme->btn_shade->a_disabled_focused, TRUE,
a_disabled_focused_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-shade.disabled.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.shade.disabled.bg",
theme->btn_shade->a_disabled_unfocused, TRUE,
a_disabled_unfocused_tmp);
/* hover */
- READ_APPEARANCE_COPY("window.active.button-shade.hover.bg",
+ READ_APPEARANCE_COPY("window.active.button.shade.hover.bg",
theme->btn_shade->a_hover_focused, TRUE,
theme->btn_shade->a_focused_unpressed);
- READ_APPEARANCE_COPY("window.inactive.button-shade.hover.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.shade.hover.bg",
theme->btn_shade->a_hover_unfocused, TRUE,
theme->btn_shade->a_unfocused_unpressed);
/* toggled unpressed */
- READ_APPEARANCE_("window.active.button-shade.toggled.unpressed.bg",
- "window.active.button-shade.toggled.bg",
+ READ_APPEARANCE_("window.active.button.shade.toggled.unpressed.bg",
+ "window.active.button.shade.toggled.bg",
theme->btn_shade->a_toggled_focused_unpressed, TRUE,
theme->btn_shade->a_focused_pressed);
- READ_APPEARANCE_("window.inactive.button-shade.toggled.unpressed.bg",
- "window.inactive.button-shade.toggled.bg",
+ READ_APPEARANCE_("window.inactive.button.shade.toggled.unpressed.bg",
+ "window.inactive.button.shade.toggled.bg",
theme->btn_shade->a_toggled_unfocused_unpressed, TRUE,
theme->btn_shade->a_unfocused_pressed);
/* toggled pressed */
- READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.shade.toggled.pressed.bg",
theme->btn_shade->a_toggled_focused_pressed, TRUE,
theme->btn_shade->a_focused_pressed);
- READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.pressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.pressed.bg",
theme->btn_shade->a_toggled_unfocused_pressed, TRUE,
theme->btn_shade->a_unfocused_pressed);
/* toggled hover */
- READ_APPEARANCE_COPY("window.active.button-shade.toggled.hover.bg",
+ READ_APPEARANCE_COPY("window.active.button.shade.toggled.hover.bg",
theme->btn_shade->a_toggled_hover_focused, TRUE,
theme->btn_shade->a_toggled_focused_unpressed);
- READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.hover.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.hover.bg",
theme->btn_shade->a_toggled_hover_unfocused, TRUE,
theme->btn_shade->a_toggled_unfocused_unpressed);
/* iconify button */
read_button_colors(db, inst, theme, theme->btn_iconify, "iconify");
- READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.iconify.unpressed.bg",
theme->btn_iconify->a_focused_unpressed, TRUE,
a_focused_unpressed_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-iconify.unpressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.iconify.unpressed.bg",
theme->btn_iconify->a_unfocused_unpressed, TRUE,
a_unfocused_unpressed_tmp);
- READ_APPEARANCE_COPY("window.active.button-iconify.pressed.bg",
+ READ_APPEARANCE_COPY("window.active.button.iconify.pressed.bg",
theme->btn_iconify->a_focused_pressed, TRUE,
a_focused_pressed_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-iconify.pressed.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.iconify.pressed.bg",
theme->btn_iconify->a_unfocused_pressed, TRUE,
a_unfocused_pressed_tmp);
- READ_APPEARANCE_COPY("window.active.button-iconify.disabled.bg",
+ READ_APPEARANCE_COPY("window.active.button.iconify.disabled.bg",
theme->btn_iconify->a_disabled_focused, TRUE,
a_disabled_focused_tmp);
- READ_APPEARANCE_COPY("window.inactive.button-iconify.disabled.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.iconify.disabled.bg",
theme->btn_iconify->a_disabled_unfocused, TRUE,
a_disabled_unfocused_tmp);
- READ_APPEARANCE_COPY("window.active.button-iconify.hover.bg",
+ READ_APPEARANCE_COPY("window.active.button.iconify.hover.bg",
theme->btn_iconify->a_hover_focused, TRUE,
theme->btn_iconify->a_focused_unpressed);
- READ_APPEARANCE_COPY("window.inactive.button-iconify.hover.bg",
+ READ_APPEARANCE_COPY("window.inactive.button.iconify.hover.bg",
theme->btn_iconify->a_hover_unfocused, TRUE,
theme->btn_iconify->a_unfocused_unpressed);
+ /* osd buttons */
+ READ_APPEARANCE_COPY("osd.button.unpressed.bg", theme->osd_unpressed_button, TRUE, a_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY_TEXTURES("osd.button.pressed.bg", theme->osd_pressed_button, TRUE, a_focused_pressed_tmp, 5);
+ READ_APPEARANCE_COPY_TEXTURES("osd.button.focused.bg", theme->osd_focused_button, TRUE, a_focused_unpressed_tmp, 5);
+
theme->a_icon->surface.grad =
theme->a_clear->surface.grad =
theme->a_clear_tex->surface.grad =
theme->a_focused_label->texture[0].data.text.shadow_offset_y;
if (theme->title_focused_shadow_color)
theme->osd_text_active_shadow_color =
- RrColorNew(inst,
- theme->title_focused_shadow_color->r,
- theme->title_focused_shadow_color->g,
- theme->title_focused_shadow_color->b);
+ RrColorCopy(theme->title_focused_shadow_color);
else
theme->osd_text_active_shadow_color = RrColorNew(inst, 0, 0, 0);
theme->osd_text_active_shadow_alpha =
theme->osd_hilite_label->texture[0].data.text.shadow_alpha =
theme->osd_text_active_shadow_alpha;
+ theme->osd_unpressed_button->texture[0].type =
+ theme->osd_pressed_button->texture[0].type =
+ theme->osd_focused_button->texture[0].type =
+ RR_TEXTURE_TEXT;
+
+ theme->osd_unpressed_button->texture[0].data.text.justify =
+ theme->osd_pressed_button->texture[0].data.text.justify =
+ theme->osd_focused_button->texture[0].data.text.justify =
+ RR_JUSTIFY_CENTER;
+
+ theme->osd_unpressed_button->texture[0].data.text.font =
+ theme->osd_pressed_button->texture[0].data.text.font =
+ theme->osd_focused_button->texture[0].data.text.font =
+ theme->osd_font_hilite;
+
+ theme->osd_unpressed_button->texture[0].data.text.color =
+ theme->osd_unpressed_color;
+ theme->osd_pressed_button->texture[0].data.text.color =
+ theme->osd_pressed_color;
+ theme->osd_focused_button->texture[0].data.text.color =
+ theme->osd_focused_color;
+
+ theme->osd_pressed_button->texture[1].data.lineart.color =
+ theme->osd_pressed_button->texture[2].data.lineart.color =
+ theme->osd_pressed_button->texture[3].data.lineart.color =
+ theme->osd_pressed_button->texture[4].data.lineart.color =
+ theme->osd_pressed_lineart;
+
+ theme->osd_focused_button->texture[1].data.lineart.color =
+ theme->osd_focused_button->texture[2].data.lineart.color =
+ theme->osd_focused_button->texture[3].data.lineart.color =
+ theme->osd_focused_button->texture[4].data.lineart.color =
+ theme->osd_focused_lineart;
+
theme->a_unfocused_label->texture[0].type = RR_TEXTURE_TEXT;
theme->a_unfocused_label->texture[0].data.text.justify = winjust;
theme->a_unfocused_label->texture[0].data.text.font =
theme->a_unfocused_label->texture[0].data.text.shadow_offset_y;
if (theme->title_unfocused_shadow_color)
theme->osd_text_inactive_shadow_color =
- RrColorNew(inst,
- theme->title_unfocused_shadow_color->r,
- theme->title_unfocused_shadow_color->g,
- theme->title_unfocused_shadow_color->b);
+ RrColorCopy(theme->title_unfocused_shadow_color);
else
theme->osd_text_inactive_shadow_color = RrColorNew(inst, 0, 0, 0);
theme->osd_text_inactive_shadow_alpha =
theme->btn_max->a_toggled_hover_unfocused->texture[0].data.mask.mask =
theme->btn_max->toggled_hover_mask;
theme->btn_max->a_toggled_focused_unpressed->texture[0].data.mask.mask =
- theme->btn_max->a_toggled_unfocused_unpressed->texture[0].data.mask.mask =
- theme->btn_max->toggled_mask;
+ theme->btn_max->a_toggled_unfocused_unpressed->
+ texture[0].data.mask.mask = theme->btn_max->toggled_mask;
theme->btn_max->a_toggled_focused_pressed->texture[0].data.mask.mask =
- theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.mask =
- theme->btn_max->toggled_pressed_mask;
+ theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.mask
+ = theme->btn_max->toggled_pressed_mask;
theme->btn_close->a_disabled_focused->texture[0].data.mask.mask =
theme->btn_close->a_disabled_unfocused->texture[0].data.mask.mask =
theme->btn_close->disabled_mask;
theme->btn_desk->a_toggled_hover_unfocused->texture[0].data.mask.mask =
theme->btn_desk->toggled_hover_mask;
theme->btn_desk->a_toggled_focused_unpressed->texture[0].data.mask.mask =
- theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.mask =
- theme->btn_desk->toggled_mask;
+ theme->btn_desk->a_toggled_unfocused_unpressed->
+ texture[0].data.mask.mask = theme->btn_desk->toggled_mask;
theme->btn_desk->a_toggled_focused_pressed->texture[0].data.mask.mask =
- theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.mask =
- theme->btn_desk->toggled_pressed_mask;
+ theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.mask
+ = theme->btn_desk->toggled_pressed_mask;
theme->btn_shade->a_disabled_focused->texture[0].data.mask.mask =
theme->btn_shade->a_disabled_unfocused->texture[0].data.mask.mask =
theme->btn_shade->disabled_mask;
theme->btn_shade->a_unfocused_unpressed->texture[0].data.mask.mask =
theme->btn_shade->mask;
theme->btn_shade->a_toggled_hover_focused->texture[0].data.mask.mask =
- theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.mask =
- theme->btn_shade->toggled_hover_mask;
+ theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.mask
+ = theme->btn_shade->toggled_hover_mask;
theme->btn_shade->a_toggled_focused_unpressed->texture[0].data.mask.mask =
- theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.mask =
- theme->btn_shade->toggled_mask;
+ theme->btn_shade->a_toggled_unfocused_unpressed->
+ texture[0].data.mask.mask = theme->btn_shade->toggled_mask;
theme->btn_shade->a_toggled_focused_pressed->texture[0].data.mask.mask =
- theme->btn_shade->a_toggled_unfocused_pressed->texture[0].data.mask.mask =
- theme->btn_shade->toggled_pressed_mask;
+ theme->btn_shade->a_toggled_unfocused_pressed->
+ texture[0].data.mask.mask = theme->btn_shade->toggled_pressed_mask;
theme->btn_iconify->a_disabled_focused->texture[0].data.mask.mask =
theme->btn_iconify->a_disabled_unfocused->texture[0].data.mask.mask =
theme->btn_iconify->disabled_mask;
theme->btn_shade->toggled_focused_unpressed_color;
theme->btn_max->a_toggled_unfocused_unpressed->texture[0].data.mask.color =
theme->btn_max->toggled_unfocused_unpressed_color;
- theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.color =
- theme->btn_desk->toggled_unfocused_unpressed_color;
- theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.color =
- theme->btn_shade->toggled_unfocused_unpressed_color;
+ theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.color
+ = theme->btn_desk->toggled_unfocused_unpressed_color;
+ theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.color
+ = theme->btn_shade->toggled_unfocused_unpressed_color;
theme->btn_max->a_toggled_focused_pressed->texture[0].data.mask.color =
theme->btn_max->toggled_focused_pressed_color;
theme->btn_desk->a_toggled_focused_pressed->texture[0].data.mask.color =
theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.color =
theme->btn_iconify->unfocused_pressed_color;
theme->a_menu_bullet_normal->texture[0].data.mask.color =
- theme->menu_color;
+ theme->menu_bullet_color;
theme->a_menu_bullet_selected->texture[0].data.mask.color =
- theme->menu_selected_color;
+ theme->menu_bullet_selected_color;
g_free(path);
XrmDestroyDatabase(db);
RrColorFree(theme->menu_title_color);
RrColorFree(theme->menu_sep_color);
RrColorFree(theme->menu_color);
+ RrColorFree(theme->menu_bullet_color);
+ RrColorFree(theme->menu_bullet_selected_color);
RrColorFree(theme->menu_selected_color);
RrColorFree(theme->menu_disabled_color);
RrColorFree(theme->menu_disabled_selected_color);
RrColorFree(theme->osd_text_inactive_color);
RrColorFree(theme->osd_text_active_shadow_color);
RrColorFree(theme->osd_text_inactive_shadow_color);
+ RrColorFree(theme->osd_pressed_color);
+ RrColorFree(theme->osd_unpressed_color);
+ RrColorFree(theme->osd_focused_color);
+ RrColorFree(theme->osd_pressed_lineart);
+ RrColorFree(theme->osd_focused_lineart);
RrColorFree(theme->menu_title_shadow_color);
RrColorFree(theme->menu_text_normal_shadow_color);
RrColorFree(theme->menu_text_selected_shadow_color);
RrFontClose(theme->osd_font_hilite);
RrFontClose(theme->osd_font_unhilite);
- RrAppearanceFree(theme->a_disabled_focused_max);
- RrAppearanceFree(theme->a_disabled_unfocused_max);
- RrAppearanceFree(theme->a_hover_focused_max);
- RrAppearanceFree(theme->a_hover_unfocused_max);
- RrAppearanceFree(theme->a_toggled_hover_focused_max);
- RrAppearanceFree(theme->a_toggled_hover_unfocused_max);
- RrAppearanceFree(theme->a_toggled_focused_unpressed_max);
- RrAppearanceFree(theme->a_toggled_focused_pressed_max);
- RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max);
- RrAppearanceFree(theme->a_toggled_unfocused_pressed_max);
- RrAppearanceFree(theme->a_focused_unpressed_max);
- RrAppearanceFree(theme->a_focused_pressed_max);
- RrAppearanceFree(theme->a_unfocused_unpressed_max);
- RrAppearanceFree(theme->a_unfocused_pressed_max);
- RrAppearanceFree(theme->a_disabled_focused_close);
- RrAppearanceFree(theme->a_disabled_unfocused_close);
- RrAppearanceFree(theme->a_hover_focused_close);
- RrAppearanceFree(theme->a_hover_unfocused_close);
- RrAppearanceFree(theme->a_focused_unpressed_close);
- RrAppearanceFree(theme->a_focused_pressed_close);
- RrAppearanceFree(theme->a_unfocused_unpressed_close);
- RrAppearanceFree(theme->a_unfocused_pressed_close);
- RrAppearanceFree(theme->a_disabled_focused_desk);
- RrAppearanceFree(theme->a_disabled_unfocused_desk);
- RrAppearanceFree(theme->a_hover_focused_desk);
- RrAppearanceFree(theme->a_hover_unfocused_desk);
- RrAppearanceFree(theme->a_toggled_hover_focused_desk);
- RrAppearanceFree(theme->a_toggled_hover_unfocused_desk);
- RrAppearanceFree(theme->a_toggled_focused_unpressed_desk);
- RrAppearanceFree(theme->a_toggled_focused_pressed_desk);
- RrAppearanceFree(theme->a_toggled_unfocused_unpressed_desk);
- RrAppearanceFree(theme->a_toggled_unfocused_pressed_desk);
- RrAppearanceFree(theme->a_focused_unpressed_desk);
- RrAppearanceFree(theme->a_focused_pressed_desk);
- RrAppearanceFree(theme->a_unfocused_unpressed_desk);
- RrAppearanceFree(theme->a_unfocused_pressed_desk);
- RrAppearanceFree(theme->a_disabled_focused_shade);
- RrAppearanceFree(theme->a_disabled_unfocused_shade);
- RrAppearanceFree(theme->a_hover_focused_shade);
- RrAppearanceFree(theme->a_hover_unfocused_shade);
- RrAppearanceFree(theme->a_toggled_hover_focused_shade);
- RrAppearanceFree(theme->a_toggled_hover_unfocused_shade);
- RrAppearanceFree(theme->a_toggled_focused_unpressed_shade);
- RrAppearanceFree(theme->a_toggled_focused_pressed_shade);
- RrAppearanceFree(theme->a_toggled_unfocused_unpressed_shade);
- RrAppearanceFree(theme->a_toggled_unfocused_pressed_shade);
- RrAppearanceFree(theme->a_focused_unpressed_shade);
- RrAppearanceFree(theme->a_focused_pressed_shade);
- RrAppearanceFree(theme->a_unfocused_unpressed_shade);
- RrAppearanceFree(theme->a_unfocused_pressed_shade);
- RrAppearanceFree(theme->a_disabled_focused_iconify);
- RrAppearanceFree(theme->a_disabled_unfocused_iconify);
- RrAppearanceFree(theme->a_hover_focused_iconify);
- RrAppearanceFree(theme->a_hover_unfocused_iconify);
- RrAppearanceFree(theme->a_focused_unpressed_iconify);
- RrAppearanceFree(theme->a_focused_pressed_iconify);
- RrAppearanceFree(theme->a_unfocused_unpressed_iconify);
- RrAppearanceFree(theme->a_unfocused_pressed_iconify);
RrAppearanceFree(theme->a_focused_grip);
RrAppearanceFree(theme->a_unfocused_grip);
RrAppearanceFree(theme->a_focused_title);
RrAppearanceFree(theme->osd_hilite_label);
RrAppearanceFree(theme->osd_unhilite_bg);
RrAppearanceFree(theme->osd_unhilite_label);
+ RrAppearanceFree(theme->osd_pressed_button);
+ RrAppearanceFree(theme->osd_unpressed_button);
+ RrAppearanceFree(theme->osd_focused_button);
g_slice_free(RrTheme, theme);
}
const RrTheme *theme, RrButton *btn,
const gchar *btnname)
{
- gchar *temp, *temp2, *stemp, *stemp2;
+ gchar *name;
/* active unpressed */
- temp = "window.active.button-%s.unpressed.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->focused_unpressed_color,
+ name = g_strdup_printf("window.active.button.%s.unpressed.image.color",
+ btnname);
+ READ_COLOR(name, btn->focused_unpressed_color,
RrColorCopy(theme->titlebut_focused_unpressed_color));
-
- g_free(temp2);
+ g_free(name);
/* inactive unpressed */
- temp = "window.inactive.button-%s.unpressed.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->unfocused_unpressed_color,
+ name = g_strdup_printf("window.inactive.button.%s.unpressed.image.color",
+ btnname);
+ READ_COLOR(name, btn->unfocused_unpressed_color,
RrColorCopy(theme->titlebut_unfocused_unpressed_color));
-
- g_free(temp2);
+ g_free(name);
/* active pressed */
- temp = "window.active.button-%s.pressed.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->focused_pressed_color,
+ name = g_strdup_printf("window.active.button.%s.pressed.image.color",
+ btnname);
+ READ_COLOR(name, btn->focused_pressed_color,
RrColorCopy(theme->titlebut_focused_pressed_color));
-
- g_free(temp2);
+ g_free(name);
/* inactive pressed */
- temp = "window.inactive.button-%s.pressed.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->unfocused_pressed_color,
+ name = g_strdup_printf("window.inactive.button.%s.pressed.image.color",
+ btnname);
+ READ_COLOR(name, btn->unfocused_pressed_color,
RrColorCopy(theme->titlebut_unfocused_pressed_color));
-
- g_free(temp2);
+ g_free(name);
/* active disabled */
- temp = "window.active.button-%s.disabled.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->disabled_focused_color,
+ name = g_strdup_printf("window.active.button.%s.disabled.image.color",
+ btnname);
+ READ_COLOR(name, btn->disabled_focused_color,
RrColorCopy(theme->titlebut_disabled_focused_color));
-
- g_free(temp2);
+ g_free(name);
/* inactive disabled */
- temp = "window.inactive.button-%s.disabled.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->disabled_unfocused_color,
+ name = g_strdup_printf("window.inactive.button.%s.disabled.image.color",
+ btnname);
+ READ_COLOR(name, btn->disabled_unfocused_color,
RrColorCopy(theme->titlebut_disabled_unfocused_color));
-
- g_free(temp2);
+ g_free(name);
/* active hover */
- temp = "window.active.button-%s.hover.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->hover_focused_color,
+ name = g_strdup_printf("window.active.button.%s.hover.image.color",
+ btnname);
+ READ_COLOR(name, btn->hover_focused_color,
RrColorCopy(theme->titlebut_hover_focused_color));
-
- g_free(temp2);
+ g_free(name);
/* inactive hover */
- temp = "window.inactive.button-%s.hover.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->hover_unfocused_color,
+ name = g_strdup_printf("window.inactive.button.%s.hover.image.color",
+ btnname);
+ READ_COLOR(name, btn->hover_unfocused_color,
RrColorCopy(theme->titlebut_hover_unfocused_color));
-
- g_free(temp2);
+ g_free(name);
/* active toggled unpressed */
- temp = "window.active.button-%s.toggled.unpressed.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- stemp = "window.active.button-%s.toggled.image.color";
- stemp2 = g_malloc(strlen(stemp) - 2 + strlen(btnname) + 1);
- g_sprintf(stemp2, stemp, btnname);
-
- READ_COLOR_(temp2, stemp2, btn->toggled_focused_unpressed_color,
- RrColorCopy(theme->titlebut_toggled_focused_unpressed_color));
-
- g_free(temp2);
- g_free(stemp2);
+ name = g_strdup_printf("window.active.button.%s.toggled."
+ "unpressed.image.color", btnname);
+ READ_COLOR(name, btn->toggled_focused_unpressed_color,
+ RrColorCopy(theme->titlebut_toggled_focused_unpressed_color));
+ g_free(name);
/* inactive toggled unpressed */
- temp = "window.inactive.button-%s.toggled.unpressed.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- stemp = "window.inactive.button-%s.toggled.image.color";
- stemp2 = g_malloc(strlen(stemp) - 2 + strlen(btnname) + 1);
- g_sprintf(stemp2, stemp, btnname);
-
- READ_COLOR_(temp2, stemp2, btn->toggled_unfocused_unpressed_color,
- RrColorCopy(theme->titlebut_toggled_unfocused_unpressed_color));
-
- g_free(temp2);
- g_free(stemp2);
+ name = g_strdup_printf("window.inactive.button.%s.toggled."
+ "unpressed.image.color", btnname);
+ READ_COLOR(name, btn->toggled_unfocused_unpressed_color,
+ RrColorCopy(theme->titlebut_toggled_unfocused_unpressed_color));
+ g_free(name);
/* active toggled hover */
- temp = "window.active.button-%s.toggled.hover.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->toggled_hover_focused_color,
+ name = g_strdup_printf("window.active.button.%s.toggled.hover.image.color",
+ btnname);
+ READ_COLOR(name, btn->toggled_hover_focused_color,
RrColorCopy(theme->titlebut_toggled_hover_focused_color));
- g_free(temp2);
+ g_free(name);
/* inactive toggled hover */
- temp = "window.inactive.button-%s.toggled.hover.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->toggled_hover_unfocused_color,
+ name = g_strdup_printf("window.inactive.button.%s.toggled.hover."
+ "image.color", btnname);
+ READ_COLOR(name, btn->toggled_hover_unfocused_color,
RrColorCopy(theme->titlebut_toggled_hover_unfocused_color));
-
- g_free(temp2);
+ g_free(name);
/* active toggled pressed */
- temp = "window.active.button-%s.toggled.pressed.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->toggled_focused_pressed_color,
+ name = g_strdup_printf("window.active.button.%s.toggled.pressed."
+ "image.color", btnname);
+ READ_COLOR(name, btn->toggled_focused_pressed_color,
RrColorCopy(theme->titlebut_toggled_focused_pressed_color));
-
- g_free(temp2);
+ g_free(name);
/* inactive toggled pressed */
- temp = "window.inactive.button-%s.toggled.pressed.image.color";
- temp2 = g_malloc(strlen(temp) - 2 + strlen(btnname) + 1);
- g_sprintf(temp2, temp, btnname);
-
- READ_COLOR(temp2, btn->toggled_unfocused_pressed_color,
+ name = g_strdup_printf("window.inactive.button.%s.toggled.pressed."
+ "image.color", btnname);
+ READ_COLOR(name, btn->toggled_unfocused_pressed_color,
RrColorCopy(theme->titlebut_toggled_unfocused_pressed_color));
-
- g_free(temp2);
+ g_free(name);
}
projects / dana / openbox.git / blobdiff