From ec304c9e433e4b1cedf924ca64d783f05db7d42d Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 5 Mar 2007 15:44:17 +0000 Subject: scary commit..but here goes. YOUR THEMES ARE NOW OFFICIALLY BROKEN. Openbox has just moved it's theme format to an XML based one. The details of this format can be found in data/themerc.xsd (and http://openbox.org/themerc.xsd ALSO! This is very good and important and stuff! In the tools directory you will find THEMETOXML ! This tool takes a themerc on stdin, and spits out the same theme in theme.xml format. So this is all you need to do to update your themes. PLEASE NOTE: This themetoxml does _not_ install itself anywhere. It simply builds and then lives out in its tools/themetoxml directory, and that's it. So if you want to use it, that is where to find it. In moving to the new XML format, a number of additions/changes to the theme engine have been made. Themetoxml takes these into account and will set all the new things appropriately to make your theme look the same as it always has. New additions include.. * padding now has an horizontal and vertical component, instead of being one number * menus can have different borders than windows (color and size) * menu offset can now be negative. it's a little weird, but someone will want it no doubt * fonts are no longer controled by the theme at all, however font shadowing is, and on that note.. * font shadows are now any color you want, not just black and white * you can now set the shadow anywhere you can set the text's color, so you have more control, i.e. you can set shadow on active menu items but not inactive, or disabled, etc. * every color now has an alpha channel. at the moment they don't do anything, besides the font shadow one, but it leaves room for future explorations. it is REALLY HIGHLY RECOMMENDED that you set the alpha to 255 all the time, until such time as it could be useful. otherwise one day your theme may turn awful for people. * font colors are in the range 0-255, in case you were wondering, and they have to be specified in decimal * if you'd like to change you font's you can do so in your configuration file. this is how it is going to stay. changing the font in the theme assumes too much about peoples eye sight and locality and stuff. it doesn't belong there, sorry. the system-wide default rc.xml includes the new font settings for your viewing pleasure, and ill drop an example of it below. * shadows can now be positioned in any direction, they have both an x and a y offset which can be negative and positive. and offset of 0,0 will disable the shadow This isn't a release or anything. If someone had some good ideas about the xml theme format, I'd like to hear them. But I don't think it will be changing much right now beyond where it is. I don't even know how the new functionality will play out for themers, so we'll see. Whew.. I guess that's it. I'm not sure if I mentioned every little change or not, but oh well. Mileage may vary.. Please send any feedback. Here's the font configuration example. Hopefully ObConf will let you set this real soon. ... arial,sans 7 bold normal arial,sans 7 bold normal arial,sans 8 bold normal arial,sans 8 bold normal --- render/theme.c | 1089 +++++++++++++++++++++++++++----------------------------- 1 file changed, 516 insertions(+), 573 deletions(-) (limited to 'render/theme.c') diff --git a/render/theme.c b/render/theme.c index c8762181..c31ca112 100644 --- a/render/theme.c +++ b/render/theme.c @@ -2,7 +2,7 @@ theme.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,44 +26,71 @@ #include "parser/parse.h" #include -#include #include #include #include -static XrmDatabase loaddb(RrTheme *theme, gchar *name); -static gboolean read_bool(XrmDatabase db, gchar *rname, gboolean *value); -static gboolean read_int(XrmDatabase db, gchar *rname, gint *value); -static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value); -static gboolean read_color(XrmDatabase db, const RrInstance *inst, - gchar *rname, RrColor **value); -static gboolean read_mask(const RrInstance *inst, - gchar *maskname, RrTheme *theme, +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, gchar *maskname, RrPixmapMask **value); -static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, - gchar *rname, RrAppearance *value, - gboolean allow_trans); static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); +static xmlNodePtr find_node(xmlNodePtr n, gchar *names[]); +static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[], + gint *integer, gint lower, gint upper); +static gboolean find_string(ParseState *ps, xmlNodePtr n, gchar *names[], + gchar **string); +static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[], + RrColor **color, gchar *alpha); + static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[], + gint *x, gint *y, + gint lowx, gint lowy, gint upx, gint upy); +static gboolean find_shadow(ParseState *ps, xmlNodePtr n, gchar *names[], + RrAppearance *a); +static gboolean find_appearance(ParseState *ps, xmlNodePtr n, gchar *names[], + RrAppearance *a, gboolean allow_trans); + +/* make a null terminated array out of a list of strings */ +#define L(args...) (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, RrFont *active_window_font, RrFont *inactive_window_font, RrFont *menu_title_font, RrFont *menu_item_font) { - XrmDatabase db = NULL; + ParseState ps; + xmlNodePtr root; RrJustify winjust, mtitlejust; - gboolean b; gchar *str; RrTheme *theme; - gint offset; - gint tint; - theme = g_new0(RrTheme, 1); + if (name) { + if (!parse_load_theme(name, &ps.doc, &root, &ps.path)) { + g_warning("Falling back to the default theme: '%s'", + DEFAULT_THEME); + /* make it fall back to default theme */ + name = NULL; + } + } + if (!name) { + if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path)) + return NULL; + } + ps.inst = inst; + theme = g_new0(RrTheme, 1); theme->inst = inst; - theme->show_handle = TRUE; - theme->a_disabled_focused_max = RrAppearanceNew(inst, 1); theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1); theme->a_hover_focused_max = RrAppearanceNew(inst, 1); @@ -96,25 +123,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_clear = RrAppearanceNew(inst, 0); theme->a_clear_tex = RrAppearanceNew(inst, 1); - if (name) { - db = loaddb(theme, name); - if (db == NULL) { - g_warning("Failed to load the theme '%s'\n" - "Falling back to the default: '%s'", - name, DEFAULT_THEME); - } else - theme->name = g_path_get_basename(name); - } - if (db == NULL) { - db = loaddb(theme, DEFAULT_THEME); - if (db == NULL) { - g_warning("Failed to load the theme '%s'.", DEFAULT_THEME); - return NULL; - } else - theme->name = g_path_get_basename(DEFAULT_THEME); - } - /* load the font stuff */ + if (active_window_font) { theme->win_font_focused = active_window_font; RrFontRef(active_window_font); @@ -128,10 +138,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->win_font_unfocused = RrFontOpenDefault(inst); winjust = RR_JUSTIFY_LEFT; - if (read_string(db, "window.label.text.justify", &str)) { - if (!g_ascii_strcasecmp(str, "right")) + if (FIND(string, L( "window", "justify"), &str)) { + if (strcmp(str, "right") == 0) winjust = RR_JUSTIFY_RIGHT; - else if (!g_ascii_strcasecmp(str, "center")) + else if (strcmp(str, "center") == 0) winjust = RR_JUSTIFY_CENTER; } @@ -142,10 +152,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->menu_title_font = RrFontOpenDefault(inst); mtitlejust = RR_JUSTIFY_LEFT; - if (read_string(db, "menu.title.text.justify", &str)) { - if (!g_ascii_strcasecmp(str, "right")) + if (FIND(string, L("menu", "justify"), &str)) { + if (strcmp(str, "right") == 0) mtitlejust = RR_JUSTIFY_RIGHT; - else if (!g_ascii_strcasecmp(str, "center")) + else if (strcmp(str, "center") == 0) mtitlejust = RR_JUSTIFY_CENTER; } @@ -156,143 +166,195 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->menu_font = RrFontOpenDefault(inst); /* load direct dimensions */ - if (!read_int(db, "menu.overlap", &theme->menu_overlap) || - theme->menu_overlap < 0 || theme->menu_overlap > 20) + if (!FIND(int, L("menu","overlap"), + &theme->menu_overlap, -100, 100)) theme->menu_overlap = 0; - if (!read_int(db, "window.handle.width", &theme->handle_height)) - theme->handle_height = 6; - if (!theme->handle_height) - theme->show_handle = FALSE; - if (theme->handle_height <= 0 || theme->handle_height > 100) + + if (!FIND(int, L("dimensions","handle"), &theme->handle_height, 0, 100)) theme->handle_height = 6; - if (!read_int(db, "padding.width", &theme->padding) || - theme->padding < 0 || theme->padding > 100) - theme->padding = 3; - if (!read_int(db, "border.width", &theme->bwidth) || - theme->bwidth < 0 || theme->bwidth > 100) - theme->bwidth = 1; - if (!read_int(db, "window.client.padding.width", &theme->cbwidth) || - theme->cbwidth < 0 || theme->cbwidth > 100) - theme->cbwidth = theme->padding; + + if (!FIND(point, L("dimensions","padding"), + &theme->paddingx, &theme->paddingy, 0, 100, 0, 100)) + theme->paddingx = theme->paddingy = 3; + + if (!FIND(int, L("window","border","width"), + &theme->fbwidth, 0, 100)) + theme->fbwidth = 1; + + /* menu border width inherits from frame border width */ + if (!FIND(int, L("menu","border","width"), + &theme->mbwidth, 0, 100)) + theme->mbwidth = theme->fbwidth; + + if (!FIND(point, L("window","clientpadding"), &theme->cbwidthx, + &theme->cbwidthy, 0, 100, 0, 100)) + theme->cbwidthx = theme->cbwidthy = 1; /* load colors */ - if (!read_color(db, inst, - "border.color", &theme->b_color)) - theme->b_color = RrColorNew(inst, 0, 0, 0); - 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)) + if (!FIND(color, L("window","border","primary"), + &theme->frame_b_color, NULL)) + theme->frame_b_color = RrColorNew(inst, 0, 0, 0); + + /* menu border color inherits from frame border color */ + if (!FIND(color, L("menu","border","primary"), + &theme->menu_b_color, NULL)) + theme->menu_b_color = RrColorNew(inst, + theme->frame_b_color->r, + theme->frame_b_color->g, + theme->frame_b_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)) theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); - if (!read_color(db, inst, - "window.inactive.label.text.color", - &theme->title_unfocused_color)) + if (!FIND(color, L("osd","text","primary"), + &theme->osd_color, NULL)) + 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)) theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!read_color(db, inst, - "window.active.button.unpressed.image.color", - &theme->titlebut_focused_unpressed_color)) + if (!FIND(color, L("window","active","buttons","unpressed","image"), + &theme->titlebut_focused_unpressed_color, NULL)) theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, - "window.inactive.button.unpressed.image.color", - &theme->titlebut_unfocused_unpressed_color)) + if (!FIND(color, L("window","inactive","buttons", "unpressed","image"), + &theme->titlebut_unfocused_unpressed_color, NULL)) theme->titlebut_unfocused_unpressed_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!read_color(db, inst, - "window.active.button.pressed.image.color", - &theme->titlebut_focused_pressed_color)) + if (!FIND(color, L("window","active","buttons","pressed","image"), + &theme->titlebut_focused_pressed_color, NULL)) theme->titlebut_focused_pressed_color = RrColorNew(inst, theme->titlebut_focused_unpressed_color->r, theme->titlebut_focused_unpressed_color->g, theme->titlebut_focused_unpressed_color->b); - if (!read_color(db, inst, - "window.inactive.button.pressed.image.color", - &theme->titlebut_unfocused_pressed_color)) + if (!FIND(color, L("window","inactive","buttons","pressed","image"), + &theme->titlebut_unfocused_pressed_color, NULL)) theme->titlebut_unfocused_pressed_color = RrColorNew(inst, theme->titlebut_unfocused_unpressed_color->r, theme->titlebut_unfocused_unpressed_color->g, theme->titlebut_unfocused_unpressed_color->b); - if (!read_color(db, inst, - "window.active.button.disabled.image.color", - &theme->titlebut_disabled_focused_color)) + if (!FIND(color, L("window","active","buttons","disabled","image"), + &theme->titlebut_disabled_focused_color, NULL)) theme->titlebut_disabled_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!read_color(db, inst, - "window.inactive.button.disabled.image.color", - &theme->titlebut_disabled_unfocused_color)) + if (!FIND(color, L("window","inactive","buttons","disabled","image"), + &theme->titlebut_disabled_unfocused_color, NULL)) theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, - "window.active.button.hover.image.color", - &theme->titlebut_hover_focused_color)) + if (!FIND(color, + L("window","active","buttons","hover","image"), + &theme->titlebut_hover_focused_color, NULL)) theme->titlebut_hover_focused_color = RrColorNew(inst, theme->titlebut_focused_unpressed_color->r, theme->titlebut_focused_unpressed_color->g, theme->titlebut_focused_unpressed_color->b); - if (!read_color(db, inst, - "window.inactive.button.hover.image.color", - &theme->titlebut_hover_unfocused_color)) + if (!FIND(color, L("window","inactive","buttons","hover","image"), + &theme->titlebut_hover_unfocused_color, NULL)) theme->titlebut_hover_unfocused_color = RrColorNew(inst, theme->titlebut_unfocused_unpressed_color->r, theme->titlebut_unfocused_unpressed_color->g, theme->titlebut_unfocused_unpressed_color->b); - if (!read_color(db, inst, - "window.active.button.toggled.image.color", - &theme->titlebut_toggled_focused_color)) + if (!FIND(color, L("window","active","buttons","toggled","image"), + &theme->titlebut_toggled_focused_color, NULL)) theme->titlebut_toggled_focused_color = RrColorNew(inst, theme->titlebut_focused_pressed_color->r, theme->titlebut_focused_pressed_color->g, theme->titlebut_focused_pressed_color->b); - if (!read_color(db, inst, - "window.inactive.button.toggled.image.color", - &theme->titlebut_toggled_unfocused_color)) + if (!FIND(color, L("window","inactive","buttons","toggled","image"), + &theme->titlebut_toggled_unfocused_color, NULL)) theme->titlebut_toggled_unfocused_color = RrColorNew(inst, theme->titlebut_unfocused_pressed_color->r, theme->titlebut_unfocused_pressed_color->g, theme->titlebut_unfocused_pressed_color->b); - if (!read_color(db, inst, - "menu.title.text.color", &theme->menu_title_color)) + if (!FIND(color, L("menu","title","text","primary"), + &theme->menu_title_color, NULL)) theme->menu_title_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, - "menu.items.text.color", &theme->menu_color)) + if (!FIND(color, L("menu","inactive","primary"), &theme->menu_color, NULL)) theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); - if (!read_color(db, inst, - "menu.items.disabled.text.color", - &theme->menu_disabled_color)) + if (!FIND(color, L("menu","disabled","primary"), + &theme->menu_disabled_color, NULL)) theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, - "menu.items.active.text.color", - &theme->menu_selected_color)) + if (!FIND(color, L("menu","active","text","primary"), + &theme->menu_selected_color, NULL)) 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 (read_mask(inst, "max.xbm", theme, &theme->max_mask)) { - if (!read_mask(inst, "max_pressed.xbm", theme, - &theme->max_pressed_mask)) { + /* 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(inst, "max_toggled.xbm", theme, - &theme->max_toggled_mask)) { + if (!read_mask(&ps, "max_toggled.xbm", &theme->max_toggled_mask)) theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_pressed_mask); - } - if (!read_mask(inst, "max_disabled.xbm", theme, - &theme->max_disabled_mask)) { + if (!read_mask(&ps, "max_disabled.xbm", &theme->max_disabled_mask)) theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); - } - if (!read_mask(inst, "max_hover.xbm", theme, &theme->max_hover_mask)) { + if (!read_mask(&ps, "max_hover.xbm", &theme->max_hover_mask)) theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); - } } else { { guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; @@ -307,21 +369,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); } - if (read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) { - if (!read_mask(inst, "iconify_pressed.xbm", theme, - &theme->iconify_pressed_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(inst, "iconify_disabled.xbm", theme, - &theme->iconify_disabled_mask)) { + if (!read_mask(&ps, "iconify_disabled.xbm", + &theme->iconify_disabled_mask)) theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask); - } - if (!read_mask(inst, "iconify_hover.xbm", theme, - &theme->iconify_hover_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, 0x7f, 0x7f, 0x7f }; @@ -336,24 +394,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, OB_DEFAULT_ICON_HEIGHT, OB_DEFAULT_ICON_pixel_data); - if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) { - if (!read_mask(inst, "desk_pressed.xbm", theme, - &theme->desk_pressed_mask)) { + 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(inst, "desk_toggled.xbm", theme, - &theme->desk_toggled_mask)) { + if (!read_mask(&ps, "desk_toggled.xbm", &theme->desk_toggled_mask)) theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_pressed_mask); - } - if (!read_mask(inst, "desk_disabled.xbm", theme, - &theme->desk_disabled_mask)) { + if (!read_mask(&ps, "desk_disabled.xbm", &theme->desk_disabled_mask)) theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); - } - if (!read_mask(inst, "desk_hover.xbm", theme, - &theme->desk_hover_mask)) { + if (!read_mask(&ps, "desk_hover.xbm", &theme->desk_hover_mask)) theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); - } } else { { guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; @@ -369,24 +419,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); } - if (read_mask(inst, "shade.xbm", theme, &theme->shade_mask)) { - if (!read_mask(inst, "shade_pressed.xbm", theme, - &theme->shade_pressed_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(inst, "shade_toggled.xbm", theme, - &theme->shade_toggled_mask)) { + if (!read_mask(&ps, "shade_toggled.xbm", &theme->shade_toggled_mask)) theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_pressed_mask); - } - if (!read_mask(inst, "shade_disabled.xbm", theme, - &theme->shade_disabled_mask)) { + if (!read_mask(&ps, "shade_disabled.xbm", &theme->shade_disabled_mask)) theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); - } - if (!read_mask(inst, "shade_hover.xbm", theme, - &theme->shade_hover_mask)) { + if (!read_mask(&ps, "shade_hover.xbm", &theme->shade_hover_mask)) theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); - } } else { { guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; @@ -402,19 +444,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); } - if (read_mask(inst, "close.xbm", theme, &theme->close_mask)) { - if (!read_mask(inst, "close_pressed.xbm", theme, - &theme->close_pressed_mask)) { + 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(inst, "close_disabled.xbm", theme, - &theme->close_disabled_mask)) { + if (!read_mask(&ps, "close_disabled.xbm", &theme->close_disabled_mask)) theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); - } - if (!read_mask(inst, "close_hover.xbm", theme, - &theme->close_hover_mask)) { + if (!read_mask(&ps, "close_hover.xbm", &theme->close_hover_mask)) theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); - } } else { { guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; @@ -425,140 +461,104 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); } - if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) { + if (!read_mask(&ps, "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); } /* read the decoration textures */ - if (!read_appearance(db, inst, - "window.active.title.bg", theme->a_focused_title, - FALSE)) + if (!FIND(appearance, L("window","active","titlebar"), + theme->a_focused_title, FALSE)) set_default_appearance(theme->a_focused_title); - if (!read_appearance(db, inst, - "window.inactive.title.bg", theme->a_unfocused_title, - FALSE)) + if (!FIND(appearance, L("window","inactive","titlebar"), + theme->a_unfocused_title, FALSE)) set_default_appearance(theme->a_unfocused_title); - if (!read_appearance(db, inst, - "window.active.label.bg", theme->a_focused_label, - TRUE)) + if (!FIND(appearance, L("window","active","label"), + theme->a_focused_label, TRUE)) set_default_appearance(theme->a_focused_label); - if (!read_appearance(db, inst, - "window.inactive.label.bg", theme->a_unfocused_label, - TRUE)) + if (!FIND(appearance, L("window","inactive","label"), + theme->a_unfocused_label, TRUE)) set_default_appearance(theme->a_unfocused_label); - if (!read_appearance(db, inst, - "window.active.handle.bg", theme->a_focused_handle, - FALSE)) + if (!FIND(appearance, L("window","active","handle"), + theme->a_focused_handle, FALSE)) set_default_appearance(theme->a_focused_handle); - if (!read_appearance(db, inst, - "window.inactive.handle.bg",theme->a_unfocused_handle, - FALSE)) + if (!FIND(appearance, L("window","inactive","handle"), + theme->a_unfocused_handle, FALSE)) set_default_appearance(theme->a_unfocused_handle); - if (!read_appearance(db, inst, - "window.active.grip.bg", theme->a_focused_grip, - TRUE)) + if (!FIND(appearance, L("window","active","grip"), + theme->a_focused_grip, TRUE)) set_default_appearance(theme->a_focused_grip); - if (!read_appearance(db, inst, - "window.inactive.grip.bg", theme->a_unfocused_grip, - TRUE)) + if (!FIND(appearance, L("window","inactive","grip"), + theme->a_unfocused_grip, TRUE)) set_default_appearance(theme->a_unfocused_grip); - if (!read_appearance(db, inst, - "menu.items.bg", theme->a_menu, - FALSE)) + if (!FIND(appearance, L("menu","entries"), theme->a_menu, FALSE)) set_default_appearance(theme->a_menu); - if (!read_appearance(db, inst, - "menu.title.bg", theme->a_menu_title, - FALSE)) + if (!FIND(appearance, L("menu","title"), theme->a_menu_title, FALSE)) set_default_appearance(theme->a_menu_title); - if (!read_appearance(db, inst, - "menu.items.active.bg", theme->a_menu_selected, - TRUE)) + if (!FIND(appearance, L("menu", "active"), theme->a_menu_selected, TRUE)) set_default_appearance(theme->a_menu_selected); /* read the appearances for rendering non-decorations */ - theme->app_hilite_bg = RrAppearanceCopy(theme->a_focused_title); - theme->app_hilite_label = RrAppearanceCopy(theme->a_focused_label); + 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->app_hilite_fg = RrAppearanceCopy(theme->a_focused_label); + theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_label); else - theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_title); - theme->app_unhilite_bg = RrAppearanceCopy(theme->a_unfocused_title); - theme->app_unhilite_label = RrAppearanceCopy(theme->a_unfocused_label); + theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_title); if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) - theme->app_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_label); + theme->osd_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_label); else - theme->app_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_title); + theme->osd_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_title); /* read buttons textures */ - if (!read_appearance(db, inst, - "window.active.button.disabled.bg", - theme->a_disabled_focused_max, - TRUE)) + if (!FIND(appearance, L("window","active","buttons","disabled"), + theme->a_disabled_focused_max, TRUE)) set_default_appearance(theme->a_disabled_focused_max); - if (!read_appearance(db, inst, - "window.inactive.button.disabled.bg", - theme->a_disabled_unfocused_max, - TRUE)) + if (!FIND(appearance, L("window","inactive","buttons","disabled"), + theme->a_disabled_unfocused_max, TRUE)) set_default_appearance(theme->a_disabled_unfocused_max); - if (!read_appearance(db, inst, - "window.active.button.pressed.bg", - theme->a_focused_pressed_max, - TRUE)) + if (!FIND(appearance, L("window","active","buttons","pressed"), + theme->a_focused_pressed_max, TRUE)) set_default_appearance(theme->a_focused_pressed_max); - if (!read_appearance(db, inst, - "window.inactive.button.pressed.bg", - theme->a_unfocused_pressed_max, - TRUE)) + if (!FIND(appearance, L("window","inactive","buttons","pressed"), + theme->a_unfocused_pressed_max, TRUE)) set_default_appearance(theme->a_unfocused_pressed_max); - if (!read_appearance(db, inst, - "window.active.button.toggled.bg", - theme->a_toggled_focused_max, - TRUE)) + if (!FIND(appearance, L("window","active","buttons","toggled"), + theme->a_toggled_focused_max, TRUE)) { RrAppearanceFree(theme->a_toggled_focused_max); theme->a_toggled_focused_max = RrAppearanceCopy(theme->a_focused_pressed_max); } - if (!read_appearance(db, inst, - "window.inactive.button.toggled.bg", - theme->a_toggled_unfocused_max, - TRUE)) + if (!FIND(appearance, L("window","inactive","buttons","toggled"), + theme->a_toggled_unfocused_max, TRUE)) { RrAppearanceFree(theme->a_toggled_unfocused_max); theme->a_toggled_unfocused_max = RrAppearanceCopy(theme->a_unfocused_pressed_max); } - if (!read_appearance(db, inst, - "window.active.button.unpressed.bg", - theme->a_focused_unpressed_max, - TRUE)) + if (!FIND(appearance, L("window","active","buttons","unpressed"), + 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)) + if (!FIND(appearance, L("window","inactive","buttons","unpressed"), + 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)) + 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 (!read_appearance(db, inst, - "window.inactive.button.hover.bg", - theme->a_hover_unfocused_max, - TRUE)) + 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); } - 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); @@ -644,79 +644,68 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, /* set up the textures */ theme->a_focused_label->texture[0].type = - theme->app_hilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme->osd_hilite_label->texture[0].type = RR_TEXTURE_TEXT; theme->a_focused_label->texture[0].data.text.justify = winjust; - theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_focused_label->texture[0].data.text.font = - theme->app_hilite_label->texture[0].data.text.font = + theme->osd_hilite_label->texture[0].data.text.font = theme->win_font_focused; theme->a_focused_label->texture[0].data.text.color = - theme->app_hilite_label->texture[0].data.text.color = theme->title_focused_color; - - if (read_bool(db, "window.active.label.text.shadow", &b) && b) { - if (!read_int(db, "window.active.label.text.shadow.offset", &offset)) - offset = 1; - - if (!read_int(db, "window.active.label.text.shadow.tint", &tint)) - tint = 50; - tint = (tint > 100 ? 100 : (tint < -100 ? -100 : tint)); - } else { - offset = 0; - tint = 50; + 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; + 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].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; } - theme->a_focused_label->texture[0].data.text.shadow_offset = - theme->app_hilite_label->texture[0].data.text.shadow_offset = offset; - theme->a_focused_label->texture[0].data.text.shadow_tint = - theme->app_hilite_label->texture[0].data.text.shadow_tint = tint; + theme->osd_hilite_label->texture[0].data.text.shadow_color = + theme->osd_shadow_color; + theme->osd_hilite_label->texture[0].data.text.shadow_alpha = + theme->osd_shadow_alpha; - theme->a_unfocused_label->texture[0].type = - theme->app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme->a_unfocused_label->texture[0].type = RR_TEXTURE_TEXT; theme->a_unfocused_label->texture[0].data.text.justify = winjust; - theme->app_unhilite_label->texture[0].data.text.justify = - RR_JUSTIFY_LEFT; theme->a_unfocused_label->texture[0].data.text.font = - theme->app_unhilite_label->texture[0].data.text.font = theme->win_font_unfocused; theme->a_unfocused_label->texture[0].data.text.color = - theme->app_unhilite_label->texture[0].data.text.color = theme->title_unfocused_color; - if (read_bool(db, "window.inactive.label.text.shadow", &b) && b) { - if (!read_int(db, "window.inactive.label.text.shadow.offset", &offset)) - offset = 1; - - if (!read_int(db, "window.inactive.label.text.shadow.tint", &tint)) - tint = 50; - tint = (tint > 100 ? 100 : (tint < -100 ? -100 : tint)); - } else { - offset = 0; - tint = 50; - } - theme->a_unfocused_label->texture[0].data.text.shadow_offset = - theme->app_unhilite_label->texture[0].data.text.shadow_offset = - offset; - theme->a_unfocused_label->texture[0].data.text.shadow_tint = - theme->app_unhilite_label->texture[0].data.text.shadow_tint = tint; + 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; + 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 = + theme->title_unfocused_shadow_alpha; theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT; theme->a_menu_title->texture[0].data.text.justify = mtitlejust; theme->a_menu_title->texture[0].data.text.font = theme->menu_title_font; theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color; - if (read_bool(db, "menu.title.text.shadow", &b) && b) { - if (!read_int(db, "menu.title.text.shadow.offset", &offset)) - offset = 1; - - if (!read_int(db, "menu.title.text.shadow.tint", &tint)) - tint = 50; - tint = (tint > 100 ? 100 : (tint < -100 ? -100 : tint)); - } else { - offset = 0; - tint = 50; - } - theme->a_menu_title->texture[0].data.text.shadow_offset = offset; - theme->a_menu_title->texture[0].data.text.shadow_tint = tint; + if (!FIND(shadow, L("menu","title","text","shadow","offset"), + theme->a_menu_title)) + theme->a_menu_title->texture[0].data.text.shadow_offset_x = + theme->a_menu_title->texture[0].data.text.shadow_offset_y = 0; + theme->a_menu_title->texture[0].data.text.shadow_color = + theme->menu_title_shadow_color; + theme->a_menu_title->texture[0].data.text.shadow_alpha = + theme->menu_title_shadow_alpha; theme->a_menu_text_normal->texture[0].type = theme->a_menu_text_disabled->texture[0].type = @@ -735,24 +724,33 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_text_selected->texture[0].data.text.color = theme->menu_selected_color; - if (read_bool(db, "menu.items.text.shadow", &b) && b) { - if (!read_int(db, "menu.items.text.shadow.offset", &offset)) - offset = 1; - - if (!read_int(db, "menu.items.text.shadow.tint", &tint)) - tint = 50; - tint = (tint > 100 ? 100 : (tint < -100 ? -100 : tint)); - } else { - offset = 0; - tint = 50; - } - theme->a_menu_text_normal->texture[0].data.text.shadow_offset = - theme->a_menu_text_disabled->texture[0].data.text.shadow_offset = - theme->a_menu_text_selected->texture[0].data.text.shadow_offset = - offset; - theme->a_menu_text_normal->texture[0].data.text.shadow_tint = - theme->a_menu_text_disabled->texture[0].data.text.shadow_tint = - theme->a_menu_text_selected->texture[0].data.text.shadow_tint = tint; + 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; + 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 = + theme->menu_text_normal_shadow_alpha; + theme->a_menu_text_selected->texture[0].data.text.shadow_color = + theme->menu_text_selected_shadow_color; + theme->a_menu_text_selected->texture[0].data.text.shadow_alpha = + theme->menu_text_selected_shadow_alpha; + theme->a_menu_text_disabled->texture[0].data.text.shadow_color = + theme->menu_text_disabled_shadow_color; + theme->a_menu_text_disabled->texture[0].data.text.shadow_alpha = + theme->menu_text_disabled_shadow_alpha; theme->a_disabled_focused_max->texture[0].type = theme->a_disabled_unfocused_max->texture[0].type = @@ -802,7 +800,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, 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; @@ -936,27 +934,35 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_bullet_selected->texture[0].data.mask.color = theme->menu_selected_color; - 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); - theme->win_font_height = - MAX(theme->win_font_height, - RrFontHeight - (theme->win_font_focused, - theme->a_unfocused_label->texture[0].data.text.shadow_offset)); - theme->menu_title_font_height = RrFontHeight - (theme->menu_title_font, - theme->a_menu_title->texture[0].data.text.shadow_offset); - theme->menu_font_height = RrFontHeight - (theme->menu_font, - theme->a_menu_text_normal->texture[0].data.text.shadow_offset); - - /* calculate some last extents */ + g_free(ps.path); + parse_close(ps.doc); + { gint ft, fb, fl, fr, ut, ub, ul, ur; + RrAppearance *a, *b, *c; + + /* 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_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; + 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, + c->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); @@ -973,14 +979,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, MAX(MAX(theme->padding * 2, ft + fb), MAX(theme->padding * 2, ut + ub)); */ - theme->title_height = theme->label_height + theme->padding * 2; + theme->title_height = theme->label_height + theme->paddingy * 2; /* this should match the above title_height given the same font size for both. */ theme->menu_title_height = theme->menu_title_font_height + - theme->padding * 2; + theme->paddingy * 2; } theme->button_size = theme->label_height - 2; theme->grip_width = 25; + theme->top_grip_height = MAX(theme->handle_height, + theme->title_height / 4); return theme; } @@ -988,28 +996,34 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, void RrThemeFree(RrTheme *theme) { if (theme) { - g_free(theme->path); - g_free(theme->name); - - RrColorFree(theme->b_color); + RrColorFree(theme->menu_b_color); + RrColorFree(theme->frame_b_color); RrColorFree(theme->cb_unfocused_color); RrColorFree(theme->cb_focused_color); - RrColorFree(theme->title_unfocused_color); RrColorFree(theme->title_focused_color); + RrColorFree(theme->title_unfocused_color); RrColorFree(theme->titlebut_disabled_focused_color); RrColorFree(theme->titlebut_disabled_unfocused_color); RrColorFree(theme->titlebut_hover_focused_color); RrColorFree(theme->titlebut_hover_unfocused_color); RrColorFree(theme->titlebut_toggled_focused_color); RrColorFree(theme->titlebut_toggled_unfocused_color); - RrColorFree(theme->titlebut_unfocused_pressed_color); RrColorFree(theme->titlebut_focused_pressed_color); - RrColorFree(theme->titlebut_unfocused_unpressed_color); + RrColorFree(theme->titlebut_unfocused_pressed_color); RrColorFree(theme->titlebut_focused_unpressed_color); - RrColorFree(theme->menu_color); + RrColorFree(theme->titlebut_unfocused_unpressed_color); RrColorFree(theme->menu_title_color); + RrColorFree(theme->menu_color); RrColorFree(theme->menu_disabled_color); RrColorFree(theme->menu_selected_color); + RrColorFree(theme->title_focused_shadow_color); + RrColorFree(theme->title_unfocused_shadow_color); + RrColorFree(theme->osd_color); + RrColorFree(theme->osd_shadow_color); + RrColorFree(theme->menu_title_shadow_color); + RrColorFree(theme->menu_text_normal_shadow_color); + RrColorFree(theme->menu_text_selected_shadow_color); + RrColorFree(theme->menu_text_disabled_shadow_color); g_free(theme->def_win_icon); @@ -1110,175 +1124,75 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_menu_bullet_selected); RrAppearanceFree(theme->a_clear); RrAppearanceFree(theme->a_clear_tex); - RrAppearanceFree(theme->app_hilite_bg); - RrAppearanceFree(theme->app_unhilite_bg); - RrAppearanceFree(theme->app_hilite_fg); - RrAppearanceFree(theme->app_unhilite_fg); - RrAppearanceFree(theme->app_hilite_label); - RrAppearanceFree(theme->app_unhilite_label); + RrAppearanceFree(theme->osd_hilite_bg); + RrAppearanceFree(theme->osd_hilite_fg); + RrAppearanceFree(theme->osd_hilite_label); + RrAppearanceFree(theme->osd_unhilite_fg); g_free(theme); } } -static XrmDatabase loaddb(RrTheme *theme, gchar *name) -{ - GSList *it; - XrmDatabase db = NULL; - gchar *s; - - if (name[0] == '/') { - s = g_build_filename(name, "openbox-3", "themerc", NULL); - if ((db = XrmGetFileDatabase(s))) - theme->path = g_path_get_dirname(s); - g_free(s); - } 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))) - theme->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))) - theme->path = g_path_get_dirname(s); - g_free(s); - } - } - - if (db == NULL) { - s = g_build_filename(name, "themerc", NULL); - if ((db = XrmGetFileDatabase(s))) - theme->path = g_path_get_dirname(s); - g_free(s); - } - - return db; -} - -static gchar *create_class_name(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_bool(XrmDatabase db, gchar *rname, gint *value) +static gboolean read_mask(ParseState *ps, gchar *maskname, + RrPixmapMask **value) { gboolean ret = FALSE; - gchar *rclass = create_class_name(rname); - gchar *rettype; - XrmValue retvalue; - - if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && - retvalue.addr != NULL) { - if (!g_ascii_strcasecmp(retvalue.addr, "true")) { - *value = TRUE; - ret = TRUE; - } else if (!g_ascii_strcasecmp(retvalue.addr, "false")) { - *value = FALSE; - ret = TRUE; - } - } - - g_free(rclass); - return ret; -} + gchar *s; + gint hx, hy; /* ignored */ + guint w, h; + guchar *b; -static gboolean read_int(XrmDatabase db, 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; + 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); } + g_free(s); - g_free(rclass); return ret; } -static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value) +static void set_default_appearance(RrAppearance *a) { - 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; + 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 read_color(XrmDatabase db, const RrInstance *inst, - gchar *rname, RrColor **value) +/* 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) { - 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; - } - } + RrPixel32 *im, *p; + gint i; - g_free(rclass); - return ret; -} + p = im = g_memdup(data, width * height * sizeof(RrPixel32)); -static gboolean read_mask(const RrInstance *inst, - gchar *maskname, RrTheme *theme, - RrPixmapMask **value) -{ - gboolean ret = FALSE; - gchar *s; - gint hx, hy; /* ignored */ - guint w, h; - guchar *b; + 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); - s = g_build_filename(theme->path, maskname, NULL); - if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) { - ret = TRUE; - *value = RrPixmapMaskNew(inst, w, h, (gchar*)b); - XFree(b); + *p = ((r << RrDefaultRedOffset) + + (g << RrDefaultGreenOffset) + + (b << RrDefaultBlueOffset) + + (a << RrDefaultAlphaOffset)); + p++; } - g_free(s); - return ret; + return im; } -static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, - RrReliefType *relief, RrBevelType *bevel, - gboolean *interlaced, gboolean *border, - gboolean allow_trans) +static void parse_style(gchar *tex, RrSurfaceColorType *grad, + RrReliefType *relief, RrBevelType *bevel, + gboolean *interlaced, gboolean *border, + gboolean allow_trans) { gchar *t; @@ -1333,86 +1247,115 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, } } +static xmlNodePtr find_node(xmlNodePtr n, gchar *names[]) +{ + gint i; + + for (i = 0; names[i] && n; ++i) + n = parse_find_node(names[i], n->children); + return n; +} -static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, - gchar *rname, RrAppearance *value, - gboolean allow_trans) +static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[], + gint *integer, gint lower, gint upper) { - 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; + gint i; + + if ((n = find_node(n, names))) { + i = parse_int(ps->doc, n); + if (i >= lower && i <= upper) { + *integer = i; + return TRUE; + } } + return FALSE; +} - g_free(icname); - g_free(bcname); - g_free(ctoname); - g_free(cname); - g_free(rclass); - return ret; +static gboolean find_string(ParseState *ps, xmlNodePtr n, gchar *names[], + gchar **string) +{ + if ((n = find_node(n, names))) { + *string = parse_string(ps->doc, n); + return TRUE; + } + return FALSE; } -static void set_default_appearance(RrAppearance *a) +static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[], + RrColor **color, gchar *alpha) { - 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); + 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; } -/* 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 find_point(ParseState *ps, xmlNodePtr n, gchar *names[], + gint *x, gint *y, + gint lowx, gint upx, gint lowy, gint upy) { - RrPixel32 *im, *p; - gint i; + if ((n = find_node(n, names))) { + gint a, b; + if (parse_attr_int("horizontal", n, &a) && + parse_attr_int("vertical", n, &b) && + a >= lowx && a <= upx && b >= lowy && b <= upy) + { + *x = a; *y = b; + return TRUE; + } + } + return FALSE; +} - p = im = g_memdup(data, width * height * sizeof(RrPixel32)); +static gboolean find_shadow(ParseState *ps, xmlNodePtr n, gchar *names[], + 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); +} - 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 find_appearance(ParseState *ps, xmlNodePtr n, gchar *names[], + RrAppearance *a, gboolean allow_trans) +{ + xmlNodePtr n2; - *p = ((r << RrDefaultRedOffset) + - (g << RrDefaultGreenOffset) + - (b << RrDefaultBlueOffset) + - (a << RrDefaultAlphaOffset)); - p++; - } + if (!(n = find_node(n, names))) + return FALSE; - return im; + 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; } -- cgit v1.2.3