X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=8ad8c8415a998a8206835b0abf6baad0cd029a65;hb=c1b2fc5324522f74a14a5cfa210c95e1509a6e7f;hp=7f67b47aa4888b5cc770fdd02f14de19866ff1de;hpb=632b2af7a8283eff025456d3bb39a362311f4182;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 7f67b47a..8ad8c841 100644 --- a/render/theme.c +++ b/render/theme.c @@ -3,9 +3,14 @@ #include "font.h" #include "mask.h" #include "theme.h" +#include "icon.h" +#include "parser/parse.h" #include #include +#include +#include +#include static XrmDatabase loaddb(RrTheme *theme, char *name); static gboolean read_int(XrmDatabase db, char *rname, int *value); @@ -18,12 +23,13 @@ static gboolean read_mask(const RrInstance *inst, static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, gchar *rname, RrAppearance *value, gboolean allow_trans); +static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) { XrmDatabase db = NULL; - RrJustify winjust, mtitlejust, mjust; + RrJustify winjust, mtitlejust; gchar *str; gchar *font_str; RrTheme *theme; @@ -32,16 +38,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->inst = inst; + theme->show_handle = TRUE; + 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,15 +61,23 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_unfocused_handle = RrAppearanceNew(inst, 0); theme->a_menu = RrAppearanceNew(inst, 0); theme->a_menu_title = RrAppearanceNew(inst, 1); - theme->a_menu_item = RrAppearanceNew(inst, 1); - theme->a_menu_disabled = RrAppearanceNew(inst, 1); - theme->a_menu_hilite = RrAppearanceNew(inst, 1); + theme->a_menu_normal = RrAppearanceNew(inst, 0); + theme->a_menu_disabled = RrAppearanceNew(inst, 0); + theme->a_menu_selected = RrAppearanceNew(inst, 0); + theme->a_menu_text_normal = RrAppearanceNew(inst, 1); + theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); + theme->a_menu_text_selected = RrAppearanceNew(inst, 1); + theme->a_menu_bullet_normal = RrAppearanceNew(inst, 1); + theme->a_menu_bullet_selected = RrAppearanceNew(inst, 1); + theme->a_clear = RrAppearanceNew(inst, 0); + theme->a_clear_tex = RrAppearanceNew(inst, 1); theme->app_hilite_bg = RrAppearanceNew(inst, 0); theme->app_unhilite_bg = RrAppearanceNew(inst, 0); + theme->app_hilite_fg = RrAppearanceNew(inst, 0); + theme->app_unhilite_fg = RrAppearanceNew(inst, 0); theme->app_hilite_label = RrAppearanceNew(inst, 1); theme->app_unhilite_label = RrAppearanceNew(inst, 1); - theme->app_icon = RrAppearanceNew(inst, 1); if (name) { db = loaddb(theme, name); @@ -82,24 +98,34 @@ 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.active.label.text.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_focused); + + if (!read_string(db, "window.inactive.label.text.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 = RrFontHeight(theme->winfont); + theme->winfont_height = MAX(theme->winfont_height, + RrFontHeight(theme->winfont_unfocused)); winjust = RR_JUSTIFY_LEFT; - if (read_string(db, "window.justify", &str)) { + if (read_string(db, "window.label.text.justify", &str)) { if (!g_ascii_strcasecmp(str, "right")) winjust = RR_JUSTIFY_RIGHT; else if (!g_ascii_strcasecmp(str, "center")) winjust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.title.xftfont", &font_str)) + if (!read_string(db, "menu.title.text.font", &font_str)) font_str = "arial,sans:bold:pixelsize=12:shadow=y"; if (!(theme->mtitlefont = RrFontOpen(inst, font_str))) { @@ -109,14 +135,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->mtitlefont_height = RrFontHeight(theme->mtitlefont); mtitlejust = RR_JUSTIFY_LEFT; - if (read_string(db, "menu.title.justify", &str)) { + if (read_string(db, "menu.title.text.justify", &str)) { if (!g_ascii_strcasecmp(str, "right")) mtitlejust = RR_JUSTIFY_RIGHT; else if (!g_ascii_strcasecmp(str, "center")) mtitlejust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.frame.xftfont", &font_str)) + if (!read_string(db, "menu.items.font", &font_str)) font_str = "arial,sans:bold:pixelsize=11:shadow=y"; if (!(theme->mfont = RrFontOpen(inst, font_str))) { @@ -125,63 +151,57 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } theme->mfont_height = RrFontHeight(theme->mfont); - mjust = RR_JUSTIFY_LEFT; - if (read_string(db, "menu.frame.justify", &str)) { - if (!g_ascii_strcasecmp(str, "right")) - mjust = RR_JUSTIFY_RIGHT; - else if (!g_ascii_strcasecmp(str, "center")) - 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) || + if (!read_int(db, "menu.overlap", &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->menu_overlap = 0; + if (!read_int(db, "window.handle.width", &theme->handle_height)) + theme->handle_height = 6; + if (!theme->handle_height) + theme->show_handle = FALSE; + if (theme->handle_height <= 0 || theme->handle_height > 100) theme->handle_height = 6; - if (!read_int(db, "bevelWidth", &theme->bevel) || - theme->bevel <= 0 || theme->bevel > 100) theme->bevel = 3; - if (!read_int(db, "borderWidth", &theme->bwidth) || - theme->bwidth < 0 || theme->bwidth > 100) theme->bwidth = 1; - if (!read_int(db, "frameWidth", &theme->cbwidth) || + if (!read_int(db, "padding.width", &theme->padding) || + theme->padding < 0 || theme->padding > 100) + theme->padding = 3; + if (!read_int(db, "border.width", &theme->bwidth) || + theme->bwidth < 0 || theme->bwidth > 100) + theme->bwidth = 1; + if (!read_int(db, "window.client.padding.width", &theme->cbwidth) || theme->cbwidth < 0 || theme->cbwidth > 100) - theme->cbwidth = theme->bevel; + theme->cbwidth = theme->padding; /* load colors */ if (!read_color(db, inst, - "borderColor", &theme->b_color)) + "border.color", &theme->b_color)) theme->b_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, - "window.frame.focusColor", &theme->cb_focused_color)) + "window.active.client.color", + &theme->cb_focused_color)) theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "window.frame.unfocusColor",&theme->cb_unfocused_color)) + "window.inactive.client.color", + &theme->cb_unfocused_color)) theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "window.label.focus.textColor", + "window.active.label.text.color", &theme->title_focused_color)) theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); if (!read_color(db, inst, - "window.label.unfocus.textColor", + "window.inactive.label.text.color", &theme->title_unfocused_color)) theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "window.button.focus.picColor", + "window.active.button.unpressed.image.color", &theme->titlebut_focused_unpressed_color)) theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, - "window.button.unfocus.picColor", + "window.inactive.button.unpressed.image.color", &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", + "window.active.button.pressed.image.color", &theme->titlebut_focused_pressed_color)) theme->titlebut_focused_pressed_color = RrColorNew(inst, @@ -189,7 +209,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_focused_unpressed_color->g, theme->titlebut_focused_unpressed_color->b); if (!read_color(db, inst, - "window.button.pressed.unfocus.picColor", + "window.inactive.button.pressed.image.color", &theme->titlebut_unfocused_pressed_color)) theme->titlebut_unfocused_pressed_color = RrColorNew(inst, @@ -197,16 +217,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_unfocused_unpressed_color->g, theme->titlebut_unfocused_unpressed_color->b); if (!read_color(db, inst, - "window.button.disabled.focus.picColor", + "window.active.button.disabled.image.color", &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", + "window.inactive.button.disabled.image.color", &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", + "window.active.button.hover.image.color", &theme->titlebut_hover_focused_color)) theme->titlebut_hover_focused_color = RrColorNew(inst, @@ -214,7 +234,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_focused_unpressed_color->g, theme->titlebut_focused_unpressed_color->b); if (!read_color(db, inst, - "window.button.hover.unfocus.picColor", + "window.inactive.button.hover.image.color", &theme->titlebut_hover_unfocused_color)) theme->titlebut_hover_unfocused_color = RrColorNew(inst, @@ -222,190 +242,344 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_unfocused_unpressed_color->g, theme->titlebut_unfocused_unpressed_color->b); if (!read_color(db, inst, - "menu.title.textColor", &theme->menu_title_color)) + "window.active.button.toggled.image.color", + &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.inactive.button.toggled.image.color", + &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.text.color", &theme->menu_title_color)) theme->menu_title_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, - "menu.frame.textColor", &theme->menu_color)) + "menu.items.text.color", &theme->menu_color)) theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "menu.frame.disableColor", &theme->menu_disabled_color)) + "menu.items.disabled.text.color", + &theme->menu_disabled_color)) theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, - "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); + "menu.items.active.text.color", + &theme->menu_selected_color)) + theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); + + 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); + theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH, + OB_DEFAULT_ICON_HEIGHT, + OB_DEFAULT_ICON_pixel_data); + + 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); + } + { + 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)) { + 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[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f }; - theme->shade_set_mask = RrPixmapMaskNew(inst, 7, 7, data); + 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, "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, "bullet.xbm", theme, &theme->menu_bullet_mask)) { + guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; + theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (char*)data); + } /* read the decoration textures */ if (!read_appearance(db, inst, - "window.title.focus", theme->a_focused_title, + "window.active.title.bg", 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.inactive.title.bg", 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.active.label.bg", 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.inactive.label.bg", 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.active.handle.bg", 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.inactive.handle.bg",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.active.grip.bg", 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.inactive.grip.bg", theme->a_unfocused_grip, TRUE)) set_default_appearance(theme->a_unfocused_grip); if (!read_appearance(db, inst, - "menu.frame", theme->a_menu, + "menu.items.bg", theme->a_menu, FALSE)) set_default_appearance(theme->a_menu); if (!read_appearance(db, inst, - "menu.title", theme->a_menu_title, + "menu.title.bg", theme->a_menu_title, FALSE)) set_default_appearance(theme->a_menu_title); if (!read_appearance(db, inst, - "menu.hilite", theme->a_menu_hilite, + "menu.items.active.bg", theme->a_menu_selected, TRUE)) - set_default_appearance(theme->a_menu_hilite); + set_default_appearance(theme->a_menu_selected); /* read the appearances for rendering non-decorations */ if (!read_appearance(db, inst, - "window.title.focus", theme->app_hilite_bg, + "window.active.title.bg", 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.active.label.bg", 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.active.label.bg", theme->app_hilite_fg, + TRUE)) + set_default_appearance(theme->app_hilite_fg); + else if (theme->app_hilite_label->surface.grad == RR_SURFACE_PARENTREL) { + if (!read_appearance(db, inst, + "window.active.title.bg", + theme->app_hilite_fg, + FALSE)) + set_default_appearance(theme->app_hilite_fg); + } + if (!read_appearance(db, inst, + "window.inactive.title.bg", 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.inactive.label.bg", theme->app_unhilite_label, TRUE)) set_default_appearance(theme->app_unhilite_label); + if (!read_appearance(db, inst, + "window.inactive.label.bg", theme->app_unhilite_fg, + TRUE)) + set_default_appearance(theme->app_unhilite_fg); + else if (theme->app_unhilite_label->surface.grad == RR_SURFACE_PARENTREL) { + if (!read_appearance(db, inst, + "window.inactive.title.bg", + theme->app_unhilite_fg, + FALSE)) + set_default_appearance(theme->app_unhilite_fg); + } + /* read buttons textures */ if (!read_appearance(db, inst, - "window.button.disabled.focus", + "window.active.button.disabled.bg", theme->a_disabled_focused_max, TRUE)) set_default_appearance(theme->a_disabled_focused_max); if (!read_appearance(db, inst, - "window.button.disabled.unfocus", + "window.inactive.button.disabled.bg", theme->a_disabled_unfocused_max, TRUE)) set_default_appearance(theme->a_disabled_unfocused_max); if (!read_appearance(db, inst, - "window.button.pressed.focus", + "window.active.button.pressed.bg", theme->a_focused_pressed_max, TRUE)) - if (!read_appearance(db, inst, - "window.button.pressed", - theme->a_focused_pressed_max, - TRUE)) - set_default_appearance(theme->a_focused_pressed_max); + set_default_appearance(theme->a_focused_pressed_max); if (!read_appearance(db, inst, - "window.button.pressed.unfocus", + "window.inactive.button.pressed.bg", theme->a_unfocused_pressed_max, TRUE)) - if (!read_appearance(db, inst, - "window.button.pressed", - theme->a_unfocused_pressed_max, - TRUE)) - set_default_appearance(theme->a_unfocused_pressed_max); + set_default_appearance(theme->a_unfocused_pressed_max); if (!read_appearance(db, inst, - "window.button.focus", + "window.active.button.toggled.bg", + theme->a_toggled_focused_max, + TRUE)) + { + RrAppearanceFree(theme->a_toggled_focused_max); + theme->a_toggled_focused_max = + RrAppearanceCopy(theme->a_focused_pressed_max); + } + if (!read_appearance(db, inst, + "window.inactive.button.toggled.bg", + theme->a_toggled_unfocused_max, + TRUE)) + { + RrAppearanceFree(theme->a_toggled_unfocused_max); + theme->a_toggled_unfocused_max = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + } + if (!read_appearance(db, inst, + "window.active.button.unpressed.bg", theme->a_focused_unpressed_max, TRUE)) set_default_appearance(theme->a_focused_unpressed_max); if (!read_appearance(db, inst, - "window.button.unfocus", + "window.inactive.button.unpressed.bg", theme->a_unfocused_unpressed_max, TRUE)) set_default_appearance(theme->a_unfocused_unpressed_max); if (!read_appearance(db, inst, - "window.button.hover.focus", + "window.active.button.hover.bg", theme->a_hover_focused_max, TRUE)) + { + RrAppearanceFree(theme->a_hover_focused_max); theme->a_hover_focused_max = RrAppearanceCopy(theme->a_focused_unpressed_max); + } if (!read_appearance(db, inst, - "window.button.hover.unfocus", + "window.inactive.button.hover.bg", theme->a_hover_unfocused_max, TRUE)) + { + RrAppearanceFree(theme->a_hover_unfocused_max); theme->a_hover_unfocused_max = RrAppearanceCopy(theme->a_unfocused_unpressed_max); + } theme->a_disabled_focused_close = RrAppearanceCopy(theme->a_disabled_focused_max); @@ -430,19 +604,19 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_hover_focused_desk = RrAppearanceCopy(theme->a_hover_focused_max); theme->a_hover_unfocused_desk = - RrAppearanceCopy(theme->a_hover_unfocused_max); + RrAppearanceCopy(theme->a_hover_unfocused_max); + theme->a_toggled_focused_desk = + RrAppearanceCopy(theme->a_toggled_focused_max); + theme->a_toggled_unfocused_desk = + RrAppearanceCopy(theme->a_toggled_unfocused_max); theme->a_unfocused_unpressed_desk = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_desk = RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_unfocused_pressed_set_desk = - RrAppearanceCopy(theme->a_unfocused_pressed_max); theme->a_focused_unpressed_desk = RrAppearanceCopy(theme->a_focused_unpressed_max); theme->a_focused_pressed_desk = RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_focused_pressed_set_desk = - RrAppearanceCopy(theme->a_focused_pressed_max); theme->a_disabled_focused_shade = RrAppearanceCopy(theme->a_disabled_focused_max); theme->a_disabled_unfocused_shade = @@ -451,18 +625,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RrAppearanceCopy(theme->a_hover_focused_max); theme->a_hover_unfocused_shade = RrAppearanceCopy(theme->a_hover_unfocused_max); + theme->a_toggled_focused_shade = + RrAppearanceCopy(theme->a_toggled_focused_max); + theme->a_toggled_unfocused_shade = + RrAppearanceCopy(theme->a_toggled_unfocused_max); theme->a_unfocused_unpressed_shade = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_shade = RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_unfocused_pressed_set_shade = - RrAppearanceCopy(theme->a_unfocused_pressed_max); theme->a_focused_unpressed_shade = RrAppearanceCopy(theme->a_focused_unpressed_max); theme->a_focused_pressed_shade = RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_focused_pressed_set_shade = - RrAppearanceCopy(theme->a_focused_pressed_max); theme->a_disabled_focused_iconify = RrAppearanceCopy(theme->a_disabled_focused_max); theme->a_disabled_unfocused_iconify = @@ -470,7 +644,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_hover_focused_iconify = RrAppearanceCopy(theme->a_hover_focused_max); theme->a_hover_unfocused_iconify = - RrAppearanceCopy(theme->a_hover_focused_max); + RrAppearanceCopy(theme->a_hover_unfocused_max); theme->a_unfocused_unpressed_iconify = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_iconify = @@ -479,12 +653,17 @@ 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_icon->surface.grad = + theme->a_clear->surface.grad = + theme->a_clear_tex->surface.grad = + theme->a_menu_normal->surface.grad = + theme->a_menu_disabled->surface.grad = + theme->a_menu_text_normal->surface.grad = + theme->a_menu_text_disabled->surface.grad = + theme->a_menu_text_selected->surface.grad = + theme->a_menu_bullet_normal->surface.grad = + theme->a_menu_bullet_selected->surface.grad = RR_SURFACE_PARENTREL; /* set up the textures */ theme->a_focused_label->texture[0].type = @@ -492,7 +671,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; @@ -500,9 +680,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_unfocused_label->texture[0].type = theme->app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT; theme->a_unfocused_label->texture[0].data.text.justify = winjust; - theme->app_unhilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + 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; @@ -512,35 +694,32 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_menu_title->texture[0].data.text.font = theme->mtitlefont; theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color; - theme->a_menu_item->surface.grad = - theme->a_menu_disabled->surface.grad = - theme->app_icon->surface.grad = RR_SURFACE_PARENTREL; - - theme->a_menu_item->texture[0].type = - theme->a_menu_disabled->texture[0].type = - theme->a_menu_hilite->texture[0].type = RR_TEXTURE_TEXT; - theme->a_menu_item->texture[0].data.text.justify = - theme->a_menu_disabled->texture[0].data.text.justify = - theme->a_menu_hilite->texture[0].data.text.justify = mjust; - theme->a_menu_item->texture[0].data.text.font = - theme->a_menu_disabled->texture[0].data.text.font = - theme->a_menu_hilite->texture[0].data.text.font = theme->mfont; - theme->a_menu_item->texture[0].data.text.color = theme->menu_color; - theme->a_menu_disabled->texture[0].data.text.color = + theme->a_menu_text_normal->texture[0].type = + theme->a_menu_text_disabled->texture[0].type = + theme->a_menu_text_selected->texture[0].type = RR_TEXTURE_TEXT; + theme->a_menu_text_normal->texture[0].data.text.justify = + theme->a_menu_text_disabled->texture[0].data.text.justify = + theme->a_menu_text_selected->texture[0].data.text.justify = + RR_JUSTIFY_LEFT; + theme->a_menu_text_normal->texture[0].data.text.font = + theme->a_menu_text_disabled->texture[0].data.text.font = + theme->a_menu_text_selected->texture[0].data.text.font = theme->mfont; + theme->a_menu_text_normal->texture[0].data.text.color = theme->menu_color; + theme->a_menu_text_disabled->texture[0].data.text.color = theme->menu_disabled_color; - theme->a_menu_hilite->texture[0].data.text.color = - theme->menu_hilite_color; + theme->a_menu_text_selected->texture[0].data.text.color = + theme->menu_selected_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 = @@ -553,22 +732,22 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_disabled_unfocused_desk->texture[0].type = theme->a_hover_focused_desk->texture[0].type = theme->a_hover_unfocused_desk->texture[0].type = + theme->a_toggled_focused_desk->texture[0].type = + theme->a_toggled_unfocused_desk->texture[0].type = theme->a_focused_unpressed_desk->texture[0].type = theme->a_focused_pressed_desk->texture[0].type = - theme->a_focused_pressed_set_desk->texture[0].type = theme->a_unfocused_unpressed_desk->texture[0].type = theme->a_unfocused_pressed_desk->texture[0].type = - theme->a_unfocused_pressed_set_desk->texture[0].type = theme->a_disabled_focused_shade->texture[0].type = theme->a_disabled_unfocused_shade->texture[0].type = theme->a_hover_focused_shade->texture[0].type = theme->a_hover_unfocused_shade->texture[0].type = + theme->a_toggled_focused_shade->texture[0].type = + theme->a_toggled_unfocused_shade->texture[0].type = theme->a_focused_unpressed_shade->texture[0].type = theme->a_focused_pressed_shade->texture[0].type = - theme->a_focused_pressed_set_shade->texture[0].type = theme->a_unfocused_unpressed_shade->texture[0].type = theme->a_unfocused_pressed_shade->texture[0].type = - theme->a_unfocused_pressed_set_shade->texture[0].type = theme->a_disabled_focused_iconify->texture[0].type = theme->a_disabled_unfocused_iconify->texture[0].type = theme->a_hover_focused_iconify->texture[0].type = @@ -576,61 +755,82 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_normal->texture[0].type = + theme->a_menu_bullet_selected->texture[0].type = RR_TEXTURE_MASK; + theme->a_disabled_focused_max->texture[0].data.mask.mask = theme->a_disabled_unfocused_max->texture[0].data.mask.mask = - theme->a_hover_focused_max->texture[0].data.mask.mask = + theme->max_disabled_mask; + theme->a_hover_focused_max->texture[0].data.mask.mask = theme->a_hover_unfocused_max->texture[0].data.mask.mask = - theme->a_focused_unpressed_max->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = - theme->a_focused_pressed_max->texture[0].data.mask.mask = + theme->max_hover_mask; + theme->a_focused_pressed_max->texture[0].data.mask.mask = theme->a_unfocused_pressed_max->texture[0].data.mask.mask = - theme->max_unset_mask; - theme->a_focused_pressed_set_max->texture[0].data.mask.mask = - theme->a_unfocused_pressed_set_max->texture[0].data.mask.mask = - theme->max_set_mask; + theme->max_pressed_mask; + theme->a_focused_unpressed_max->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = + theme->max_mask; + theme->a_toggled_focused_max->texture[0].data.mask.mask = + theme->a_toggled_unfocused_max->texture[0].data.mask.mask = + theme->max_toggled_mask; theme->a_disabled_focused_close->texture[0].data.mask.mask = theme->a_disabled_unfocused_close->texture[0].data.mask.mask = - theme->a_hover_focused_close->texture[0].data.mask.mask = + theme->close_disabled_mask; + theme->a_hover_focused_close->texture[0].data.mask.mask = theme->a_hover_unfocused_close->texture[0].data.mask.mask = - theme->a_focused_pressed_close->texture[0].data.mask.mask = + theme->close_hover_mask; + theme->a_focused_pressed_close->texture[0].data.mask.mask = theme->a_unfocused_pressed_close->texture[0].data.mask.mask = - theme->a_focused_unpressed_close->texture[0].data.mask.mask = + theme->close_pressed_mask; + theme->a_focused_unpressed_close->texture[0].data.mask.mask = theme->a_unfocused_unpressed_close->texture[0].data.mask.mask = theme->close_mask; theme->a_disabled_focused_desk->texture[0].data.mask.mask = theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = - theme->a_hover_focused_desk->texture[0].data.mask.mask = + theme->desk_disabled_mask; + theme->a_hover_focused_desk->texture[0].data.mask.mask = theme->a_hover_unfocused_desk->texture[0].data.mask.mask = - theme->a_focused_unpressed_desk->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = - theme->a_focused_pressed_desk->texture[0].data.mask.mask = + theme->desk_hover_mask; + theme->a_focused_pressed_desk->texture[0].data.mask.mask = theme->a_unfocused_pressed_desk->texture[0].data.mask.mask = - theme->desk_unset_mask; - theme->a_focused_pressed_set_desk->texture[0].data.mask.mask = - theme->a_unfocused_pressed_set_desk->texture[0].data.mask.mask = - theme->desk_set_mask; + theme->desk_pressed_mask; + theme->a_focused_unpressed_desk->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = + theme->desk_mask; + theme->a_toggled_focused_desk->texture[0].data.mask.mask = + theme->a_toggled_unfocused_desk->texture[0].data.mask.mask = + theme->desk_toggled_mask; theme->a_disabled_focused_shade->texture[0].data.mask.mask = theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = - theme->a_hover_focused_shade->texture[0].data.mask.mask = + theme->shade_disabled_mask; + theme->a_hover_focused_shade->texture[0].data.mask.mask = theme->a_hover_unfocused_shade->texture[0].data.mask.mask = - theme->a_focused_unpressed_shade->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = - theme->a_focused_pressed_shade->texture[0].data.mask.mask = + theme->shade_hover_mask; + theme->a_focused_pressed_shade->texture[0].data.mask.mask = theme->a_unfocused_pressed_shade->texture[0].data.mask.mask = - theme->shade_unset_mask; - theme->a_focused_pressed_set_shade->texture[0].data.mask.mask = - theme->a_unfocused_pressed_set_shade->texture[0].data.mask.mask = - theme->shade_set_mask; + theme->shade_pressed_mask; + theme->a_focused_unpressed_shade->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = + theme->shade_mask; + theme->a_toggled_focused_shade->texture[0].data.mask.mask = + theme->a_toggled_unfocused_shade->texture[0].data.mask.mask = + theme->shade_toggled_mask; theme->a_disabled_focused_iconify->texture[0].data.mask.mask = theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = - theme->a_hover_focused_iconify->texture[0].data.mask.mask = + theme->iconify_disabled_mask; + theme->a_hover_focused_iconify->texture[0].data.mask.mask = theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = - theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = - theme->a_focused_pressed_iconify->texture[0].data.mask.mask = + theme->iconify_hover_mask; + theme->a_focused_pressed_iconify->texture[0].data.mask.mask = theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask = + theme->iconify_pressed_mask; + theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = theme->iconify_mask; + theme->a_menu_bullet_normal->texture[0].data.mask.mask = + theme->a_menu_bullet_selected->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 = @@ -655,6 +855,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_hover_unfocused_shade->texture[0].data.mask.color = theme->a_hover_unfocused_iconify->texture[0].data.mask.color = theme->titlebut_hover_unfocused_color; + theme->a_toggled_focused_max->texture[0].data.mask.color = + theme->a_toggled_focused_desk->texture[0].data.mask.color = + theme->a_toggled_focused_shade->texture[0].data.mask.color = + theme->titlebut_toggled_focused_color; + theme->a_toggled_unfocused_max->texture[0].data.mask.color = + theme->a_toggled_unfocused_desk->texture[0].data.mask.color = + theme->a_toggled_unfocused_shade->texture[0].data.mask.color = + theme->titlebut_toggled_unfocused_color; theme->a_focused_unpressed_max->texture[0].data.mask.color = theme->a_focused_unpressed_close->texture[0].data.mask.color = theme->a_focused_unpressed_desk->texture[0].data.mask.color = @@ -662,12 +870,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_focused_unpressed_iconify->texture[0].data.mask.color = theme->titlebut_focused_unpressed_color; theme->a_focused_pressed_max->texture[0].data.mask.color = - theme->a_focused_pressed_set_max->texture[0].data.mask.color = theme->a_focused_pressed_close->texture[0].data.mask.color = theme->a_focused_pressed_desk->texture[0].data.mask.color = - theme->a_focused_pressed_set_desk->texture[0].data.mask.color = theme->a_focused_pressed_shade->texture[0].data.mask.color = - theme->a_focused_pressed_set_shade->texture[0].data.mask.color = theme->a_focused_pressed_iconify->texture[0].data.mask.color = theme->titlebut_focused_pressed_color; theme->a_unfocused_unpressed_max->texture[0].data.mask.color = @@ -677,21 +882,42 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = theme->titlebut_unfocused_unpressed_color; theme->a_unfocused_pressed_max->texture[0].data.mask.color = - theme->a_unfocused_pressed_set_max->texture[0].data.mask.color = theme->a_unfocused_pressed_close->texture[0].data.mask.color = theme->a_unfocused_pressed_desk->texture[0].data.mask.color = - theme->a_unfocused_pressed_set_desk->texture[0].data.mask.color = theme->a_unfocused_pressed_shade->texture[0].data.mask.color = - theme->a_unfocused_pressed_set_shade->texture[0].data.mask.color = theme->a_unfocused_pressed_iconify->texture[0].data.mask.color = theme->titlebut_unfocused_pressed_color; + theme->a_menu_bullet_normal->texture[0].data.mask.color = + theme->menu_color; + theme->a_menu_bullet_selected->texture[0].data.mask.color = + theme->menu_selected_color; XrmDestroyDatabase(db); - theme->label_height = theme->winfont_height; - theme->title_height = theme->label_height + theme->bevel * 2; + { + gint fl, ft, fr, fb; + gint ul, ut, ur, ub; + + RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb); + RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub); + theme->label_height = theme->winfont_height + + MAX(ft + fb, ut + ub); + + /* this would be nice I think, since padding.width can now be 0, + but it breaks frame.c horribly and I don't feel like fixing that + right now, so if anyone complains, here is how to keep text from + going over the title's bevel/border with a padding.width of 0 and a + bevelless/borderless label + RrMargins(theme->a_focused_title, &fl, &ft, &fr, &fb); + RrMargins(theme->a_unfocused_title, &ul, &ut, &ur, &ub); + theme->title_height = theme->label_height + + MAX(MAX(theme->padding * 2, ft + fb), + MAX(theme->padding * 2, ut + ub)); + */ + theme->title_height = theme->label_height + theme->padding * 2; + } theme->button_size = theme->label_height - 2; - theme->grip_width = theme->button_size * 2; + theme->grip_width = theme->title_height * 1.5; return theme; } @@ -699,6 +925,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) void RrThemeFree(RrTheme *theme) { if (theme) { + g_free(theme->path); g_free(theme->name); RrColorFree(theme->b_color); @@ -710,6 +937,8 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->titlebut_disabled_unfocused_color); RrColorFree(theme->titlebut_hover_focused_color); RrColorFree(theme->titlebut_hover_unfocused_color); + RrColorFree(theme->titlebut_toggled_focused_color); + RrColorFree(theme->titlebut_toggled_unfocused_color); RrColorFree(theme->titlebut_unfocused_pressed_color); RrColorFree(theme->titlebut_focused_pressed_color); RrColorFree(theme->titlebut_unfocused_unpressed_color); @@ -717,33 +946,50 @@ void RrThemeFree(RrTheme *theme) 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); + RrColorFree(theme->menu_selected_color); + + g_free(theme->def_win_icon); + + 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); @@ -756,6 +1002,8 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_disabled_unfocused_desk); RrAppearanceFree(theme->a_hover_focused_desk); RrAppearanceFree(theme->a_hover_unfocused_desk); + RrAppearanceFree(theme->a_toggled_focused_desk); + RrAppearanceFree(theme->a_toggled_unfocused_desk); RrAppearanceFree(theme->a_focused_unpressed_desk); RrAppearanceFree(theme->a_focused_pressed_desk); RrAppearanceFree(theme->a_unfocused_unpressed_desk); @@ -764,6 +1012,8 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_disabled_unfocused_shade); RrAppearanceFree(theme->a_hover_focused_shade); RrAppearanceFree(theme->a_hover_unfocused_shade); + RrAppearanceFree(theme->a_toggled_focused_shade); + RrAppearanceFree(theme->a_toggled_unfocused_shade); RrAppearanceFree(theme->a_focused_unpressed_shade); RrAppearanceFree(theme->a_focused_pressed_shade); RrAppearanceFree(theme->a_unfocused_unpressed_shade); @@ -787,32 +1037,52 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_unfocused_handle); RrAppearanceFree(theme->a_menu); RrAppearanceFree(theme->a_menu_title); - RrAppearanceFree(theme->a_menu_item); + RrAppearanceFree(theme->a_menu_normal); RrAppearanceFree(theme->a_menu_disabled); - RrAppearanceFree(theme->a_menu_hilite); + RrAppearanceFree(theme->a_menu_selected); + RrAppearanceFree(theme->a_menu_text_normal); + RrAppearanceFree(theme->a_menu_text_disabled); + RrAppearanceFree(theme->a_menu_text_selected); + RrAppearanceFree(theme->a_menu_bullet_normal); + RrAppearanceFree(theme->a_menu_bullet_selected); + RrAppearanceFree(theme->a_clear); + RrAppearanceFree(theme->a_clear_tex); RrAppearanceFree(theme->app_hilite_bg); RrAppearanceFree(theme->app_unhilite_bg); + RrAppearanceFree(theme->app_hilite_fg); + RrAppearanceFree(theme->app_unhilite_fg); RrAppearanceFree(theme->app_hilite_label); RrAppearanceFree(theme->app_unhilite_label); - RrAppearanceFree(theme->app_icon); + + g_free(theme); } } static XrmDatabase loaddb(RrTheme *theme, char *name) { - XrmDatabase db; + GSList *it; + XrmDatabase db = NULL; + gchar *s; - if ((db = XrmGetFileDatabase(name))) - theme->path = g_path_get_dirname(name); - if (db == NULL) { - char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes", - name, NULL); + if (name[0] == '/') { + s = g_build_filename(name, "openbox-3", "themerc", NULL); if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); - g_free(s); + g_free(s); + } else { + for (it = parse_xdg_data_dir_paths(); !db && it; + it = g_slist_next(it)) + { + s = g_build_filename(it->data, "themes", name, + "openbox-3", "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); + s = g_build_filename(name, "themerc", NULL); if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s); @@ -898,37 +1168,17 @@ 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; } @@ -993,13 +1243,15 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, gboolean allow_trans) { gboolean ret = FALSE; - char *rclass = create_class_name(rname), *cname, *ctoname, *bcname; + char *rclass = create_class_name(rname); + char *cname, *ctoname, *bcname, *icname; char *rettype; XrmValue retvalue; cname = g_strconcat(rname, ".color", NULL); ctoname = g_strconcat(rname, ".colorTo", NULL); - bcname = g_strconcat(rname, ".borderColor", NULL); + bcname = g_strconcat(rname, ".border.color", NULL); + icname = g_strconcat(rname, ".interlace.color", NULL); if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { @@ -1018,9 +1270,14 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, if (!read_color(db, inst, bcname, &value->surface.border_color)) value->surface.border_color = RrColorNew(inst, 0, 0, 0); + if (value->surface.interlaced) + if (!read_color(db, inst, icname, + &value->surface.interlace_color)) + value->surface.interlace_color = RrColorNew(inst, 0, 0, 0); ret = TRUE; } + g_free(icname); g_free(bcname); g_free(ctoname); g_free(cname); @@ -1038,3 +1295,28 @@ static void set_default_appearance(RrAppearance *a) a->surface.primary = RrColorNew(a->inst, 0, 0, 0); a->surface.secondary = RrColorNew(a->inst, 0, 0, 0); } + +/* Reads the output from gimp's C-Source file format into valid RGBA data for + an RrTextureRGBA. */ +static RrPixel32* read_c_image(gint width, gint height, const guint8 *data) +{ + RrPixel32 *im, *p; + gint i; + + p = im = g_memdup(data, width * height * sizeof(RrPixel32)); + + for (i = 0; i < width * height; ++i) { + guchar a = ((*p >> 24) & 0xff); + guchar b = ((*p >> 16) & 0xff); + guchar g = ((*p >> 8) & 0xff); + guchar r = ((*p >> 0) & 0xff); + + *p = ((r << RrDefaultRedOffset) + + (g << RrDefaultGreenOffset) + + (b << RrDefaultBlueOffset) + + (a << RrDefaultAlphaOffset)); + p++; + } + + return im; +}