X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=obrender%2Ftheme.c;h=649385059bc08a9c283f3ed73f3aa94767d9bd14;hb=95ed8437020ca3070d7cafcdfef78f8b3985fb5f;hp=8481eee3edd4633900b398a8a9e9e2365eabedd2;hpb=ccd4d460e528b4d07b3f47640870382da69f41db;p=chaz%2Fopenbox diff --git a/obrender/theme.c b/obrender/theme.c index 8481eee3..64938505 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -45,6 +45,9 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, static int parse_inline_number(const char *p); static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); +static void read_button_colors(XrmDatabase db, const RrInstance *inst, + const RrTheme *theme, RrButton *btn, + const gchar *btnname); static RrFont *get_font(RrFont *target, RrFont **default_font, const RrInstance *inst) @@ -169,64 +172,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->inst = inst; theme->name = g_strdup(name ? name : DEFAULT_THEME); - theme->a_disabled_focused_max = RrAppearanceNew(inst, 1); - theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1); - theme->a_hover_focused_max = RrAppearanceNew(inst, 1); - theme->a_hover_unfocused_max = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_unpressed_max = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_unpressed_max = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_focused_max = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_unfocused_max = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_disabled_focused_desk = RrAppearanceNew(inst, 1); - theme->a_disabled_unfocused_desk = RrAppearanceNew(inst, 1); - theme->a_hover_focused_desk = RrAppearanceNew(inst, 1); - theme->a_hover_unfocused_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_unpressed_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_unpressed_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_focused_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_unfocused_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_pressed_desk = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_pressed_desk = RrAppearanceNew(inst, 1); - theme->a_focused_unpressed_desk = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_desk = RrAppearanceNew(inst, 1); - theme->a_unfocused_unpressed_desk = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_desk = RrAppearanceNew(inst, 1); - theme->a_disabled_focused_shade = RrAppearanceNew(inst, 1); - theme->a_disabled_unfocused_shade = RrAppearanceNew(inst, 1); - theme->a_hover_focused_shade = RrAppearanceNew(inst, 1); - theme->a_hover_unfocused_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_unpressed_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_unpressed_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_focused_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_hover_unfocused_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_pressed_shade = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_pressed_shade = RrAppearanceNew(inst, 1); - theme->a_focused_unpressed_shade = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_shade = RrAppearanceNew(inst, 1); - theme->a_unfocused_unpressed_shade = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_shade = RrAppearanceNew(inst, 1); - theme->a_disabled_focused_close = RrAppearanceNew(inst, 1); - theme->a_disabled_unfocused_close = RrAppearanceNew(inst, 1); - theme->a_hover_focused_close = RrAppearanceNew(inst, 1); - theme->a_hover_unfocused_close = RrAppearanceNew(inst, 1); - theme->a_focused_unpressed_close = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_close = RrAppearanceNew(inst, 1); - theme->a_unfocused_unpressed_close = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_close = RrAppearanceNew(inst, 1); - theme->a_disabled_focused_iconify = RrAppearanceNew(inst, 1); - theme->a_disabled_unfocused_iconify = RrAppearanceNew(inst, 1); - theme->a_hover_focused_iconify = RrAppearanceNew(inst, 1); - theme->a_hover_unfocused_iconify = RrAppearanceNew(inst, 1); - theme->a_focused_unpressed_iconify = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_iconify = RrAppearanceNew(inst, 1); - theme->a_unfocused_unpressed_iconify = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_iconify = RrAppearanceNew(inst, 1); + /* init buttons */ + theme->btn_max = RrButtonNew(inst); + theme->btn_close = RrButtonNew(inst); + theme->btn_desk = RrButtonNew(inst); + theme->btn_shade = RrButtonNew(inst); + theme->btn_iconify = RrButtonNew(inst); + + /* init appearances */ theme->a_focused_grip = RrAppearanceNew(inst, 0); theme->a_unfocused_grip = RrAppearanceNew(inst, 0); theme->a_focused_title = RrAppearanceNew(inst, 0); @@ -418,6 +371,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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)); @@ -430,105 +386,113 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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)); + /* load the image masks */ /* maximize button masks */ userdef = TRUE; - if (!read_mask(inst, path, theme, "max.xbm", &theme->max_mask)) { + if (!read_mask(inst, path, theme, "max.xbm", &theme->btn_max->mask)) { guchar data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; - theme->max_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme->btn_max->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); userdef = FALSE; } if (!read_mask(inst, path, theme, "max_toggled.xbm", - &theme->max_toggled_mask)) + &theme->btn_max->toggled_mask)) { if (userdef) - theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask); + theme->btn_max->toggled_mask = RrPixmapMaskCopy(theme->btn_max->mask); else { guchar data[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; - theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data); + theme->btn_max->toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data); } } - READ_MASK_COPY("max_pressed.xbm", theme->max_pressed_mask, - theme->max_mask); - READ_MASK_COPY("max_disabled.xbm", theme->max_disabled_mask, - theme->max_mask); - READ_MASK_COPY("max_hover.xbm", theme->max_hover_mask, theme->max_mask); - READ_MASK_COPY("max_toggled_pressed.xbm", theme->max_toggled_pressed_mask, - theme->max_toggled_mask); - READ_MASK_COPY("max_toggled_hover.xbm", theme->max_toggled_hover_mask, - theme->max_toggled_mask); + READ_MASK_COPY("max_pressed.xbm", theme->btn_max->pressed_mask, + theme->btn_max->mask); + READ_MASK_COPY("max_disabled.xbm", theme->btn_max->disabled_mask, + theme->btn_max->mask); + READ_MASK_COPY("max_hover.xbm", theme->btn_max->hover_mask, + theme->btn_max->mask); + READ_MASK_COPY("max_toggled_pressed.xbm", + theme->btn_max->toggled_pressed_mask, + theme->btn_max->toggled_mask); + READ_MASK_COPY("max_toggled_hover.xbm", + theme->btn_max->toggled_hover_mask, + theme->btn_max->toggled_mask); /* iconify button masks */ - if (!read_mask(inst, path, theme, "iconify.xbm", &theme->iconify_mask)) { + if (!read_mask(inst, path, theme, "iconify.xbm", &theme->btn_iconify->mask)) { guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; - theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme->btn_iconify->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } - READ_MASK_COPY("iconify_pressed.xbm", theme->iconify_pressed_mask, - theme->iconify_mask); - READ_MASK_COPY("iconify_disabled.xbm", theme->iconify_disabled_mask, - theme->iconify_mask); - READ_MASK_COPY("iconify_hover.xbm", theme->iconify_hover_mask, - theme->iconify_mask); + READ_MASK_COPY("iconify_pressed.xbm", theme->btn_iconify->pressed_mask, + theme->btn_iconify->mask); + READ_MASK_COPY("iconify_disabled.xbm", theme->btn_iconify->disabled_mask, + theme->btn_iconify->mask); + READ_MASK_COPY("iconify_hover.xbm", theme->btn_iconify->hover_mask, + theme->btn_iconify->mask); /* all desktops button masks */ userdef = TRUE; - if (!read_mask(inst, path, theme, "desk.xbm", &theme->desk_mask)) { + if (!read_mask(inst, path, theme, "desk.xbm", &theme->btn_desk->mask)) { guchar data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; - theme->desk_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme->btn_desk->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); userdef = FALSE; } if (!read_mask(inst, path, theme, "desk_toggled.xbm", - &theme->desk_toggled_mask)) { + &theme->btn_desk->toggled_mask)) { if (userdef) - theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask); + theme->btn_desk->toggled_mask = RrPixmapMaskCopy(theme->btn_desk->mask); else { guchar data[] = { 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 }; - theme->desk_toggled_mask = + theme->btn_desk->toggled_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } } - READ_MASK_COPY("desk_pressed.xbm", theme->desk_pressed_mask, - theme->desk_mask); - READ_MASK_COPY("desk_disabled.xbm", theme->desk_disabled_mask, - theme->desk_mask); - READ_MASK_COPY("desk_hover.xbm", theme->desk_hover_mask, theme->desk_mask); + READ_MASK_COPY("desk_pressed.xbm", theme->btn_desk->pressed_mask, + theme->btn_desk->mask); + READ_MASK_COPY("desk_disabled.xbm", theme->btn_desk->disabled_mask, + theme->btn_desk->mask); + READ_MASK_COPY("desk_hover.xbm", theme->btn_desk->hover_mask, theme->btn_desk->mask); READ_MASK_COPY("desk_toggled_pressed.xbm", - theme->desk_toggled_pressed_mask, theme->desk_toggled_mask); - READ_MASK_COPY("desk_toggled_hover.xbm", theme->desk_toggled_hover_mask, - theme->desk_toggled_mask); + theme->btn_desk->toggled_pressed_mask, theme->btn_desk->toggled_mask); + READ_MASK_COPY("desk_toggled_hover.xbm", theme->btn_desk->toggled_hover_mask, + theme->btn_desk->toggled_mask); /* shade button masks */ - if (!read_mask(inst, path, theme, "shade.xbm", &theme->shade_mask)) { + if (!read_mask(inst, path, theme, "shade.xbm", &theme->btn_shade->mask)) { guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; - theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme->btn_shade->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } - READ_MASK_COPY("shade_toggled.xbm", theme->shade_toggled_mask, - theme->shade_mask); - READ_MASK_COPY("shade_pressed.xbm", theme->shade_pressed_mask, - theme->shade_mask); - READ_MASK_COPY("shade_disabled.xbm", theme->shade_disabled_mask, - theme->shade_mask); - READ_MASK_COPY("shade_hover.xbm", theme->shade_hover_mask, - theme->shade_mask); + READ_MASK_COPY("shade_toggled.xbm", theme->btn_shade->toggled_mask, + theme->btn_shade->mask); + READ_MASK_COPY("shade_pressed.xbm", theme->btn_shade->pressed_mask, + theme->btn_shade->mask); + READ_MASK_COPY("shade_disabled.xbm", theme->btn_shade->disabled_mask, + theme->btn_shade->mask); + READ_MASK_COPY("shade_hover.xbm", theme->btn_shade->hover_mask, + theme->btn_shade->mask); READ_MASK_COPY("shade_toggled_pressed.xbm", - theme->shade_toggled_pressed_mask, - theme->shade_toggled_mask); + theme->btn_shade->toggled_pressed_mask, + theme->btn_shade->toggled_mask); READ_MASK_COPY("shade_toggled_hover.xbm", - theme->shade_toggled_hover_mask, theme->shade_toggled_mask); + theme->btn_shade->toggled_hover_mask, + theme->btn_shade->toggled_mask); /* close button masks */ - if (!read_mask(inst, path, theme, "close.xbm", &theme->close_mask)) { + if (!read_mask(inst, path, theme, "close.xbm", &theme->btn_close->mask)) { guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; - theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme->btn_close->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } - READ_MASK_COPY("close_pressed.xbm", theme->close_pressed_mask, - theme->close_mask); - READ_MASK_COPY("close_disabled.xbm", theme->close_disabled_mask, - theme->close_mask); - READ_MASK_COPY("close_hover.xbm", theme->close_hover_mask, - theme->close_mask); + READ_MASK_COPY("close_pressed.xbm", theme->btn_close->pressed_mask, + theme->btn_close->mask); + READ_MASK_COPY("close_disabled.xbm", theme->btn_close->disabled_mask, + theme->btn_close->mask); + READ_MASK_COPY("close_hover.xbm", theme->btn_close->hover_mask, + theme->btn_close->mask); /* submenu bullet mask */ if (!read_mask(inst, path, theme, "bullet.xbm", &theme->menu_bullet_mask)) @@ -554,6 +518,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH; theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT; + /* the toggled hover mask = the toggled unpressed mask (i.e. no change) */ + theme->btn_max->toggled_hover_mask = + RrPixmapMaskCopy(theme->btn_max->toggled_mask); + theme->btn_desk->toggled_hover_mask = + RrPixmapMaskCopy(theme->btn_desk->toggled_mask); + theme->btn_shade->toggled_hover_mask = + RrPixmapMaskCopy(theme->btn_shade->toggled_mask); + /* the toggled pressed mask = the toggled unpressed mask (i.e. no change)*/ + theme->btn_max->toggled_pressed_mask = + RrPixmapMaskCopy(theme->btn_max->toggled_mask); + theme->btn_desk->toggled_pressed_mask = + RrPixmapMaskCopy(theme->btn_desk->toggled_mask); + theme->btn_shade->toggled_pressed_mask = + RrPixmapMaskCopy(theme->btn_shade->toggled_mask); + /* read the decoration textures */ READ_APPEARANCE("window.active.title.bg", theme->a_focused_title, FALSE); READ_APPEARANCE("window.inactive.title.bg", theme->a_unfocused_title, @@ -610,15 +589,30 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, } /* read buttons textures */ - READ_APPEARANCE("window.active.button.disabled.bg", - a_disabled_focused_tmp, TRUE); - READ_APPEARANCE("window.inactive.button.disabled.bg", - a_disabled_unfocused_tmp, TRUE); + + /* bases: unpressed, pressed, disabled */ + READ_APPEARANCE("window.active.button.unpressed.bg", + a_focused_unpressed_tmp, TRUE); + READ_APPEARANCE("window.inactive.button.unpressed.bg", + a_unfocused_unpressed_tmp, TRUE); READ_APPEARANCE("window.active.button.pressed.bg", a_focused_pressed_tmp, TRUE); READ_APPEARANCE("window.inactive.button.pressed.bg", a_unfocused_pressed_tmp, TRUE); + READ_APPEARANCE("window.active.button.disabled.bg", + a_disabled_focused_tmp, TRUE); + READ_APPEARANCE("window.inactive.button.disabled.bg", + a_disabled_unfocused_tmp, TRUE); + /* hover */ + READ_APPEARANCE_COPY("window.active.button.hover.bg", + 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); + + /* toggled unpressed */ READ_APPEARANCE_("window.active.button.toggled.unpressed.bg", "window.active.button.toggled.bg", a_toggled_focused_unpressed_tmp, TRUE, @@ -628,13 +622,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, a_toggled_unfocused_unpressed_tmp, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", - a_toggled_hover_focused_tmp, TRUE, - a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", - a_toggled_hover_unfocused_tmp, TRUE, - a_toggled_unfocused_unpressed_tmp); - + /* toggled pressed */ READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg", a_toggled_focused_pressed_tmp, TRUE, a_focused_pressed_tmp); @@ -642,203 +630,243 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, a_toggled_unfocused_pressed_tmp, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE("window.active.button.unpressed.bg", - a_focused_unpressed_tmp, TRUE); - READ_APPEARANCE("window.inactive.button.unpressed.bg", - a_unfocused_unpressed_tmp, TRUE); + /* toggled hover */ + READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", + a_toggled_hover_focused_tmp, TRUE, + a_toggled_focused_unpressed_tmp); + READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", + a_toggled_hover_unfocused_tmp, TRUE, + a_toggled_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.hover.bg", - 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, - a_hover_unfocused_tmp); + read_button_colors(db, inst, theme, theme->btn_max, "max"); + + /* bases: unpressed, pressed, disabled */ READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg", - theme->a_focused_unpressed_max, TRUE, + theme->btn_max->a_focused_unpressed, 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, + theme->btn_max->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); + 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", - theme->a_unfocused_pressed_max, TRUE, + theme->btn_max->a_unfocused_pressed, 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.disabled.bg", + theme->btn_max->a_disabled_focused, TRUE, + a_disabled_focused_tmp); + 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", + theme->btn_max->a_hover_focused, TRUE, + theme->btn_max->a_focused_unpressed); + 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", + 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", + 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", - 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); + theme->btn_max->a_toggled_focused_pressed, TRUE, + theme->btn_max->a_focused_pressed); READ_APPEARANCE_COPY("window.inactive.button-max.toggled.pressed.bg", - theme->a_toggled_unfocused_pressed_max, TRUE, - a_toggled_unfocused_pressed_tmp); + 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", + 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", + theme->btn_max->a_toggled_hover_unfocused, TRUE, + theme->btn_max->a_toggled_unfocused_unpressed); /* 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_button_colors(db, inst, theme, theme->btn_close, "close"); + READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg", - theme->a_focused_unpressed_close, TRUE, + theme->btn_close->a_focused_unpressed, 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, + theme->btn_close->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); + 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", - theme->a_unfocused_pressed_close, TRUE, + theme->btn_close->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); - - /* desk button */ - READ_APPEARANCE_COPY("window.active.button-desk.disabled.bg", - theme->a_disabled_focused_desk, TRUE, + 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-desk.disabled.bg", - theme->a_disabled_unfocused_desk, TRUE, + 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-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-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", + theme->btn_close->a_hover_unfocused, TRUE, + theme->btn_close->a_unfocused_unpressed); + + /* 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", - theme->a_focused_unpressed_desk, TRUE, + theme->btn_desk->a_focused_unpressed, 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, + theme->btn_desk->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); + 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", - theme->a_unfocused_pressed_desk, TRUE, + theme->btn_desk->a_unfocused_pressed, 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.disabled.bg", + theme->btn_desk->a_disabled_focused, TRUE, + a_disabled_focused_tmp); + 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", + theme->btn_desk->a_hover_focused, TRUE, + theme->btn_desk->a_focused_unpressed); + 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", + 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", + 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", - 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); + theme->btn_desk->a_toggled_focused_pressed, TRUE, + theme->btn_desk->a_focused_pressed); READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.pressed.bg", - theme->a_toggled_unfocused_pressed_desk, TRUE, - a_toggled_unfocused_pressed_tmp); + 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", + 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", + theme->btn_desk->a_toggled_hover_unfocused, TRUE, + theme->btn_desk->a_toggled_unfocused_unpressed); /* 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_button_colors(db, inst, theme, theme->btn_shade, "shade"); + + /* bases: unpressed, pressed, disabled */ READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg", - theme->a_focused_unpressed_shade, TRUE, + theme->btn_shade->a_focused_unpressed, 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, + theme->btn_shade->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); + 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", - theme->a_unfocused_pressed_shade, TRUE, + theme->btn_shade->a_unfocused_pressed, 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.disabled.bg", + theme->btn_shade->a_disabled_focused, TRUE, + a_disabled_focused_tmp); + 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", + theme->btn_shade->a_hover_focused, TRUE, + theme->btn_shade->a_focused_unpressed); + 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", + 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", + 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", - 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); + theme->btn_shade->a_toggled_focused_pressed, TRUE, + theme->btn_shade->a_focused_pressed); READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.pressed.bg", - theme->a_toggled_unfocused_pressed_shade, TRUE, - a_toggled_unfocused_pressed_tmp); + 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", + 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", + theme->btn_shade->a_toggled_hover_unfocused, TRUE, + theme->btn_shade->a_toggled_unfocused_unpressed); /* 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_button_colors(db, inst, theme, theme->btn_iconify, "iconify"); + READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg", - theme->a_focused_unpressed_iconify, TRUE, + theme->btn_iconify->a_focused_unpressed, 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, + theme->btn_iconify->a_unfocused_unpressed, TRUE, a_unfocused_unpressed_tmp); + 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", - theme->a_unfocused_pressed_iconify, TRUE, + theme->btn_iconify->a_unfocused_pressed, TRUE, a_unfocused_pressed_tmp); + 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", + theme->btn_iconify->a_disabled_unfocused, TRUE, + 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); + READ_APPEARANCE_COPY("window.inactive.button-iconify.hover.bg", + theme->btn_iconify->a_hover_unfocused, TRUE, + theme->btn_iconify->a_unfocused_unpressed); theme->a_icon->surface.grad = theme->a_clear->surface.grad = @@ -1167,233 +1195,277 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_alpha = theme->menu_text_disabled_shadow_alpha; - theme->a_disabled_focused_max->texture[0].type = - theme->a_disabled_unfocused_max->texture[0].type = - theme->a_hover_focused_max->texture[0].type = - theme->a_hover_unfocused_max->texture[0].type = - theme->a_toggled_hover_focused_max->texture[0].type = - theme->a_toggled_hover_unfocused_max->texture[0].type = - theme->a_toggled_focused_unpressed_max->texture[0].type = - theme->a_toggled_unfocused_unpressed_max->texture[0].type = - theme->a_toggled_focused_pressed_max->texture[0].type = - theme->a_toggled_unfocused_pressed_max->texture[0].type = - theme->a_focused_unpressed_max->texture[0].type = - theme->a_focused_pressed_max->texture[0].type = - theme->a_unfocused_unpressed_max->texture[0].type = - theme->a_unfocused_pressed_max->texture[0].type = - theme->a_disabled_focused_close->texture[0].type = - theme->a_disabled_unfocused_close->texture[0].type = - theme->a_hover_focused_close->texture[0].type = - theme->a_hover_unfocused_close->texture[0].type = - theme->a_focused_unpressed_close->texture[0].type = - theme->a_focused_pressed_close->texture[0].type = - theme->a_unfocused_unpressed_close->texture[0].type = - theme->a_unfocused_pressed_close->texture[0].type = - theme->a_disabled_focused_desk->texture[0].type = - theme->a_disabled_unfocused_desk->texture[0].type = - theme->a_hover_focused_desk->texture[0].type = - theme->a_hover_unfocused_desk->texture[0].type = - theme->a_toggled_hover_focused_desk->texture[0].type = - theme->a_toggled_hover_unfocused_desk->texture[0].type = - theme->a_toggled_focused_unpressed_desk->texture[0].type = - theme->a_toggled_unfocused_unpressed_desk->texture[0].type = - theme->a_toggled_focused_pressed_desk->texture[0].type = - theme->a_toggled_unfocused_pressed_desk->texture[0].type = - theme->a_focused_unpressed_desk->texture[0].type = - theme->a_focused_pressed_desk->texture[0].type = - theme->a_unfocused_unpressed_desk->texture[0].type = - theme->a_unfocused_pressed_desk->texture[0].type = - theme->a_disabled_focused_shade->texture[0].type = - theme->a_disabled_unfocused_shade->texture[0].type = - theme->a_hover_focused_shade->texture[0].type = - theme->a_hover_unfocused_shade->texture[0].type = - theme->a_toggled_hover_focused_shade->texture[0].type = - theme->a_toggled_hover_unfocused_shade->texture[0].type = - theme->a_toggled_focused_unpressed_shade->texture[0].type = - theme->a_toggled_unfocused_unpressed_shade->texture[0].type = - theme->a_toggled_focused_pressed_shade->texture[0].type = - theme->a_toggled_unfocused_pressed_shade->texture[0].type = - theme->a_focused_unpressed_shade->texture[0].type = - theme->a_focused_pressed_shade->texture[0].type = - theme->a_unfocused_unpressed_shade->texture[0].type = - theme->a_unfocused_pressed_shade->texture[0].type = - theme->a_disabled_focused_iconify->texture[0].type = - theme->a_disabled_unfocused_iconify->texture[0].type = - theme->a_hover_focused_iconify->texture[0].type = - theme->a_hover_unfocused_iconify->texture[0].type = - theme->a_focused_unpressed_iconify->texture[0].type = - theme->a_focused_pressed_iconify->texture[0].type = - theme->a_unfocused_unpressed_iconify->texture[0].type = - theme->a_unfocused_pressed_iconify->texture[0].type = + theme->btn_max->a_disabled_focused->texture[0].type = + theme->btn_max->a_disabled_unfocused->texture[0].type = + theme->btn_max->a_hover_focused->texture[0].type = + theme->btn_max->a_hover_unfocused->texture[0].type = + theme->btn_max->a_toggled_hover_focused->texture[0].type = + theme->btn_max->a_toggled_hover_unfocused->texture[0].type = + theme->btn_max->a_toggled_focused_unpressed->texture[0].type = + theme->btn_max->a_toggled_unfocused_unpressed->texture[0].type = + theme->btn_max->a_toggled_focused_pressed->texture[0].type = + theme->btn_max->a_toggled_unfocused_pressed->texture[0].type = + theme->btn_max->a_focused_unpressed->texture[0].type = + theme->btn_max->a_focused_pressed->texture[0].type = + theme->btn_max->a_unfocused_unpressed->texture[0].type = + theme->btn_max->a_unfocused_pressed->texture[0].type = + theme->btn_close->a_disabled_focused->texture[0].type = + theme->btn_close->a_disabled_unfocused->texture[0].type = + theme->btn_close->a_hover_focused->texture[0].type = + theme->btn_close->a_hover_unfocused->texture[0].type = + theme->btn_close->a_focused_unpressed->texture[0].type = + theme->btn_close->a_focused_pressed->texture[0].type = + theme->btn_close->a_unfocused_unpressed->texture[0].type = + theme->btn_close->a_unfocused_pressed->texture[0].type = + theme->btn_desk->a_disabled_focused->texture[0].type = + theme->btn_desk->a_disabled_unfocused->texture[0].type = + theme->btn_desk->a_hover_focused->texture[0].type = + theme->btn_desk->a_hover_unfocused->texture[0].type = + theme->btn_desk->a_toggled_hover_focused->texture[0].type = + theme->btn_desk->a_toggled_hover_unfocused->texture[0].type = + theme->btn_desk->a_toggled_focused_unpressed->texture[0].type = + theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].type = + theme->btn_desk->a_toggled_focused_pressed->texture[0].type = + theme->btn_desk->a_toggled_unfocused_pressed->texture[0].type = + theme->btn_desk->a_focused_unpressed->texture[0].type = + theme->btn_desk->a_focused_pressed->texture[0].type = + theme->btn_desk->a_unfocused_unpressed->texture[0].type = + theme->btn_desk->a_unfocused_pressed->texture[0].type = + theme->btn_shade->a_disabled_focused->texture[0].type = + theme->btn_shade->a_disabled_unfocused->texture[0].type = + theme->btn_shade->a_hover_focused->texture[0].type = + theme->btn_shade->a_hover_unfocused->texture[0].type = + theme->btn_shade->a_toggled_hover_focused->texture[0].type = + theme->btn_shade->a_toggled_hover_unfocused->texture[0].type = + theme->btn_shade->a_toggled_focused_unpressed->texture[0].type = + theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].type = + theme->btn_shade->a_toggled_focused_pressed->texture[0].type = + theme->btn_shade->a_toggled_unfocused_pressed->texture[0].type = + theme->btn_shade->a_focused_unpressed->texture[0].type = + theme->btn_shade->a_focused_pressed->texture[0].type = + theme->btn_shade->a_unfocused_unpressed->texture[0].type = + theme->btn_shade->a_unfocused_pressed->texture[0].type = + theme->btn_iconify->a_disabled_focused->texture[0].type = + theme->btn_iconify->a_disabled_unfocused->texture[0].type = + theme->btn_iconify->a_hover_focused->texture[0].type = + theme->btn_iconify->a_hover_unfocused->texture[0].type = + theme->btn_iconify->a_focused_unpressed->texture[0].type = + theme->btn_iconify->a_focused_pressed->texture[0].type = + theme->btn_iconify->a_unfocused_unpressed->texture[0].type = + theme->btn_iconify->a_unfocused_pressed->texture[0].type = theme->a_menu_bullet_normal->texture[0].type = theme->a_menu_bullet_selected->texture[0].type = RR_TEXTURE_MASK; - theme->a_disabled_focused_max->texture[0].data.mask.mask = - theme->a_disabled_unfocused_max->texture[0].data.mask.mask = - theme->max_disabled_mask; - theme->a_hover_focused_max->texture[0].data.mask.mask = - theme->a_hover_unfocused_max->texture[0].data.mask.mask = - theme->max_hover_mask; - theme->a_focused_pressed_max->texture[0].data.mask.mask = - theme->a_unfocused_pressed_max->texture[0].data.mask.mask = - theme->max_pressed_mask; - theme->a_focused_unpressed_max->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = - theme->max_mask; - theme->a_toggled_hover_focused_max->texture[0].data.mask.mask = - theme->a_toggled_hover_unfocused_max->texture[0].data.mask.mask = - theme->max_toggled_hover_mask; - theme->a_toggled_focused_unpressed_max->texture[0].data.mask.mask = - theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.mask = - theme->max_toggled_mask; - theme->a_toggled_focused_pressed_max->texture[0].data.mask.mask = - theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.mask = - theme->max_toggled_pressed_mask; - theme->a_disabled_focused_close->texture[0].data.mask.mask = - theme->a_disabled_unfocused_close->texture[0].data.mask.mask = - theme->close_disabled_mask; - theme->a_hover_focused_close->texture[0].data.mask.mask = - theme->a_hover_unfocused_close->texture[0].data.mask.mask = - theme->close_hover_mask; - theme->a_focused_pressed_close->texture[0].data.mask.mask = - theme->a_unfocused_pressed_close->texture[0].data.mask.mask = - theme->close_pressed_mask; - theme->a_focused_unpressed_close->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_close->texture[0].data.mask.mask = - theme->close_mask; - theme->a_disabled_focused_desk->texture[0].data.mask.mask = - theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = - theme->desk_disabled_mask; - theme->a_hover_focused_desk->texture[0].data.mask.mask = - theme->a_hover_unfocused_desk->texture[0].data.mask.mask = - theme->desk_hover_mask; - theme->a_focused_pressed_desk->texture[0].data.mask.mask = - theme->a_unfocused_pressed_desk->texture[0].data.mask.mask = - theme->desk_pressed_mask; - theme->a_focused_unpressed_desk->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = - theme->desk_mask; - theme->a_toggled_hover_focused_desk->texture[0].data.mask.mask = - theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.mask = - theme->desk_toggled_hover_mask; - theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.mask = - theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.mask = - theme->desk_toggled_mask; - theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask = - theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.mask = - theme->desk_toggled_pressed_mask; - theme->a_disabled_focused_shade->texture[0].data.mask.mask = - theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = - theme->shade_disabled_mask; - theme->a_hover_focused_shade->texture[0].data.mask.mask = - theme->a_hover_unfocused_shade->texture[0].data.mask.mask = - theme->shade_hover_mask; - theme->a_focused_pressed_shade->texture[0].data.mask.mask = - theme->a_unfocused_pressed_shade->texture[0].data.mask.mask = - theme->shade_pressed_mask; - theme->a_focused_unpressed_shade->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = - theme->shade_mask; - theme->a_toggled_hover_focused_shade->texture[0].data.mask.mask = - theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.mask = - theme->shade_toggled_hover_mask; - theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.mask = - theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.mask = - theme->shade_toggled_mask; - theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask = - theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.mask = - theme->shade_toggled_pressed_mask; - theme->a_disabled_focused_iconify->texture[0].data.mask.mask = - theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = - theme->iconify_disabled_mask; - theme->a_hover_focused_iconify->texture[0].data.mask.mask = - theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = - theme->iconify_hover_mask; - theme->a_focused_pressed_iconify->texture[0].data.mask.mask = - theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask = - theme->iconify_pressed_mask; - theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = - theme->iconify_mask; + theme->btn_max->a_disabled_focused->texture[0].data.mask.mask = + theme->btn_max->a_disabled_unfocused->texture[0].data.mask.mask = + theme->btn_max->disabled_mask; + theme->btn_max->a_hover_focused->texture[0].data.mask.mask = + theme->btn_max->a_hover_unfocused->texture[0].data.mask.mask = + theme->btn_max->hover_mask; + theme->btn_max->a_focused_pressed->texture[0].data.mask.mask = + theme->btn_max->a_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_max->pressed_mask; + theme->btn_max->a_focused_unpressed->texture[0].data.mask.mask = + theme->btn_max->a_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_max->mask; + theme->btn_max->a_toggled_hover_focused->texture[0].data.mask.mask = + 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_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_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_close->a_hover_focused->texture[0].data.mask.mask = + theme->btn_close->a_hover_unfocused->texture[0].data.mask.mask = + theme->btn_close->hover_mask; + theme->btn_close->a_focused_pressed->texture[0].data.mask.mask = + theme->btn_close->a_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_close->pressed_mask; + theme->btn_close->a_focused_unpressed->texture[0].data.mask.mask = + theme->btn_close->a_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_close->mask; + theme->btn_desk->a_disabled_focused->texture[0].data.mask.mask = + theme->btn_desk->a_disabled_unfocused->texture[0].data.mask.mask = + theme->btn_desk->disabled_mask; + theme->btn_desk->a_hover_focused->texture[0].data.mask.mask = + theme->btn_desk->a_hover_unfocused->texture[0].data.mask.mask = + theme->btn_desk->hover_mask; + theme->btn_desk->a_focused_pressed->texture[0].data.mask.mask = + theme->btn_desk->a_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_desk->pressed_mask; + theme->btn_desk->a_focused_unpressed->texture[0].data.mask.mask = + theme->btn_desk->a_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_desk->mask; + theme->btn_desk->a_toggled_hover_focused->texture[0].data.mask.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_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_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_hover_focused->texture[0].data.mask.mask = + theme->btn_shade->a_hover_unfocused->texture[0].data.mask.mask = + theme->btn_shade->hover_mask; + theme->btn_shade->a_focused_pressed->texture[0].data.mask.mask = + theme->btn_shade->a_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_shade->pressed_mask; + theme->btn_shade->a_focused_unpressed->texture[0].data.mask.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_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_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_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_iconify->a_hover_focused->texture[0].data.mask.mask = + theme->btn_iconify->a_hover_unfocused->texture[0].data.mask.mask = + theme->btn_iconify->hover_mask; + theme->btn_iconify->a_focused_pressed->texture[0].data.mask.mask = + theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.mask = + theme->btn_iconify->pressed_mask; + theme->btn_iconify->a_focused_unpressed->texture[0].data.mask.mask = + theme->btn_iconify->a_unfocused_unpressed->texture[0].data.mask.mask = + theme->btn_iconify->mask; theme->a_menu_bullet_normal->texture[0].data.mask.mask = theme->a_menu_bullet_selected->texture[0].data.mask.mask = theme->menu_bullet_mask; - theme->a_disabled_focused_max->texture[0].data.mask.color = - theme->a_disabled_focused_close->texture[0].data.mask.color = - theme->a_disabled_focused_desk->texture[0].data.mask.color = - theme->a_disabled_focused_shade->texture[0].data.mask.color = - theme->a_disabled_focused_iconify->texture[0].data.mask.color = - theme->titlebut_disabled_focused_color; - theme->a_disabled_unfocused_max->texture[0].data.mask.color = - theme->a_disabled_unfocused_close->texture[0].data.mask.color = - theme->a_disabled_unfocused_desk->texture[0].data.mask.color = - theme->a_disabled_unfocused_shade->texture[0].data.mask.color = - theme->a_disabled_unfocused_iconify->texture[0].data.mask.color = - theme->titlebut_disabled_unfocused_color; - theme->a_hover_focused_max->texture[0].data.mask.color = - theme->a_hover_focused_close->texture[0].data.mask.color = - theme->a_hover_focused_desk->texture[0].data.mask.color = - theme->a_hover_focused_shade->texture[0].data.mask.color = - theme->a_hover_focused_iconify->texture[0].data.mask.color = - theme->titlebut_hover_focused_color; - theme->a_hover_unfocused_max->texture[0].data.mask.color = - theme->a_hover_unfocused_close->texture[0].data.mask.color = - theme->a_hover_unfocused_desk->texture[0].data.mask.color = - theme->a_hover_unfocused_shade->texture[0].data.mask.color = - theme->a_hover_unfocused_iconify->texture[0].data.mask.color = - theme->titlebut_hover_unfocused_color; - theme->a_toggled_hover_focused_max->texture[0].data.mask.color = - theme->a_toggled_hover_focused_desk->texture[0].data.mask.color = - theme->a_toggled_hover_focused_shade->texture[0].data.mask.color = - theme->titlebut_toggled_hover_focused_color; - theme->a_toggled_hover_unfocused_max->texture[0].data.mask.color = - theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.color = - theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.color = - theme->titlebut_toggled_hover_unfocused_color; - theme->a_toggled_focused_unpressed_max->texture[0].data.mask.color = - theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.color = - theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.color = - theme->titlebut_toggled_focused_unpressed_color; - theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.color = - theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.color = - theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.color= - theme->titlebut_toggled_unfocused_unpressed_color; - theme->a_toggled_focused_pressed_max->texture[0].data.mask.color = - theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color = - theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color = - theme->titlebut_toggled_focused_pressed_color; - theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.color = - theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.color = - theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.color = - theme->titlebut_toggled_unfocused_pressed_color; - theme->a_focused_unpressed_max->texture[0].data.mask.color = - theme->a_focused_unpressed_close->texture[0].data.mask.color = - theme->a_focused_unpressed_desk->texture[0].data.mask.color = - theme->a_focused_unpressed_shade->texture[0].data.mask.color = - theme->a_focused_unpressed_iconify->texture[0].data.mask.color = - theme->titlebut_focused_unpressed_color; - theme->a_focused_pressed_max->texture[0].data.mask.color = - theme->a_focused_pressed_close->texture[0].data.mask.color = - theme->a_focused_pressed_desk->texture[0].data.mask.color = - theme->a_focused_pressed_shade->texture[0].data.mask.color = - theme->a_focused_pressed_iconify->texture[0].data.mask.color = - theme->titlebut_focused_pressed_color; - theme->a_unfocused_unpressed_max->texture[0].data.mask.color = - theme->a_unfocused_unpressed_close->texture[0].data.mask.color = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = - theme->titlebut_unfocused_unpressed_color; - theme->a_unfocused_pressed_max->texture[0].data.mask.color = - theme->a_unfocused_pressed_close->texture[0].data.mask.color = - theme->a_unfocused_pressed_desk->texture[0].data.mask.color = - theme->a_unfocused_pressed_shade->texture[0].data.mask.color = - theme->a_unfocused_pressed_iconify->texture[0].data.mask.color = - theme->titlebut_unfocused_pressed_color; + theme->btn_max->a_disabled_focused->texture[0].data.mask.color = + theme->btn_max->disabled_focused_color; + theme->btn_close->a_disabled_focused->texture[0].data.mask.color = + theme->btn_close->disabled_focused_color; + theme->btn_desk->a_disabled_focused->texture[0].data.mask.color = + theme->btn_desk->disabled_focused_color; + theme->btn_shade->a_disabled_focused->texture[0].data.mask.color = + theme->btn_shade->disabled_focused_color; + theme->btn_iconify->a_disabled_focused->texture[0].data.mask.color = + theme->btn_iconify->disabled_focused_color; + theme->btn_max->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_max->disabled_unfocused_color; + theme->btn_close->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_close->disabled_unfocused_color; + theme->btn_desk->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_desk->disabled_unfocused_color; + theme->btn_shade->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_shade->disabled_unfocused_color; + theme->btn_iconify->a_disabled_unfocused->texture[0].data.mask.color = + theme->btn_iconify->disabled_unfocused_color; + theme->btn_max->a_hover_focused->texture[0].data.mask.color = + theme->btn_max->hover_focused_color; + theme->btn_close->a_hover_focused->texture[0].data.mask.color = + theme->btn_close->hover_focused_color; + theme->btn_desk->a_hover_focused->texture[0].data.mask.color = + theme->btn_desk->hover_focused_color; + theme->btn_shade->a_hover_focused->texture[0].data.mask.color = + theme->btn_shade->hover_focused_color; + theme->btn_iconify->a_hover_focused->texture[0].data.mask.color = + theme->btn_iconify->hover_focused_color; + theme->btn_max->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_max->hover_unfocused_color; + theme->btn_close->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_close->hover_unfocused_color; + theme->btn_desk->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_desk->hover_unfocused_color; + theme->btn_shade->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_shade->hover_unfocused_color; + theme->btn_iconify->a_hover_unfocused->texture[0].data.mask.color = + theme->btn_iconify->hover_unfocused_color; + theme->btn_max->a_toggled_hover_focused->texture[0].data.mask.color = + theme->btn_max->toggled_hover_focused_color; + theme->btn_desk->a_toggled_hover_focused->texture[0].data.mask.color = + theme->btn_desk->toggled_hover_focused_color; + theme->btn_shade->a_toggled_hover_focused->texture[0].data.mask.color = + theme->btn_shade->toggled_hover_focused_color; + theme->btn_max->a_toggled_hover_unfocused->texture[0].data.mask.color = + theme->btn_max->toggled_hover_unfocused_color; + theme->btn_desk->a_toggled_hover_unfocused->texture[0].data.mask.color = + theme->btn_desk->toggled_hover_unfocused_color; + theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.color = + theme->btn_shade->toggled_hover_unfocused_color; + theme->btn_max->a_toggled_focused_unpressed->texture[0].data.mask.color = + theme->btn_max->toggled_focused_unpressed_color; + theme->btn_desk->a_toggled_focused_unpressed->texture[0].data.mask.color = + theme->btn_desk->toggled_focused_unpressed_color; + theme->btn_shade->a_toggled_focused_unpressed->texture[0].data.mask.color = + 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_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_desk->toggled_focused_pressed_color; + theme->btn_shade->a_toggled_focused_pressed->texture[0].data.mask.color = + theme->btn_shade->toggled_focused_pressed_color; + theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.color = + theme->btn_max->toggled_unfocused_pressed_color; + theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.color = + theme->btn_desk->toggled_unfocused_pressed_color; + theme->btn_shade->a_toggled_unfocused_pressed->texture[0].data.mask.color = + theme->btn_shade->toggled_unfocused_pressed_color; + theme->btn_max->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_max->focused_unpressed_color; + theme->btn_close->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_close->focused_unpressed_color; + theme->btn_desk->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_desk->focused_unpressed_color; + theme->btn_shade->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_shade->focused_unpressed_color; + theme->btn_iconify->a_focused_unpressed->texture[0].data.mask.color = + theme->btn_iconify->focused_unpressed_color; + theme->btn_max->a_focused_pressed->texture[0].data.mask.color = + theme->btn_max->focused_pressed_color; + theme->btn_close->a_focused_pressed->texture[0].data.mask.color = + theme->btn_close->focused_pressed_color; + theme->btn_desk->a_focused_pressed->texture[0].data.mask.color = + theme->btn_desk->focused_pressed_color; + theme->btn_shade->a_focused_pressed->texture[0].data.mask.color = + theme->btn_shade->focused_pressed_color; + theme->btn_iconify->a_focused_pressed->texture[0].data.mask.color = + theme->btn_iconify->focused_pressed_color; + theme->btn_max->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_max->unfocused_unpressed_color; + theme->btn_close->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_close->unfocused_unpressed_color; + theme->btn_desk->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_desk->unfocused_unpressed_color; + theme->btn_shade->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_shade->unfocused_unpressed_color; + theme->btn_iconify->a_unfocused_unpressed->texture[0].data.mask.color = + theme->btn_iconify->unfocused_unpressed_color; + theme->btn_max->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_max->unfocused_pressed_color; + theme->btn_close->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_close->unfocused_pressed_color; + theme->btn_desk->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_desk->unfocused_pressed_color; + theme->btn_shade->a_unfocused_pressed->texture[0].data.mask.color = + theme->btn_shade->unfocused_pressed_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); @@ -1467,6 +1539,12 @@ void RrThemeFree(RrTheme *theme) if (theme) { g_free(theme->name); + RrButtonFree(theme->btn_max); + RrButtonFree(theme->btn_close); + RrButtonFree(theme->btn_desk); + RrButtonFree(theme->btn_shade); + RrButtonFree(theme->btn_iconify); + RrColorFree(theme->menu_border_color); RrColorFree(theme->osd_border_color); RrColorFree(theme->frame_focused_border_color); @@ -1494,6 +1572,8 @@ void RrThemeFree(RrTheme *theme) 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); @@ -1510,36 +1590,7 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_text_disabled_selected_shadow_color); g_free(theme->def_win_icon); - - RrPixmapMaskFree(theme->max_mask); - RrPixmapMaskFree(theme->max_toggled_mask); - RrPixmapMaskFree(theme->max_toggled_hover_mask); - RrPixmapMaskFree(theme->max_toggled_pressed_mask); - RrPixmapMaskFree(theme->max_disabled_mask); - RrPixmapMaskFree(theme->max_hover_mask); - RrPixmapMaskFree(theme->max_pressed_mask); - RrPixmapMaskFree(theme->desk_mask); - RrPixmapMaskFree(theme->desk_toggled_mask); - RrPixmapMaskFree(theme->desk_toggled_hover_mask); - RrPixmapMaskFree(theme->desk_toggled_pressed_mask); - RrPixmapMaskFree(theme->desk_disabled_mask); - RrPixmapMaskFree(theme->desk_hover_mask); - RrPixmapMaskFree(theme->desk_pressed_mask); - RrPixmapMaskFree(theme->shade_mask); - RrPixmapMaskFree(theme->shade_toggled_mask); - RrPixmapMaskFree(theme->shade_toggled_hover_mask); - RrPixmapMaskFree(theme->shade_toggled_pressed_mask); - RrPixmapMaskFree(theme->shade_disabled_mask); - RrPixmapMaskFree(theme->shade_hover_mask); - RrPixmapMaskFree(theme->shade_pressed_mask); - RrPixmapMaskFree(theme->iconify_mask); - RrPixmapMaskFree(theme->iconify_disabled_mask); - RrPixmapMaskFree(theme->iconify_hover_mask); - RrPixmapMaskFree(theme->iconify_pressed_mask); - RrPixmapMaskFree(theme->close_mask); - RrPixmapMaskFree(theme->close_disabled_mask); - RrPixmapMaskFree(theme->close_hover_mask); - RrPixmapMaskFree(theme->close_pressed_mask); + RrPixmapMaskFree(theme->menu_bullet_mask); RrPixmapMaskFree(theme->down_arrow_mask); RrPixmapMaskFree(theme->up_arrow_mask); @@ -1551,64 +1602,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); @@ -1986,3 +1979,162 @@ static RrPixel32* read_c_image(gint width, gint height, const guint8 *data) return im; } + +static void read_button_colors(XrmDatabase db, const RrInstance *inst, + const RrTheme *theme, RrButton *btn, + const gchar *btnname) +{ + gchar *temp, *temp2, *stemp, *stemp2; + + /* 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, + RrColorCopy(theme->titlebut_focused_unpressed_color)); + + g_free(temp2); + + /* 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, + RrColorCopy(theme->titlebut_unfocused_unpressed_color)); + + g_free(temp2); + + /* 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, + RrColorCopy(theme->titlebut_focused_pressed_color)); + + g_free(temp2); + + /* 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, + RrColorCopy(theme->titlebut_unfocused_pressed_color)); + + g_free(temp2); + + /* 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, + RrColorCopy(theme->titlebut_disabled_focused_color)); + + g_free(temp2); + + /* 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, + RrColorCopy(theme->titlebut_disabled_unfocused_color)); + + g_free(temp2); + + /* 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, + RrColorCopy(theme->titlebut_hover_focused_color)); + + g_free(temp2); + + /* 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, + RrColorCopy(theme->titlebut_hover_unfocused_color)); + + g_free(temp2); + + /* 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); + + /* 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); + + /* 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, + RrColorCopy(theme->titlebut_toggled_hover_focused_color)); + + g_free(temp2); + + /* 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, + RrColorCopy(theme->titlebut_toggled_hover_unfocused_color)); + + g_free(temp2); + + /* 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, + RrColorCopy(theme->titlebut_toggled_focused_pressed_color)); + + g_free(temp2); + + /* 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, + RrColorCopy(theme->titlebut_toggled_unfocused_pressed_color)); + + g_free(temp2); +} + +