X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=399bd2c5a3fb8e72f55ca93a80e30e97ebab34e1;hb=4bf6b1b551be744be4fbe4d1faab5be12d051378;hp=8051a3afdb8a98228d0de715da9dcc485bbd5c89;hpb=410bf6dc53d6779d019128381f6b8dbcaf03dc31;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 8051a3af..399bd2c5 100644 --- a/render/theme.c +++ b/render/theme.c @@ -23,88 +23,97 @@ #include "mask.h" #include "theme.h" #include "icon.h" -#include "parser/parse.h" +#include "obt/paths.h" #include +#include #include #include #include -typedef struct { - xmlDocPtr doc; - const RrInstance *inst; - gchar *path; -} ParseState; - -static void parse_style(gchar *tex, RrSurfaceColorType *grad, - RrReliefType *relief, RrBevelType *bevel, - gboolean *interlaced, gboolean *border, - gboolean allow_trans); -static gboolean read_mask(ParseState *ps, const gchar *maskname, +static XrmDatabase loaddb(const gchar *name, gchar **path); +static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value); +static gboolean read_string(XrmDatabase db, const gchar *rname, gchar **value); +static gboolean read_color(XrmDatabase db, const RrInstance *inst, + const gchar *rname, RrColor **value); +static gboolean read_mask(const RrInstance *inst, const gchar *path, + RrTheme *theme, const gchar *maskname, RrPixmapMask **value); +static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, + const gchar *rname, RrAppearance *value, + gboolean allow_trans); +static int parse_inline_number(const char *p); static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); -static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[]); -static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[], - gint *integer, gint lower, gint upper); -static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[], - gchar **string); -static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrColor **color, gchar *alpha); - static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[], - gint *x, gint *y, - gint lowx, gint lowy, gint upx, gint upy); -static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrAppearance *a); -static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrAppearance *a, gboolean allow_trans); - -/* make a null terminated array out of a list of strings */ -#define L(args...) (const gchar*[]){args,NULL} -/* shortcut to the various find_* functions */ -#define FIND(type, args...) find_##type(&ps, root, args) - -RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, + +static RrFont *get_font(RrFont *target, RrFont **default_font, + const RrInstance *inst) +{ + if (target) { + RrFontRef(target); + return target; + } else { + /* Only load the default font once */ + if (*default_font) { + RrFontRef(*default_font); + } else { + *default_font = RrFontOpenDefault(inst); + } + return *default_font; + } +} + +RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, + gboolean allow_fallback, RrFont *active_window_font, RrFont *inactive_window_font, RrFont *menu_title_font, RrFont *menu_item_font, RrFont *osd_font) { - ParseState ps; - xmlNodePtr root; + XrmDatabase db = NULL; RrJustify winjust, mtitlejust; gchar *str; RrTheme *theme; + RrFont *default_font = NULL; + gchar *path; + gboolean userdef; if (name) { - if (!parse_load_theme(name, &ps.doc, &root, &ps.path)) { + db = loaddb(name, &path); + if (db == NULL) { g_message("Unable to load the theme '%s'", name); - g_message("Falling back to the default theme '%s'", - DEFAULT_THEME); - /* make it fall back to default theme */ + if (allow_fallback) + g_message("Falling back to the default theme '%s'", + DEFAULT_THEME); + /* fallback to the default theme */ name = NULL; } } - if (!name) { - if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path)) { - g_message("Unable to load the theme '%s'", DEFAULT_THEME); + if (name == NULL) { + if (allow_fallback) { + db = loaddb(DEFAULT_THEME, &path); + if (db == NULL) { + g_message("Unable to load the theme '%s'", DEFAULT_THEME); + return NULL; + } + } else return NULL; - } } - ps.inst = inst; theme = g_new0(RrTheme, 1); + theme->inst = inst; + theme->name = g_strdup(name ? name : DEFAULT_THEME); 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_pressed_max = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_pressed_max = RrAppearanceNew(inst, 1); theme->a_toggled_focused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_toggled_unfocused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_toggled_hover_focused_max = RrAppearanceNew(inst, 1); theme->a_toggled_hover_unfocused_max = RrAppearanceNew(inst, 1); + theme->a_toggled_focused_pressed_max = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_pressed_max = RrAppearanceNew(inst, 1); theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); @@ -122,9 +131,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_title = RrAppearanceNew(inst, 0); theme->a_menu_text_title = RrAppearanceNew(inst, 1); theme->a_menu_normal = RrAppearanceNew(inst, 0); - theme->a_menu_disabled = RrAppearanceNew(inst, 0); - theme->a_menu_disabled_selected = RrAppearanceNew(inst, 0); theme->a_menu_selected = RrAppearanceNew(inst, 0); + theme->a_menu_disabled = RrAppearanceNew(inst, 0); + /* a_menu_disabled_selected is copied from a_menu_selected */ theme->a_menu_text_normal = RrAppearanceNew(inst, 1); theme->a_menu_text_selected = RrAppearanceNew(inst, 1); theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); @@ -133,578 +142,630 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_bullet_selected = RrAppearanceNew(inst, 1); theme->a_clear = RrAppearanceNew(inst, 0); theme->a_clear_tex = RrAppearanceNew(inst, 1); + theme->osd_hilite_bg = RrAppearanceNew(inst, 0); + theme->osd_hilite_label = RrAppearanceNew(inst, 1); + theme->osd_hilite_fg = RrAppearanceNew(inst, 0); + theme->osd_unhilite_fg = RrAppearanceNew(inst, 0); /* load the font stuff */ - - if (active_window_font) { - theme->win_font_focused = active_window_font; - RrFontRef(active_window_font); - } else - theme->win_font_focused = RrFontOpenDefault(inst); - - if (inactive_window_font) { - theme->win_font_unfocused = inactive_window_font; - RrFontRef(inactive_window_font); - } else - theme->win_font_unfocused = RrFontOpenDefault(inst); + theme->win_font_focused = get_font(active_window_font, + &default_font, inst); + theme->win_font_unfocused = get_font(inactive_window_font, + &default_font, inst); winjust = RR_JUSTIFY_LEFT; - if (FIND(string, L( "window", "justify"), &str)) { - if (strcmp(str, "right") == 0) + if (read_string(db, "window.label.text.justify", &str)) { + if (!g_ascii_strcasecmp(str, "right")) winjust = RR_JUSTIFY_RIGHT; - else if (strcmp(str, "center") == 0) + else if (!g_ascii_strcasecmp(str, "center")) winjust = RR_JUSTIFY_CENTER; - g_free(str); } - if (menu_title_font) { - theme->menu_title_font = menu_title_font; - RrFontRef(menu_title_font); - } else - theme->menu_title_font = RrFontOpenDefault(inst); + theme->menu_title_font = get_font(menu_title_font, &default_font, inst); mtitlejust = RR_JUSTIFY_LEFT; - if (FIND(string, L("menu", "justify"), &str)) { - if (strcmp(str, "right") == 0) + if (read_string(db, "menu.title.text.justify", &str)) { + if (!g_ascii_strcasecmp(str, "right")) mtitlejust = RR_JUSTIFY_RIGHT; - else if (strcmp(str, "center") == 0) + else if (!g_ascii_strcasecmp(str, "center")) mtitlejust = RR_JUSTIFY_CENTER; - g_free(str); } - if (menu_item_font) { - theme->menu_font = menu_item_font; - RrFontRef(menu_item_font); - } else - theme->menu_font = RrFontOpenDefault(inst); + theme->menu_font = get_font(menu_item_font, &default_font, inst); - if (osd_font) { - theme->osd_font = osd_font; - RrFontRef(osd_font); - } else - theme->osd_font = RrFontOpenDefault(inst); + theme->osd_font = get_font(osd_font, &default_font, inst); /* load direct dimensions */ - if (!FIND(int, L("menu","overlap"), - &theme->menu_overlap, -100, 100)) - theme->menu_overlap = 0; - - if (!FIND(int, L("dimensions","handle"), &theme->handle_height, 0, 100)) + if ((!read_int(db, "menu.overlap.x", &theme->menu_overlap_x) && + !read_int(db, "menu.overlap", &theme->menu_overlap_x)) || + theme->menu_overlap_x < -100 || theme->menu_overlap_x > 100) + theme->menu_overlap_x = 0; + if ((!read_int(db, "menu.overlap.y", &theme->menu_overlap_y) && + !read_int(db, "menu.overlap", &theme->menu_overlap_y)) || + theme->menu_overlap_y < -100 || theme->menu_overlap_y > 100) + theme->menu_overlap_y = 0; + if (!read_int(db, "window.handle.width", &theme->handle_height) || + theme->handle_height < 0 || theme->handle_height > 100) theme->handle_height = 6; - - if (!FIND(point, L("dimensions","padding"), - &theme->paddingx, &theme->paddingy, 0, 100, 0, 100)) - theme->paddingx = theme->paddingy = 3; - - if (!FIND(int, L("dimensions","window","border"), - &theme->fbwidth, 0, 100)) + if (!read_int(db, "padding.width", &theme->paddingx) || + theme->paddingx < 0 || theme->paddingx > 100) + theme->paddingx = 3; + if (!read_int(db, "padding.height", &theme->paddingy) || + theme->paddingy < 0 || theme->paddingy > 100) + theme->paddingy = theme->paddingx; + if (!read_int(db, "border.width", &theme->fbwidth) || + theme->fbwidth < 0 || theme->fbwidth > 100) theme->fbwidth = 1; - - /* menu border width inherits from frame border width */ - if (!FIND(int, L("dimensions","menu","border"), - &theme->mbwidth, 0, 100)) + /* menu border width inherits from the frame border width */ + if (!read_int(db, "menu.border.width", &theme->mbwidth) || + theme->mbwidth < 0 || theme->mbwidth > 100) theme->mbwidth = theme->fbwidth; - - if (!FIND(point, L("dimensions","window","clientpadding"), - &theme->cbwidthx, &theme->cbwidthy, 0, 100, 0, 100)) - theme->cbwidthx = theme->cbwidthy = 1; + /* osd border width inherits from the frame border width */ + if (!read_int(db, "osd.border.width", &theme->obwidth) || + theme->obwidth < 0 || theme->obwidth > 100) + theme->obwidth = theme->fbwidth; + if (!read_int(db, "window.client.padding.width", &theme->cbwidthx) || + theme->cbwidthx < 0 || theme->cbwidthx > 100) + theme->cbwidthx = theme->paddingx; + if (!read_int(db, "window.client.padding.height", &theme->cbwidthy) || + theme->cbwidthy < 0 || theme->cbwidthy > 100) + theme->cbwidthy = theme->cbwidthx; + if (!read_int(db, "menu.separator.width", &theme->menu_sep_width) || + theme->menu_sep_width < 1 || theme->menu_sep_width > 100) + theme->menu_sep_width = 1; + if (!read_int(db, "menu.separator.padding.width", + &theme->menu_sep_paddingx) || + theme->menu_sep_paddingx < 0 || theme->menu_sep_paddingx > 100) + theme->menu_sep_paddingx = 6; + if (!read_int(db, "menu.separator.padding.height", + &theme->menu_sep_paddingy) || + theme->menu_sep_paddingy < 0 || theme->menu_sep_paddingy > 100) + theme->menu_sep_paddingy = 3; /* load colors */ - if (!FIND(color, L("window","active","border"), - &theme->frame_focused_border_color, NULL)) + if (!read_color(db, inst, + "window.active.border.color", + &theme->frame_focused_border_color) && + !read_color(db, inst, + "border.color", + &theme->frame_focused_border_color)) theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0); - /* frame unfocused border color inherits from frame focused border color */ - if (!FIND(color, L("window","inactive","border"), - &theme->frame_unfocused_border_color, NULL)) - theme->frame_unfocused_border_color = + /* title separator focused color inherits from focused border color */ + if (!read_color(db, inst, + "window.active.title.separator.color", + &theme->title_separator_focused_color)) + theme->title_separator_focused_color = RrColorNew(inst, theme->frame_focused_border_color->r, theme->frame_focused_border_color->g, theme->frame_focused_border_color->b); + /* unfocused border color inherits from frame focused border color */ + if (!read_color(db, inst, + "window.inactive.border.color", + &theme->frame_unfocused_border_color)) + theme->frame_unfocused_border_color = + RrColorNew(inst, theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); + /* title separator unfocused color inherits from unfocused border color */ + if (!read_color(db, inst, + "window.inactive.title.separator.color", + &theme->title_separator_unfocused_color)) + theme->title_separator_unfocused_color = + RrColorNew(inst, + theme->frame_unfocused_border_color->r, + theme->frame_unfocused_border_color->g, + theme->frame_unfocused_border_color->b); /* menu border color inherits from frame focused border color */ - if (!FIND(color, L("menu","border"), - &theme->menu_border_color, NULL)) + if (!read_color(db, inst, "menu.border.color", &theme->menu_border_color)) theme->menu_border_color = RrColorNew(inst, theme->frame_focused_border_color->r, theme->frame_focused_border_color->g, theme->frame_focused_border_color->b); - if (!FIND(color, L("window","active","clientpadding"), - &theme->cb_focused_color, NULL)) - theme->cb_focused_color = RrColorNew(inst, 255, 255, 255); - if (!FIND(color, L("window","inactive","clientpadding"), - &theme->cb_unfocused_color, NULL)) - theme->cb_unfocused_color = RrColorNew(inst, 255, 255, 255); - if (!FIND(color, L("window","active","label","text","primary"), - &theme->title_focused_color, NULL)) + /* osd border color inherits from frame focused border color */ + if (!read_color(db, inst, "osd.border.color", &theme->osd_border_color)) + theme->osd_border_color = + RrColorNew(inst, + theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); + if (!read_color(db, inst, + "window.active.client.color", + &theme->cb_focused_color)) + theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.inactive.client.color", + &theme->cb_unfocused_color)) + theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.active.label.text.color", + &theme->title_focused_color)) theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); - if (!FIND(color, L("osd","text","primary"), - &theme->osd_color, NULL)) + if (!read_color(db, inst, "osd.label.text.color", &theme->osd_color)) theme->osd_color = RrColorNew(inst, theme->title_focused_color->r, theme->title_focused_color->g, theme->title_focused_color->b); - if (!FIND(color, L("window","inactive","label","text","primary"), - &theme->title_unfocused_color, NULL)) + if (!read_color(db, inst, + "window.inactive.label.text.color", + &theme->title_unfocused_color)) theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!FIND(color, L("window","active","buttons","unpressed","image"), - &theme->titlebut_focused_unpressed_color, NULL)) + if (!read_color(db, inst, + "window.active.button.unpressed.image.color", + &theme->titlebut_focused_unpressed_color)) theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0); - if (!FIND(color, L("window","inactive","buttons", "unpressed","image"), - &theme->titlebut_unfocused_unpressed_color, NULL)) + if (!read_color(db, inst, + "window.inactive.button.unpressed.image.color", + &theme->titlebut_unfocused_unpressed_color)) theme->titlebut_unfocused_unpressed_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!FIND(color, L("window","active","buttons","pressed","image"), - &theme->titlebut_focused_pressed_color, NULL)) + if (!read_color(db, inst, + "window.active.button.pressed.image.color", + &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 (!FIND(color, L("window","inactive","buttons","pressed","image"), - &theme->titlebut_unfocused_pressed_color, NULL)) + if (!read_color(db, inst, + "window.inactive.button.pressed.image.color", + &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 (!FIND(color, L("window","active","buttons","disabled","image"), - &theme->titlebut_disabled_focused_color, NULL)) + if (!read_color(db, inst, + "window.active.button.disabled.image.color", + &theme->titlebut_disabled_focused_color)) theme->titlebut_disabled_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!FIND(color, L("window","inactive","buttons","disabled","image"), - &theme->titlebut_disabled_unfocused_color, NULL)) + if (!read_color(db, inst, + "window.inactive.button.disabled.image.color", + &theme->titlebut_disabled_unfocused_color)) theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); - if (!FIND(color, - L("window","active","buttons","hover","image"), - &theme->titlebut_hover_focused_color, NULL)) + if (!read_color(db, inst, + "window.active.button.hover.image.color", + &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 (!FIND(color, L("window","inactive","buttons","hover","image"), - &theme->titlebut_hover_unfocused_color, NULL)) + if (!read_color(db, inst, + "window.inactive.button.hover.image.color", + &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 (!FIND(color, - L("window","active","buttons","toggled-pressed","image"), - &theme->titlebut_toggled_focused_pressed_color, NULL)) - theme->titlebut_toggled_focused_pressed_color = - RrColorNew(inst, - theme->titlebut_focused_pressed_color->r, - theme->titlebut_focused_pressed_color->g, - theme->titlebut_focused_pressed_color->b); - if (!FIND(color, - L("window","inactive","buttons","toggled-pressed","image"), - &theme->titlebut_toggled_unfocused_pressed_color, NULL)) - theme->titlebut_toggled_unfocused_pressed_color = - RrColorNew(inst, - theme->titlebut_unfocused_pressed_color->r, - theme->titlebut_unfocused_pressed_color->g, - theme->titlebut_unfocused_pressed_color->b); - if (!FIND(color, - L("window","active","buttons","toggled-unpressed","image"), - &theme->titlebut_toggled_focused_unpressed_color, NULL)) + if (!read_color(db, inst, + "window.active.button.toggled.unpressed.image.color", + &theme->titlebut_toggled_focused_unpressed_color) && + !read_color(db, inst, + "window.active.button.toggled.image.color", + &theme->titlebut_toggled_focused_unpressed_color)) theme->titlebut_toggled_focused_unpressed_color = RrColorNew(inst, theme->titlebut_focused_pressed_color->r, theme->titlebut_focused_pressed_color->g, theme->titlebut_focused_pressed_color->b); - if (!FIND(color, - L("window","inactive","buttons","toggled-unpressed","image"), - &theme->titlebut_toggled_unfocused_unpressed_color, NULL)) + if (!read_color(db, inst, + "window.inactive.button.toggled.unpressed.image.color", + &theme->titlebut_toggled_unfocused_unpressed_color) && + !read_color(db, inst, + "window.inactive.button.toggled.image.color", + &theme->titlebut_toggled_unfocused_unpressed_color)) theme->titlebut_toggled_unfocused_unpressed_color = RrColorNew(inst, theme->titlebut_unfocused_pressed_color->r, theme->titlebut_unfocused_pressed_color->g, theme->titlebut_unfocused_pressed_color->b); - if (!FIND(color, - L("window","active","buttons","toggled-hover","image"), - &theme->titlebut_toggled_hover_focused_color, NULL)) + if (!read_color(db, inst, + "window.active.button.toggled.hover.image.color", + &theme->titlebut_toggled_hover_focused_color)) theme->titlebut_toggled_hover_focused_color = RrColorNew(inst, theme->titlebut_toggled_focused_unpressed_color->r, theme->titlebut_toggled_focused_unpressed_color->g, theme->titlebut_toggled_focused_unpressed_color->b); - if (!FIND(color, - L("window","inactive","buttons","toggled-hover","image"), - &theme->titlebut_toggled_hover_unfocused_color, NULL)) + if (!read_color(db, inst, + "window.inactive.button.toggled.hover.image.color", + &theme->titlebut_toggled_hover_unfocused_color)) theme->titlebut_toggled_hover_unfocused_color = RrColorNew(inst, theme->titlebut_toggled_unfocused_unpressed_color->r, theme->titlebut_toggled_unfocused_unpressed_color->g, theme->titlebut_toggled_unfocused_unpressed_color->b); - if (!FIND(color, L("menu","title","text","primary"), - &theme->menu_title_color, NULL)) + if (!read_color(db, inst, + "window.active.button.toggled.pressed.image.color", + &theme->titlebut_toggled_focused_pressed_color)) + theme->titlebut_toggled_focused_pressed_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.pressed.image.color", + &theme->titlebut_toggled_unfocused_pressed_color)) + theme->titlebut_toggled_unfocused_pressed_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 (!FIND(color, L("menu","inactive","primary"), &theme->menu_color, NULL)) + if (!read_color(db, inst, + "menu.items.text.color", &theme->menu_color)) theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!FIND(color, L("menu","disabled","primary"), - &theme->menu_disabled_color, NULL)) + if (!read_color(db, inst, + "menu.items.disabled.text.color", + &theme->menu_disabled_color)) theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); - if (!FIND(color, L("menu","activedisabled","text","primary"), - &theme->menu_disabled_selected_color, NULL)) + if (!read_color(db, inst, + "menu.items.active.disabled.text.color", + &theme->menu_disabled_selected_color)) theme->menu_disabled_selected_color = RrColorNew(inst, theme->menu_disabled_color->r, theme->menu_disabled_color->g, theme->menu_disabled_color->b); - if (!FIND(color, L("menu","active","text","primary"), - &theme->menu_selected_color, NULL)) + if (!read_color(db, inst, + "menu.items.active.text.color", + &theme->menu_selected_color)) theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); - if (!FIND(color, L("window","active","label","text","shadow","primary"), - &theme->title_focused_shadow_color, - &theme->title_focused_shadow_alpha)) - { - theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->title_focused_shadow_alpha = 50; - } - if (!FIND(color, L("osd","text","shadow","primary"), - &theme->osd_shadow_color, &theme->osd_shadow_alpha)) - { - theme->osd_shadow_color = - RrColorNew(inst, theme->title_focused_shadow_color->r, - theme->title_focused_shadow_color->g, - theme->title_focused_shadow_color->b); - theme->osd_shadow_alpha = theme->title_focused_shadow_alpha; - } - if (!FIND(color, L("window","inactive","label","text","shadow","primary"), - &theme->title_unfocused_shadow_color, - &theme->title_unfocused_shadow_alpha)) - { - theme->title_unfocused_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->title_unfocused_shadow_alpha = 50; - } - if (!FIND(color, L("menu","title","text","shadow","primary"), - &theme->menu_title_shadow_color, - &theme->menu_title_shadow_alpha)) - { - theme->menu_title_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_title_shadow_alpha = 50; - } - if (!FIND(color, L("menu","inactive","shadow","primary"), - &theme->menu_text_normal_shadow_color, - &theme->menu_text_normal_shadow_alpha)) - { - theme->menu_text_normal_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_text_normal_shadow_alpha = 50; - } - if (!FIND(color, L("menu","active","text","shadow","primary"), - &theme->menu_text_selected_shadow_color, - &theme->menu_text_selected_shadow_alpha)) - { - theme->menu_text_selected_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_text_selected_shadow_alpha = 50; - } - if (!FIND(color, L("menu","disabled","shadow","primary"), - &theme->menu_text_disabled_shadow_color, - &theme->menu_text_disabled_shadow_alpha)) - { - theme->menu_text_disabled_shadow_color = - RrColorNew(inst, theme->menu_text_normal_shadow_color->r, - theme->menu_text_normal_shadow_color->g, - theme->menu_text_normal_shadow_color->b); - theme->menu_text_disabled_shadow_alpha = - theme->menu_text_normal_shadow_alpha; - } - if (!FIND(color, L("menu","activedisabled","shadow","primary"), - &theme->menu_text_disabled_selected_shadow_color, - &theme->menu_text_disabled_selected_shadow_alpha)) - { - theme->menu_text_disabled_selected_shadow_color = - RrColorNew(inst, theme->menu_text_disabled_shadow_color->r, - theme->menu_text_disabled_shadow_color->g, - theme->menu_text_disabled_shadow_color->b); - theme->menu_text_disabled_selected_shadow_alpha = - theme->menu_text_disabled_shadow_alpha; - } - + if (!read_color(db, inst, + "menu.separator.color", &theme->menu_sep_color)) + theme->menu_sep_color = RrColorNew(inst, + theme->menu_color->r, + theme->menu_color->g, + theme->menu_color->b); + /* load the image masks */ - if (read_mask(&ps, "max.xbm", &theme->max_mask)) { - if (!read_mask(&ps, "max_pressed.xbm", &theme->max_pressed_mask)) - theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); - if (!read_mask(&ps, "max_toggled.xbm", &theme->max_toggled_mask)) - theme->max_toggled_mask = - RrPixmapMaskCopy(theme->max_pressed_mask); - if (!read_mask(&ps, "max_toggled_pressed.xbm", - &theme->max_toggled_pressed_mask)) - theme->max_toggled_pressed_mask = - RrPixmapMaskCopy(theme->max_toggled_mask); - if (!read_mask(&ps, "max_toggled_hover.xbm", - &theme->max_toggled_hover_mask)) - theme->max_toggled_hover_mask = - RrPixmapMaskCopy(theme->max_toggled_mask); - if (!read_mask(&ps, "max_disabled.xbm", &theme->max_disabled_mask)) - theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); - if (!read_mask(&ps, "max_hover.xbm", &theme->max_hover_mask)) - theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); - } else { - { + + /* maximize button masks */ + userdef = TRUE; + if (!read_mask(inst, path, theme, "max.xbm", &theme->max_mask)) { guchar data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; theme->max_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); - } - { + userdef = FALSE; + } + if (!read_mask(inst, path, theme, "max_toggled.xbm", + &theme->max_toggled_mask)) + { + if (userdef) + theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask); + else { guchar data[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data); } + } + if (!read_mask(inst, path, theme, "max_pressed.xbm", + &theme->max_pressed_mask)) theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); + if (!read_mask(inst,path,theme,"max_disabled.xbm", + &theme->max_disabled_mask)) theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); + if (!read_mask(inst, path, theme, "max_hover.xbm", &theme->max_hover_mask)) theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); + if (!read_mask(inst, path, theme, "max_toggled_pressed.xbm", + &theme->max_toggled_pressed_mask)) theme->max_toggled_pressed_mask = RrPixmapMaskCopy(theme->max_toggled_mask); + if (!read_mask(inst, path, theme, "max_toggled_hover.xbm", + &theme->max_toggled_hover_mask)) theme->max_toggled_hover_mask = RrPixmapMaskCopy(theme->max_toggled_mask); - } - if (read_mask(&ps, "iconify.xbm", &theme->iconify_mask)) { - if (!read_mask(&ps, "iconify_pressed.xbm", - &theme->iconify_pressed_mask)) - theme->iconify_pressed_mask = - RrPixmapMaskCopy(theme->iconify_mask); - if (!read_mask(&ps, "iconify_disabled.xbm", - &theme->iconify_disabled_mask)) - theme->iconify_disabled_mask = - RrPixmapMaskCopy(theme->iconify_mask); - if (!read_mask(&ps, "iconify_hover.xbm", &theme->iconify_hover_mask)) - theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); - } else { - { - guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; - theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); - } + /* iconify button masks */ + if (!read_mask(inst, path, theme, "iconify.xbm", &theme->iconify_mask)) { + guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; + theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + } + if (!read_mask(inst, path, theme, "iconify_pressed.xbm", + &theme->iconify_pressed_mask)) theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask); + if (!read_mask(inst, path, theme, "iconify_disabled.xbm", + &theme->iconify_disabled_mask)) theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask); + if (!read_mask(inst, path, theme, "iconify_hover.xbm", + &theme->iconify_hover_mask)) theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); - } - theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH, - OB_DEFAULT_ICON_HEIGHT, - OB_DEFAULT_ICON_pixel_data); - - if (read_mask(&ps, "desk.xbm", &theme->desk_mask)) { - if (!read_mask(&ps, "desk_pressed.xbm", &theme->desk_pressed_mask)) - theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); - if (!read_mask(&ps, "desk_toggled.xbm", &theme->desk_toggled_mask)) - theme->desk_toggled_mask = - RrPixmapMaskCopy(theme->desk_pressed_mask); - if (!read_mask(&ps, "desk_toggled_pressed.xbm", - &theme->desk_toggled_pressed_mask)) - theme->desk_toggled_pressed_mask = - RrPixmapMaskCopy(theme->desk_toggled_mask); - if (!read_mask(&ps, "desk_toggled_hover.xbm", - &theme->desk_toggled_hover_mask)) - theme->desk_toggled_hover_mask = - RrPixmapMaskCopy(theme->desk_toggled_mask); - if (!read_mask(&ps, "desk_disabled.xbm", &theme->desk_disabled_mask)) - theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); - if (!read_mask(&ps, "desk_hover.xbm", &theme->desk_hover_mask)) - theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); - } else { - { - guchar data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; - theme->desk_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); - } - { + /* all desktops button masks */ + userdef = TRUE; + if (!read_mask(inst, path, theme, "desk.xbm", &theme->desk_mask)) { + guchar data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; + theme->desk_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + userdef = FALSE; + } + if (!read_mask(inst, path, theme, "desk_toggled.xbm", + &theme->desk_toggled_mask)) { + if (userdef) + theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask); + else { guchar data[] = { 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 }; - theme->desk_toggled_mask = RrPixmapMaskNew(inst,6,6,(gchar*)data); + theme->desk_toggled_mask = + RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } + } + if (!read_mask(inst, path, theme, "desk_pressed.xbm", + &theme->desk_pressed_mask)) theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); + if (!read_mask(inst, path, theme, "desk_disabled.xbm", + &theme->desk_disabled_mask)) theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); + if (!read_mask(inst, path, theme, "desk_hover.xbm", + &theme->desk_hover_mask)) theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); + if (!read_mask(inst, path, theme, "desk_toggled_pressed.xbm", + &theme->desk_toggled_pressed_mask)) theme->desk_toggled_pressed_mask = RrPixmapMaskCopy(theme->desk_toggled_mask); + if (!read_mask(inst, path, theme, "desk_toggled_hover.xbm", + &theme->desk_toggled_hover_mask)) theme->desk_toggled_hover_mask = RrPixmapMaskCopy(theme->desk_toggled_mask); - } - if (read_mask(&ps, "shade.xbm", &theme->shade_mask)) { - if (!read_mask(&ps, "shade_pressed.xbm", &theme->shade_pressed_mask)) - theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); - if (!read_mask(&ps, "shade_toggled.xbm", &theme->shade_toggled_mask)) - theme->shade_toggled_mask = - RrPixmapMaskCopy(theme->shade_pressed_mask); - if (!read_mask(&ps, "shade_toggled_pressed.xbm", - &theme->shade_toggled_pressed_mask)) - theme->shade_toggled_pressed_mask = - RrPixmapMaskCopy(theme->shade_toggled_mask); - if (!read_mask(&ps, "shade_toggled_hover.xbm", - &theme->shade_toggled_hover_mask)) - theme->shade_toggled_hover_mask = - RrPixmapMaskCopy(theme->shade_toggled_mask); - if (!read_mask(&ps, "shade_disabled.xbm", &theme->shade_disabled_mask)) - theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); - if (!read_mask(&ps, "shade_hover.xbm", &theme->shade_hover_mask)) - theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); - } else { - { - guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; - theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); - } - { - guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; - theme->shade_toggled_mask = RrPixmapMaskNew(inst,6,6,(gchar*)data); - } + /* shade button masks */ + if (!read_mask(inst, path, theme, "shade.xbm", &theme->shade_mask)) { + guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; + theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + } + if (!read_mask(inst, path, theme, "shade_toggled.xbm", + &theme->shade_toggled_mask)) + theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(inst, path, theme, "shade_pressed.xbm", + &theme->shade_pressed_mask)) theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(inst, path, theme, "shade_disabled.xbm", + &theme->shade_disabled_mask)) theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(inst, path, theme, "shade_hover.xbm", + &theme->shade_hover_mask)) theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(inst, path, theme, "shade_toggled_pressed.xbm", + &theme->shade_toggled_pressed_mask)) theme->shade_toggled_pressed_mask = RrPixmapMaskCopy(theme->shade_toggled_mask); + if (!read_mask(inst, path, theme, "shade_toggled_hover.xbm", + &theme->shade_toggled_hover_mask)) theme->shade_toggled_hover_mask = RrPixmapMaskCopy(theme->shade_toggled_mask); - } - if (read_mask(&ps, "close.xbm", &theme->close_mask)) { - if (!read_mask(&ps, "close_pressed.xbm", &theme->close_pressed_mask)) - theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); - if (!read_mask(&ps, "close_disabled.xbm", &theme->close_disabled_mask)) - theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); - if (!read_mask(&ps, "close_hover.xbm", &theme->close_hover_mask)) - theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); - } else { - { - guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; - theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); - } + /* close button masks */ + if (!read_mask(inst, path, theme, "close.xbm", &theme->close_mask)) { + guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; + theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + } + if (!read_mask(inst, path, theme, "close_pressed.xbm", + &theme->close_pressed_mask)) theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); + if (!read_mask(inst, path, theme, "close_disabled.xbm", + &theme->close_disabled_mask)) theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); + if (!read_mask(inst, path, theme, "close_hover.xbm", + &theme->close_hover_mask)) theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); - } - if (!read_mask(&ps, "bullet.xbm", &theme->menu_bullet_mask)) { + /* submenu bullet mask */ + if (!read_mask(inst, path, theme, "bullet.xbm", &theme->menu_bullet_mask)) + { guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (gchar*)data); } + /* up and down arrows */ + { + guchar data[] = { 0xfe, 0x00, 0x7c, 0x00, 0x38, 0x00, 0x10, 0x00 }; + theme->down_arrow_mask = RrPixmapMaskNew(inst, 9, 4, (gchar*)data); + } + { + guchar data[] = { 0x10, 0x00, 0x38, 0x00, 0x7c, 0x00, 0xfe, 0x00 }; + theme->up_arrow_mask = RrPixmapMaskNew(inst, 9, 4, (gchar*)data); + } + + /* setup the default window icon */ + theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH, + OB_DEFAULT_ICON_HEIGHT, + OB_DEFAULT_ICON_pixel_data); + theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH; + theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT; + /* read the decoration textures */ - if (!FIND(appearance, L("window","active","titlebar"), - theme->a_focused_title, FALSE)) + if (!read_appearance(db, inst, + "window.active.title.bg", theme->a_focused_title, + FALSE)) set_default_appearance(theme->a_focused_title); - if (!FIND(appearance, L("window","inactive","titlebar"), - theme->a_unfocused_title, FALSE)) + if (!read_appearance(db, inst, + "window.inactive.title.bg", theme->a_unfocused_title, + FALSE)) set_default_appearance(theme->a_unfocused_title); - if (!FIND(appearance, L("window","active","label"), - theme->a_focused_label, TRUE)) + if (!read_appearance(db, inst, + "window.active.label.bg", theme->a_focused_label, + TRUE)) set_default_appearance(theme->a_focused_label); - if (!FIND(appearance, L("window","inactive","label"), - theme->a_unfocused_label, TRUE)) + if (!read_appearance(db, inst, + "window.inactive.label.bg", theme->a_unfocused_label, + TRUE)) set_default_appearance(theme->a_unfocused_label); - if (!FIND(appearance, L("window","active","handle"), - theme->a_focused_handle, FALSE)) + if (!read_appearance(db, inst, + "window.active.handle.bg", theme->a_focused_handle, + FALSE)) set_default_appearance(theme->a_focused_handle); - if (!FIND(appearance, L("window","inactive","handle"), - theme->a_unfocused_handle, FALSE)) + if (!read_appearance(db, inst, + "window.inactive.handle.bg",theme->a_unfocused_handle, + FALSE)) set_default_appearance(theme->a_unfocused_handle); - if (!FIND(appearance, L("window","active","grip"), - theme->a_focused_grip, TRUE)) + if (!read_appearance(db, inst, + "window.active.grip.bg", theme->a_focused_grip, + TRUE)) set_default_appearance(theme->a_focused_grip); - if (!FIND(appearance, L("window","inactive","grip"), - theme->a_unfocused_grip, TRUE)) + if (!read_appearance(db, inst, + "window.inactive.grip.bg", theme->a_unfocused_grip, + TRUE)) set_default_appearance(theme->a_unfocused_grip); - if (!FIND(appearance, L("menu","entries"), theme->a_menu, FALSE)) + if (!read_appearance(db, inst, + "menu.items.bg", theme->a_menu, + FALSE)) set_default_appearance(theme->a_menu); - if (!FIND(appearance, L("menu","title"), theme->a_menu_title, TRUE)) + if (!read_appearance(db, inst, + "menu.title.bg", theme->a_menu_title, + TRUE)) set_default_appearance(theme->a_menu_title); - if (!FIND(appearance, L("menu", "active"), theme->a_menu_selected, TRUE)) + if (!read_appearance(db, inst, + "menu.items.active.bg", theme->a_menu_selected, + TRUE)) set_default_appearance(theme->a_menu_selected); - if (!FIND(appearance, L("menu", "activedisabled"), - theme->a_menu_disabled_selected, TRUE)) - theme->a_menu_disabled_selected = - RrAppearanceCopy(theme->a_menu_selected); - - /* read the appearances for rendering non-decorations */ - theme->osd_hilite_bg = RrAppearanceCopy(theme->a_focused_title); - theme->osd_hilite_label = RrAppearanceCopy(theme->a_focused_label); - if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL) - theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_label); - else - theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_title); - if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) - theme->osd_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_label); - else - theme->osd_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_title); + theme->a_menu_disabled_selected = + RrAppearanceCopy(theme->a_menu_selected); + + /* read appearances for non-decorations (on-screen-display) */ + if (!read_appearance(db, inst, "osd.bg", theme->osd_hilite_bg, FALSE)) { + RrAppearanceFree(theme->osd_hilite_bg); + theme->osd_hilite_bg = RrAppearanceCopy(theme->a_focused_title); + } + if (!read_appearance(db, inst, "osd.label.bg", + theme->osd_hilite_label, TRUE)) { + RrAppearanceFree(theme->osd_hilite_label); + theme->osd_hilite_label = RrAppearanceCopy(theme->a_focused_label); + } + /* osd_hilite_fg can't be parentrel */ + if (!read_appearance(db, inst, "osd.hilight.bg", + theme->osd_hilite_fg, FALSE)) { + RrAppearanceFree(theme->osd_hilite_fg); + if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL) + theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_label); + else + theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_title); + } + /* osd_unhilite_fg can't be parentrel either */ + if (!read_appearance(db, inst, "osd.unhilight.bg", + theme->osd_unhilite_fg, FALSE)) { + RrAppearanceFree(theme->osd_unhilite_fg); + if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) + theme->osd_unhilite_fg=RrAppearanceCopy(theme->a_unfocused_label); + else + theme->osd_unhilite_fg=RrAppearanceCopy(theme->a_unfocused_title); + } /* read buttons textures */ - if (!FIND(appearance, L("window","active","buttons","disabled"), - theme->a_disabled_focused_max, TRUE)) + if (!read_appearance(db, inst, + "window.active.button.disabled.bg", + theme->a_disabled_focused_max, + TRUE)) set_default_appearance(theme->a_disabled_focused_max); - if (!FIND(appearance, L("window","inactive","buttons","disabled"), - theme->a_disabled_unfocused_max, TRUE)) + if (!read_appearance(db, inst, + "window.inactive.button.disabled.bg", + theme->a_disabled_unfocused_max, + TRUE)) set_default_appearance(theme->a_disabled_unfocused_max); - if (!FIND(appearance, L("window","active","buttons","pressed"), - theme->a_focused_pressed_max, TRUE)) + if (!read_appearance(db, inst, + "window.active.button.pressed.bg", + theme->a_focused_pressed_max, + TRUE)) set_default_appearance(theme->a_focused_pressed_max); - if (!FIND(appearance, L("window","inactive","buttons","pressed"), - theme->a_unfocused_pressed_max, TRUE)) + if (!read_appearance(db, inst, + "window.inactive.button.pressed.bg", + theme->a_unfocused_pressed_max, + TRUE)) set_default_appearance(theme->a_unfocused_pressed_max); - if (!FIND(appearance, L("window","active","buttons","unpressed"), - theme->a_focused_unpressed_max, TRUE)) - set_default_appearance(theme->a_focused_unpressed_max); - if (!FIND(appearance, L("window","inactive","buttons","unpressed"), - theme->a_unfocused_unpressed_max, TRUE)) - set_default_appearance(theme->a_unfocused_unpressed_max); - if (!FIND(appearance, L("window","active","buttons","hover"), - theme->a_hover_focused_max, TRUE)) - { - RrAppearanceFree(theme->a_hover_focused_max); - theme->a_hover_focused_max = - RrAppearanceCopy(theme->a_focused_unpressed_max); - } - if (!FIND(appearance, L("window","inactive","buttons","hover"), - theme->a_hover_unfocused_max, TRUE)) - { - RrAppearanceFree(theme->a_hover_unfocused_max); - theme->a_hover_unfocused_max = - RrAppearanceCopy(theme->a_unfocused_unpressed_max); - } - if (!FIND(appearance, L("window","active","buttons","toggled-pressed"), - theme->a_toggled_focused_pressed_max, TRUE)) - { - RrAppearanceFree(theme->a_toggled_focused_pressed_max); - theme->a_toggled_focused_pressed_max = - RrAppearanceCopy(theme->a_focused_pressed_max); - } - if (!FIND(appearance, L("window","inactive","buttons","toggled-pressed"), - theme->a_toggled_unfocused_pressed_max, TRUE)) - { - RrAppearanceFree(theme->a_toggled_unfocused_pressed_max); - theme->a_toggled_unfocused_pressed_max = - RrAppearanceCopy(theme->a_unfocused_pressed_max); - } - if (!FIND(appearance, L("window","active","buttons","toggled-unpressed"), - theme->a_toggled_focused_unpressed_max, TRUE)) + if (!read_appearance(db, inst, + "window.active.button.toggled.unpressed.bg", + theme->a_toggled_focused_unpressed_max, + TRUE) && + !read_appearance(db, inst, + "window.active.button.toggled.bg", + theme->a_toggled_focused_unpressed_max, + TRUE)) { RrAppearanceFree(theme->a_toggled_focused_unpressed_max); theme->a_toggled_focused_unpressed_max = RrAppearanceCopy(theme->a_focused_pressed_max); } - if (!FIND(appearance, L("window","inactive","buttons","toggled-unpressed"), - theme->a_toggled_unfocused_unpressed_max, TRUE)) + if (!read_appearance(db, inst, + "window.inactive.button.toggled.unpressed.bg", + theme->a_toggled_unfocused_unpressed_max, + TRUE) && + !read_appearance(db, inst, + "window.inactive.button.toggled.bg", + theme->a_toggled_unfocused_unpressed_max, + TRUE)) { RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max); theme->a_toggled_unfocused_unpressed_max = RrAppearanceCopy(theme->a_unfocused_pressed_max); } - if (!FIND(appearance, L("window","active","buttons","toggled-hover"), - theme->a_toggled_hover_focused_max, TRUE)) + if (!read_appearance(db, inst, + "window.active.button.toggled.hover.bg", + theme->a_toggled_hover_focused_max, + TRUE)) { RrAppearanceFree(theme->a_toggled_hover_focused_max); theme->a_toggled_hover_focused_max = RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); } - if (!FIND(appearance, L("window","inactive","buttons","toggled-hover"), - theme->a_toggled_hover_unfocused_max, TRUE)) + if (!read_appearance(db, inst, + "window.inactive.button.toggled.hover.bg", + theme->a_toggled_hover_unfocused_max, + TRUE)) { RrAppearanceFree(theme->a_toggled_hover_unfocused_max); theme->a_toggled_hover_unfocused_max = RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); } + if (!read_appearance(db, inst, + "window.active.button.toggled.pressed.bg", + theme->a_toggled_focused_pressed_max, + TRUE)) + { + RrAppearanceFree(theme->a_toggled_focused_pressed_max); + theme->a_toggled_focused_pressed_max = + RrAppearanceCopy(theme->a_focused_pressed_max); + } + if (!read_appearance(db, inst, + "window.inactive.button.toggled.pressed.bg", + theme->a_toggled_unfocused_pressed_max, + TRUE)) + { + RrAppearanceFree(theme->a_toggled_unfocused_pressed_max); + theme->a_toggled_unfocused_pressed_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.inactive.button.unpressed.bg", + theme->a_unfocused_unpressed_max, + TRUE)) + set_default_appearance(theme->a_unfocused_unpressed_max); + if (!read_appearance(db, inst, + "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.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 = + theme->a_disabled_focused_close = RrAppearanceCopy(theme->a_disabled_focused_max); theme->a_disabled_unfocused_close = RrAppearanceCopy(theme->a_disabled_unfocused_max); @@ -727,19 +788,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); - theme->a_toggled_focused_pressed_desk = - RrAppearanceCopy(theme->a_toggled_focused_pressed_max); - theme->a_toggled_unfocused_pressed_desk = - RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); - theme->a_toggled_focused_unpressed_desk = - RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); - theme->a_toggled_unfocused_unpressed_desk = - RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + RrAppearanceCopy(theme->a_hover_unfocused_max); theme->a_toggled_hover_focused_desk = RrAppearanceCopy(theme->a_toggled_hover_focused_max); theme->a_toggled_hover_unfocused_desk = RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); + theme->a_toggled_focused_unpressed_desk = + RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + theme->a_toggled_unfocused_unpressed_desk = + RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + theme->a_toggled_focused_pressed_desk = + RrAppearanceCopy(theme->a_toggled_focused_pressed_max); + theme->a_toggled_unfocused_pressed_desk = + RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); theme->a_unfocused_unpressed_desk = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_desk = @@ -756,18 +817,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_pressed_shade = - RrAppearanceCopy(theme->a_toggled_focused_pressed_max); - theme->a_toggled_unfocused_pressed_shade = - RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); - theme->a_toggled_focused_unpressed_shade = - RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); - theme->a_toggled_unfocused_unpressed_shade = - RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); theme->a_toggled_hover_focused_shade = RrAppearanceCopy(theme->a_toggled_hover_focused_max); theme->a_toggled_hover_unfocused_shade = RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); + theme->a_toggled_focused_unpressed_shade = + RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + theme->a_toggled_unfocused_unpressed_shade = + RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + theme->a_toggled_focused_pressed_shade = + RrAppearanceCopy(theme->a_toggled_focused_pressed_max); + theme->a_toggled_unfocused_pressed_shade = + RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); theme->a_unfocused_unpressed_shade = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_shade = @@ -807,35 +868,91 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_bullet_selected->surface.grad = RR_SURFACE_PARENTREL; /* set up the textures */ - theme->a_focused_label->texture[0].type = - theme->osd_hilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme->a_focused_label->texture[0].type = RR_TEXTURE_TEXT; theme->a_focused_label->texture[0].data.text.justify = winjust; - theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; - theme->a_focused_label->texture[0].data.text.font = - theme->win_font_focused; - theme->osd_hilite_label->texture[0].data.text.font = theme->osd_font; + theme->a_focused_label->texture[0].data.text.font=theme->win_font_focused; theme->a_focused_label->texture[0].data.text.color = theme->title_focused_color; - theme->osd_hilite_label->texture[0].data.text.color = - theme->osd_color; - if (!FIND(shadow, L("window","active","label","text","shadow","offset"), - theme->a_focused_label)) - theme->a_focused_label->texture[0].data.text.shadow_offset_x = - theme->a_focused_label->texture[0].data.text.shadow_offset_y = 0; + if (read_string(db, "window.active.label.text.font", &str)) { + char *p; + gint i = 0; + gint j; + if (strstr(str, "shadow=y")) { + if ((p = strstr(str, "shadowoffset="))) + i = parse_inline_number(p + strlen("shadowoffset=")); + else + i = 1; + theme->a_focused_label->texture[0].data.text.shadow_offset_x = i; + theme->a_focused_label->texture[0].data.text.shadow_offset_y = i; + } + if ((p = strstr(str, "shadowtint="))) + { + i = parse_inline_number(p + strlen("shadowtint=")); + j = (i > 0 ? 0 : 255); + i = ABS(i*255/100); + + theme->title_focused_shadow_color = RrColorNew(inst, j, j, j); + theme->title_focused_shadow_alpha = i; + } else { + theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->title_focused_shadow_alpha = 50; + } + } + theme->a_focused_label->texture[0].data.text.shadow_color = theme->title_focused_shadow_color; theme->a_focused_label->texture[0].data.text.shadow_alpha = theme->title_focused_shadow_alpha; - if (!FIND(shadow, L("osd","text","shadow","offset"), - theme->osd_hilite_label)) - { + theme->osd_hilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + theme->osd_hilite_label->texture[0].data.text.font = theme->osd_font; + theme->osd_hilite_label->texture[0].data.text.color = theme->osd_color; + + if (read_string(db, "osd.label.text.font", &str)) { + char *p; + gint i = 0; + gint j; + if (strstr(str, "shadow=y")) { + if ((p = strstr(str, "shadowoffset="))) + i = parse_inline_number(p + strlen("shadowoffset=")); + else + i = 1; + theme->a_focused_label->texture[0].data.text.shadow_offset_x = i; + theme->a_focused_label->texture[0].data.text.shadow_offset_y = i; + theme->osd_hilite_label->texture[0].data.text.shadow_offset_x = i; + theme->osd_hilite_label->texture[0].data.text.shadow_offset_y = i; + } + if ((p = strstr(str, "shadowtint="))) + { + i = parse_inline_number(p + strlen("shadowtint=")); + j = (i > 0 ? 0 : 255); + i = ABS(i*255/100); + + theme->osd_shadow_color = RrColorNew(inst, j, j, j); + theme->osd_shadow_alpha = i; + } else { + theme->osd_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->osd_shadow_alpha = 50; + } + } else { + /* inherit the font settings from the focused label */ theme->osd_hilite_label->texture[0].data.text.shadow_offset_x = theme->a_focused_label->texture[0].data.text.shadow_offset_x; theme->osd_hilite_label->texture[0].data.text.shadow_offset_y = theme->a_focused_label->texture[0].data.text.shadow_offset_y; + if (theme->title_focused_shadow_color) + theme->osd_shadow_color = + RrColorNew(inst, + theme->title_focused_shadow_color->r, + theme->title_focused_shadow_color->g, + theme->title_focused_shadow_color->b); + else + theme->osd_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->osd_shadow_alpha = theme->title_focused_shadow_alpha; } + theme->osd_hilite_label->texture[0].data.text.shadow_color = theme->osd_shadow_color; theme->osd_hilite_label->texture[0].data.text.shadow_alpha = @@ -848,10 +965,32 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_unfocused_label->texture[0].data.text.color = theme->title_unfocused_color; - if (!FIND(shadow, L("window","inactive","label","text","shadow","offset"), - theme->a_unfocused_label)) - theme->a_unfocused_label->texture[0].data.text.shadow_offset_x = - theme->a_unfocused_label->texture[0].data.text.shadow_offset_y = 0; + if (read_string(db, "window.inactive.label.text.font", &str)) { + char *p; + gint i = 0; + gint j; + if (strstr(str, "shadow=y")) { + if ((p = strstr(str, "shadowoffset="))) + i = parse_inline_number(p + strlen("shadowoffset=")); + else + i = 1; + theme->a_unfocused_label->texture[0].data.text.shadow_offset_x = i; + theme->a_unfocused_label->texture[0].data.text.shadow_offset_y = i; + } + if ((p = strstr(str, "shadowtint="))) + { + i = parse_inline_number(p + strlen("shadowtint=")); + j = (i > 0 ? 0 : 255); + i = ABS(i*255/100); + + theme->title_unfocused_shadow_color = RrColorNew(inst, j, j, j); + theme->title_unfocused_shadow_alpha = i; + } else { + theme->title_unfocused_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->title_unfocused_shadow_alpha = 50; + } + } + theme->a_unfocused_label->texture[0].data.text.shadow_color = theme->title_unfocused_shadow_color; theme->a_unfocused_label->texture[0].data.text.shadow_alpha = @@ -864,10 +1003,32 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_text_title->texture[0].data.text.color = theme->menu_title_color; - if (!FIND(shadow, L("menu","title","text","shadow","offset"), - theme->a_menu_text_title)) - theme->a_menu_text_title->texture[0].data.text.shadow_offset_x = - theme->a_menu_text_title->texture[0].data.text.shadow_offset_y = 0; + if (read_string(db, "menu.title.text.font", &str)) { + char *p; + gint i = 0; + gint j; + if (strstr(str, "shadow=y")) { + if ((p = strstr(str, "shadowoffset="))) + i = parse_inline_number(p + strlen("shadowoffset=")); + else + i = 1; + theme->a_menu_text_title->texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_title->texture[0].data.text.shadow_offset_y = i; + } + if ((p = strstr(str, "shadowtint="))) + { + i = parse_inline_number(p + strlen("shadowtint=")); + j = (i > 0 ? 0 : 255); + i = ABS(i*255/100); + + theme->menu_title_shadow_color = RrColorNew(inst, j, j, j); + theme->menu_title_shadow_alpha = i; + } else { + theme->menu_title_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->menu_title_shadow_alpha = 50; + } + } + theme->a_menu_text_title->texture[0].data.text.shadow_color = theme->menu_title_shadow_color; theme->a_menu_text_title->texture[0].data.text.shadow_alpha = @@ -875,13 +1036,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_text_normal->texture[0].type = theme->a_menu_text_selected->texture[0].type = - theme->a_menu_text_disabled->texture[0].type = - theme->a_menu_text_disabled_selected->texture[0].type = + theme->a_menu_text_disabled->texture[0].type = + theme->a_menu_text_disabled_selected->texture[0].type = RR_TEXTURE_TEXT; - theme->a_menu_text_normal->texture[0].data.text.justify = + theme->a_menu_text_normal->texture[0].data.text.justify = theme->a_menu_text_selected->texture[0].data.text.justify = - theme->a_menu_text_disabled->texture[0].data.text.justify = - theme->a_menu_text_disabled_selected->texture[0].data.text.justify = + theme->a_menu_text_disabled->texture[0].data.text.justify = + theme->a_menu_text_disabled_selected->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_menu_text_normal->texture[0].data.text.font = theme->a_menu_text_selected->texture[0].data.text.font = @@ -896,27 +1057,55 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_text_disabled_selected->texture[0].data.text.color = theme->menu_disabled_selected_color; - if (!FIND(shadow, L("menu","inactive","shadow","offset"), - theme->a_menu_text_normal)) - theme->a_menu_text_normal->texture[0].data.text.shadow_offset_x = - theme->a_menu_text_normal->texture[0].data.text.shadow_offset_y = - 0; - if (!FIND(shadow, L("menu","active","text","shadow","offset"), - theme->a_menu_text_selected)) - theme->a_menu_text_selected->texture[0].data.text.shadow_offset_x = - theme->a_menu_text_selected->texture[0].data.text.shadow_offset_y = - 0; - if (!FIND(shadow, L("menu","disabled","shadow","offset"), - theme->a_menu_text_disabled)) - theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_x = - theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_y = - 0; - if (!FIND(shadow, L("menu","activedisabled","shadow","offset"), - theme->a_menu_text_disabled_selected)) - theme->a_menu_text_disabled_selected-> - texture[0].data.text.shadow_offset_x = 0; - theme->a_menu_text_disabled_selected-> - texture[0].data.text.shadow_offset_y = 0; + if (read_string(db, "menu.items.font", &str)) { + char *p; + gint i = 0; + gint j; + if (strstr(str, "shadow=y")) { + if ((p = strstr(str, "shadowoffset="))) + i = parse_inline_number(p + strlen("shadowoffset=")); + else + i = 1; + theme->a_menu_text_normal-> + texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_normal-> + texture[0].data.text.shadow_offset_y = i; + theme->a_menu_text_selected-> + texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_selected-> + texture[0].data.text.shadow_offset_y = i; + theme->a_menu_text_disabled-> + texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_disabled-> + texture[0].data.text.shadow_offset_y = i; + theme->a_menu_text_disabled_selected-> + texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_disabled_selected-> + texture[0].data.text.shadow_offset_y = i; + } + if ((p = strstr(str, "shadowtint="))) + { + i = parse_inline_number(p + strlen("shadowtint=")); + j = (i > 0 ? 0 : 255); + i = ABS(i*255/100); + + theme->menu_text_normal_shadow_color = RrColorNew(inst, j, j, j); + theme->menu_text_selected_shadow_color = RrColorNew(inst, j, j, j); + theme->menu_text_disabled_shadow_color = RrColorNew(inst, j, j, j); + theme->menu_text_normal_shadow_alpha = i; + theme->menu_text_selected_shadow_alpha = i; + theme->menu_text_disabled_shadow_alpha = i; + theme->menu_text_disabled_selected_shadow_alpha = i; + } else { + theme->menu_text_normal_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->menu_text_selected_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->menu_text_disabled_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->menu_text_normal_shadow_alpha = 50; + theme->menu_text_selected_shadow_alpha = 50; + theme->menu_text_disabled_selected_shadow_alpha = 50; + } + } + theme->a_menu_text_normal->texture[0].data.text.shadow_color = theme->menu_text_normal_shadow_color; theme->a_menu_text_normal->texture[0].data.text.shadow_alpha = @@ -930,270 +1119,260 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_text_disabled->texture[0].data.text.shadow_alpha = theme->menu_text_disabled_shadow_alpha; theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_color = - theme->menu_text_disabled_selected_shadow_color; + theme->menu_text_disabled_shadow_color; theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_alpha = - theme->menu_text_disabled_selected_shadow_alpha; - - 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_pressed_max->texture[0].type = - theme->a_toggled_unfocused_pressed_max->texture[0].type = - theme->a_toggled_focused_unpressed_max->texture[0].type = - theme->a_toggled_unfocused_unpressed_max->texture[0].type = - theme->a_toggled_hover_focused_max->texture[0].type = - theme->a_toggled_hover_unfocused_max->texture[0].type = - theme->a_focused_unpressed_max->texture[0].type = - theme->a_focused_pressed_max->texture[0].type = - theme->a_unfocused_unpressed_max->texture[0].type = - theme->a_unfocused_pressed_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_pressed_desk->texture[0].type = - theme->a_toggled_unfocused_pressed_desk->texture[0].type = - theme->a_toggled_focused_unpressed_desk->texture[0].type = - theme->a_toggled_unfocused_unpressed_desk->texture[0].type = - theme->a_toggled_hover_focused_desk->texture[0].type = - theme->a_toggled_hover_unfocused_desk->texture[0].type = - theme->a_focused_unpressed_desk->texture[0].type = - theme->a_focused_pressed_desk->texture[0].type = - theme->a_unfocused_unpressed_desk->texture[0].type = - theme->a_unfocused_pressed_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_pressed_shade->texture[0].type = - theme->a_toggled_unfocused_pressed_shade->texture[0].type = - theme->a_toggled_focused_unpressed_shade->texture[0].type = - theme->a_toggled_unfocused_unpressed_shade->texture[0].type = - theme->a_toggled_hover_focused_shade->texture[0].type = - theme->a_toggled_hover_unfocused_shade->texture[0].type = - theme->a_focused_unpressed_shade->texture[0].type = - theme->a_focused_pressed_shade->texture[0].type = - theme->a_unfocused_unpressed_shade->texture[0].type = - theme->a_unfocused_pressed_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->menu_text_disabled_shadow_alpha; + + 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_hover_focused_max->texture[0].type = + theme->a_toggled_hover_unfocused_max->texture[0].type = + theme->a_toggled_focused_unpressed_max->texture[0].type = + theme->a_toggled_unfocused_unpressed_max->texture[0].type = + theme->a_toggled_focused_pressed_max->texture[0].type = + theme->a_toggled_unfocused_pressed_max->texture[0].type = + theme->a_focused_unpressed_max->texture[0].type = + theme->a_focused_pressed_max->texture[0].type = + theme->a_unfocused_unpressed_max->texture[0].type = + theme->a_unfocused_pressed_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_hover_focused_desk->texture[0].type = + theme->a_toggled_hover_unfocused_desk->texture[0].type = + theme->a_toggled_focused_unpressed_desk->texture[0].type = + theme->a_toggled_unfocused_unpressed_desk->texture[0].type = + theme->a_toggled_focused_pressed_desk->texture[0].type = + theme->a_toggled_unfocused_pressed_desk->texture[0].type = + theme->a_focused_unpressed_desk->texture[0].type = + theme->a_focused_pressed_desk->texture[0].type = + theme->a_unfocused_unpressed_desk->texture[0].type = + theme->a_unfocused_pressed_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_hover_focused_shade->texture[0].type = + theme->a_toggled_hover_unfocused_shade->texture[0].type = + theme->a_toggled_focused_unpressed_shade->texture[0].type = + theme->a_toggled_unfocused_unpressed_shade->texture[0].type = + theme->a_toggled_focused_pressed_shade->texture[0].type = + theme->a_toggled_unfocused_pressed_shade->texture[0].type = + theme->a_focused_unpressed_shade->texture[0].type = + theme->a_focused_pressed_shade->texture[0].type = + theme->a_unfocused_unpressed_shade->texture[0].type = + theme->a_unfocused_pressed_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 = 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_disabled_focused_max->texture[0].data.mask.mask = + theme->a_disabled_unfocused_max->texture[0].data.mask.mask = theme->max_disabled_mask; - theme->a_hover_focused_max->texture[0].data.mask.mask = - theme->a_hover_unfocused_max->texture[0].data.mask.mask = + theme->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_focused_pressed_max->texture[0].data.mask.mask = theme->a_unfocused_pressed_max->texture[0].data.mask.mask = theme->max_pressed_mask; - theme->a_focused_unpressed_max->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = + theme->a_focused_unpressed_max->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = theme->max_mask; - theme->a_toggled_focused_pressed_max->texture[0].data.mask.mask = - theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.mask = - theme->max_toggled_pressed_mask; - theme->a_toggled_focused_unpressed_max->texture[0].data.mask.mask = - theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.mask = - theme->max_toggled_mask; - theme->a_toggled_hover_focused_max->texture[0].data.mask.mask = + theme->a_toggled_hover_focused_max->texture[0].data.mask.mask = theme->a_toggled_hover_unfocused_max->texture[0].data.mask.mask = theme->max_toggled_hover_mask; - theme->a_disabled_focused_close->texture[0].data.mask.mask = - theme->a_disabled_unfocused_close->texture[0].data.mask.mask = + theme->a_toggled_focused_unpressed_max->texture[0].data.mask.mask = + theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.mask = + theme->max_toggled_mask; + theme->a_toggled_focused_pressed_max->texture[0].data.mask.mask = + theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.mask = + theme->max_toggled_pressed_mask; + theme->a_disabled_focused_close->texture[0].data.mask.mask = + theme->a_disabled_unfocused_close->texture[0].data.mask.mask = theme->close_disabled_mask; - theme->a_hover_focused_close->texture[0].data.mask.mask = - theme->a_hover_unfocused_close->texture[0].data.mask.mask = + theme->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_focused_pressed_close->texture[0].data.mask.mask = theme->a_unfocused_pressed_close->texture[0].data.mask.mask = theme->close_pressed_mask; - theme->a_focused_unpressed_close->texture[0].data.mask.mask = + theme->a_focused_unpressed_close->texture[0].data.mask.mask = theme->a_unfocused_unpressed_close->texture[0].data.mask.mask = theme->close_mask; - theme->a_disabled_focused_desk->texture[0].data.mask.mask = - theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = + theme->a_disabled_focused_desk->texture[0].data.mask.mask = + theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = theme->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_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_focused_pressed_desk->texture[0].data.mask.mask = theme->a_unfocused_pressed_desk->texture[0].data.mask.mask = theme->desk_pressed_mask; - theme->a_focused_unpressed_desk->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = + theme->a_focused_unpressed_desk->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = theme->desk_mask; - theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask = - theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.mask = - theme->desk_toggled_pressed_mask; - theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.mask = - theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.mask = - theme->desk_toggled_mask; - theme->a_toggled_hover_focused_desk->texture[0].data.mask.mask = + theme->a_toggled_hover_focused_desk->texture[0].data.mask.mask = theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.mask = theme->desk_toggled_hover_mask; - theme->a_disabled_focused_shade->texture[0].data.mask.mask = - theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = + theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.mask = + theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.mask = + theme->desk_toggled_mask; + theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask = + theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.mask = + theme->desk_toggled_pressed_mask; + theme->a_disabled_focused_shade->texture[0].data.mask.mask = + theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = theme->shade_disabled_mask; - theme->a_hover_focused_shade->texture[0].data.mask.mask = - theme->a_hover_unfocused_shade->texture[0].data.mask.mask = + theme->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_focused_pressed_shade->texture[0].data.mask.mask = theme->a_unfocused_pressed_shade->texture[0].data.mask.mask = theme->shade_pressed_mask; - theme->a_focused_unpressed_shade->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = + theme->a_focused_unpressed_shade->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = theme->shade_mask; - theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask = - theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.mask = - theme->shade_toggled_pressed_mask; - theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.mask = - theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.mask = - theme->shade_toggled_mask; - theme->a_toggled_hover_focused_shade->texture[0].data.mask.mask = + theme->a_toggled_hover_focused_shade->texture[0].data.mask.mask = theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.mask = theme->shade_toggled_hover_mask; - theme->a_disabled_focused_iconify->texture[0].data.mask.mask = - theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = + theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.mask = + theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.mask = + theme->shade_toggled_mask; + theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask = + theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.mask = + theme->shade_toggled_pressed_mask; + theme->a_disabled_focused_iconify->texture[0].data.mask.mask = + theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = theme->iconify_disabled_mask; - theme->a_hover_focused_iconify->texture[0].data.mask.mask = - theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = + theme->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_focused_pressed_iconify->texture[0].data.mask.mask = theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask = theme->iconify_pressed_mask; - theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = + theme->a_focused_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->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 = - theme->a_disabled_focused_shade->texture[0].data.mask.color = - theme->a_disabled_focused_iconify->texture[0].data.mask.color = + theme->a_disabled_focused_max->texture[0].data.mask.color = + theme->a_disabled_focused_close->texture[0].data.mask.color = + theme->a_disabled_focused_desk->texture[0].data.mask.color = + theme->a_disabled_focused_shade->texture[0].data.mask.color = + theme->a_disabled_focused_iconify->texture[0].data.mask.color = theme->titlebut_disabled_focused_color; - theme->a_disabled_unfocused_max->texture[0].data.mask.color = - theme->a_disabled_unfocused_close->texture[0].data.mask.color = - theme->a_disabled_unfocused_desk->texture[0].data.mask.color = - theme->a_disabled_unfocused_shade->texture[0].data.mask.color = - theme->a_disabled_unfocused_iconify->texture[0].data.mask.color = + theme->a_disabled_unfocused_max->texture[0].data.mask.color = + theme->a_disabled_unfocused_close->texture[0].data.mask.color = + theme->a_disabled_unfocused_desk->texture[0].data.mask.color = + theme->a_disabled_unfocused_shade->texture[0].data.mask.color = + theme->a_disabled_unfocused_iconify->texture[0].data.mask.color = theme->titlebut_disabled_unfocused_color; - theme->a_hover_focused_max->texture[0].data.mask.color = - theme->a_hover_focused_close->texture[0].data.mask.color = - theme->a_hover_focused_desk->texture[0].data.mask.color = - theme->a_hover_focused_shade->texture[0].data.mask.color = - theme->a_hover_focused_iconify->texture[0].data.mask.color = + theme->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->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_hover_focused_max->texture[0].data.mask.color = - theme->a_toggled_hover_focused_desk->texture[0].data.mask.color = - theme->a_toggled_hover_focused_shade->texture[0].data.mask.color = + theme->a_toggled_hover_focused_max->texture[0].data.mask.color = + theme->a_toggled_hover_focused_desk->texture[0].data.mask.color = + theme->a_toggled_hover_focused_shade->texture[0].data.mask.color = theme->titlebut_toggled_hover_focused_color; - theme->a_toggled_hover_unfocused_max->texture[0].data.mask.color = - theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.color = - theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.color = + theme->a_toggled_hover_unfocused_max->texture[0].data.mask.color = + theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.color = + theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.color = theme->titlebut_toggled_hover_unfocused_color; - theme->a_toggled_focused_pressed_max->texture[0].data.mask.color = - theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color = - theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color = - theme->titlebut_toggled_focused_pressed_color; - theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.color = - theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.color = - theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.color = - theme->titlebut_toggled_unfocused_pressed_color; - theme->a_toggled_focused_unpressed_max->texture[0].data.mask.color = - theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.color = - theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.color = + theme->a_toggled_focused_unpressed_max->texture[0].data.mask.color = + theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.color = + theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.color = theme->titlebut_toggled_focused_unpressed_color; - theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.color = + theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.color = theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.color = theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.color= theme->titlebut_toggled_unfocused_unpressed_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 = - theme->a_focused_unpressed_shade->texture[0].data.mask.color = - theme->a_focused_unpressed_iconify->texture[0].data.mask.color = + theme->a_toggled_focused_pressed_max->texture[0].data.mask.color = + theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color = + theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color = + theme->titlebut_toggled_focused_pressed_color; + theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.color = + theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.color = + theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.color = + theme->titlebut_toggled_unfocused_pressed_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 = + theme->a_focused_unpressed_shade->texture[0].data.mask.color = + theme->a_focused_unpressed_iconify->texture[0].data.mask.color = theme->titlebut_focused_unpressed_color; - theme->a_focused_pressed_max->texture[0].data.mask.color = - theme->a_focused_pressed_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_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_pressed_color; - theme->a_unfocused_unpressed_max->texture[0].data.mask.color = - theme->a_unfocused_unpressed_close->texture[0].data.mask.color = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = + theme->a_unfocused_unpressed_max->texture[0].data.mask.color = + theme->a_unfocused_unpressed_close->texture[0].data.mask.color = + theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = + theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = + theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = theme->titlebut_unfocused_unpressed_color; - theme->a_unfocused_pressed_max->texture[0].data.mask.color = - theme->a_unfocused_pressed_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_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_pressed_color; - theme->a_menu_bullet_normal->texture[0].data.mask.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->a_menu_bullet_selected->texture[0].data.mask.color = theme->menu_selected_color; - g_free(ps.path); - parse_close(ps.doc); - + g_free(path); + XrmDestroyDatabase(db); + + /* set the font heights */ + theme->win_font_height = RrFontHeight + (theme->win_font_focused, + theme->a_focused_label->texture[0].data.text.shadow_offset_y); + theme->win_font_height = + MAX(theme->win_font_height, + RrFontHeight + (theme->win_font_focused, + theme->a_unfocused_label->texture[0].data.text.shadow_offset_y)); + theme->menu_title_font_height = RrFontHeight + (theme->menu_title_font, + theme->a_menu_text_title->texture[0].data.text.shadow_offset_y); + theme->menu_font_height = RrFontHeight + (theme->menu_font, + theme->a_menu_text_normal->texture[0].data.text.shadow_offset_y); + + /* calculate some last extents */ { gint ft, fb, fl, fr, ut, ub, ul, ur; - RrAppearance *a, *b, *c, *d; - - /* caluclate the font heights*/ - a = theme->a_focused_label; - theme->win_font_height = - RrFontHeight(theme->win_font_focused, - a->texture[0].data.text.shadow_offset_y); - a = theme->a_unfocused_label; - theme->win_font_height = - MAX(theme->win_font_height, - RrFontHeight(theme->win_font_unfocused, - a->texture[0].data.text.shadow_offset_y)); - a = theme->a_menu_text_title; - theme->menu_title_font_height = - RrFontHeight(theme->menu_title_font, - a->texture[0].data.text.shadow_offset_y); - a = theme->a_menu_text_normal; - b = theme->a_menu_text_selected; - c = theme->a_menu_text_disabled; - d = theme->a_menu_text_disabled_selected; - theme->menu_font_height = - RrFontHeight(theme->menu_font, - MAX(a->texture[0].data.text.shadow_offset_y, - MAX(b->texture[0].data.text.shadow_offset_y, - MAX(c->texture[0].data.text.shadow_offset_y, - d->texture[0].data.text.shadow_offset_y - )))); RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb); RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub); @@ -1227,9 +1406,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, void RrThemeFree(RrTheme *theme) { if (theme) { + g_free(theme->name); + RrColorFree(theme->menu_border_color); + RrColorFree(theme->osd_border_color); RrColorFree(theme->frame_focused_border_color); RrColorFree(theme->frame_unfocused_border_color); + RrColorFree(theme->title_separator_focused_color); + RrColorFree(theme->title_separator_unfocused_color); RrColorFree(theme->cb_unfocused_color); RrColorFree(theme->cb_focused_color); RrColorFree(theme->title_focused_color); @@ -1238,17 +1422,18 @@ 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_focused_pressed_color); - RrColorFree(theme->titlebut_unfocused_pressed_color); - RrColorFree(theme->titlebut_focused_unpressed_color); - RrColorFree(theme->titlebut_unfocused_unpressed_color); RrColorFree(theme->titlebut_toggled_hover_focused_color); RrColorFree(theme->titlebut_toggled_hover_unfocused_color); RrColorFree(theme->titlebut_toggled_focused_pressed_color); RrColorFree(theme->titlebut_toggled_unfocused_pressed_color); RrColorFree(theme->titlebut_toggled_focused_unpressed_color); RrColorFree(theme->titlebut_toggled_unfocused_unpressed_color); + RrColorFree(theme->titlebut_focused_pressed_color); + RrColorFree(theme->titlebut_unfocused_pressed_color); + RrColorFree(theme->titlebut_focused_unpressed_color); + RrColorFree(theme->titlebut_unfocused_unpressed_color); RrColorFree(theme->menu_title_color); + RrColorFree(theme->menu_sep_color); RrColorFree(theme->menu_color); RrColorFree(theme->menu_selected_color); RrColorFree(theme->menu_disabled_color); @@ -1295,26 +1480,29 @@ void RrThemeFree(RrTheme *theme) RrPixmapMaskFree(theme->close_hover_mask); RrPixmapMaskFree(theme->close_pressed_mask); RrPixmapMaskFree(theme->menu_bullet_mask); + RrPixmapMaskFree(theme->down_arrow_mask); + RrPixmapMaskFree(theme->up_arrow_mask); - RrFontClose(theme->win_font_focused); + RrFontClose(theme->win_font_focused); RrFontClose(theme->win_font_unfocused); RrFontClose(theme->menu_title_font); RrFontClose(theme->menu_font); + RrFontClose(theme->osd_font); RrAppearanceFree(theme->a_disabled_focused_max); RrAppearanceFree(theme->a_disabled_unfocused_max); RrAppearanceFree(theme->a_hover_focused_max); RrAppearanceFree(theme->a_hover_unfocused_max); - RrAppearanceFree(theme->a_focused_unpressed_max); - RrAppearanceFree(theme->a_focused_pressed_max); - RrAppearanceFree(theme->a_unfocused_unpressed_max); - RrAppearanceFree(theme->a_unfocused_pressed_max); RrAppearanceFree(theme->a_toggled_hover_focused_max); RrAppearanceFree(theme->a_toggled_hover_unfocused_max); RrAppearanceFree(theme->a_toggled_focused_unpressed_max); RrAppearanceFree(theme->a_toggled_focused_pressed_max); RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max); RrAppearanceFree(theme->a_toggled_unfocused_pressed_max); + RrAppearanceFree(theme->a_focused_unpressed_max); + RrAppearanceFree(theme->a_focused_pressed_max); + RrAppearanceFree(theme->a_unfocused_unpressed_max); + RrAppearanceFree(theme->a_unfocused_pressed_max); RrAppearanceFree(theme->a_disabled_focused_close); RrAppearanceFree(theme->a_disabled_unfocused_close); RrAppearanceFree(theme->a_hover_focused_close); @@ -1327,30 +1515,30 @@ 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_focused_unpressed_desk); - RrAppearanceFree(theme->a_focused_pressed_desk); - RrAppearanceFree(theme->a_unfocused_unpressed_desk); - RrAppearanceFree(theme->a_unfocused_pressed_desk); RrAppearanceFree(theme->a_toggled_hover_focused_desk); RrAppearanceFree(theme->a_toggled_hover_unfocused_desk); RrAppearanceFree(theme->a_toggled_focused_unpressed_desk); RrAppearanceFree(theme->a_toggled_focused_pressed_desk); RrAppearanceFree(theme->a_toggled_unfocused_unpressed_desk); RrAppearanceFree(theme->a_toggled_unfocused_pressed_desk); + RrAppearanceFree(theme->a_focused_unpressed_desk); + RrAppearanceFree(theme->a_focused_pressed_desk); + RrAppearanceFree(theme->a_unfocused_unpressed_desk); + RrAppearanceFree(theme->a_unfocused_pressed_desk); RrAppearanceFree(theme->a_disabled_focused_shade); RrAppearanceFree(theme->a_disabled_unfocused_shade); RrAppearanceFree(theme->a_hover_focused_shade); RrAppearanceFree(theme->a_hover_unfocused_shade); - RrAppearanceFree(theme->a_focused_unpressed_shade); - RrAppearanceFree(theme->a_focused_pressed_shade); - RrAppearanceFree(theme->a_unfocused_unpressed_shade); - RrAppearanceFree(theme->a_unfocused_pressed_shade); RrAppearanceFree(theme->a_toggled_hover_focused_shade); RrAppearanceFree(theme->a_toggled_hover_unfocused_shade); RrAppearanceFree(theme->a_toggled_focused_unpressed_shade); RrAppearanceFree(theme->a_toggled_focused_pressed_shade); RrAppearanceFree(theme->a_toggled_unfocused_unpressed_shade); RrAppearanceFree(theme->a_toggled_unfocused_pressed_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); @@ -1392,66 +1580,147 @@ void RrThemeFree(RrTheme *theme) } } -static gboolean read_mask(ParseState *ps, const gchar *maskname, - RrPixmapMask **value) +static XrmDatabase loaddb(const gchar *name, gchar **path) { - gboolean ret = FALSE; + GSList *it; + XrmDatabase db = NULL; gchar *s; - gint hx, hy; /* ignored */ - guint w, h; - guchar *b; - s = g_build_filename(ps->path, maskname, NULL); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) { - ret = TRUE; - *value = RrPixmapMaskNew(ps->inst, w, h, (gchar*)b); - XFree(b); + if (name[0] == '/') { + s = g_build_filename(name, "openbox-3", "themerc", NULL); + if ((db = XrmGetFileDatabase(s))) + *path = g_path_get_dirname(s); + g_free(s); + } else { + ObtPaths *p; + + p = obt_paths_new(); + + /* XXX backwards compatibility, remove me sometime later */ + s = g_build_filename(g_get_home_dir(), ".themes", name, + "openbox-3", "themerc", NULL); + if ((db = XrmGetFileDatabase(s))) + *path = g_path_get_dirname(s); + g_free(s); + + for (it = obt_paths_data_dirs(p); !db && it; it = g_slist_next(it)) + { + s = g_build_filename(it->data, "themes", name, + "openbox-3", "themerc", NULL); + if ((db = XrmGetFileDatabase(s))) + *path = g_path_get_dirname(s); + g_free(s); + } + + obt_paths_unref(p); } - g_free(s); + if (db == NULL) { + s = g_build_filename(name, "themerc", NULL); + if ((db = XrmGetFileDatabase(s))) + *path = g_path_get_dirname(s); + g_free(s); + } + + return db; +} + +static gchar *create_class_name(const gchar *rname) +{ + gchar *rclass = g_strdup(rname); + gchar *p = rclass; + + while (TRUE) { + *p = toupper(*p); + p = strchr(p+1, '.'); + if (p == NULL) break; + ++p; + if (*p == '\0') break; + } + return rclass; +} + +static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value) +{ + gboolean ret = FALSE; + gchar *rclass = create_class_name(rname); + gchar *rettype, *end; + XrmValue retvalue; + + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && + retvalue.addr != NULL) { + *value = (gint)strtol(retvalue.addr, &end, 10); + if (end != retvalue.addr) + ret = TRUE; + } + + g_free(rclass); return ret; } -static void set_default_appearance(RrAppearance *a) +static gboolean read_string(XrmDatabase db, const gchar *rname, gchar **value) { - a->surface.grad = RR_SURFACE_SOLID; - a->surface.relief = RR_RELIEF_FLAT; - a->surface.bevel = RR_BEVEL_1; - a->surface.interlaced = FALSE; - a->surface.border = FALSE; - a->surface.primary = RrColorNew(a->inst, 0, 0, 0); - a->surface.secondary = RrColorNew(a->inst, 0, 0, 0); + gboolean ret = FALSE; + gchar *rclass = create_class_name(rname); + gchar *rettype; + XrmValue retvalue; + + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && + retvalue.addr != NULL) { + *value = retvalue.addr; + ret = TRUE; + } + + g_free(rclass); + return ret; } -/* 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) +static gboolean read_color(XrmDatabase db, const RrInstance *inst, + const gchar *rname, RrColor **value) { - RrPixel32 *im, *p; - gint i; + gboolean ret = FALSE; + gchar *rclass = create_class_name(rname); + gchar *rettype; + XrmValue retvalue; + + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && + retvalue.addr != NULL) { + RrColor *c = RrColorParse(inst, retvalue.addr); + if (c != NULL) { + *value = c; + ret = TRUE; + } + } - p = im = g_memdup(data, width * height * sizeof(RrPixel32)); + g_free(rclass); + return ret; +} - 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); +static gboolean read_mask(const RrInstance *inst, const gchar *path, + RrTheme *theme, const gchar *maskname, + RrPixmapMask **value) +{ + gboolean ret = FALSE; + gchar *s; + gint hx, hy; /* ignored */ + guint w, h; + guchar *b; - *p = ((r << RrDefaultRedOffset) + - (g << RrDefaultGreenOffset) + - (b << RrDefaultBlueOffset) + - (a << RrDefaultAlphaOffset)); - p++; + s = g_build_filename(path, maskname, NULL); + if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) { + ret = TRUE; + *value = RrPixmapMaskNew(inst, w, h, (gchar*)b); + XFree(b); } + g_free(s); - return im; + return ret; } -static void parse_style(gchar *tex, RrSurfaceColorType *grad, - RrReliefType *relief, RrBevelType *bevel, - gboolean *interlaced, gboolean *border, - gboolean allow_trans) +static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, + RrReliefType *relief, RrBevelType *bevel, + gboolean *interlaced, gboolean *border, + gboolean allow_trans) { gchar *t; @@ -1480,141 +1749,177 @@ static void parse_style(gchar *tex, RrSurfaceColorType *grad, } else { *grad = RR_SURFACE_SOLID; } + } - if (strstr(tex, "sunken") != NULL) - *relief = RR_RELIEF_SUNKEN; - else if (strstr(tex, "flat") != NULL) - *relief = RR_RELIEF_FLAT; - else - *relief = RR_RELIEF_RAISED; - - *border = FALSE; - if (*relief == RR_RELIEF_FLAT) { - if (strstr(tex, "border") != NULL) - *border = TRUE; - } else { - if (strstr(tex, "bevel2") != NULL) - *bevel = RR_BEVEL_2; - else - *bevel = RR_BEVEL_1; - } + if (strstr(tex, "sunken") != NULL) + *relief = RR_RELIEF_SUNKEN; + else if (strstr(tex, "flat") != NULL) + *relief = RR_RELIEF_FLAT; + else if (strstr(tex, "raised") != NULL) + *relief = RR_RELIEF_RAISED; + else + *relief = (*grad == RR_SURFACE_PARENTREL) ? + RR_RELIEF_FLAT : RR_RELIEF_RAISED; - if (strstr(tex, "interlaced") != NULL) - *interlaced = TRUE; + *border = FALSE; + if (*relief == RR_RELIEF_FLAT) { + if (strstr(tex, "border") != NULL) + *border = TRUE; + } else { + if (strstr(tex, "bevel2") != NULL) + *bevel = RR_BEVEL_2; else - *interlaced = FALSE; + *bevel = RR_BEVEL_1; } -} -static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[]) -{ - gint i; - - for (i = 0; names[i] && n; ++i) - n = parse_find_node(names[i], n->children); - return n; + if (strstr(tex, "interlaced") != NULL) + *interlaced = TRUE; + else + *interlaced = FALSE; } -static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[], - gint *integer, gint lower, gint upper) +static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, + const gchar *rname, RrAppearance *value, + gboolean allow_trans) { + gboolean ret = FALSE; + gchar *rclass = create_class_name(rname); + gchar *cname, *ctoname, *bcname, *icname, *hname, *sname; + gchar *csplitname, *ctosplitname; + gchar *rettype; + XrmValue retvalue; gint i; - if ((n = find_node(n, names))) { - i = parse_int(ps->doc, n); - if (i >= lower && i <= upper) { - *integer = i; - return TRUE; + cname = g_strconcat(rname, ".color", NULL); + ctoname = g_strconcat(rname, ".colorTo", NULL); + bcname = g_strconcat(rname, ".border.color", NULL); + icname = g_strconcat(rname, ".interlace.color", NULL); + hname = g_strconcat(rname, ".highlight", NULL); + sname = g_strconcat(rname, ".shadow", NULL); + csplitname = g_strconcat(rname, ".color.splitTo", NULL); + ctosplitname = g_strconcat(rname, ".colorTo.splitTo", NULL); + + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && + retvalue.addr != NULL) { + parse_appearance(retvalue.addr, + &value->surface.grad, + &value->surface.relief, + &value->surface.bevel, + &value->surface.interlaced, + &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)) + value->surface.secondary = RrColorNew(inst, 0, 0, 0); + if (value->surface.border) + 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); + if (read_int(db, hname, &i) && i >= 0) + value->surface.bevel_light_adjust = i; + if (read_int(db, sname, &i) && i >= 0 && i <= 256) + value->surface.bevel_dark_adjust = i; + + if (value->surface.grad == RR_SURFACE_SPLIT_VERTICAL) { + gint r, g, b; + + if (!read_color(db, inst, csplitname, + &value->surface.split_primary)) + { + r = value->surface.primary->r; + r += r >> 2; + g = value->surface.primary->g; + g += g >> 2; + b = value->surface.primary->b; + b += b >> 2; + if (r > 0xFF) r = 0xFF; + if (g > 0xFF) g = 0xFF; + if (b > 0xFF) b = 0xFF; + value->surface.split_primary = RrColorNew(inst, r, g, b); + } + + if (!read_color(db, inst, ctosplitname, + &value->surface.split_secondary)) + { + r = value->surface.secondary->r; + r += r >> 4; + g = value->surface.secondary->g; + g += g >> 4; + b = value->surface.secondary->b; + b += b >> 4; + if (r > 0xFF) r = 0xFF; + if (g > 0xFF) g = 0xFF; + if (b > 0xFF) b = 0xFF; + value->surface.split_secondary = RrColorNew(inst, r, g, b); + } } - } - return FALSE; -} -static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[], - gchar **string) -{ - if ((n = find_node(n, names))) { - *string = parse_string(ps->doc, n); - return TRUE; + ret = TRUE; } - return FALSE; -} -static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrColor **color, gchar *alpha) -{ - if ((n = find_node(n, names))) { - int r,g,b,a; - if (parse_attr_int("r", n, &r) && - parse_attr_int("g", n, &g) && - parse_attr_int("b", n, &b) && - parse_attr_int("a", n, &a) && - r >= 0 && g >= 0 && b >= 0 && a >= 0 && - r < 256 && g < 256 && b < 256 && a < 256) - { - *color = RrColorNew(ps->inst, r, g, b); - if (alpha) *alpha = a; - return TRUE; - } - } - return FALSE; + g_free(ctosplitname); + g_free(csplitname); + g_free(sname); + g_free(hname); + g_free(icname); + g_free(bcname); + g_free(ctoname); + g_free(cname); + g_free(rclass); + return ret; } -static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[], - gint *x, gint *y, - gint lowx, gint upx, gint lowy, gint upy) +static int parse_inline_number(const char *p) { - if ((n = find_node(n, names))) { - gint a, b; - if (parse_attr_int("x", n, &a) && - parse_attr_int("y", n, &b) && - a >= lowx && a <= upx && b >= lowy && b <= upy) - { - *x = a; *y = b; - return TRUE; - } + int neg = 1; + int res = 0; + if (*p == '-') { + neg = -1; + ++p; } - return FALSE; + for (; isdigit(*p); ++p) + res = res * 10 + *p - '0'; + res *= neg; + return res; } -static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrAppearance *a) +static void set_default_appearance(RrAppearance *a) { - return find_point(ps, n, names, - &a->texture[0].data.text.shadow_offset_x, - &a->texture[0].data.text.shadow_offset_y, - -20, 20, -20, 20); + a->surface.grad = RR_SURFACE_SOLID; + a->surface.relief = RR_RELIEF_FLAT; + a->surface.bevel = RR_BEVEL_1; + a->surface.interlaced = FALSE; + a->surface.border = FALSE; + a->surface.primary = RrColorNew(a->inst, 0, 0, 0); + a->surface.secondary = RrColorNew(a->inst, 0, 0, 0); } -static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrAppearance *a, gboolean allow_trans) +/* 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) { - xmlNodePtr n2; + RrPixel32 *im, *p; + gint i; - if (!(n = find_node(n, names))) - return FALSE; + p = im = g_memdup(data, width * height * sizeof(RrPixel32)); - if ((n2 = find_node(n, L("style")))) { - gchar *s = parse_string(ps->doc, n2); - parse_style(s, &a->surface.grad, &a->surface.relief, - &a->surface.bevel, &a->surface.interlaced, - &a->surface.border, allow_trans); - g_free(s); - } else - return FALSE; - - if (!find_color(ps, n, L("primary"), &a->surface.primary, NULL)) - a->surface.primary = RrColorNew(ps->inst, 0, 0, 0); - if (!find_color(ps, n, L("secondary"), &a->surface.secondary, NULL)) - a->surface.secondary = RrColorNew(ps->inst, 0, 0, 0); - if (a->surface.border) - if (!find_color(ps, n, L("border"), - &a->surface.border_color, NULL)) - a->surface.border_color = RrColorNew(ps->inst, 0, 0, 0); - if (a->surface.interlaced) - if (!find_color(ps, n, L("interlace"), - &a->surface.interlace_color, NULL)) - a->surface.interlace_color = RrColorNew(ps->inst, 0, 0, 0); - - return TRUE; + 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; }