X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=cfbc5f9ce868f850c7dabe4477d25e996296a071;hb=54ad34a039d5d83d61c481aaef18d1ea7876d36e;hp=29f0663ccb26b53c12fa91723b5557ecdafc507f;hpb=5fce782499aa821c3a25bfdbf475066c2c21a7ed;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 29f0663c..cfbc5f9c 100644 --- a/render/theme.c +++ b/render/theme.c @@ -16,7 +16,8 @@ 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) @@ -33,6 +34,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_focused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); theme->a_focused_pressed_set_max = RrAppearanceNew(inst, 1); @@ -63,8 +66,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (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_path_get_basename(name); } @@ -129,12 +133,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; @@ -166,12 +168,29 @@ 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)) @@ -181,6 +200,22 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "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, "menu.title.textColor", &theme->menu_title_color)) theme->menu_title_color = RrColorNew(inst, 0, 0, 0); @@ -253,89 +288,128 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) /* 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)) + 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)) + 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)) + theme->a_focused_pressed_max, + TRUE)) if (!read_appearance(db, inst, "window.button.pressed", - 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)) + theme->a_unfocused_pressed_max, + TRUE)) if (!read_appearance(db, inst, "window.button.pressed", - 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.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 = @@ -348,6 +422,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_unfocused_unpressed_desk = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_desk = @@ -364,6 +442,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_unfocused_unpressed_shade = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_shade = @@ -380,6 +462,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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 = @@ -442,6 +528,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_focused_unpressed_max->texture[0].type = theme->a_focused_pressed_max->texture[0].type = theme->a_focused_pressed_set_max->texture[0].type = @@ -450,12 +538,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_focused_unpressed_desk->texture[0].type = theme->a_focused_pressed_desk->texture[0].type = theme->a_focused_pressed_set_desk->texture[0].type = @@ -464,6 +556,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_focused_unpressed_shade->texture[0].type = theme->a_focused_pressed_shade->texture[0].type = theme->a_focused_pressed_set_shade->texture[0].type = @@ -472,12 +566,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->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 = @@ -488,6 +586,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->max_set_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->a_hover_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 = @@ -495,6 +595,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->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 = @@ -505,6 +607,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->desk_set_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->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 = @@ -515,6 +619,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->shade_set_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->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 = @@ -532,34 +638,48 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_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_unpressed_shade->texture[0].data.mask.color = + theme->a_focused_unpressed_iconify->texture[0].data.mask.color = + theme->titlebut_focused_unpressed_color; + theme->a_focused_pressed_max->texture[0].data.mask.color = + theme->a_focused_pressed_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_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->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_unpressed_close->texture[0].data.mask.color = + theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = + theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = + theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = + theme->titlebut_unfocused_unpressed_color; theme->a_unfocused_pressed_max->texture[0].data.mask.color = theme->a_unfocused_pressed_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->a_unfocused_pressed_iconify->texture[0].data.mask.color = - theme->titlebut_unfocused_color; + theme->titlebut_unfocused_pressed_color; XrmDestroyDatabase(db); @@ -581,8 +701,14 @@ 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_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); @@ -601,26 +727,44 @@ void RrThemeFree(RrTheme *theme) 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_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_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_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); @@ -784,7 +928,8 @@ static gboolean read_mask(const RrInstance *inst, 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; @@ -792,7 +937,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) { @@ -837,7 +982,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; @@ -855,7 +1001,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))