X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obrender%2Ftheme.c;h=87ca5c89912e766def7152681a24945e68638572;hb=aa1fe695a5bf4625b2d2fc9a26d950e49a36f191;hp=29db238be9827463a6f48e8c189d79754ff6aab3;hpb=464ee8996e6478e8bd6fc8c8e9df220187c51786;p=chaz%2Fopenbox diff --git a/obrender/theme.c b/obrender/theme.c index 29db238b..87ca5c89 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -93,6 +93,13 @@ static RrFont *get_font(RrFont *target, RrFont **default_font, 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)) {\ @@ -167,7 +174,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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); @@ -209,6 +216,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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, @@ -249,9 +259,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_INT("border.width", theme->fbwidth, 0, 100, 1); READ_INT("menu.border.width", theme->mbwidth, 0, 100, theme->fbwidth); READ_INT("osd.border.width", theme->obwidth, 0, 100, theme->fbwidth); + READ_INT("undecorated.border.width", theme->ubwidth, 0, 100, + theme->fbwidth); READ_INT("menu.separator.width", theme->menu_sep_width, 1, 100, 1); - READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx, 0, 100, 6); - READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy, 0, 100, 3); + READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx, + 0, 100, 6); + READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy, + 0, 100, 3); READ_INT("window.client.padding.width", theme->cbwidthx, 0, 100, theme->paddingx); READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100, @@ -260,7 +274,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* load colors */ READ_COLOR_("window.active.border.color", "border.color", theme->frame_focused_border_color, RrColorNew(inst, 0, 0, 0)); - + /* undecorated focused border color inherits from frame focused border + color */ + READ_COLOR("window.undecorated.active.border.color", + theme->frame_undecorated_focused_border_color, + RrColorCopy(theme->frame_focused_border_color)); /* title separator focused color inherits from focused border color */ READ_COLOR("window.active.title.separator.color", theme->title_separator_focused_color, @@ -271,6 +289,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->frame_unfocused_border_color, RrColorCopy(theme->frame_focused_border_color)); + /* undecorated unfocused border color inherits from frame unfocused border + color */ + READ_COLOR("window.undecorated.inactive.border.color", + theme->frame_undecorated_unfocused_border_color, + RrColorCopy(theme->frame_unfocused_border_color)); + /* title separator unfocused color inherits from unfocused border color */ READ_COLOR("window.inactive.title.separator.color", theme->title_separator_unfocused_color, @@ -293,19 +317,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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("window.inactive.label.text.color", - theme->title_unfocused_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_("osd.inactive.label.text.color", + "osd.label.text.color", + theme->osd_text_inactive_color, RrColorCopy(theme->title_unfocused_color)); READ_COLOR("window.active.button.unpressed.image.color", theme->titlebut_focused_unpressed_color, @@ -390,6 +411,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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 */ @@ -645,228 +677,233 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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", + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.max.hover.bg", theme->btn_max->a_hover_unfocused, TRUE, - theme->btn_max->a_unfocused_unpressed); + a_hover_unfocused_tmp); /* 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", + a_toggled_focused_unpressed_tmp); + 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); + a_toggled_unfocused_unpressed_tmp); /* 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", + a_toggled_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.max.toggled.pressed.bg", theme->btn_max->a_toggled_unfocused_pressed, TRUE, - theme->btn_max->a_unfocused_pressed); + a_toggled_unfocused_pressed_tmp); /* 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", + a_toggled_hover_focused_tmp); + 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); + a_toggled_hover_unfocused_tmp); /* 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", + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.close.hover.bg", theme->btn_close->a_hover_unfocused, TRUE, - theme->btn_close->a_unfocused_unpressed); + a_hover_unfocused_tmp); /* desk button */ 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", + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.desk.hover.bg", theme->btn_desk->a_hover_unfocused, TRUE, - theme->btn_desk->a_unfocused_unpressed); + a_hover_unfocused_tmp); /* 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", + a_toggled_focused_unpressed_tmp); + 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); + a_toggled_unfocused_unpressed_tmp); /* 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", + a_toggled_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.pressed.bg", theme->btn_desk->a_toggled_unfocused_pressed, TRUE, - theme->btn_desk->a_unfocused_pressed); + a_toggled_unfocused_pressed_tmp); /* 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", + a_toggled_hover_focused_tmp); + 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); + a_toggled_hover_unfocused_tmp); /* shade button */ 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", + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.shade.hover.bg", theme->btn_shade->a_hover_unfocused, TRUE, - theme->btn_shade->a_unfocused_unpressed); + a_hover_unfocused_tmp); /* 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", + a_toggled_focused_unpressed_tmp); + 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); + a_toggled_unfocused_unpressed_tmp); /* 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", + a_toggled_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.pressed.bg", theme->btn_shade->a_toggled_unfocused_pressed, TRUE, - theme->btn_shade->a_unfocused_pressed); + a_toggled_unfocused_pressed_tmp); /* 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", + a_toggled_hover_focused_tmp); + 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); + a_toggled_hover_unfocused_tmp); /* 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", + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button.iconify.hover.bg", theme->btn_iconify->a_hover_unfocused, TRUE, - theme->btn_iconify->a_unfocused_unpressed); + a_hover_unfocused_tmp); + + /* 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 = @@ -960,10 +997,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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 = @@ -975,6 +1009,40 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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 = @@ -1053,10 +1121,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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 = @@ -1272,11 +1337,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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; @@ -1305,11 +1370,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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; @@ -1323,14 +1388,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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; @@ -1406,10 +1471,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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 = @@ -1548,7 +1613,9 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_border_color); RrColorFree(theme->osd_border_color); RrColorFree(theme->frame_focused_border_color); + RrColorFree(theme->frame_undecorated_focused_border_color); RrColorFree(theme->frame_unfocused_border_color); + RrColorFree(theme->frame_undecorated_unfocused_border_color); RrColorFree(theme->title_separator_focused_color); RrColorFree(theme->title_separator_unfocused_color); RrColorFree(theme->cb_unfocused_color); @@ -1583,6 +1650,11 @@ void RrThemeFree(RrTheme *theme) 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); @@ -1602,64 +1674,6 @@ void RrThemeFree(RrTheme *theme) 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); @@ -1689,6 +1703,9 @@ void RrThemeFree(RrTheme *theme) 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); } @@ -1781,6 +1798,7 @@ static gboolean read_string(XrmDatabase db, const gchar *rname, gchar **value) if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { + g_strstrip(retvalue.addr); *value = retvalue.addr; ret = TRUE; } @@ -1799,7 +1817,12 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst, if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - RrColor *c = RrColorParse(inst, retvalue.addr); + RrColor *c; + + /* retvalue.addr is inside the xrdb database so we can't destroy it + but we can edit it in place, as g_strstrip does. */ + g_strstrip(retvalue.addr); + c = RrColorParse(inst, retvalue.addr); if (c != NULL) { *value = c; ret = TRUE; @@ -2042,157 +2065,106 @@ static void read_button_colors(XrmDatabase db, const RrInstance *inst, 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); }