X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=29f0663ccb26b53c12fa91723b5557ecdafc507f;hb=e9a8e272c06fd0cc1a2d93418d261886e786b16f;hp=4f86c8d062ea02a344b9403c371e0d9a137cd0cf;hpb=1e882b62718e4d6a4a149b415964646ad424fbfd;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 4f86c8d0..29f0663c 100644 --- a/render/theme.c +++ b/render/theme.c @@ -7,13 +7,13 @@ #include #include -static XrmDatabase loaddb(char *theme); +static XrmDatabase loaddb(RrTheme *theme, char *name); static gboolean read_int(XrmDatabase db, char *rname, int *value); static gboolean read_string(XrmDatabase db, char *rname, char **value); static gboolean read_color(XrmDatabase db, const RrInstance *inst, gchar *rname, RrColor **value); -static gboolean read_mask(XrmDatabase db, const RrInstance *inst, - gchar *rname, gchar *theme, +static gboolean read_mask(const RrInstance *inst, + gchar *maskname, RrTheme *theme, RrPixmapMask **value); static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, gchar *rname, RrAppearance *value); @@ -31,44 +31,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->inst = inst; - theme->b_color = theme->cb_unfocused_color = theme->cb_focused_color = - theme->title_unfocused_color = theme->title_focused_color = - theme->titlebut_unfocused_color = theme->titlebut_focused_color = - theme->menu_color = theme->menu_title_color = - theme->menu_disabled_color = theme->menu_hilite_color = NULL; - theme->winfont = theme->mtitlefont = theme->mfont = NULL; - theme->title_layout = NULL; - theme->max_set_mask = theme->max_unset_mask = NULL; - theme->desk_set_mask = theme->desk_unset_mask = NULL; - theme->shade_set_mask = theme->shade_unset_mask = NULL; - theme->iconify_mask = theme->close_mask = NULL; - + theme->a_disabled_focused_max = RrAppearanceNew(inst, 1); + theme->a_disabled_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_unpressed_close = NULL; - theme->a_focused_pressed_close = NULL; - theme->a_unfocused_unpressed_close = NULL; - theme->a_unfocused_pressed_close = NULL; - theme->a_focused_unpressed_desk = NULL; - theme->a_focused_pressed_desk = NULL; - theme->a_focused_pressed_set_desk = NULL; - theme->a_unfocused_unpressed_desk = NULL; - theme->a_unfocused_pressed_desk = NULL; - theme->a_unfocused_pressed_set_desk = NULL; - theme->a_focused_unpressed_shade = NULL; - theme->a_focused_pressed_shade = NULL; - theme->a_focused_pressed_set_shade = NULL; - theme->a_unfocused_unpressed_shade = NULL; - theme->a_unfocused_pressed_shade = NULL; - theme->a_unfocused_pressed_set_shade = NULL; - theme->a_focused_unpressed_iconify = NULL; - theme->a_focused_pressed_iconify = NULL; - theme->a_unfocused_unpressed_iconify = NULL; - theme->a_unfocused_pressed_iconify = NULL; theme->a_focused_grip = RrAppearanceNew(inst, 0); theme->a_unfocused_grip = RrAppearanceNew(inst, 0); theme->a_focused_title = RrAppearanceNew(inst, 0); @@ -91,46 +61,31 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->app_icon = RrAppearanceNew(inst, 1); if (name) { - db = loaddb(name); + db = loaddb(theme, name); if (db == NULL) { g_warning("Failed to load the theme '%s'", name); g_message("Falling back to the default: '%s'", DEFAULT_THEME); } else - theme->name = g_strdup(name); + theme->name = g_path_get_basename(name); } if (db == NULL) { - db = loaddb(DEFAULT_THEME); + db = loaddb(theme, DEFAULT_THEME); if (db == NULL) { g_warning("Failed to load the theme '%s'.", DEFAULT_THEME); return NULL; } else - theme->name = g_strdup(DEFAULT_THEME); + theme->name = g_path_get_basename(DEFAULT_THEME); } /* load the font stuff */ - font_str = "arial:bold:pixelsize=10"; - - theme->winfont_shadow = FALSE; - if (read_string(db, "window.xft.flags", &str)) { - if (g_strrstr(str, "shadow")) - theme->winfont_shadow = TRUE; - g_free(str); - } - - if (!read_int(db, "window.xft.shadow.offset", - &theme->winfont_shadow_offset)) - theme->winfont_shadow_offset = 1; - if (!read_int(db, "window.xft.shadow.tint", - &theme->winfont_shadow_tint) || - theme->winfont_shadow_tint < 100 || theme->winfont_shadow_tint > 100) - theme->winfont_shadow_tint = 25; + if (!read_string(db, "window.title.xftfont", &font_str)) + font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50"; if (!(theme->winfont = RrFontOpen(inst, font_str))) { RrThemeFree(theme); return NULL; } - theme->winfont_height = RrFontHeight(theme->winfont, theme->winfont_shadow, - theme->winfont_shadow_offset); + theme->winfont_height = RrFontHeight(theme->winfont); winjust = RR_JUSTIFY_LEFT; if (read_string(db, "window.justify", &str)) { @@ -138,34 +93,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) winjust = RR_JUSTIFY_RIGHT; else if (!g_ascii_strcasecmp(str, "center")) winjust = RR_JUSTIFY_CENTER; - g_free(str); } - font_str = "arial-10:bold"; - - theme->mtitlefont_shadow = FALSE; - if (read_string(db, "menu.title.xft.flags", &str)) { - if (g_strrstr(str, "shadow")) - theme->mtitlefont_shadow = TRUE; - g_free(str); - } - - if (!read_int(db, "menu.title.xft.shadow.offset", - &theme->mtitlefont_shadow_offset)) - theme->mtitlefont_shadow_offset = 1; - if (!read_int(db, "menu.title.xft.shadow.tint", - &theme->mtitlefont_shadow_tint) || - theme->mtitlefont_shadow_tint < 100 || - theme->mtitlefont_shadow_tint > 100) - theme->mtitlefont_shadow_tint = 25; + if (!read_string(db, "menu.title.xftfont", &font_str)) + font_str = "arial,sans:bold:pixelsize=12:shadow=y"; if (!(theme->mtitlefont = RrFontOpen(inst, font_str))) { RrThemeFree(theme); return NULL; } - theme->mtitlefont_height = RrFontHeight(theme->mtitlefont, - theme->mtitlefont_shadow, - theme->mtitlefont_shadow_offset); + theme->mtitlefont_height = RrFontHeight(theme->mtitlefont); mtitlejust = RR_JUSTIFY_LEFT; if (read_string(db, "menu.title.justify", &str)) { @@ -173,33 +110,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) mtitlejust = RR_JUSTIFY_RIGHT; else if (!g_ascii_strcasecmp(str, "center")) mtitlejust = RR_JUSTIFY_CENTER; - g_free(str); } - font_str = "arial-8"; - - theme->mfont_shadow = FALSE; - if (read_string(db, "menu.frame.xft.flags", &str)) { - if (g_strrstr(str, "shadow")) - theme->mfont_shadow = TRUE; - g_free(str); - } - - if (!read_int(db, "menu.frame.xft.shadow.offset", - &theme->mfont_shadow_offset)) - theme->mfont_shadow_offset = 1; - if (!read_int(db, "menu.frame.xft.shadow.tint", - &theme->mfont_shadow_tint) || - theme->mfont_shadow_tint < 100 || - theme->mfont_shadow_tint > 100) - theme->mfont_shadow_tint = 25; + if (!read_string(db, "menu.frame.xftfont", &font_str)) + font_str = "arial,sans:bold:pixelsize=11:shadow=y"; if (!(theme->mfont = RrFontOpen(inst, font_str))) { RrThemeFree(theme); return NULL; } - theme->mfont_height = RrFontHeight(theme->mfont, theme->mfont_shadow, - theme->mfont_shadow_offset); + theme->mfont_height = RrFontHeight(theme->mfont); mjust = RR_JUSTIFY_LEFT; if (read_string(db, "menu.frame.justify", &str)) { @@ -207,12 +127,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) mjust = RR_JUSTIFY_RIGHT; else if (!g_ascii_strcasecmp(str, "center")) mjust = RR_JUSTIFY_CENTER; - g_free(str); } /* load the title layout */ - theme->title_layout = g_strdup("NLIMC"); + if (!read_string(db, "window.title.layout", &font_str)) + font_str = "NLIMC"; + theme->title_layout = g_strdup(font_str); + /* load direct dimensions */ if (!read_int(db, "handleWidth", &theme->handle_height) || theme->handle_height < 0 || theme->handle_height > 100) theme->handle_height = 6; @@ -250,6 +172,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "window.button.unfocus.picColor", &theme->titlebut_unfocused_color)) theme->titlebut_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.button.disabled.focus.picColor", + &theme->titlebut_disabled_focused_color)) + theme->titlebut_disabled_focused_color = + RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.button.disabled.unfocus.picColor", + &theme->titlebut_disabled_unfocused_color)) + theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, "menu.title.textColor", &theme->menu_title_color)) theme->menu_title_color = RrColorNew(inst, 0, 0, 0); @@ -263,11 +194,8 @@ 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(db, inst, - "window.button.max.mask", name, &theme->max_unset_mask)){ - if (!read_mask(db, inst, - "window.button.max.toggled.mask", name, - &theme->max_set_mask)) { + 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); } } else { @@ -281,18 +209,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } } - if (!read_mask(db, inst, - "window.button.icon.mask", name, - &theme->iconify_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(db, inst, - "window.button.stick.mask", name, - &theme->desk_unset_mask)) { - if (!read_mask(db, inst, "window.button.stick.toggled.mask", name, - &theme->desk_set_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); } @@ -307,10 +230,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } } - if (read_mask(db, inst, "window.button.shade.mask", name, - &theme->shade_unset_mask)) { - if (!read_mask(db, inst, "window.button.shade.toggled.mask", name, - &theme->shade_set_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); } @@ -325,8 +246,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } } - if (!read_mask(db, inst, "window.button.close.mask", name, - &theme->close_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); } @@ -381,6 +301,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) set_default_appearance(theme->app_unhilite_label); /* read buttons textures */ + if (!read_appearance(db, inst, + "window.button.disabled.focus", + theme->a_disabled_focused_max)) + set_default_appearance(theme->a_disabled_focused_max); + if (!read_appearance(db, inst, + "window.button.disabled.unfocus", + theme->a_disabled_unfocused_max)) + set_default_appearance(theme->a_disabled_unfocused_max); if (!read_appearance(db, inst, "window.button.pressed.focus", theme->a_focused_pressed_max)) @@ -404,6 +332,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_unfocused_unpressed_max)) set_default_appearance(theme->a_unfocused_unpressed_max); + theme->a_disabled_focused_close = + RrAppearanceCopy(theme->a_disabled_focused_max); + theme->a_disabled_unfocused_close = + RrAppearanceCopy(theme->a_disabled_unfocused_max); theme->a_unfocused_unpressed_close = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_close = @@ -412,6 +344,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RrAppearanceCopy(theme->a_focused_unpressed_max); theme->a_focused_pressed_close = RrAppearanceCopy(theme->a_focused_pressed_max); + theme->a_disabled_focused_desk = + RrAppearanceCopy(theme->a_disabled_focused_max); + theme->a_disabled_unfocused_desk = + RrAppearanceCopy(theme->a_disabled_unfocused_max); theme->a_unfocused_unpressed_desk = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_desk = @@ -424,6 +360,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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 = + RrAppearanceCopy(theme->a_disabled_unfocused_max); theme->a_unfocused_unpressed_shade = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_shade = @@ -436,6 +376,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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 = + RrAppearanceCopy(theme->a_disabled_focused_max); theme->a_unfocused_unpressed_iconify = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_iconify = @@ -458,15 +402,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_focused_label->texture[0].data.text.font = theme->app_hilite_label->texture[0].data.text.font = theme->winfont; - theme->a_focused_label->texture[0].data.text.shadow = - theme->app_hilite_label->texture[0].data.text.shadow = - theme->winfont_shadow; - theme->a_focused_label->texture[0].data.text.offset = - theme->app_hilite_label->texture[0].data.text.offset = - theme->winfont_shadow_offset; - theme->a_focused_label->texture[0].data.text.tint = - theme->app_hilite_label->texture[0].data.text.tint = - theme->winfont_shadow_tint; theme->a_focused_label->texture[0].data.text.color = theme->app_hilite_label->texture[0].data.text.color = theme->title_focused_color; @@ -477,15 +412,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->app_unhilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_unfocused_label->texture[0].data.text.font = theme->app_unhilite_label->texture[0].data.text.font = theme->winfont; - theme->a_unfocused_label->texture[0].data.text.shadow = - theme->app_unhilite_label->texture[0].data.text.shadow = - theme->winfont_shadow; - theme->a_unfocused_label->texture[0].data.text.offset = - theme->app_unhilite_label->texture[0].data.text.offset = - theme->winfont_shadow_offset; - theme->a_unfocused_label->texture[0].data.text.tint = - theme->app_unhilite_label->texture[0].data.text.tint = - theme->winfont_shadow_tint; theme->a_unfocused_label->texture[0].data.text.color = theme->app_unhilite_label->texture[0].data.text.color = theme->title_unfocused_color; @@ -493,11 +419,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT; theme->a_menu_title->texture[0].data.text.justify = mtitlejust; theme->a_menu_title->texture[0].data.text.font = theme->mtitlefont; - theme->a_menu_title->texture[0].data.text.shadow = theme->mtitlefont_shadow; - theme->a_menu_title->texture[0].data.text.offset = - theme->mtitlefont_shadow_offset; - theme->a_menu_title->texture[0].data.text.tint = - theme->mtitlefont_shadow_tint; theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color; theme->a_menu_item->surface.grad = @@ -513,51 +434,51 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_menu_item->texture[0].data.text.font = theme->a_menu_disabled->texture[0].data.text.font = theme->a_menu_hilite->texture[0].data.text.font = theme->mfont; - theme->a_menu_item->texture[0].data.text.shadow = - theme->a_menu_disabled->texture[0].data.text.shadow = - theme->a_menu_hilite->texture[0].data.text.shadow = - theme->mfont_shadow; - theme->a_menu_item->texture[0].data.text.offset = - theme->a_menu_disabled->texture[0].data.text.offset = - theme->a_menu_hilite->texture[0].data.text.offset = - theme->mfont_shadow_offset; - theme->a_menu_item->texture[0].data.text.tint = - theme->a_menu_disabled->texture[0].data.text.tint = - theme->a_menu_hilite->texture[0].data.text.tint = - theme->mfont_shadow_tint; theme->a_menu_item->texture[0].data.text.color = theme->menu_color; theme->a_menu_disabled->texture[0].data.text.color = theme->menu_disabled_color; theme->a_menu_hilite->texture[0].data.text.color = theme->menu_hilite_color; - theme->a_focused_unpressed_max->texture[0].type = + theme->a_disabled_focused_max->texture[0].type = + theme->a_disabled_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_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_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_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_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 = RR_TEXTURE_MASK; - theme->a_focused_unpressed_max->texture[0].data.mask.mask = + theme->a_disabled_focused_max->texture[0].data.mask.mask = + theme->a_disabled_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->a_unfocused_pressed_max->texture[0].data.mask.mask = @@ -565,12 +486,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->a_focused_pressed_close->texture[0].data.mask.mask = + theme->a_disabled_focused_close->texture[0].data.mask.mask = + theme->a_disabled_unfocused_close->texture[0].data.mask.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->a_unfocused_unpressed_close->texture[0].data.mask.mask = theme->close_mask; - theme->a_focused_unpressed_desk->texture[0].data.mask.mask = + theme->a_disabled_focused_desk->texture[0].data.mask.mask = + theme->a_disabled_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->a_unfocused_pressed_desk->texture[0].data.mask.mask = @@ -578,7 +503,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->a_focused_unpressed_shade->texture[0].data.mask.mask = + theme->a_disabled_focused_shade->texture[0].data.mask.mask = + theme->a_disabled_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->a_unfocused_pressed_shade->texture[0].data.mask.mask = @@ -586,11 +513,25 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->a_focused_unpressed_iconify->texture[0].data.mask.mask = + theme->a_disabled_focused_iconify->texture[0].data.mask.mask = + theme->a_disabled_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->a_unfocused_pressed_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 = + 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_focused_unpressed_max->texture[0].data.mask.color = theme->a_focused_pressed_max->texture[0].data.mask.color = theme->a_focused_pressed_set_max->texture[0].data.mask.color = @@ -706,22 +647,26 @@ void RrThemeFree(RrTheme *theme) } } -static XrmDatabase loaddb(char *theme) +static XrmDatabase loaddb(RrTheme *theme, char *name) { XrmDatabase db; - db = XrmGetFileDatabase(theme); + if ((db = XrmGetFileDatabase(name))) + theme->path = g_path_get_dirname(name); if (db == NULL) { char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - theme, NULL); - db = XrmGetFileDatabase(s); + name, NULL); + if ((db = XrmGetFileDatabase(s))) + theme->path = g_path_get_dirname(s); g_free(s); } if (db == NULL) { - char *s = g_build_filename(THEMEDIR, theme, NULL); - db = XrmGetFileDatabase(s); - g_free(s); + char *s = g_build_filename(THEMEDIR, name, NULL); + if ((db = XrmGetFileDatabase(s))) + theme->path = g_path_get_dirname(s); + g_free(s); } + return db; } @@ -767,7 +712,7 @@ static gboolean read_string(XrmDatabase db, char *rname, char **value) if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - *value = g_strdup(retvalue.addr); + *value = retvalue.addr; ret = TRUE; } @@ -796,62 +741,44 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst, return ret; } -static gboolean read_mask(XrmDatabase db, const RrInstance *inst, - gchar *rname, gchar *theme, +static gboolean read_mask(const RrInstance *inst, + gchar *maskname, RrTheme *theme, RrPixmapMask **value) { gboolean ret = FALSE; - char *rclass = create_class_name(rname); - char *rettype; char *s; - char *button_dir; - XrmValue retvalue; + char *data_dir; int hx, hy; /* ignored */ unsigned int w, h; unsigned char *b; - - if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && - retvalue.addr != NULL) { - - button_dir = g_strdup_printf("%s_data", theme); - s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - button_dir, retvalue.addr, NULL); + data_dir = g_strdup_printf("%s_data", theme->name); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) + s = g_build_filename(g_get_home_dir(), ".openbox", "themes", + data_dir, maskname, NULL); + if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) + ret = TRUE; + else { + g_free(s); + s = g_build_filename(THEMEDIR, data_dir, maskname, NULL); + if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) ret = TRUE; else { g_free(s); - s = g_build_filename(THEMEDIR, button_dir, retvalue.addr, NULL); - + s = g_build_filename(theme->path, data_dir, maskname, NULL); if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) ret = TRUE; - else { - char *themename; - - g_free(s); - themename = g_path_get_basename(theme); - s = g_strdup_printf("%s/%s_data/%s", theme, - themename, retvalue.addr); - g_free(themename); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == - BitmapSuccess) - ret = TRUE; - else - g_message("Unable to find bitmap '%s'", retvalue.addr); - } } + } - if (ret) { - *value = RrPixmapMaskNew(inst, w, h, (char*)b); - XFree(b); - } - - g_free(s); - g_free(button_dir); + if (ret) { + *value = RrPixmapMaskNew(inst, w, h, (char*)b); + XFree(b); } + + g_free(s); + g_free(data_dir); - g_free(rclass); return ret; }