X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=ca3283a27807efdbfe6cdd07e9c237950fd66d43;hb=ede531da35b7ef5c91ae9bde531c35528bfad423;hp=3da9986848671977935f9d17e85920624fe71bc0;hpb=a12e73cf3741f91d9188bacbcc7733d5948c8156;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 3da99868..ca3283a2 100644 --- a/render/theme.c +++ b/render/theme.c @@ -6,17 +6,21 @@ #include #include +#include +#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); + gchar *rname, RrAppearance *value, + gboolean allow_trans); static void set_default_appearance(RrAppearance *a); RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) @@ -31,44 +35,16 @@ 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_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_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); @@ -83,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); @@ -91,20 +68,21 @@ 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); + g_warning("Failed to load the theme '%s'\n" + "Falling back to the default: '%s'", + name, 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 */ @@ -159,11 +137,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) mjust = RR_JUSTIFY_CENTER; } - /* load the title layout */ - 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, "menuOverlap", &theme->menu_overlap) || + theme->menu_overlap < 0 || theme->menu_overlap > 20) + theme->handle_height = 0; if (!read_int(db, "handleWidth", &theme->handle_height) || theme->handle_height < 0 || theme->handle_height > 100) theme->handle_height = 6; @@ -195,12 +172,70 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, "window.button.focus.picColor", - &theme->titlebut_focused_color)) - theme->titlebut_focused_color = RrColorNew(inst, 0, 0, 0); + &theme->titlebut_focused_unpressed_color)) + theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, "window.button.unfocus.picColor", - &theme->titlebut_unfocused_color)) - theme->titlebut_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + &theme->titlebut_unfocused_unpressed_color)) + theme->titlebut_unfocused_unpressed_color = + RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.button.pressed.focus.picColor", + &theme->titlebut_focused_pressed_color)) + theme->titlebut_focused_pressed_color = + RrColorNew(inst, + theme->titlebut_focused_unpressed_color->r, + theme->titlebut_focused_unpressed_color->g, + theme->titlebut_focused_unpressed_color->b); + if (!read_color(db, inst, + "window.button.pressed.unfocus.picColor", + &theme->titlebut_unfocused_pressed_color)) + theme->titlebut_unfocused_pressed_color = + RrColorNew(inst, + 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.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, + "window.button.hover.focus.picColor", + &theme->titlebut_hover_focused_color)) + theme->titlebut_hover_focused_color = + RrColorNew(inst, + theme->titlebut_focused_unpressed_color->r, + theme->titlebut_focused_unpressed_color->g, + theme->titlebut_focused_unpressed_color->b); + if (!read_color(db, inst, + "window.button.hover.unfocus.picColor", + &theme->titlebut_hover_unfocused_color)) + theme->titlebut_hover_unfocused_color = + RrColorNew(inst, + 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); @@ -214,147 +249,277 @@ 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)) { - 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(db, inst, - "window.button.icon.mask", name, - &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(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)) { - 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(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)) { - 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(db, inst, "window.button.close.mask", name, - &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 */ if (!read_appearance(db, inst, - "window.title.focus", theme->a_focused_title)) + "window.title.focus", theme->a_focused_title, + FALSE)) set_default_appearance(theme->a_focused_title); if (!read_appearance(db, inst, - "window.title.unfocus", theme->a_unfocused_title)) + "window.title.unfocus", theme->a_unfocused_title, + FALSE)) set_default_appearance(theme->a_unfocused_title); if (!read_appearance(db, inst, - "window.label.focus", theme->a_focused_label)) + "window.label.focus", theme->a_focused_label, + TRUE)) set_default_appearance(theme->a_focused_label); if (!read_appearance(db, inst, - "window.label.unfocus", theme->a_unfocused_label)) + "window.label.unfocus", theme->a_unfocused_label, + TRUE)) set_default_appearance(theme->a_unfocused_label); if (!read_appearance(db, inst, - "window.handle.focus", theme->a_focused_handle)) + "window.handle.focus", theme->a_focused_handle, + FALSE)) set_default_appearance(theme->a_focused_handle); if (!read_appearance(db, inst, - "window.handle.unfocus",theme->a_unfocused_handle)) + "window.handle.unfocus",theme->a_unfocused_handle, + FALSE)) set_default_appearance(theme->a_unfocused_handle); if (!read_appearance(db, inst, - "window.grip.focus", theme->a_focused_grip)) + "window.grip.focus", theme->a_focused_grip, + TRUE)) set_default_appearance(theme->a_focused_grip); if (!read_appearance(db, inst, - "window.grip.unfocus", theme->a_unfocused_grip)) + "window.grip.unfocus", theme->a_unfocused_grip, + TRUE)) set_default_appearance(theme->a_unfocused_grip); if (!read_appearance(db, inst, - "menu.frame", theme->a_menu)) + "menu.frame", theme->a_menu, + FALSE)) set_default_appearance(theme->a_menu); if (!read_appearance(db, inst, - "menu.title", theme->a_menu_title)) + "menu.title", theme->a_menu_title, + FALSE)) set_default_appearance(theme->a_menu_title); if (!read_appearance(db, inst, - "menu.hilite", theme->a_menu_hilite)) + "menu.hilite", theme->a_menu_hilite, + TRUE)) set_default_appearance(theme->a_menu_hilite); /* read the appearances for rendering non-decorations */ if (!read_appearance(db, inst, - "window.title.focus", theme->app_hilite_bg)) + "window.title.focus", theme->app_hilite_bg, + FALSE)) set_default_appearance(theme->app_hilite_bg); if (!read_appearance(db, inst, - "window.label.focus", theme->app_hilite_label)) + "window.label.focus", theme->app_hilite_label, + TRUE)) set_default_appearance(theme->app_hilite_label); if (!read_appearance(db, inst, - "window.title.unfocus", theme->app_unhilite_bg)) + "window.title.unfocus", theme->app_unhilite_bg, + FALSE)) set_default_appearance(theme->app_unhilite_bg); if (!read_appearance(db, inst, - "window.label.unfocus", theme->app_unhilite_label)) + "window.label.unfocus", theme->app_unhilite_label, + TRUE)) set_default_appearance(theme->app_unhilite_label); /* read buttons textures */ + if (!read_appearance(db, inst, + "window.button.disabled.focus", + theme->a_disabled_focused_max, + TRUE)) + set_default_appearance(theme->a_disabled_focused_max); + if (!read_appearance(db, inst, + "window.button.disabled.unfocus", + theme->a_disabled_unfocused_max, + TRUE)) + set_default_appearance(theme->a_disabled_unfocused_max); if (!read_appearance(db, inst, "window.button.pressed.focus", - theme->a_focused_pressed_max)) - if (!read_appearance(db, inst, - "window.button.pressed", - theme->a_focused_pressed_max)) - set_default_appearance(theme->a_focused_pressed_max); + theme->a_focused_pressed_max, + TRUE)) + set_default_appearance(theme->a_focused_pressed_max); if (!read_appearance(db, inst, "window.button.pressed.unfocus", - theme->a_unfocused_pressed_max)) - if (!read_appearance(db, inst, - "window.button.pressed", - theme->a_unfocused_pressed_max)) - set_default_appearance(theme->a_unfocused_pressed_max); + theme->a_unfocused_pressed_max, + TRUE)) + 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)) + theme->a_focused_unpressed_max, + TRUE)) set_default_appearance(theme->a_focused_unpressed_max); if (!read_appearance(db, inst, "window.button.unfocus", - theme->a_unfocused_unpressed_max)) + theme->a_unfocused_unpressed_max, + TRUE)) set_default_appearance(theme->a_unfocused_unpressed_max); - + if (!read_appearance(db, inst, + "window.button.hover.focus", + theme->a_hover_focused_max, + TRUE)) + theme->a_hover_focused_max = + RrAppearanceCopy(theme->a_focused_unpressed_max); + if (!read_appearance(db, inst, + "window.button.hover.unfocus", + theme->a_hover_unfocused_max, + TRUE)) + theme->a_hover_unfocused_max = + RrAppearanceCopy(theme->a_unfocused_unpressed_max); + + theme->a_disabled_focused_close = + RrAppearanceCopy(theme->a_disabled_focused_max); + theme->a_disabled_unfocused_close = + RrAppearanceCopy(theme->a_disabled_unfocused_max); + theme->a_hover_focused_close = + RrAppearanceCopy(theme->a_hover_focused_max); + theme->a_hover_unfocused_close = + RrAppearanceCopy(theme->a_hover_unfocused_max); theme->a_unfocused_unpressed_close = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_close = @@ -363,30 +528,54 @@ 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_hover_focused_desk = + RrAppearanceCopy(theme->a_hover_focused_max); + theme->a_hover_unfocused_desk = + 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 = + RrAppearanceCopy(theme->a_disabled_unfocused_max); + theme->a_hover_focused_shade = + RrAppearanceCopy(theme->a_hover_focused_max); + theme->a_hover_unfocused_shade = + RrAppearanceCopy(theme->a_hover_unfocused_max); + theme->a_toggled_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 = + RrAppearanceCopy(theme->a_disabled_focused_max); + theme->a_hover_focused_iconify = + RrAppearanceCopy(theme->a_hover_focused_max); + theme->a_hover_unfocused_iconify = + RrAppearanceCopy(theme->a_hover_unfocused_max); theme->a_unfocused_unpressed_iconify = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_iconify = @@ -395,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 = @@ -447,94 +633,177 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_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 = + 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_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 = + 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 = 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->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_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->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->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->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->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_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->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->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_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->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->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_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_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_pressed_max->texture[0].data.mask.color = - theme->a_focused_pressed_set_max->texture[0].data.mask.color = theme->a_focused_unpressed_close->texture[0].data.mask.color = - theme->a_focused_pressed_close->texture[0].data.mask.color = theme->a_focused_unpressed_desk->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_unpressed_shade->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_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_color; + theme->titlebut_focused_pressed_color; theme->a_unfocused_unpressed_max->texture[0].data.mask.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_unpressed_close->texture[0].data.mask.color = - theme->a_unfocused_pressed_close->texture[0].data.mask.color = theme->a_unfocused_unpressed_desk->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_unpressed_shade->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_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_color; + theme->titlebut_unfocused_pressed_color; XrmDestroyDatabase(db); @@ -556,46 +825,91 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->cb_focused_color); RrColorFree(theme->title_unfocused_color); RrColorFree(theme->title_focused_color); - RrColorFree(theme->titlebut_unfocused_color); - RrColorFree(theme->titlebut_focused_color); + RrColorFree(theme->titlebut_disabled_focused_color); + 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); + RrColorFree(theme->titlebut_focused_unpressed_color); RrColorFree(theme->menu_color); RrColorFree(theme->menu_title_color); 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); RrFontClose(theme->mfont); - g_free(theme->title_layout); - + 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_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); + 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_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); 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_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); 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); @@ -614,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); @@ -622,22 +937,28 @@ void RrThemeFree(RrTheme *theme) } } -static XrmDatabase loaddb(char *theme) +static XrmDatabase loaddb(RrTheme *theme, char *name) { XrmDatabase db; - db = XrmGetFileDatabase(theme); + 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", - theme, NULL); - db = XrmGetFileDatabase(s); + 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, theme, NULL); - db = XrmGetFileDatabase(s); - g_free(s); + char *s = g_build_filename(name, "themerc", NULL); + if ((db = XrmGetFileDatabase(s))) + theme->path = g_path_get_dirname(s); + g_free(s); } + return db; } @@ -712,68 +1033,31 @@ 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; 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); - 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); - - 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); + s = g_build_filename(theme->path, maskname, NULL); + if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) { + ret = TRUE; + *value = RrPixmapMaskNew(inst, w, h, (char*)b); + XFree(b); } + g_free(s); - g_free(rclass); return ret; } static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, RrReliefType *relief, RrBevelType *bevel, - gboolean *interlaced, gboolean *border) + gboolean *interlaced, gboolean *border, + gboolean allow_trans) { char *t; @@ -781,7 +1065,7 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, for (t = tex; *t != '\0'; ++t) *t = g_ascii_tolower(*t); - if (strstr(tex, "parentrelative") != NULL) { + if (allow_trans && strstr(tex, "parentrelative") != NULL) { *grad = RR_SURFACE_PARENTREL; } else { if (strstr(tex, "gradient") != NULL) { @@ -826,7 +1110,8 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, - gchar *rname, RrAppearance *value) + gchar *rname, RrAppearance *value, + gboolean allow_trans) { gboolean ret = FALSE; char *rclass = create_class_name(rname), *cname, *ctoname, *bcname; @@ -844,7 +1129,8 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, &value->surface.relief, &value->surface.bevel, &value->surface.interlaced, - &value->surface.border); + &value->surface.border, + allow_trans); if (!read_color(db, inst, cname, &value->surface.primary)) value->surface.primary = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, ctoname, &value->surface.secondary))