X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=71770f8356f9e7cbf95a3fd4b567a2351c7caa20;hb=c0c06e3828981cacc96b27a87d7803f603241d15;hp=a7da009b01488af135a906e5d4c61236f1a27740;hpb=ea6258ce0f8b4e7af8d44f2e540eb25ccfe8955b;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index a7da009b..71770f83 100644 --- a/render/theme.c +++ b/render/theme.c @@ -6,6 +6,9 @@ #include #include +#include +#include +#include static XrmDatabase loaddb(RrTheme *theme, char *name); static gboolean read_int(XrmDatabase db, char *rname, int *value); @@ -16,7 +19,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,12 +37,14 @@ 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_toggled_focused_max = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_max = RrAppearanceNew(inst, 1); theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_focused_pressed_set_max = RrAppearanceNew(inst, 1); theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_unfocused_pressed_set_max = RrAppearanceNew(inst, 1); theme->a_focused_grip = RrAppearanceNew(inst, 0); theme->a_unfocused_grip = RrAppearanceNew(inst, 0); theme->a_focused_title = RrAppearanceNew(inst, 0); @@ -53,6 +59,8 @@ 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_menu_bullet = RrAppearanceNew(inst, 1); + theme->a_clear = RrAppearanceNew(inst, 0); theme->app_hilite_bg = RrAppearanceNew(inst, 0); theme->app_unhilite_bg = RrAppearanceNew(inst, 0); @@ -63,8 +71,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); } @@ -78,14 +87,24 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } /* load the font stuff */ - if (!read_string(db, "window.title.xftfont", &font_str)) + if (!read_string(db, "window.focus.font", &font_str)) font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50"; - if (!(theme->winfont = RrFontOpen(inst, font_str))) { + if (!(theme->winfont_focused = RrFontOpen(inst, font_str))) { RrThemeFree(theme); return NULL; } - theme->winfont_height = RrFontHeight(theme->winfont); + theme->winfont_height = RrFontHeight(theme->winfont_focused); + + if (!read_string(db, "window.unfocus.font", &font_str)) + /* font_str will already be set to the last one */; + + if (!(theme->winfont_unfocused = RrFontOpen(inst, font_str))) { + RrThemeFree(theme); + return NULL; + } + theme->winfont_height = MAX(theme->winfont_height, + RrFontHeight(theme->winfont_unfocused)); winjust = RR_JUSTIFY_LEFT; if (read_string(db, "window.justify", &str)) { @@ -95,7 +114,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) winjust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.title.xftfont", &font_str)) + if (!read_string(db, "menu.title.font", &font_str)) font_str = "arial,sans:bold:pixelsize=12:shadow=y"; if (!(theme->mtitlefont = RrFontOpen(inst, font_str))) { @@ -112,7 +131,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) mtitlejust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.frame.xftfont", &font_str)) + if (!read_string(db, "menu.frame.font", &font_str)) font_str = "arial,sans:bold:pixelsize=11:shadow=y"; if (!(theme->mfont = RrFontOpen(inst, font_str))) { @@ -129,11 +148,6 @@ 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) @@ -169,12 +183,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)) @@ -184,12 +215,47 @@ 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, + "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); if (!read_color(db, inst, "menu.frame.textColor", &theme->menu_color)) theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "menu.bullet.picColor", &theme->menu_bullet_color)) + theme->menu_bullet_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, "menu.frame.disableColor", &theme->menu_disabled_color)) theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); @@ -197,148 +263,285 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "menu.hilite.textColor", &theme->menu_hilite_color)) theme->menu_hilite_color = RrColorNew(inst, 0, 0, 0); - if (read_mask(inst, "max.xbm", theme, &theme->max_unset_mask)){ - if (!read_mask(inst, "max_t.xbm", theme, &theme->max_set_mask)) { - theme->max_set_mask = RrPixmapMaskCopy(theme->max_unset_mask); + + if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) { + if (!read_mask(inst, "max_pressed.xbm", theme, + &theme->max_pressed_mask)) { + theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); + } + if (!read_mask(inst, "max_toggled.xbm", theme, + &theme->max_toggled_mask)) { + theme->max_toggled_mask = + RrPixmapMaskCopy(theme->max_pressed_mask); } - } else { + if (!read_mask(inst, "max_disabled.xbm", theme, + &theme->max_disabled_mask)) { + theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); + } + if (!read_mask(inst, "max_hover.xbm", theme, &theme->max_hover_mask)) { + theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); + } + } else { { - char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; - theme->max_unset_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; + theme->max_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); } { - char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; - theme->max_set_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; + theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); } + theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); + theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); + theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); } - if (!read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) { - char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; - theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data); + if (read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) { + if (!read_mask(inst, "iconify_pressed.xbm", theme, + &theme->iconify_pressed_mask)) { + theme->iconify_pressed_mask = + RrPixmapMaskCopy(theme->iconify_mask); + } + if (!read_mask(inst, "iconify_disabled.xbm", theme, + &theme->iconify_disabled_mask)) { + theme->iconify_disabled_mask = + RrPixmapMaskCopy(theme->iconify_mask); + } + if (!read_mask(inst, "iconify_hover.xbm", theme, + &theme->iconify_hover_mask)) { + theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); + } + } else { + { + guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; + theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); + } + theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask); + theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask); + theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); } - if (read_mask(inst, "stick.xbm", theme, &theme->desk_unset_mask)) { - if (!read_mask(inst, "stick_t.xbm", theme, &theme->desk_set_mask)) { - theme->desk_set_mask = - RrPixmapMaskCopy(theme->desk_unset_mask); + if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) { + if (!read_mask(inst, "desk_pressed.xbm", theme, + &theme->desk_pressed_mask)) { + theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); + } + if (!read_mask(inst, "desk_toggled.xbm", theme, + &theme->desk_toggled_mask)) { + theme->desk_toggled_mask = + RrPixmapMaskCopy(theme->desk_pressed_mask); + } + if (!read_mask(inst, "desk_disabled.xbm", theme, + &theme->desk_disabled_mask)) { + theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); + } + if (!read_mask(inst, "desk_hover.xbm", theme, + &theme->desk_hover_mask)) { + theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); } } else { { - char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; - theme->desk_unset_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; + theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); } { - char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 }; - theme->desk_set_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 }; + theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7, + (char*)data); } + theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); + theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); + theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); } - if (read_mask(inst, "shade.xbm", theme, &theme->shade_unset_mask)) { - if (!read_mask(inst, "shade_t.xbm", theme, &theme->shade_set_mask)) { - theme->shade_set_mask = - RrPixmapMaskCopy(theme->shade_unset_mask); + if (read_mask(inst, "shade.xbm", theme, &theme->shade_mask)) { + if (!read_mask(inst, "shade_pressed.xbm", theme, + &theme->shade_pressed_mask)) { + theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); + } + if (!read_mask(inst, "shade_toggled.xbm", theme, + &theme->shade_toggled_mask)) { + theme->shade_toggled_mask = + RrPixmapMaskCopy(theme->shade_pressed_mask); + } + if (!read_mask(inst, "shade_disabled.xbm", theme, + &theme->shade_disabled_mask)) { + theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); + } + if (!read_mask(inst, "shade_hover.xbm", theme, + &theme->shade_hover_mask)) { + theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); } } else { { - char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; - theme->shade_unset_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; + theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); } { - char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f }; - theme->shade_set_mask = RrPixmapMaskNew(inst, 7, 7, data); + guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f }; + theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7, + (char*)data); } + theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); + theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); + theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); } - if (!read_mask(inst, "close.xbm", theme, &theme->close_mask)) { - char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; - theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data); - } + if (read_mask(inst, "close.xbm", theme, &theme->close_mask)) { + if (!read_mask(inst, "close_pressed.xbm", theme, + &theme->close_pressed_mask)) { + theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); + } + if (!read_mask(inst, "close_disabled.xbm", theme, + &theme->close_disabled_mask)) { + theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); + } + if (!read_mask(inst, "close_hover.xbm", theme, + &theme->close_hover_mask)) { + theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); + } + } else { + { + guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; + theme->close_mask = RrPixmapMaskNew(inst, 7, 7, (char*)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); + } + + if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) { + guchar data[] = { 0x18, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x18 }; + theme->menu_bullet_mask = RrPixmapMaskNew(inst, 8, 8, (char*)data); + } /* 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)) - 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 = @@ -351,38 +554,50 @@ 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_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 = @@ -391,12 +606,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 = @@ -404,7 +616,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_focused_label->texture[0].data.text.justify = winjust; 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->app_hilite_label->texture[0].data.text.font = + theme->winfont_focused; theme->a_focused_label->texture[0].data.text.color = theme->app_hilite_label->texture[0].data.text.color = theme->title_focused_color; @@ -414,7 +627,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_unfocused_label->texture[0].data.text.justify = winjust; 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->app_unhilite_label->texture[0].data.text.font = + theme->winfont_unfocused; theme->a_unfocused_label->texture[0].data.text.color = theme->app_unhilite_label->texture[0].data.text.color = theme->title_unfocused_color; @@ -426,6 +640,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_menu_item->surface.grad = theme->a_menu_disabled->surface.grad = + theme->a_menu_bullet->surface.grad = theme->app_icon->surface.grad = RR_SURFACE_PARENTREL; theme->a_menu_item->texture[0].type = @@ -442,87 +657,128 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->menu_disabled_color; theme->a_menu_hilite->texture[0].data.text.color = theme->menu_hilite_color; + theme->a_menu_bullet->texture[0].data.mask.color = + theme->menu_bullet_color; 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_unfocused_pressed_iconify->texture[0].type = + theme->a_menu_bullet->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_focused_unpressed_max->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = - theme->a_focused_pressed_max->texture[0].data.mask.mask = + theme->max_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_unset_mask; - theme->a_focused_pressed_set_max->texture[0].data.mask.mask = - theme->a_unfocused_pressed_set_max->texture[0].data.mask.mask = - theme->max_set_mask; + theme->max_pressed_mask; + theme->a_focused_unpressed_max->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = + theme->max_mask; + theme->a_toggled_focused_max->texture[0].data.mask.mask = + theme->a_toggled_unfocused_max->texture[0].data.mask.mask = + theme->max_toggled_mask; theme->a_disabled_focused_close->texture[0].data.mask.mask = theme->a_disabled_unfocused_close->texture[0].data.mask.mask = - theme->a_focused_pressed_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->a_focused_unpressed_desk->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = - theme->a_focused_pressed_desk->texture[0].data.mask.mask = + theme->desk_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_unset_mask; - theme->a_focused_pressed_set_desk->texture[0].data.mask.mask = - theme->a_unfocused_pressed_set_desk->texture[0].data.mask.mask = - theme->desk_set_mask; + theme->desk_pressed_mask; + theme->a_focused_unpressed_desk->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = + theme->desk_mask; + theme->a_toggled_focused_desk->texture[0].data.mask.mask = + theme->a_toggled_unfocused_desk->texture[0].data.mask.mask = + theme->desk_toggled_mask; theme->a_disabled_focused_shade->texture[0].data.mask.mask = theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = - theme->a_focused_unpressed_shade->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = - theme->a_focused_pressed_shade->texture[0].data.mask.mask = + theme->shade_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_unset_mask; - theme->a_focused_pressed_set_shade->texture[0].data.mask.mask = - theme->a_unfocused_pressed_set_shade->texture[0].data.mask.mask = - theme->shade_set_mask; + theme->shade_pressed_mask; + theme->a_focused_unpressed_shade->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = + theme->shade_mask; + theme->a_toggled_focused_shade->texture[0].data.mask.mask = + theme->a_toggled_unfocused_shade->texture[0].data.mask.mask = + theme->shade_toggled_mask; theme->a_disabled_focused_iconify->texture[0].data.mask.mask = theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = - theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = - theme->a_focused_pressed_iconify->texture[0].data.mask.mask = + theme->iconify_disabled_mask; + theme->a_hover_focused_iconify->texture[0].data.mask.mask = + theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = + theme->iconify_hover_mask; + theme->a_focused_pressed_iconify->texture[0].data.mask.mask = theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask = + theme->iconify_pressed_mask; + theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = theme->iconify_mask; + theme->a_menu_bullet->texture[0].data.mask.mask = + theme->menu_bullet_mask; theme->a_disabled_focused_max->texture[0].data.mask.color = theme->a_disabled_focused_close->texture[0].data.mask.color = theme->a_disabled_focused_desk->texture[0].data.mask.color = @@ -535,34 +791,52 @@ 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_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; + theme->a_menu_bullet->texture[0].data.mask.color = + theme->menu_bullet_color; XrmDestroyDatabase(db); @@ -584,46 +858,93 @@ 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); + RrPixmapMaskFree(theme->menu_bullet_mask); - RrFontClose(theme->winfont); + RrFontClose(theme->winfont_focused); + RrFontClose(theme->winfont_unfocused); 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); @@ -642,6 +963,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); @@ -654,17 +976,19 @@ static XrmDatabase loaddb(RrTheme *theme, char *name) { XrmDatabase db; - if ((db = XrmGetFileDatabase(name))) - theme->path = g_path_get_dirname(name); + char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes", + name, "themerc", NULL); + if ((db = XrmGetFileDatabase(s))) + theme->path = g_path_get_dirname(s); + g_free(s); if (db == NULL) { - char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - name, NULL); + char *s = g_build_filename(THEMEDIR, name, "themerc", NULL); if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s); } if (db == NULL) { - char *s = g_build_filename(THEMEDIR, name, NULL); + char *s = g_build_filename(name, "themerc", NULL); if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s); @@ -750,44 +1074,25 @@ static gboolean read_mask(const RrInstance *inst, { gboolean ret = FALSE; char *s; - char *data_dir; int hx, hy; /* ignored */ unsigned int w, h; unsigned char *b; - data_dir = g_strdup_printf("%s_data", theme->name); - - s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - data_dir, maskname, NULL); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) + s = g_build_filename(theme->path, maskname, NULL); + if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) { ret = TRUE; - else { - g_free(s); - s = g_build_filename(THEMEDIR, data_dir, maskname, NULL); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) - ret = TRUE; - else { - g_free(s); - s = g_build_filename(theme->path, data_dir, maskname, NULL); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) - ret = TRUE; - } - } - - if (ret) { *value = RrPixmapMaskNew(inst, w, h, (char*)b); XFree(b); } - g_free(s); - g_free(data_dir); 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; @@ -795,7 +1100,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) { @@ -840,7 +1145,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; @@ -858,7 +1164,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))