X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=ba1ce78d1f7d2eb1ddf61e593639de5656d88099;hb=96bb892054bb9801fd2b5b7959ee2cec27c075ea;hp=450d3e8e2fbfd795da57a5e6dbe9415b9eeaa89b;hpb=268c13867de4d2524aba020a27487d3092b10cfe;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 450d3e8e..ba1ce78d 100644 --- a/render/theme.c +++ b/render/theme.c @@ -26,43 +26,25 @@ #include "parser/parse.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, const gchar *name, gboolean allow_fallback, @@ -70,26 +52,28 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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; + 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); if (allow_fallback) g_message("Falling back to the default theme '%s'", DEFAULT_THEME); - /* make it fall back to default theme */ + /* fallback to the default theme */ name = NULL; } } if (name == NULL) { if (allow_fallback) { - if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path)) { + db = loaddb(DEFAULT_THEME, &path); + if (db == NULL) { g_message("Unable to load the theme '%s'", DEFAULT_THEME); return NULL; } @@ -97,9 +81,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, return NULL; } - ps.inst = inst; - theme = g_new0(RrTheme, 1); + theme->inst = inst; theme->name = g_strdup(name ? name : DEFAULT_THEME); @@ -107,12 +90,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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_focused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); @@ -130,9 +109,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const 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_selected = 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_text_normal = RrAppearanceNew(inst, 1); theme->a_menu_text_selected = RrAppearanceNew(inst, 1); theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); @@ -147,7 +126,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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); @@ -161,12 +139,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->win_font_unfocused = RrFontOpenDefault(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) { @@ -176,12 +153,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->menu_title_font = RrFontOpenDefault(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) { @@ -197,56 +173,63 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_font = RrFontOpenDefault(inst); /* load direct dimensions */ - if (!FIND(int, L("menu","overlap"), - &theme->menu_overlap, -100, 100)) + if (!read_int(db, "menu.overlap", &theme->menu_overlap) || + theme->menu_overlap < -100 || theme->menu_overlap > 100) theme->menu_overlap = 0; - - if (!FIND(int, L("dimensions","handle"), &theme->handle_height, 0, 100)) + 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; + 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; - - /* osd border width inherits from frame border width */ - if (!FIND(int, L("dimensions","osd","border"), &theme->obwidth, 0, 100)) + /* 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 (!FIND(point, L("dimensions","window","clientpadding"), - &theme->cbwidthx, &theme->cbwidthy, 0, 100, 0, 100)) - theme->cbwidthx = theme->cbwidthy = 1; + 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; /* 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); /* title separator focused color inherits from focused boder color */ - if (!FIND(color, L("window","active","titleseparator"), - &theme->title_separator_focused_color, NULL)) + 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); - /* frame unfocused border color inherits from frame focused border color */ - if (!FIND(color, L("window","inactive","border"), - &theme->frame_unfocused_border_color, NULL)) + /* 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, + 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 boder color */ - if (!FIND(color, L("window","inactive","titleseparator"), - &theme->title_separator_unfocused_color, NULL)) + 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, @@ -254,223 +237,164 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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); /* osd border color inherits from frame focused border color */ - if (!FIND(color, L("osd","border"), &theme->osd_border_color, NULL)) + 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 (!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)) + 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","label","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.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.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)) - 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)) - 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, + "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","active-disabled","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","label","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","active-disabled","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; - } + + /* toggled hover = toggled unpressed (i.e. no change) */ + 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); + 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); + /* toggled pressed = pressed (which is the toggled unpressed fallback..) */ + 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); + 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); /* load the image masks */ /* maximize button masks */ userdef = TRUE; - if (!read_mask(&ps, "max.xbm", &theme->max_mask)) { + 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(&ps, "max_toggled.xbm", &theme->max_toggled_mask)) { + if (!read_mask(inst, path, theme, "max_toggled.xbm", + &theme->max_toggled_mask)) + { if (userdef) theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask); else { @@ -478,41 +402,47 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data); } } - if (!read_mask(&ps, "max_pressed.xbm", &theme->max_pressed_mask)) + if (!read_mask(inst, path, theme, "max_pressed.xbm", + &theme->max_pressed_mask)) theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); - if (!read_mask(&ps, "max_disabled.xbm", &theme->max_disabled_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(&ps, "max_hover.xbm", &theme->max_hover_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(&ps, "max_toggled_pressed.xbm", + 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(&ps, "max_toggled_hover.xbm", + 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); /* iconify button masks */ - if (!read_mask(&ps, "iconify.xbm", &theme->iconify_mask)) { + 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(&ps, "iconify_pressed.xbm", &theme->iconify_pressed_mask)) + if (!read_mask(inst, path, theme, "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)) + if (!read_mask(inst, path, theme, "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)) + if (!read_mask(inst, path, theme, "iconify_hover.xbm", + &theme->iconify_hover_mask)) theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); /* all desktops button masks */ userdef = TRUE; - if (!read_mask(&ps, "desk.xbm", &theme->desk_mask)) { + 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(&ps, "desk_toggled.xbm", &theme->desk_toggled_mask)) { + if (!read_mask(inst, path, theme, "desk_toggled.xbm", + &theme->desk_toggled_mask)) { if (userdef) theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask); else { @@ -521,57 +451,68 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } } - if (!read_mask(&ps, "desk_pressed.xbm", &theme->desk_pressed_mask)) + if (!read_mask(inst, path, theme, "desk_pressed.xbm", + &theme->desk_pressed_mask)) theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); - if (!read_mask(&ps, "desk_disabled.xbm", &theme->desk_disabled_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(&ps, "desk_hover.xbm", &theme->desk_hover_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(&ps, "desk_toggled_pressed.xbm", + 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(&ps, "desk_toggled_hover.xbm", + 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); /* shade button masks */ - if (!read_mask(&ps, "shade.xbm", &theme->shade_mask)) { + 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(&ps, "shade_toggled.xbm", &theme->shade_toggled_mask)) + if (!read_mask(inst, path, theme, "shade_toggled.xbm", + &theme->shade_toggled_mask)) theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_mask); - if (!read_mask(&ps, "shade_pressed.xbm", &theme->shade_pressed_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(&ps, "shade_disabled.xbm", &theme->shade_disabled_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(&ps, "shade_hover.xbm", &theme->shade_hover_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(&ps, "shade_toggled_pressed.xbm", + 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(&ps, "shade_toggled_hover.xbm", + 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); /* close button masks */ - if (!read_mask(&ps, "close.xbm", &theme->close_mask)) { + 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(&ps, "close_pressed.xbm", &theme->close_pressed_mask)) + if (!read_mask(inst, path, theme, "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)) + if (!read_mask(inst, path, theme, "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)) + if (!read_mask(inst, path, theme, "close_hover.xbm", + &theme->close_hover_mask)) theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); /* submenu bullet mask */ - if (!read_mask(&ps, "bullet.xbm", &theme->menu_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); } @@ -581,53 +522,82 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, OB_DEFAULT_ICON_HEIGHT, OB_DEFAULT_ICON_pixel_data); + /* the toggled hover mask = the toggled unpressed mask (i.e. no change) */ + theme->max_toggled_hover_mask = + RrPixmapMaskCopy(theme->max_toggled_mask); + theme->desk_toggled_hover_mask = + RrPixmapMaskCopy(theme->desk_toggled_mask); + theme->shade_toggled_hover_mask = + RrPixmapMaskCopy(theme->shade_toggled_mask); + /* the toggled pressed mask = the toggled unpressed mask (i.e. no change)*/ + theme->max_toggled_pressed_mask = + RrPixmapMaskCopy(theme->max_toggled_mask); + theme->desk_toggled_pressed_mask = + RrPixmapMaskCopy(theme->desk_toggled_mask); + theme->shade_toggled_pressed_mask = + RrPixmapMaskCopy(theme->shade_toggled_mask); + /* 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", "active-disabled"), - theme->a_menu_disabled_selected, TRUE)) - theme->a_menu_disabled_selected = - RrAppearanceCopy(theme->a_menu_selected); + theme->a_menu_disabled_selected = + RrAppearanceCopy(theme->a_menu_selected); /* read appearances for non-decorations (on-screen-display) */ - if (!FIND(appearance, L("osd", "background"), theme->osd_hilite_bg, FALSE)) { + 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 (!FIND(appearance, L("osd", "label"), theme->osd_hilite_label, TRUE)) { + 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 (!FIND(appearance, L("osd", "hilight"), theme->osd_hilite_fg, FALSE)) { + 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); @@ -635,9 +605,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_title); } /* osd_unhilite_fg can't be parentrel either */ - if (!FIND(appearance, L("osd", "unhilight"), theme->osd_unhilite_fg, - FALSE)) - { + 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); @@ -646,82 +615,85 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, } /* 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.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.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.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_toggled_hover_focused_max); - theme->a_toggled_hover_focused_max = - RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + RrAppearanceFree(theme->a_hover_focused_max); + theme->a_hover_focused_max = + RrAppearanceCopy(theme->a_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.hover.bg", + theme->a_hover_unfocused_max, + TRUE)) { - RrAppearanceFree(theme->a_toggled_hover_unfocused_max); - theme->a_toggled_hover_unfocused_max = - RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + RrAppearanceFree(theme->a_hover_unfocused_max); + theme->a_hover_unfocused_max = + RrAppearanceCopy(theme->a_unfocused_unpressed_max); } - theme->a_disabled_focused_close = + /* toggled + hover = toggled unpressed (i.e. no change) */ + theme->a_toggled_hover_focused_max = + RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + theme->a_toggled_hover_unfocused_max = + RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + /* toggled + pressed = pressed (which is the toggled fallback..) */ + theme->a_toggled_focused_pressed_max = + RrAppearanceCopy(theme->a_focused_pressed_max); + theme->a_toggled_unfocused_pressed_max = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + + theme->a_disabled_focused_close = RrAppearanceCopy(theme->a_disabled_focused_max); theme->a_disabled_unfocused_close = RrAppearanceCopy(theme->a_disabled_unfocused_max); @@ -745,18 +717,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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); 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 = @@ -773,18 +745,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, const 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 = @@ -824,35 +796,95 @@ RrTheme* RrThemeNew(const RrInstance *inst, const 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","label","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->title_focused_shadow_color = RrColorNew(inst, j, j, j); + theme->title_focused_shadow_alpha = i; + theme->osd_shadow_color = RrColorNew(inst, j, j, j); + theme->osd_shadow_alpha = i; + } else { + theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->title_focused_shadow_alpha = 50; + 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 = @@ -865,10 +897,32 @@ RrTheme* RrThemeNew(const RrInstance *inst, const 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 = @@ -881,10 +935,32 @@ RrTheme* RrThemeNew(const RrInstance *inst, const 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 = @@ -913,27 +989,55 @@ RrTheme* RrThemeNew(const RrInstance *inst, const 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","active-disabled","shadow","offset"), - theme->a_menu_text_disabled_selected)) - theme->a_menu_text_disabled_selected-> - texture[0].data.text.shadow_offset_x = + 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_y = 0; + 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 = @@ -947,20 +1051,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, const 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->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_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_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 = @@ -977,12 +1081,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_disabled_unfocused_desk->texture[0].type = theme->a_hover_focused_desk->texture[0].type = theme->a_hover_unfocused_desk->texture[0].type = - theme->a_toggled_focused_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_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 = @@ -991,12 +1095,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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_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 = @@ -1011,7 +1115,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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->max_disabled_mask; @@ -1024,15 +1128,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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_unfocused_max->texture[0].data.mask.mask = theme->max_toggled_hover_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; @@ -1057,15 +1161,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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_unfocused_desk->texture[0].data.mask.mask = theme->desk_toggled_hover_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; @@ -1078,15 +1182,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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_unfocused_shade->texture[0].data.mask.mask = theme->shade_toggled_hover_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; @@ -1126,30 +1230,30 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_hover_unfocused_shade->texture[0].data.mask.color = theme->a_hover_unfocused_iconify->texture[0].data.mask.color = theme->titlebut_hover_unfocused_color; - theme->a_toggled_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_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 = @@ -1179,43 +1283,33 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, 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); theme->label_height = theme->win_font_height + MAX(ft + fb, ut + ub); - theme->label_height += theme->label_height & 1; + theme->label_height += theme->label_height % 2; /* this would be nice I think, since padding.width can now be 0, but it breaks frame.c horribly and I don't feel like fixing that @@ -1260,16 +1354,16 @@ 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_color); RrColorFree(theme->menu_selected_color); @@ -1327,16 +1421,16 @@ void RrThemeFree(RrTheme *theme) 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); @@ -1349,30 +1443,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); @@ -1414,66 +1508,142 @@ 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 { + /* 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 = parse_xdg_data_dir_paths(); !db && it; + it = g_slist_next(it)) + { + s = g_build_filename(it->data, "themes", name, + "openbox-3", "themerc", NULL); + if ((db = XrmGetFileDatabase(s))) + *path = g_path_get_dirname(s); + 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(s); + 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; @@ -1531,115 +1701,100 @@ static void parse_style(gchar *tex, RrSurfaceColorType *grad, *interlaced = FALSE; } -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; -} -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) { - gint i; - - if ((n = find_node(n, names))) { - i = parse_int(ps->doc, n); - if (i >= lower && i <= upper) { - *integer = i; - return TRUE; - } + gboolean ret = FALSE; + gchar *rclass = create_class_name(rname); + gchar *cname, *ctoname, *bcname, *icname; + gchar *rettype; + XrmValue retvalue; + + 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); + + 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); + ret = TRUE; } - 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; - } - return FALSE; + g_free(icname); + g_free(bcname); + g_free(ctoname); + g_free(cname); + g_free(rclass); + return ret; } -static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrColor **color, gchar *alpha) +static int parse_inline_number(const char *p) { - 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; - } + 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_point(ParseState *ps, xmlNodePtr n, const gchar *names[], - gint *x, gint *y, - gint lowx, gint upx, gint lowy, gint upy) +static void set_default_appearance(RrAppearance *a) { - 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; - } - } - return FALSE; + 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_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrAppearance *a) +/* 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) { - 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); -} + RrPixel32 *im, *p; + gint i; -static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrAppearance *a, gboolean allow_trans) -{ - xmlNodePtr n2; + p = im = g_memdup(data, width * height * sizeof(RrPixel32)); + + for (i = 0; i < width * height; ++i) { + guchar a = ((*p >> 24) & 0xff); + guchar b = ((*p >> 16) & 0xff); + guchar g = ((*p >> 8) & 0xff); + guchar r = ((*p >> 0) & 0xff); - if (!(n = find_node(n, names))) - return FALSE; + *p = ((r << RrDefaultRedOffset) + + (g << RrDefaultGreenOffset) + + (b << RrDefaultBlueOffset) + + (a << RrDefaultAlphaOffset)); + p++; + } - 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; + return im; }