X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obrender%2Ftheme.c;h=d5ce865981f7d207db289bf9150676402d042832;hb=6c87b1dd703bb67d7c945dc846da9d17c9c72382;hp=cd641f8ec7689bcb909467a01a41991e8efc5f03;hpb=d09fd3183e6a52c63fcfdcf62d418cfdccb0015b;p=chaz%2Fopenbox diff --git a/obrender/theme.c b/obrender/theme.c index cd641f8e..d5ce8659 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)) {\ @@ -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_text_active_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, - RrColorNew(inst, 0xff, 0xff, 0xff)); + 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 */ @@ -667,36 +699,36 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* hover */ READ_APPEARANCE_COPY("window.active.button.max.hover.bg", theme->btn_max->a_hover_focused, TRUE, - theme->btn_max->a_focused_unpressed); + 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", theme->btn_max->a_toggled_focused_unpressed, TRUE, - theme->btn_max->a_focused_pressed); + 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", theme->btn_max->a_toggled_focused_pressed, TRUE, - theme->btn_max->a_focused_pressed); + 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", theme->btn_max->a_toggled_hover_focused, TRUE, - theme->btn_max->a_toggled_focused_unpressed); + 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"); @@ -721,10 +753,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, a_disabled_unfocused_tmp); READ_APPEARANCE_COPY("window.active.button.close.hover.bg", theme->btn_close->a_hover_focused, TRUE, - theme->btn_close->a_focused_unpressed); + 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"); @@ -752,36 +784,36 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* hover */ READ_APPEARANCE_COPY("window.active.button.desk.hover.bg", theme->btn_desk->a_hover_focused, TRUE, - theme->btn_desk->a_focused_unpressed); + 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", theme->btn_desk->a_toggled_focused_unpressed, TRUE, - theme->btn_desk->a_focused_pressed); + 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", theme->btn_desk->a_toggled_focused_pressed, TRUE, - theme->btn_desk->a_focused_pressed); + 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", theme->btn_desk->a_toggled_hover_focused, TRUE, - theme->btn_desk->a_toggled_focused_unpressed); + 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"); @@ -809,36 +841,36 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* hover */ READ_APPEARANCE_COPY("window.active.button.shade.hover.bg", theme->btn_shade->a_hover_focused, TRUE, - theme->btn_shade->a_focused_unpressed); + 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", theme->btn_shade->a_toggled_focused_unpressed, TRUE, - theme->btn_shade->a_focused_pressed); + 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", theme->btn_shade->a_toggled_focused_pressed, TRUE, - theme->btn_shade->a_focused_pressed); + 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", theme->btn_shade->a_toggled_hover_focused, TRUE, - theme->btn_shade->a_toggled_focused_unpressed); + 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"); @@ -863,10 +895,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, a_disabled_unfocused_tmp); READ_APPEARANCE_COPY("window.active.button.iconify.hover.bg", theme->btn_iconify->a_hover_focused, TRUE, - theme->btn_iconify->a_focused_unpressed); + 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 = @@ -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); @@ -1631,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); } @@ -1723,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; } @@ -1741,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;