X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=ca3283a27807efdbfe6cdd07e9c237950fd66d43;hb=ede531da35b7ef5c91ae9bde531c35528bfad423;hp=e8f0e88474bc3751595a558c1f5be4dc0dd04d8e;hpb=4d9bd88f12d917ee105ccde0a3b5ed87bf0788ad;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index e8f0e884..ca3283a2 100644 --- a/render/theme.c +++ b/render/theme.c @@ -39,12 +39,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_max = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_max = RrAppearanceNew(inst, 1); theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_set_max = RrAppearanceNew(inst, 1); theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_set_max = RrAppearanceNew(inst, 1); theme->a_focused_grip = RrAppearanceNew(inst, 0); theme->a_unfocused_grip = RrAppearanceNew(inst, 0); theme->a_focused_title = RrAppearanceNew(inst, 0); @@ -59,6 +59,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_menu_item = RrAppearanceNew(inst, 1); theme->a_menu_disabled = RrAppearanceNew(inst, 1); theme->a_menu_hilite = RrAppearanceNew(inst, 1); + theme->a_clear = RrAppearanceNew(inst, 0); theme->app_hilite_bg = RrAppearanceNew(inst, 0); theme->app_unhilite_bg = RrAppearanceNew(inst, 0); @@ -219,6 +220,22 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_unfocused_unpressed_color->r, theme->titlebut_unfocused_unpressed_color->g, theme->titlebut_unfocused_unpressed_color->b); + if (!read_color(db, inst, + "window.button.toggled.focus.picColor", + &theme->titlebut_toggled_focused_color)) + theme->titlebut_toggled_focused_color = + RrColorNew(inst, + theme->titlebut_focused_pressed_color->r, + theme->titlebut_focused_pressed_color->g, + theme->titlebut_focused_pressed_color->b); + if (!read_color(db, inst, + "window.button.toggled.unfocus.picColor", + &theme->titlebut_toggled_unfocused_color)) + theme->titlebut_toggled_unfocused_color = + RrColorNew(inst, + theme->titlebut_unfocused_pressed_color->r, + theme->titlebut_unfocused_pressed_color->g, + theme->titlebut_unfocused_pressed_color->b); if (!read_color(db, inst, "menu.title.textColor", &theme->menu_title_color)) theme->menu_title_color = RrColorNew(inst, 0, 0, 0); @@ -232,61 +249,147 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "menu.hilite.textColor", &theme->menu_hilite_color)) theme->menu_hilite_color = RrColorNew(inst, 0, 0, 0); - if (read_mask(inst, "max.xbm", theme, &theme->max_unset_mask)){ - if (!read_mask(inst, "max_t.xbm", theme, &theme->max_set_mask)) { - theme->max_set_mask = RrPixmapMaskCopy(theme->max_unset_mask); + if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) { + if (!read_mask(inst, "max_pressed.xbm", theme, + &theme->max_pressed_mask)) { + theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); + } + if (!read_mask(inst, "max_toggled.xbm", theme, + &theme->max_toggled_mask)) { + theme->max_toggled_mask = + RrPixmapMaskCopy(theme->max_pressed_mask); } - } else { + if (!read_mask(inst, "max_disabled.xbm", theme, + &theme->max_disabled_mask)) { + theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); + } + if (!read_mask(inst, "max_hover.xbm", theme, &theme->max_hover_mask)) { + theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); + } + } else { { char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; - theme->max_unset_mask = RrPixmapMaskNew(inst, 7, 7, data); + theme->max_mask = RrPixmapMaskNew(inst, 7, 7, data); } { char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; - theme->max_set_mask = RrPixmapMaskNew(inst, 7, 7, data); + theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data); } + theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); + theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); + theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); } - if (!read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) { - char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; - theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data); + if (read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) { + if (!read_mask(inst, "iconify_pressed.xbm", theme, + &theme->iconify_pressed_mask)) { + theme->iconify_pressed_mask = + RrPixmapMaskCopy(theme->iconify_mask); + } + if (!read_mask(inst, "iconify_disabled.xbm", theme, + &theme->iconify_disabled_mask)) { + theme->iconify_disabled_mask = + RrPixmapMaskCopy(theme->iconify_mask); + } + if (!read_mask(inst, "iconify_hover.xbm", theme, + &theme->iconify_hover_mask)) { + theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); + } + } else { + { + char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; + theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask); + theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask); + theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); } - if (read_mask(inst, "stick.xbm", theme, &theme->desk_unset_mask)) { - if (!read_mask(inst, "stick_t.xbm", theme, &theme->desk_set_mask)) { - theme->desk_set_mask = - RrPixmapMaskCopy(theme->desk_unset_mask); + if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) { + if (!read_mask(inst, "desk_pressed.xbm", theme, + &theme->desk_pressed_mask)) { + theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); + } + if (!read_mask(inst, "desk_toggled.xbm", theme, + &theme->desk_toggled_mask)) { + theme->desk_toggled_mask = + RrPixmapMaskCopy(theme->desk_pressed_mask); + } + if (!read_mask(inst, "desk_disabled.xbm", theme, + &theme->desk_disabled_mask)) { + theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); + } + if (!read_mask(inst, "desk_hover.xbm", theme, + &theme->desk_hover_mask)) { + theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); } } else { { char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; - theme->desk_unset_mask = RrPixmapMaskNew(inst, 7, 7, data); + theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, data); } { char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 }; - theme->desk_set_mask = RrPixmapMaskNew(inst, 7, 7, data); + theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data); } + theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); + theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); + theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); } - if (read_mask(inst, "shade.xbm", theme, &theme->shade_unset_mask)) { - if (!read_mask(inst, "shade_t.xbm", theme, &theme->shade_set_mask)) { - theme->shade_set_mask = - RrPixmapMaskCopy(theme->shade_unset_mask); + if (read_mask(inst, "shade.xbm", theme, &theme->shade_mask)) { + if (!read_mask(inst, "shade_pressed.xbm", theme, + &theme->shade_pressed_mask)) { + theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); + } + if (!read_mask(inst, "shade_toggled.xbm", theme, + &theme->shade_toggled_mask)) { + theme->shade_toggled_mask = + RrPixmapMaskCopy(theme->shade_pressed_mask); + } + if (!read_mask(inst, "shade_disabled.xbm", theme, + &theme->shade_disabled_mask)) { + theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); + } + if (!read_mask(inst, "shade_hover.xbm", theme, + &theme->shade_hover_mask)) { + theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); } } else { { char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; - theme->shade_unset_mask = RrPixmapMaskNew(inst, 7, 7, data); + theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, data); } { char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f }; - theme->shade_set_mask = RrPixmapMaskNew(inst, 7, 7, data); + theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data); } + theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); + theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); + theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); } - if (!read_mask(inst, "close.xbm", theme, &theme->close_mask)) { - char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; - theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data); + if (read_mask(inst, "close.xbm", theme, &theme->close_mask)) { + if (!read_mask(inst, "close_pressed.xbm", theme, + &theme->close_pressed_mask)) { + theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); + } + if (!read_mask(inst, "close_disabled.xbm", theme, + &theme->close_disabled_mask)) { + theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); + } + if (!read_mask(inst, "close_hover.xbm", theme, + &theme->close_hover_mask)) { + theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); + } + } else { + { + char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; + theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data); + } + theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); + theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); + theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); } /* read the decoration textures */ @@ -368,20 +471,24 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "window.button.pressed.focus", theme->a_focused_pressed_max, TRUE)) - if (!read_appearance(db, inst, - "window.button.pressed", - theme->a_focused_pressed_max, - TRUE)) - set_default_appearance(theme->a_focused_pressed_max); + set_default_appearance(theme->a_focused_pressed_max); if (!read_appearance(db, inst, "window.button.pressed.unfocus", theme->a_unfocused_pressed_max, TRUE)) - if (!read_appearance(db, inst, - "window.button.pressed", - theme->a_unfocused_pressed_max, - TRUE)) - set_default_appearance(theme->a_unfocused_pressed_max); + set_default_appearance(theme->a_unfocused_pressed_max); + if (!read_appearance(db, inst, + "window.button.toggled.focus", + theme->a_toggled_focused_max, + TRUE)) + theme->a_toggled_focused_max = + RrAppearanceCopy(theme->a_focused_pressed_max); + if (!read_appearance(db, inst, + "window.button.toggled.unfocus", + theme->a_toggled_unfocused_max, + TRUE)) + theme->a_toggled_unfocused_max = + RrAppearanceCopy(theme->a_unfocused_pressed_max); if (!read_appearance(db, inst, "window.button.focus", theme->a_focused_unpressed_max, @@ -428,19 +535,19 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_hover_focused_desk = RrAppearanceCopy(theme->a_hover_focused_max); theme->a_hover_unfocused_desk = - RrAppearanceCopy(theme->a_hover_unfocused_max); + RrAppearanceCopy(theme->a_hover_unfocused_max); + theme->a_toggled_focused_desk = + RrAppearanceCopy(theme->a_toggled_focused_max); + theme->a_toggled_unfocused_desk = + RrAppearanceCopy(theme->a_toggled_unfocused_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_unfocused_pressed_set_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_focused_pressed_set_desk = - RrAppearanceCopy(theme->a_focused_pressed_max); theme->a_disabled_focused_shade = RrAppearanceCopy(theme->a_disabled_focused_max); theme->a_disabled_unfocused_shade = @@ -449,18 +556,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RrAppearanceCopy(theme->a_hover_focused_max); theme->a_hover_unfocused_shade = RrAppearanceCopy(theme->a_hover_unfocused_max); + theme->a_toggled_focused_shade = + RrAppearanceCopy(theme->a_toggled_focused_max); + theme->a_toggled_unfocused_shade = + RrAppearanceCopy(theme->a_toggled_unfocused_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_unfocused_pressed_set_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_focused_pressed_set_shade = - RrAppearanceCopy(theme->a_focused_pressed_max); theme->a_disabled_focused_iconify = RrAppearanceCopy(theme->a_disabled_focused_max); theme->a_disabled_unfocused_iconify = @@ -477,12 +584,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RrAppearanceCopy(theme->a_focused_unpressed_max); theme->a_focused_pressed_iconify = RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_unfocused_pressed_set_max = - RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_focused_pressed_set_max = - RrAppearanceCopy(theme->a_focused_pressed_max); theme->a_icon->surface.grad = RR_SURFACE_PARENTREL; + theme->a_clear->surface.grad = RR_SURFACE_PARENTREL; /* set up the textures */ theme->a_focused_label->texture[0].type = @@ -533,12 +637,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_focused_max->texture[0].type = + theme->a_toggled_unfocused_max->texture[0].type = theme->a_focused_unpressed_max->texture[0].type = theme->a_focused_pressed_max->texture[0].type = - theme->a_focused_pressed_set_max->texture[0].type = theme->a_unfocused_unpressed_max->texture[0].type = theme->a_unfocused_pressed_max->texture[0].type = - theme->a_unfocused_pressed_set_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 = @@ -551,22 +655,22 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_focused_desk->texture[0].type = + theme->a_toggled_unfocused_desk->texture[0].type = theme->a_focused_unpressed_desk->texture[0].type = theme->a_focused_pressed_desk->texture[0].type = - theme->a_focused_pressed_set_desk->texture[0].type = theme->a_unfocused_unpressed_desk->texture[0].type = theme->a_unfocused_pressed_desk->texture[0].type = - theme->a_unfocused_pressed_set_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_focused_shade->texture[0].type = + theme->a_toggled_unfocused_shade->texture[0].type = theme->a_focused_unpressed_shade->texture[0].type = theme->a_focused_pressed_shade->texture[0].type = - theme->a_focused_pressed_set_shade->texture[0].type = theme->a_unfocused_unpressed_shade->texture[0].type = theme->a_unfocused_pressed_shade->texture[0].type = - theme->a_unfocused_pressed_set_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 = @@ -577,57 +681,72 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_unfocused_pressed_iconify->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->a_hover_focused_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->a_focused_unpressed_max->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = - theme->a_focused_pressed_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_unset_mask; - theme->a_focused_pressed_set_max->texture[0].data.mask.mask = - theme->a_unfocused_pressed_set_max->texture[0].data.mask.mask = - theme->max_set_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_focused_max->texture[0].data.mask.mask = + theme->a_toggled_unfocused_max->texture[0].data.mask.mask = + theme->max_toggled_mask; theme->a_disabled_focused_close->texture[0].data.mask.mask = theme->a_disabled_unfocused_close->texture[0].data.mask.mask = - theme->a_hover_focused_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->a_focused_pressed_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->a_focused_unpressed_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->a_hover_focused_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->a_focused_unpressed_desk->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = - theme->a_focused_pressed_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_unset_mask; - theme->a_focused_pressed_set_desk->texture[0].data.mask.mask = - theme->a_unfocused_pressed_set_desk->texture[0].data.mask.mask = - theme->desk_set_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_focused_desk->texture[0].data.mask.mask = + theme->a_toggled_unfocused_desk->texture[0].data.mask.mask = + theme->desk_toggled_mask; theme->a_disabled_focused_shade->texture[0].data.mask.mask = theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = - theme->a_hover_focused_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->a_focused_unpressed_shade->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = - theme->a_focused_pressed_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_unset_mask; - theme->a_focused_pressed_set_shade->texture[0].data.mask.mask = - theme->a_unfocused_pressed_set_shade->texture[0].data.mask.mask = - theme->shade_set_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_focused_shade->texture[0].data.mask.mask = + theme->a_toggled_unfocused_shade->texture[0].data.mask.mask = + theme->shade_toggled_mask; theme->a_disabled_focused_iconify->texture[0].data.mask.mask = theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = - theme->a_hover_focused_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->a_focused_unpressed_iconify->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = - theme->a_focused_pressed_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->a_disabled_focused_max->texture[0].data.mask.color = theme->a_disabled_focused_close->texture[0].data.mask.color = @@ -653,6 +772,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_focused_max->texture[0].data.mask.color = + theme->a_toggled_focused_desk->texture[0].data.mask.color = + theme->a_toggled_focused_shade->texture[0].data.mask.color = + theme->titlebut_toggled_focused_color; + theme->a_toggled_unfocused_max->texture[0].data.mask.color = + theme->a_toggled_unfocused_desk->texture[0].data.mask.color = + theme->a_toggled_unfocused_shade->texture[0].data.mask.color = + theme->titlebut_toggled_unfocused_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 = @@ -660,12 +787,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_set_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_set_desk->texture[0].data.mask.color = theme->a_focused_pressed_shade->texture[0].data.mask.color = - theme->a_focused_pressed_set_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 = @@ -675,12 +799,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_set_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_set_desk->texture[0].data.mask.color = theme->a_unfocused_pressed_shade->texture[0].data.mask.color = - theme->a_unfocused_pressed_set_shade->texture[0].data.mask.color = theme->a_unfocused_pressed_iconify->texture[0].data.mask.color = theme->titlebut_unfocused_pressed_color; @@ -708,6 +829,8 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->titlebut_disabled_unfocused_color); RrColorFree(theme->titlebut_hover_focused_color); RrColorFree(theme->titlebut_hover_unfocused_color); + RrColorFree(theme->titlebut_toggled_focused_color); + RrColorFree(theme->titlebut_toggled_unfocused_color); RrColorFree(theme->titlebut_unfocused_pressed_color); RrColorFree(theme->titlebut_focused_pressed_color); RrColorFree(theme->titlebut_unfocused_unpressed_color); @@ -717,14 +840,29 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_disabled_color); RrColorFree(theme->menu_hilite_color); - RrPixmapMaskFree(theme->max_set_mask); - RrPixmapMaskFree(theme->max_unset_mask); - RrPixmapMaskFree(theme->desk_set_mask); - RrPixmapMaskFree(theme->desk_unset_mask); - RrPixmapMaskFree(theme->shade_set_mask); - RrPixmapMaskFree(theme->shade_unset_mask); + RrPixmapMaskFree(theme->max_mask); + RrPixmapMaskFree(theme->max_toggled_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_disabled_mask); + RrPixmapMaskFree(theme->desk_hover_mask); + RrPixmapMaskFree(theme->desk_pressed_mask); + RrPixmapMaskFree(theme->shade_mask); + RrPixmapMaskFree(theme->shade_toggled_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); RrFontClose(theme->winfont); RrFontClose(theme->mtitlefont); @@ -734,12 +872,12 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_disabled_unfocused_max); RrAppearanceFree(theme->a_hover_focused_max); RrAppearanceFree(theme->a_hover_unfocused_max); + RrAppearanceFree(theme->a_toggled_focused_max); + RrAppearanceFree(theme->a_toggled_unfocused_max); RrAppearanceFree(theme->a_focused_unpressed_max); RrAppearanceFree(theme->a_focused_pressed_max); - RrAppearanceFree(theme->a_focused_pressed_set_max); RrAppearanceFree(theme->a_unfocused_unpressed_max); RrAppearanceFree(theme->a_unfocused_pressed_max); - RrAppearanceFree(theme->a_unfocused_pressed_set_max); RrAppearanceFree(theme->a_disabled_focused_close); RrAppearanceFree(theme->a_disabled_unfocused_close); RrAppearanceFree(theme->a_hover_focused_close); @@ -752,6 +890,8 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_disabled_unfocused_desk); RrAppearanceFree(theme->a_hover_focused_desk); RrAppearanceFree(theme->a_hover_unfocused_desk); + RrAppearanceFree(theme->a_toggled_focused_desk); + RrAppearanceFree(theme->a_toggled_unfocused_desk); RrAppearanceFree(theme->a_focused_unpressed_desk); RrAppearanceFree(theme->a_focused_pressed_desk); RrAppearanceFree(theme->a_unfocused_unpressed_desk); @@ -760,6 +900,8 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_disabled_unfocused_shade); RrAppearanceFree(theme->a_hover_focused_shade); RrAppearanceFree(theme->a_hover_unfocused_shade); + RrAppearanceFree(theme->a_toggled_focused_shade); + RrAppearanceFree(theme->a_toggled_unfocused_shade); RrAppearanceFree(theme->a_focused_unpressed_shade); RrAppearanceFree(theme->a_focused_pressed_shade); RrAppearanceFree(theme->a_unfocused_unpressed_shade); @@ -786,6 +928,7 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_menu_item); RrAppearanceFree(theme->a_menu_disabled); RrAppearanceFree(theme->a_menu_hilite); + RrAppearanceFree(theme->a_clear); RrAppearanceFree(theme->app_hilite_bg); RrAppearanceFree(theme->app_unhilite_bg); RrAppearanceFree(theme->app_hilite_label); @@ -798,19 +941,19 @@ static XrmDatabase loaddb(RrTheme *theme, char *name) { XrmDatabase db; - char *s = g_build_filename(name, "themerc", NULL); + char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes", + name, "themerc", NULL); if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s); if (db == NULL) { - char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - name, "themerc", NULL); + char *s = g_build_filename(THEMEDIR, name, "themerc", NULL); if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s); } if (db == NULL) { - char *s = g_build_filename(THEMEDIR, name, "themerc", NULL); + char *s = g_build_filename(name, "themerc", NULL); if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s); @@ -900,28 +1043,12 @@ static gboolean read_mask(const RrInstance *inst, unsigned int w, h; unsigned char *b; - s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - theme->name, maskname, NULL); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) + s = g_build_filename(theme->path, maskname, NULL); + if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) { ret = TRUE; - else { - g_free(s); - s = g_build_filename(THEMEDIR, theme->name, maskname, NULL); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) - ret = TRUE; - else { - g_free(s); - s = g_build_filename(theme->path, maskname, NULL); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) - ret = TRUE; - } - } - - if (ret) { *value = RrPixmapMaskNew(inst, w, h, (char*)b); XFree(b); } - g_free(s); return ret;