X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=obrender%2Ftheme.c;h=03372f7d30f09b195e61d92b1c55031116273698;hb=cc0b1f756937bda7c7785b60b60ed61d08cf67e1;hp=b7ebbb0ce3f8a657f50389f96455869768fef7f8;hpb=01506d6a74b97d78748b0a5958959f459d44c656;p=chaz%2Fopenbox diff --git a/obrender/theme.c b/obrender/theme.c index b7ebbb0c..03372f7d 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -110,6 +110,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, gchar *path; gboolean userdef; gint menu_overlap = 0; + RrAppearance *a_disabled_focused_tmp; + RrAppearance *a_disabled_unfocused_tmp; + RrAppearance *a_hover_focused_tmp; + RrAppearance *a_hover_unfocused_tmp; + RrAppearance *a_focused_unpressed_tmp; + RrAppearance *a_focused_pressed_tmp; + RrAppearance *a_unfocused_unpressed_tmp; + RrAppearance *a_unfocused_pressed_tmp; + RrAppearance *a_toggled_hover_focused_tmp; + RrAppearance *a_toggled_hover_unfocused_tmp; + RrAppearance *a_toggled_focused_unpressed_tmp; + RrAppearance *a_toggled_focused_pressed_tmp; + RrAppearance *a_toggled_unfocused_unpressed_tmp; + RrAppearance *a_toggled_unfocused_pressed_tmp; if (name) { db = loaddb(name, &path); @@ -133,7 +147,24 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, return NULL; } - theme = g_slice_new0(RrTheme); + /* initialize temp reading textures */ + a_disabled_focused_tmp = RrAppearanceNew(inst, 1); + a_disabled_unfocused_tmp = RrAppearanceNew(inst, 1); + a_hover_focused_tmp = RrAppearanceNew(inst, 1); + a_hover_unfocused_tmp = RrAppearanceNew(inst, 1); + a_toggled_focused_unpressed_tmp = RrAppearanceNew(inst, 1); + a_toggled_unfocused_unpressed_tmp = RrAppearanceNew(inst, 1); + a_toggled_hover_focused_tmp = RrAppearanceNew(inst, 1); + a_toggled_hover_unfocused_tmp = RrAppearanceNew(inst, 1); + a_toggled_focused_pressed_tmp = RrAppearanceNew(inst, 1); + a_toggled_unfocused_pressed_tmp = RrAppearanceNew(inst, 1); + a_focused_unpressed_tmp = RrAppearanceNew(inst, 1); + a_focused_pressed_tmp = RrAppearanceNew(inst, 1); + a_unfocused_unpressed_tmp = RrAppearanceNew(inst, 1); + a_unfocused_pressed_tmp = RrAppearanceNew(inst, 1); + + /* initialize theme */ + theme = g_slice_new0(RrTheme, 1); theme->inst = inst; theme->name = g_strdup(name ? name : DEFAULT_THEME); @@ -536,137 +567,234 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* read buttons textures */ READ_APPEARANCE("window.active.button.disabled.bg", - theme->a_disabled_focused_max, TRUE); + a_disabled_focused_tmp, TRUE); READ_APPEARANCE("window.inactive.button.disabled.bg", - theme->a_disabled_unfocused_max, TRUE); + a_disabled_unfocused_tmp, TRUE); READ_APPEARANCE("window.active.button.pressed.bg", - theme->a_focused_pressed_max, TRUE); + a_focused_pressed_tmp, TRUE); READ_APPEARANCE("window.inactive.button.pressed.bg", - theme->a_unfocused_pressed_max, TRUE); + a_unfocused_pressed_tmp, TRUE); READ_APPEARANCE_("window.active.button.toggled.unpressed.bg", "window.active.button.toggled.bg", - theme->a_toggled_focused_unpressed_max, TRUE, - theme->a_focused_pressed_max); + a_toggled_focused_unpressed_tmp, TRUE, + a_focused_pressed_tmp); READ_APPEARANCE_("window.inactive.button.toggled.unpressed.bg", "window.inactive.button.toggled.bg", - theme->a_toggled_unfocused_unpressed_max, TRUE, - theme->a_unfocused_pressed_max); + a_toggled_unfocused_unpressed_tmp, TRUE, + a_unfocused_pressed_tmp); READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", - theme->a_toggled_hover_focused_max, TRUE, - theme->a_toggled_focused_unpressed_max); + a_toggled_hover_focused_tmp, TRUE, + a_toggled_focused_unpressed_tmp); READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", - theme->a_toggled_hover_unfocused_max, TRUE, - theme->a_toggled_unfocused_unpressed_max); + a_toggled_hover_unfocused_tmp, TRUE, + a_toggled_unfocused_unpressed_tmp); READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg", - theme->a_toggled_focused_pressed_max, TRUE, - theme->a_focused_pressed_max); + a_toggled_focused_pressed_tmp, TRUE, + a_focused_pressed_tmp); READ_APPEARANCE_COPY("window.inactive.button.toggled.pressed.bg", - theme->a_toggled_unfocused_pressed_max, TRUE, - theme->a_unfocused_pressed_max); + a_toggled_unfocused_pressed_tmp, TRUE, + a_unfocused_pressed_tmp); READ_APPEARANCE("window.active.button.unpressed.bg", - theme->a_focused_unpressed_max, TRUE); + a_focused_unpressed_tmp, TRUE); READ_APPEARANCE("window.inactive.button.unpressed.bg", - theme->a_unfocused_unpressed_max, TRUE); + a_unfocused_unpressed_tmp, TRUE); READ_APPEARANCE_COPY("window.active.button.hover.bg", - theme->a_hover_focused_max, TRUE, - theme->a_focused_unpressed_max); + a_hover_focused_tmp, TRUE, + a_focused_unpressed_tmp); READ_APPEARANCE_COPY("window.inactive.button.hover.bg", + a_hover_unfocused_tmp, TRUE, + a_unfocused_unpressed_tmp); + + /* now do individual buttons, if specified */ + + /* max button */ + READ_APPEARANCE_COPY("window.active.button-max.disabled.bg", + theme->a_disabled_focused_max, TRUE, + a_disabled_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-max.disabled.bg", + theme->a_disabled_unfocused_max, TRUE, + a_disabled_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", + theme->a_hover_focused_max, TRUE, + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", theme->a_hover_unfocused_max, TRUE, - theme->a_unfocused_unpressed_max); - - theme->a_disabled_focused_close = - RrAppearanceCopy(theme->a_disabled_focused_max); - theme->a_disabled_unfocused_close = - RrAppearanceCopy(theme->a_disabled_unfocused_max); - theme->a_hover_focused_close = - RrAppearanceCopy(theme->a_hover_focused_max); - theme->a_hover_unfocused_close = - RrAppearanceCopy(theme->a_hover_unfocused_max); - theme->a_unfocused_unpressed_close = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); - theme->a_unfocused_pressed_close = - RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_focused_unpressed_close = - RrAppearanceCopy(theme->a_focused_unpressed_max); - theme->a_focused_pressed_close = - RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_disabled_focused_desk = - RrAppearanceCopy(theme->a_disabled_focused_max); - theme->a_disabled_unfocused_desk = - RrAppearanceCopy(theme->a_disabled_unfocused_max); - theme->a_hover_focused_desk = - RrAppearanceCopy(theme->a_hover_focused_max); - theme->a_hover_unfocused_desk = - RrAppearanceCopy(theme->a_hover_unfocused_max); - theme->a_toggled_hover_focused_desk = - RrAppearanceCopy(theme->a_toggled_hover_focused_max); - theme->a_toggled_hover_unfocused_desk = - RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); - theme->a_toggled_focused_unpressed_desk = - RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); - theme->a_toggled_unfocused_unpressed_desk = - RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); - theme->a_toggled_focused_pressed_desk = - RrAppearanceCopy(theme->a_toggled_focused_pressed_max); - theme->a_toggled_unfocused_pressed_desk = - RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); - theme->a_unfocused_unpressed_desk = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); - theme->a_unfocused_pressed_desk = - RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_focused_unpressed_desk = - RrAppearanceCopy(theme->a_focused_unpressed_max); - theme->a_focused_pressed_desk = - RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_disabled_focused_shade = - RrAppearanceCopy(theme->a_disabled_focused_max); - theme->a_disabled_unfocused_shade = - RrAppearanceCopy(theme->a_disabled_unfocused_max); - theme->a_hover_focused_shade = - RrAppearanceCopy(theme->a_hover_focused_max); - theme->a_hover_unfocused_shade = - RrAppearanceCopy(theme->a_hover_unfocused_max); - theme->a_toggled_hover_focused_shade = - RrAppearanceCopy(theme->a_toggled_hover_focused_max); - theme->a_toggled_hover_unfocused_shade = - RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); - theme->a_toggled_focused_unpressed_shade = - RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); - theme->a_toggled_unfocused_unpressed_shade = - RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); - theme->a_toggled_focused_pressed_shade = - RrAppearanceCopy(theme->a_toggled_focused_pressed_max); - theme->a_toggled_unfocused_pressed_shade = - RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); - theme->a_unfocused_unpressed_shade = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); - theme->a_unfocused_pressed_shade = - RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_focused_unpressed_shade = - RrAppearanceCopy(theme->a_focused_unpressed_max); - theme->a_focused_pressed_shade = - RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_disabled_focused_iconify = - RrAppearanceCopy(theme->a_disabled_focused_max); - theme->a_disabled_unfocused_iconify = - RrAppearanceCopy(theme->a_disabled_focused_max); - theme->a_hover_focused_iconify = - RrAppearanceCopy(theme->a_hover_focused_max); - theme->a_hover_unfocused_iconify = - RrAppearanceCopy(theme->a_hover_unfocused_max); - theme->a_unfocused_unpressed_iconify = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); - theme->a_unfocused_pressed_iconify = - RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_focused_unpressed_iconify = - RrAppearanceCopy(theme->a_focused_unpressed_max); - theme->a_focused_pressed_iconify = - RrAppearanceCopy(theme->a_focused_pressed_max); + a_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg", + theme->a_focused_unpressed_max, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", + theme->a_focused_pressed_max, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-max.unpressed.bg", + theme->a_unfocused_unpressed_max, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", + theme->a_unfocused_pressed_max, TRUE, + a_unfocused_pressed_tmp); + READ_APPEARANCE_COPY("window.active.button-max.toggled.hover.bg", + theme->a_toggled_hover_focused_max, TRUE, + a_toggled_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-max.toggled.hover.bg", + theme->a_toggled_hover_unfocused_max, TRUE, + a_toggled_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-max.toggled.unpressed.bg", + theme->a_toggled_focused_unpressed_max, TRUE, + a_toggled_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg", + theme->a_toggled_focused_pressed_max, TRUE, + a_toggled_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-max.toggled.unpressed.bg", + theme->a_toggled_unfocused_unpressed_max, TRUE, + a_toggled_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-max.toggled.pressed.bg", + theme->a_toggled_unfocused_pressed_max, TRUE, + a_toggled_unfocused_pressed_tmp); + + /* close button */ + READ_APPEARANCE_COPY("window.active.button-close.disabled.bg", + theme->a_disabled_focused_close, TRUE, + a_disabled_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-close.disabled.bg", + theme->a_disabled_unfocused_close, TRUE, + a_disabled_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-close.hover.bg", + theme->a_hover_focused_close, TRUE, + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-close.hover.bg", + theme->a_hover_unfocused_close, TRUE, + a_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg", + theme->a_focused_unpressed_close, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-close.pressed.bg", + theme->a_focused_pressed_close, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-close.unpressed.bg", + theme->a_unfocused_unpressed_close, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-close.pressed.bg", + theme->a_unfocused_pressed_close, TRUE, + a_unfocused_pressed_tmp); + + /* desk button */ + READ_APPEARANCE_COPY("window.active.button-desk.disabled.bg", + theme->a_disabled_focused_desk, TRUE, + a_disabled_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-desk.disabled.bg", + theme->a_disabled_unfocused_desk, TRUE, + a_disabled_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", + theme->a_hover_focused_desk, TRUE, + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", + theme->a_hover_unfocused_desk, TRUE, + a_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg", + theme->a_focused_unpressed_desk, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", + theme->a_focused_pressed_desk, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-desk.unpressed.bg", + theme->a_unfocused_unpressed_desk, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", + theme->a_unfocused_pressed_desk, TRUE, + a_unfocused_pressed_tmp); + READ_APPEARANCE_COPY("window.active.button-desk.toggled.hover.bg", + theme->a_toggled_hover_focused_desk, TRUE, + a_toggled_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.hover.bg", + theme->a_toggled_hover_unfocused_desk, TRUE, + a_toggled_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-desk.toggled.unpressed.bg", + theme->a_toggled_focused_unpressed_desk, TRUE, + a_toggled_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg", + theme->a_toggled_focused_pressed_desk, TRUE, + a_toggled_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.unpressed.bg", + theme->a_toggled_unfocused_unpressed_desk, TRUE, + a_toggled_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.pressed.bg", + theme->a_toggled_unfocused_pressed_desk, TRUE, + a_toggled_unfocused_pressed_tmp); + + /* shade button */ + READ_APPEARANCE_COPY("window.active.button-shade.disabled.bg", + theme->a_disabled_focused_shade, TRUE, + a_disabled_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-shade.disabled.bg", + theme->a_disabled_unfocused_shade, TRUE, + a_disabled_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", + theme->a_hover_focused_shade, TRUE, + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", + theme->a_hover_unfocused_shade, TRUE, + a_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg", + theme->a_focused_unpressed_shade, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", + theme->a_focused_pressed_shade, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-shade.unpressed.bg", + theme->a_unfocused_unpressed_shade, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", + theme->a_unfocused_pressed_shade, TRUE, + a_unfocused_pressed_tmp); + READ_APPEARANCE_COPY("window.active.button-shade.toggled.hover.bg", + theme->a_toggled_hover_focused_shade, TRUE, + a_toggled_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.hover.bg", + theme->a_toggled_hover_unfocused_shade, TRUE, + a_toggled_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-shade.toggled.unpressed.bg", + theme->a_toggled_focused_unpressed_shade, TRUE, + a_toggled_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg", + theme->a_toggled_focused_pressed_shade, TRUE, + a_toggled_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.unpressed.bg", + theme->a_toggled_unfocused_unpressed_shade, TRUE, + a_toggled_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.pressed.bg", + theme->a_toggled_unfocused_pressed_shade, TRUE, + a_toggled_unfocused_pressed_tmp); + + /* iconify button */ + READ_APPEARANCE_COPY("window.active.button-iconify.disabled.bg", + theme->a_disabled_focused_iconify, TRUE, + a_disabled_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-iconify.disabled.bg", + theme->a_disabled_unfocused_iconify, TRUE, + a_disabled_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-iconify.hover.bg", + theme->a_hover_focused_iconify, TRUE, + a_hover_focused_tmp); + READ_APPEARANCE_COPY("window.inactive.button-iconify.hover.bg", + theme->a_hover_unfocused_iconify, TRUE, + a_hover_unfocused_tmp); + READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg", + theme->a_focused_unpressed_iconify, TRUE, + a_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.active.button-iconify.pressed.bg", + theme->a_focused_pressed_iconify, TRUE, + a_focused_pressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-iconify.unpressed.bg", + theme->a_unfocused_unpressed_iconify, TRUE, + a_unfocused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button-iconify.pressed.bg", + theme->a_unfocused_pressed_iconify, TRUE, + a_unfocused_pressed_tmp); theme->a_icon->surface.grad = theme->a_clear->surface.grad = @@ -1272,6 +1400,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->button_size = theme->label_height - 2; theme->grip_width = 25; + RrAppearanceFree(a_disabled_focused_tmp); + RrAppearanceFree(a_disabled_unfocused_tmp); + RrAppearanceFree(a_hover_focused_tmp); + RrAppearanceFree(a_hover_unfocused_tmp); + RrAppearanceFree(a_focused_unpressed_tmp); + RrAppearanceFree(a_focused_pressed_tmp); + RrAppearanceFree(a_unfocused_unpressed_tmp); + RrAppearanceFree(a_unfocused_pressed_tmp); + RrAppearanceFree(a_toggled_hover_focused_tmp); + RrAppearanceFree(a_toggled_hover_unfocused_tmp); + RrAppearanceFree(a_toggled_focused_unpressed_tmp); + RrAppearanceFree(a_toggled_focused_pressed_tmp); + RrAppearanceFree(a_toggled_unfocused_unpressed_tmp); + RrAppearanceFree(a_toggled_unfocused_pressed_tmp); + return theme; }