From 44f226e581c95bf2195adbca3877acf50f88c76e Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 25 Mar 2007 19:14:01 +0000 Subject: [PATCH] reverting to using the old themes. shadow information is read out of the font strings, even though the fonts are not. --- render/theme.c | 1070 ++++++++++++--------- themes/Mikachu/openbox-3/themerc | 159 +++ themes/Mikachu/openbox-3/themerc.xml | 206 ---- themes/Natura/openbox-3/themerc | 96 ++ themes/Natura/openbox-3/themerc.xml | 177 ---- themes/artwiz-boxed/openbox-3/themerc | 102 ++ themes/artwiz-boxed/openbox-3/themerc.xml | 148 --- themes/bear2/openbox-3/themerc | 78 ++ themes/bear2/openbox-3/themerc.xml | 155 --- themes/orang/openbox-3/themerc | 100 ++ themes/orang/openbox-3/themerc.xml | 140 --- themes/syscrash/openbox-3/themerc | 113 +++ themes/syscrash/openbox-3/themerc.xml | 132 --- tools/themetoxml/Makefile | 4 - tools/themetoxml/rgb.h | 762 --------------- tools/themetoxml/themetoxml.c | 559 ----------- 16 files changed, 1242 insertions(+), 2759 deletions(-) create mode 100644 themes/Mikachu/openbox-3/themerc delete mode 100644 themes/Mikachu/openbox-3/themerc.xml create mode 100644 themes/Natura/openbox-3/themerc delete mode 100644 themes/Natura/openbox-3/themerc.xml create mode 100644 themes/artwiz-boxed/openbox-3/themerc delete mode 100644 themes/artwiz-boxed/openbox-3/themerc.xml create mode 100644 themes/bear2/openbox-3/themerc delete mode 100644 themes/bear2/openbox-3/themerc.xml create mode 100644 themes/orang/openbox-3/themerc delete mode 100644 themes/orang/openbox-3/themerc.xml create mode 100644 themes/syscrash/openbox-3/themerc delete mode 100644 themes/syscrash/openbox-3/themerc.xml delete mode 100644 tools/themetoxml/Makefile delete mode 100644 tools/themetoxml/rgb.h delete mode 100644 tools/themetoxml/themetoxml.c diff --git a/render/theme.c b/render/theme.c index 507ec70f..88c09ccb 100644 --- a/render/theme.c +++ b/render/theme.c @@ -26,69 +26,38 @@ #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(RrTheme *theme, 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, + const gchar *maskname, RrTheme *theme, 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[], - const gchar **string); -static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrColor **color, gchar *alpha); - static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[], - gint *x, gint *y, - gint lowx, gint lowy, gint upx, gint upy); -static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrAppearance *a); -static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[], - RrAppearance *a, gboolean allow_trans); - -/* make a null terminated array out of a list of strings */ -#define L(args...) (const gchar*[]){args,NULL} -/* shortcut to the various find_* functions */ -#define FIND(type, args...) find_##type(&ps, root, args) RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, RrFont *active_window_font, RrFont *inactive_window_font, RrFont *menu_title_font, RrFont *menu_item_font) { - ParseState ps; - xmlNodePtr root; + XrmDatabase db = NULL; RrJustify winjust, mtitlejust; - const gchar *str; + gchar *str; RrTheme *theme; - - 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; + gchar *path; theme = g_new0(RrTheme, 1); + theme->inst = inst; theme->a_disabled_focused_max = RrAppearanceNew(inst, 1); @@ -123,8 +92,23 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_clear = RrAppearanceNew(inst, 0); theme->a_clear_tex = RrAppearanceNew(inst, 1); - /* load the font stuff */ + if (name) { + db = loaddb(theme, name, &path); + if (db == NULL) { + g_warning("Failed to load the theme '%s'\n" + "Falling back to the default: '%s'", + name, DEFAULT_THEME); + } + } + if (db == NULL) { + db = loaddb(theme, DEFAULT_THEME, &path); + if (db == NULL) { + g_warning("Failed to load the theme '%s'.", DEFAULT_THEME); + return NULL; + } + } + /* load the font stuff */ if (active_window_font) { theme->win_font_focused = active_window_font; RrFontRef(active_window_font); @@ -138,10 +122,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, 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; } @@ -152,10 +136,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, 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; } @@ -166,195 +150,152 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->menu_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 < 0 || theme->menu_overlap > 20) 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("window","border","width"), - &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("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; + theme->mbwidth = theme->fbwidth; + if (!read_int(db, "window.client.padding.width", &theme->cbwidthx) || + theme->cbwidthx < 0 || theme->cbwidthx > 100) + theme->cbwidthx = theme->paddingx; + theme->cbwidthy = theme->cbwidthx; /* load colors */ - if (!FIND(color, L("window","border","primary"), - &theme->frame_b_color, NULL)) + if (!read_color(db, inst, + "border.color", &theme->frame_b_color)) 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->menu_b_color = RrColorNew(inst, + theme->frame_b_color->r, + theme->frame_b_color->g, + theme->frame_b_color->b); + if (!read_color(db, inst, + "window.active.client.color", + &theme->cb_focused_color)) + theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.inactive.client.color", + &theme->cb_unfocused_color)) + theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + if (!read_color(db, inst, + "window.active.label.text.color", + &theme->title_focused_color)) theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); - if (!FIND(color, L("osd","text","primary"), - &theme->osd_color, NULL)) - 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->osd_color = RrColorNew(inst, + theme->title_focused_color->r, + theme->title_focused_color->g, + theme->title_focused_color->b); + 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","image"), - &theme->titlebut_toggled_focused_color, NULL)) + if (!read_color(db, inst, + "window.active.button.toggled.image.color", + &theme->titlebut_toggled_focused_color)) theme->titlebut_toggled_focused_color = RrColorNew(inst, theme->titlebut_focused_pressed_color->r, theme->titlebut_focused_pressed_color->g, theme->titlebut_focused_pressed_color->b); - if (!FIND(color, L("window","inactive","buttons","toggled","image"), - &theme->titlebut_toggled_unfocused_color, NULL)) + if (!read_color(db, inst, + "window.inactive.button.toggled.image.color", + &theme->titlebut_toggled_unfocused_color)) theme->titlebut_toggled_unfocused_color = RrColorNew(inst, theme->titlebut_unfocused_pressed_color->r, theme->titlebut_unfocused_pressed_color->g, theme->titlebut_unfocused_pressed_color->b); - if (!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","text","primary"), - &theme->menu_selected_color, NULL)) + if (!read_color(db, inst, + "menu.items.active.text.color", + &theme->menu_selected_color)) theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); - if (!FIND(color, L("window","active","label","text","shadow","primary"), - &theme->title_focused_shadow_color, - &theme->title_focused_shadow_alpha)) - { - theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->title_focused_shadow_alpha = 50; - } - if (!FIND(color, L("osd","text","shadow","primary"), - &theme->osd_shadow_color, &theme->osd_shadow_alpha)) - { - theme->osd_shadow_color = - RrColorNew(inst, theme->title_focused_shadow_color->r, - theme->title_focused_shadow_color->g, - theme->title_focused_shadow_color->b); - theme->osd_shadow_alpha = theme->title_focused_shadow_alpha; - } - if (!FIND(color, L("window","inactive","label","text","shadow","primary"), - &theme->title_unfocused_shadow_color, - &theme->title_unfocused_shadow_alpha)) - { - theme->title_unfocused_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->title_unfocused_shadow_alpha = 50; - } - if (!FIND(color, L("menu","title","text","shadow","primary"), - &theme->menu_title_shadow_color, - &theme->menu_title_shadow_alpha)) - { - theme->menu_title_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_title_shadow_alpha = 50; - } - if (!FIND(color, L("menu","inactive","shadow","primary"), - &theme->menu_text_normal_shadow_color, - &theme->menu_text_normal_shadow_alpha)) - { - theme->menu_text_normal_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_text_normal_shadow_alpha = 50; - } - if (!FIND(color, L("menu","active","text","shadow","primary"), - &theme->menu_text_selected_shadow_color, - &theme->menu_text_selected_shadow_alpha)) - { - theme->menu_text_selected_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_text_selected_shadow_alpha = 50; - } - if (!FIND(color, L("menu","disabled","shadow","primary"), - &theme->menu_text_disabled_shadow_color, - &theme->menu_text_disabled_shadow_alpha)) - { - theme->menu_text_disabled_shadow_color = - RrColorNew(inst, theme->menu_text_normal_shadow_color->r, - theme->menu_text_normal_shadow_color->g, - theme->menu_text_normal_shadow_color->b); - theme->menu_text_disabled_shadow_alpha = - theme->menu_text_normal_shadow_alpha; - } - /* load the image masks */ - if (read_mask(&ps, "max.xbm", &theme->max_mask)) { - if (!read_mask(&ps, "max_pressed.xbm", &theme->max_pressed_mask)) + if (read_mask(inst, path, "max.xbm", theme, &theme->max_mask)) { + if (!read_mask(inst, path, "max_pressed.xbm", theme, + &theme->max_pressed_mask)) { theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); - if (!read_mask(&ps, "max_toggled.xbm", &theme->max_toggled_mask)) + } + if (!read_mask(inst, path, "max_toggled.xbm", theme, + &theme->max_toggled_mask)) { theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_pressed_mask); - if (!read_mask(&ps, "max_disabled.xbm", &theme->max_disabled_mask)) + } + if (!read_mask(inst, path, "max_disabled.xbm", theme, + &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, "max_hover.xbm", theme, + &theme->max_hover_mask)) { theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); + } } else { { guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; @@ -369,17 +310,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); } - if (read_mask(&ps, "iconify.xbm", &theme->iconify_mask)) { - if (!read_mask(&ps, "iconify_pressed.xbm", - &theme->iconify_pressed_mask)) + if (read_mask(inst, path, "iconify.xbm", theme, &theme->iconify_mask)) { + if (!read_mask(inst, path, "iconify_pressed.xbm", theme, + &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, "iconify_disabled.xbm", theme, + &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, "iconify_hover.xbm", theme, + &theme->iconify_hover_mask)) { theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); + } } else { { guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; @@ -394,16 +339,24 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, OB_DEFAULT_ICON_HEIGHT, OB_DEFAULT_ICON_pixel_data); - if (read_mask(&ps, "desk.xbm", &theme->desk_mask)) { - if (!read_mask(&ps, "desk_pressed.xbm", &theme->desk_pressed_mask)) + if (read_mask(inst, path, "desk.xbm", theme, &theme->desk_mask)) { + if (!read_mask(inst, path, "desk_pressed.xbm", theme, + &theme->desk_pressed_mask)) { theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); - if (!read_mask(&ps, "desk_toggled.xbm", &theme->desk_toggled_mask)) + } + if (!read_mask(inst, path, "desk_toggled.xbm", theme, + &theme->desk_toggled_mask)) { theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_pressed_mask); - if (!read_mask(&ps, "desk_disabled.xbm", &theme->desk_disabled_mask)) + } + if (!read_mask(inst, path, "desk_disabled.xbm", theme, + &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, "desk_hover.xbm", theme, + &theme->desk_hover_mask)) { theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); + } } else { { guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; @@ -419,16 +372,24 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); } - if (read_mask(&ps, "shade.xbm", &theme->shade_mask)) { - if (!read_mask(&ps, "shade_pressed.xbm", &theme->shade_pressed_mask)) + if (read_mask(inst, path, "shade.xbm", theme, &theme->shade_mask)) { + if (!read_mask(inst, path, "shade_pressed.xbm", theme, + &theme->shade_pressed_mask)) { theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); - if (!read_mask(&ps, "shade_toggled.xbm", &theme->shade_toggled_mask)) + } + if (!read_mask(inst, path, "shade_toggled.xbm", theme, + &theme->shade_toggled_mask)) { theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_pressed_mask); - if (!read_mask(&ps, "shade_disabled.xbm", &theme->shade_disabled_mask)) + } + if (!read_mask(inst, path, "shade_disabled.xbm", theme, + &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, "shade_hover.xbm", theme, + &theme->shade_hover_mask)) { theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); + } } else { { guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; @@ -444,13 +405,19 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); } - if (read_mask(&ps, "close.xbm", &theme->close_mask)) { - if (!read_mask(&ps, "close_pressed.xbm", &theme->close_pressed_mask)) + if (read_mask(inst, path, "close.xbm", theme, &theme->close_mask)) { + if (!read_mask(inst, path, "close_pressed.xbm", theme, + &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, "close_disabled.xbm", theme, + &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, "close_hover.xbm", theme, + &theme->close_hover_mask)) { theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); + } } else { { guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; @@ -461,41 +428,56 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); } - if (!read_mask(&ps, "bullet.xbm", &theme->menu_bullet_mask)) { + if (!read_mask(inst, path, "bullet.xbm", theme, + &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 (!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, FALSE)) + if (!read_appearance(db, inst, + "menu.title.bg", theme->a_menu_title, + FALSE)) 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); /* read the appearances for rendering non-decorations */ @@ -511,54 +493,74 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->osd_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_title); /* read buttons textures */ - if (!FIND(appearance, L("window","active","buttons","disabled"), - theme->a_disabled_focused_max, TRUE)) + if (!read_appearance(db, inst, + "window.active.button.disabled.bg", + theme->a_disabled_focused_max, + TRUE)) set_default_appearance(theme->a_disabled_focused_max); - if (!FIND(appearance, L("window","inactive","buttons","disabled"), - theme->a_disabled_unfocused_max, TRUE)) + if (!read_appearance(db, inst, + "window.inactive.button.disabled.bg", + theme->a_disabled_unfocused_max, + TRUE)) set_default_appearance(theme->a_disabled_unfocused_max); - if (!FIND(appearance, L("window","active","buttons","pressed"), - theme->a_focused_pressed_max, TRUE)) + if (!read_appearance(db, inst, + "window.active.button.pressed.bg", + theme->a_focused_pressed_max, + TRUE)) set_default_appearance(theme->a_focused_pressed_max); - if (!FIND(appearance, L("window","inactive","buttons","pressed"), - theme->a_unfocused_pressed_max, TRUE)) + if (!read_appearance(db, inst, + "window.inactive.button.pressed.bg", + theme->a_unfocused_pressed_max, + TRUE)) set_default_appearance(theme->a_unfocused_pressed_max); - if (!FIND(appearance, L("window","active","buttons","toggled"), - theme->a_toggled_focused_max, TRUE)) + if (!read_appearance(db, inst, + "window.active.button.toggled.bg", + theme->a_toggled_focused_max, + TRUE)) { RrAppearanceFree(theme->a_toggled_focused_max); theme->a_toggled_focused_max = RrAppearanceCopy(theme->a_focused_pressed_max); } - if (!FIND(appearance, L("window","inactive","buttons","toggled"), - theme->a_toggled_unfocused_max, TRUE)) + if (!read_appearance(db, inst, + "window.inactive.button.toggled.bg", + theme->a_toggled_unfocused_max, + TRUE)) { RrAppearanceFree(theme->a_toggled_unfocused_max); theme->a_toggled_unfocused_max = RrAppearanceCopy(theme->a_unfocused_pressed_max); } - if (!FIND(appearance, L("window","active","buttons","unpressed"), - theme->a_focused_unpressed_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 (!FIND(appearance, L("window","inactive","buttons","unpressed"), - theme->a_unfocused_unpressed_max, TRUE)) + 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 (!FIND(appearance, L("window","active","buttons","hover"), - theme->a_hover_focused_max, TRUE)) + if (!read_appearance(db, inst, + "window.active.button.hover.bg", + theme->a_hover_focused_max, + TRUE)) { RrAppearanceFree(theme->a_hover_focused_max); theme->a_hover_focused_max = RrAppearanceCopy(theme->a_focused_unpressed_max); } - if (!FIND(appearance, L("window","inactive","buttons","hover"), - theme->a_hover_unfocused_max, TRUE)) + if (!read_appearance(db, inst, + "window.inactive.button.hover.bg", + theme->a_hover_unfocused_max, + TRUE)) { RrAppearanceFree(theme->a_hover_unfocused_max); theme->a_hover_unfocused_max = RrAppearanceCopy(theme->a_unfocused_unpressed_max); } - theme->a_disabled_focused_close = + theme->a_disabled_focused_close = RrAppearanceCopy(theme->a_disabled_focused_max); theme->a_disabled_unfocused_close = RrAppearanceCopy(theme->a_disabled_unfocused_max); @@ -655,27 +657,37 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, 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; + 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; + 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 (i && (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; + } } - 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 = RR_TEXTURE_TEXT; theme->a_unfocused_label->texture[0].data.text.justify = winjust; @@ -684,28 +696,64 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_unfocused_label->texture[0].data.text.color = theme->title_unfocused_color; - if (!FIND(shadow, L("window","inactive","label","text","shadow","offset"), - theme->a_unfocused_label)) - theme->a_unfocused_label->texture[0].data.text.shadow_offset_x = - theme->a_unfocused_label->texture[0].data.text.shadow_offset_y = 0; - 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; + 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 (i && (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_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 (!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; + 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_title->texture[0].data.text.shadow_offset_x = i; + theme->a_menu_title->texture[0].data.text.shadow_offset_y = i; + } + if (i && (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_normal->texture[0].type = theme->a_menu_text_disabled->texture[0].type = @@ -724,33 +772,49 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_text_selected->texture[0].data.text.color = theme->menu_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; - 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; + 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_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_selected-> + texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_selected-> + texture[0].data.text.shadow_offset_y = i; + } + if (i && (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; + } 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_shadow_alpha = 50; + } + } theme->a_disabled_focused_max->texture[0].type = theme->a_disabled_unfocused_max->texture[0].type = @@ -800,7 +864,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; @@ -934,35 +998,28 @@ RrTheme* RrThemeNew(const RrInstance *inst, 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_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; - - /* 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); @@ -1131,66 +1188,142 @@ void RrThemeFree(RrTheme *theme) } } -static gboolean read_mask(ParseState *ps, const gchar *maskname, - RrPixmapMask **value) +static XrmDatabase loaddb(RrTheme *theme, 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); + } } - g_free(s); + if (db == NULL) { + s = g_build_filename(name, "themerc", NULL); + if ((db = XrmGetFileDatabase(s))) + *path = g_path_get_dirname(s); + g_free(s); + } + + return db; +} + +static gchar *create_class_name(const gchar *rname) +{ + gchar *rclass = g_strdup(rname); + gchar *p = rclass; + + while (TRUE) { + *p = toupper(*p); + p = strchr(p+1, '.'); + if (p == NULL) break; + ++p; + if (*p == '\0') break; + } + return rclass; +} + +static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value) +{ + gboolean ret = FALSE; + gchar *rclass = create_class_name(rname); + gchar *rettype, *end; + XrmValue retvalue; + + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && + retvalue.addr != NULL) { + *value = (gint)strtol(retvalue.addr, &end, 10); + if (end != retvalue.addr) + ret = TRUE; + } + + g_free(rclass); return ret; } -static void set_default_appearance(RrAppearance *a) +static gboolean read_string(XrmDatabase db, const gchar *rname, gchar **value) { - a->surface.grad = RR_SURFACE_SOLID; - a->surface.relief = RR_RELIEF_FLAT; - a->surface.bevel = RR_BEVEL_1; - a->surface.interlaced = FALSE; - a->surface.border = FALSE; - a->surface.primary = RrColorNew(a->inst, 0, 0, 0); - a->surface.secondary = RrColorNew(a->inst, 0, 0, 0); + gboolean ret = FALSE; + gchar *rclass = create_class_name(rname); + gchar *rettype; + XrmValue retvalue; + + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && + retvalue.addr != NULL) { + *value = retvalue.addr; + ret = TRUE; + } + + g_free(rclass); + return ret; } -/* Reads the output from gimp's C-Source file format into valid RGBA data for - an RrTextureRGBA. */ -static RrPixel32* read_c_image(gint width, gint height, const guint8 *data) +static gboolean read_color(XrmDatabase db, const RrInstance *inst, + const gchar *rname, RrColor **value) { - RrPixel32 *im, *p; - gint i; + gboolean ret = FALSE; + gchar *rclass = create_class_name(rname); + gchar *rettype; + XrmValue retvalue; + + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && + retvalue.addr != NULL) { + RrColor *c = RrColorParse(inst, retvalue.addr); + if (c != NULL) { + *value = c; + ret = TRUE; + } + } - p = im = g_memdup(data, width * height * sizeof(RrPixel32)); + g_free(rclass); + return ret; +} - for (i = 0; i < width * height; ++i) { - guchar a = ((*p >> 24) & 0xff); - guchar b = ((*p >> 16) & 0xff); - guchar g = ((*p >> 8) & 0xff); - guchar r = ((*p >> 0) & 0xff); +static gboolean read_mask(const RrInstance *inst, const gchar *path, + const gchar *maskname, RrTheme *theme, + 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; @@ -1245,115 +1378,100 @@ static void parse_style(gchar *tex, RrSurfaceColorType *grad, } } -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[], - const 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)); - if (!(n = find_node(n, names))) - return FALSE; + 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 ((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; + *p = ((r << RrDefaultRedOffset) + + (g << RrDefaultGreenOffset) + + (b << RrDefaultBlueOffset) + + (a << RrDefaultAlphaOffset)); + p++; + } + + return im; } diff --git a/themes/Mikachu/openbox-3/themerc b/themes/Mikachu/openbox-3/themerc new file mode 100644 index 00000000..7e8d96b0 --- /dev/null +++ b/themes/Mikachu/openbox-3/themerc @@ -0,0 +1,159 @@ +!! Menu settings + +menu.title.bg: raised gradient crossdiagonal bevel1 +menu.title.bg.color: #6699CC +menu.title.bg.colorTo: #334866 +menu.title.bg.border.color: #000000 +menu.title.text.color: #CCCCFF +menu.title.text.justify: center + +menu.items.bg: flat gradient horizontal bevel1 +menu.items.bg.color: #AAAACC +menu.items.bg.colorTo: #AAAAD0 +menu.items.bg.border.color: #000000 +menu.items.text.color: #000022 +menu.items.disabled.text.color: #711 + +menu.items.active.bg: raised gradient horizontal bevel1 +menu.items.active.bg.color: #555577 +menu.items.active.bg.colorTo: #6699CC +menu.items.active.bg.border.color: #000000 +menu.items.active.text.color: #CCCCFF + +menu.frame.justify: left + +!! General window settings +window.label.text.justify: left + +!! focused window settings +window.active.client.color: #00FF00 + +window.active.title.bg: raised gradient crossdiagonal bevel1 +window.active.title.bg.color: #6699CC +window.active.title.bg.colorTo: #334866 +window.active.title.bg.border.color: #000000 + +window.active.handle.bg: flat gradient crossdiagonal bevel1 +window.active.handle.bg.color: #6699CC +window.active.handle.bg.colorTo: #334866 +window.active.handle.bg.border.color: #000000 + +window.active.grip.bg: parentrelative +window.active.grip.bg.color: #000000 +window.active.grip.bg.colorTo: #000000 +window.active.grip.bg.border.color: #000000 + +window.active.label.bg: parentrelative +window.active.label.bg.color: #000000 +window.active.label.bg.colorTo: #000000 +window.active.label.bg.border.color: #000000 +window.active.label.text.color: #BFE9FF + +window.active.button.unpressed.bg: parentrelative +window.active.button.unpressed.bg.color: #000000 +window.active.button.unpressed.bg.colorTo: #000000 +window.active.button.unpressed.bg.border.color: #000000 +window.active.button.unpressed.image.color: grey85 + +window.active.button.pressed.bg: sunken gradient crossdiagonal bevel1 +window.active.button.pressed.bg.color: #6699CC +window.active.button.pressed.bg.colorTo: #334866 +window.active.button.pressed.bg.border.color: #000000 +window.active.button.pressed.image.color: green + +window.active.button.toggled.bg: sunken gradient crossdiagonal bevel1 +window.active.button.toggled.bg.color: #6699CC +window.active.button.toggled.bg.colorTo: #334866 +window.active.button.toggled.bg.border.color: #000000 +window.active.button.toggled.image.color: grey85 + +window.active.button.disabled.bg: parentrelative +window.active.button.disabled.bg.color: #000000 +window.active.button.disabled.bg.colorTo: #000000 +window.active.button.disabled.image.color: #000000 +window.active.button.disabled.bg.border.color: #000000 + +window.active.button.hover.bg: parentrelative +window.active.button.hover.image.color: #00FF00 +window.active.button.hover.bg.color: #000000 +window.active.button.hover.bg.colorTo: #000000 +window.active.button.hover.bg.border.color: #000000 + +!window.active.button.hover.bg: raised gradient crossdiagonal bevel1 +!window.active.button.hover.image.color: #00FF00 +!window.active.button.hover.bg.color: #334866 +!window.active.button.hover.bg.colorTo: #6699CC +!window.active.button.hover.bg.border.color: #000000 + +!! unfocused window settings +window.inactive.client.color: grey50 + +window.inactive.title.bg: flat gradient diagonal bevel1 +window.inactive.title.bg.color: #7F7F88 +window.inactive.title.bg.colorTo: #33333B +window.inactive.title.bg.border.color: #000000 + +window.inactive.handle.bg: flat gradient diagonal bevel1 +window.inactive.handle.bg.color: grey50 +window.inactive.handle.bg.colorTo: grey20 +window.inactive.handle.bg.border.color: #000000 + +window.inactive.grip.bg: parentrelative +window.inactive.grip.bg.color: #000000 +window.inactive.grip.bg.colorTo: #000000 +window.inactive.grip.bg.border.color: #000000 + +window.inactive.label.bg: parentrelative +window.inactive.label.bg.color: #000000 +window.inactive.label.bg.colorTo: #000000 +window.inactive.label.bg.border.color: #000000 +window.inactive.label.text.color: grey70 + +window.inactive.button.unpressed.bg: parentrelative +window.inactive.button.unpressed.bg.color: #000000 +window.inactive.button.unpressed.bg.colorTo: #000000 +window.inactive.button.unpressed.bg.border.color: #000000 +window.inactive.button.unpressed.image.color: grey60 + +window.inactive.button.pressed.bg: sunken gradient crossdiagonal bevel1 +window.inactive.button.pressed.bg.color: grey60 +window.inactive.button.pressed.bg.colorTo: grey20 +window.inactive.button.pressed.bg.border.color: #000000 +window.inactive.button.pressed.image.color: #00CC00 + +window.inactive.button.disabled.bg: parentrelative +window.inactive.button.disabled.bg.color: #000000 +window.inactive.button.disabled.bg.colorTo: #000000 +window.inactive.button.disabled.bg.border.color: #000000 +window.inactive.button.disabled.image.color: #000000 + +window.inactive.button.toggled.bg: sunken gradient crossdiagonal bevel1 +window.inactive.button.toggled.bg.color: grey60 +window.inactive.button.toggled.bg.colorTo: grey20 +window.inactive.button.toggled.bg.border.color: #000000 +window.inactive.button.toggled.image.color: grey60 + +window.inactive.button.hover.bg: parentrelative +window.inactive.button.hover.bg.color: #000000 +window.inactive.button.hover.bg.colorTo: #000000 +window.inactive.button.hover.image.color: #00CC00 +window.inactive.button.hover.bg.border.color: #000000 + +!! Global width settings +border.width: 1 +padding.width: 1 +window.handle.width: 0 +window.client.padding.width: 0 +focus.inner.color: #A6CAF3 +focus.outer.color: #0000A0 + +!! Miscellaneous settings +border.color: #223344 + +!! Font stuff +window.active.label.text.font: Candara,sans:pixelsize=14:shadow=n:weight=0 +window.inactive.label.text.font: Candara,sans:pixelsize=14:shadowoffset=3:shadowtint=32:shadow=y:weight=0 +menu.title.text.font: Technical,sans:pixelsize=26:shadowoffset=2:shadowtint=35:shadow=y +menu.items.font: Technical,sans:pixelsize=14:shadowoffset=2:shadowtint=15:shadow=y + +!menu.overlap: 3 diff --git a/themes/Mikachu/openbox-3/themerc.xml b/themes/Mikachu/openbox-3/themerc.xml deleted file mode 100644 index 1da7484d..00000000 --- a/themes/Mikachu/openbox-3/themerc.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - - 0 - - - - - 1 - - - - left - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - center - - <text> - <primary r="204" g="204" b="255" a="255"/> - <shadow> - <offset x="2" y="2"/> - <primary r="0" g="0" b="0" a="89"/> - </shadow> - </text> - <style>raised gradient crossdiagonal bevel1</style> - <primary r="102" g="153" b="204" a="255"/> - <secondary r="51" g="72" b="102" a="255"/> - <border r="0" g="0" b="0" a="255"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/Natura/openbox-3/themerc b/themes/Natura/openbox-3/themerc new file mode 100644 index 00000000..99add829 --- /dev/null +++ b/themes/Natura/openbox-3/themerc @@ -0,0 +1,96 @@ +!! Natura by quandar (http://deletefactory.net/quandar) + +!! Global Width +window.handle.width: 2 + +window.client.padding.width: 0 +border.Width: 1 +padding.width: 2 + +border.color: #000000 +menu.overlap: 0 +window.frameColor: #eeeeee +window.*.client.color: #eeeeee +*.text.justify: left + +!! Menu +menu.title.bg: flat gradient split +menu.title.bg.color: #5c4e45 +menu.title.bg.colorTo: #51443e +menu.title.text.color: #ffffff + +menu.items.bg: flat solid +menu.items.bg.color: #f9f2ee + +menu.items.text.color: #000000 +menu.items.disabled.text.color: #737573 + +menu.items.active.bg: flat gradient split +menu.items.active.bg.color: #5c4e45 +menu.items.active.bg.colorTo:#51443e +menu.items.active.text.color: #f9f2ee + +!! Active Windows +window.active.title.bg: flat gradient split +window.active.title.bg.color: #5c4e45 +window.active.title.bg.colorTo: #51443e +window.active.*.bg.border.color: #000000 + +window.active.label.bg: parentrelative +window.active.label.text.color: #f9f2ee + +window.active.button.*.bg: parentrelative +window.active.button.*.image.color: #f9f2ee +window.active.button.*.bg.border.color: #4e5860 + +window.active.button.hover.bg.color: #576773 +window.active.button.hover.bg.border.color: #9aabb9 +window.active.button.pressed.bg.color: #343b40 +window.active.button.pressed.bg.colorTo: #000000 +window.active.button.pressed.image.color: #b6b6b6 +window.active.button.pressed.bg.border.color: #95a5b2 + +window.active.button.disabled.bg: parentrelative +window.active.button.disabled.image.color: #ffffff + +window.active.handle.bg: flat solid +window.active.handle.bg.color:#51443e + +window.*.grip.bg: flat solid +window.*.grip.bg.color: #51443e + +window.handle.width: 2 + +!! Inactive Windows +window.inactive.title.bg: flat gradient vertical +window.inactive.title.bg.color: #f0ece3 +window.inactive.title.bg.colorTo: #f8f7f2 +window.inactive.*.border.color: #bfbfbf + +window.inactive.label.bg: parentrelative +window.inactive.label.text.color: #919191 + +window.inactive.button.*.bg: parentrelative +window.inactive.button.*.bg.color: #eeeeee +window.inactive.button.*.image.color: #b6b6b6 +window.inactive.button.*.bg.border.color: #c9c9c9 + +window.inactive.button.pressed.bg.color: #c5c2c5 +window.inactive.button.pressed.bg.border.color: #7b7d7b +window.inactive.button.pressed.image.color: #999999 + +window.inactive.button.hover.bg.color: #afb1b2 +window.inactive.button.hover.bg.border.color: #d9dfe4 +window.inactive.button.hover.image.color: #ffffff +window.inactive.button.disabled.bg: parentrelative +window.inactive.button.disabled.image.color: #ffffff + +window.inactive.handle.bg: flat solid +window.inactive.handle.bg.color: #f9f7f3 +window.inactive.grip.bg: parentrelative + +!! Fonts +window.active.label.text.font: sans:pixelsize=12:bold:shadow=y:shadowoffset=1:shadowtint=75 +window.inactive.label.text.font: sans:pixelsize=12:bold:shadow=y:shadowoffset=1:shadowtint=0 +menu.items.font: sans:pixelsize=12 +menu.title.text.font: sans:pixelsize=12:bold:shadow=y:shadowoffset=1:shadowtint=75 diff --git a/themes/Natura/openbox-3/themerc.xml b/themes/Natura/openbox-3/themerc.xml deleted file mode 100644 index d48a55f0..00000000 --- a/themes/Natura/openbox-3/themerc.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - 2 - - - - - 1 - - - - left - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - left - 0 - - <text> - <primary r="255" g="255" b="255" a="255"/> - <shadow> - <offset x="1" y="1"/> - <primary r="0" g="0" b="0" a="191"/> - </shadow> - </text> - <style>flat gradient splitvertical</style> - <primary r="92" g="78" b="69" a="255"/> - <secondary r="81" g="68" b="62" a="255"/> - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/artwiz-boxed/openbox-3/themerc b/themes/artwiz-boxed/openbox-3/themerc new file mode 100644 index 00000000..e10ad8c0 --- /dev/null +++ b/themes/artwiz-boxed/openbox-3/themerc @@ -0,0 +1,102 @@ +menu.title.bg: raised gradient diagonal +menu.title.bg.color: rgb:90/94/98 +menu.title.bg.colorTo: rgb:20/24/28 +menu.title.text.color: white +menu.title.text.justify: center + +menu.items.bg: sunken gradient diagonal +menu.items.bg.color: rgb:10/20/30 +menu.items.bg.colorTo: rgb:70/80/90 +menu.items.text.color: rgb:90/a0/b0 +menu.items.justify: center + +menu.items.active.bg: raised gradient diagonal +menu.items.active.bg.color: rgb:90/94/98 +menu.items.active.bg.colorTo: rgb:20/24/28 +menu.items.active.text.color: white +menu.bullet.image.color: rgb:90/a0/b0 +menu.bullet.selected.image.color: #ffffff + +window.active.title.bg: raised gradient vertical +window.active.title.bg.color: rgb:80/84/88 +window.active.title.bg.colorTo: rgb:30/34/38 +window.inactive.title.bg: raised vertical gradient +window.inactive.title.bg.color: rgb:50/54/58 +window.inactive.title.bg.colorTo: black + +window.active.label.bg: sunken diagonal gradient +window.active.label.bg.color: rgb:10/20/30 +window.active.label.bg.colorTo: rgb:70/80/90 +window.active.label.text.color: white +window.inactive.label.bg: sunken gradient diagonal +window.inactive.label.bg.color: black +window.inactive.label.bg.colorTo: rgb:40/50/60 +window.inactive.label.text.color: rgb:60/64/68 +window.label.text.justify: center + +window.active.button.unpressed.bg: raised gradient diagonal +window.active.button.unpressed.bg.color: rgb:90/94/98 +window.active.button.unpressed.bg.colorTo: rgb:20/24/28 +window.active.button.unpressed.image.color: white + +window.inactive.button.unpressed.bg: raised gradient diagonal +window.inactive.button.unpressed.bg.color: rgb:50/54/58 +window.inactive.button.unpressed.bg.colorTo: black +window.inactive.button.unpressed.image.color: rgb:70/74/78 + +window.active.button.pressed.bg: sunken gradient diagonal +window.active.button.pressed.bg.color: rgb:20/40/50 +window.active.button.pressed.bg.colorTo: rgb:60/70/80 + +window.inactive.button.pressed.bg: sunken gradient diagonal +window.inactive.button.pressed.bg.color: rgb:50/54/58 +window.inactive.button.pressed.bg.colorTo: black +window.inactive.button.pressed.image.color: rgb:70/74/78 + +window.active.client.color: rgb:40/44/48 +window.inactive.client.color: rgb:20/24/28 + +window.active.handle.bg: raised gradient diagonal +window.active.handle.bg.color: rgb:70/74/78 +window.active.handle.bg.colorTo: rgb:40/44/48 + +window.inactive.handle.bg: raised gradient diagonal +window.inactive.handle.bg.color: rgb:50/54/58 +window.inactive.handle.bg.colorTo: black + +window.active.grip.bg: sunken diagonal gradient +window.active.grip.bg.color: rgb:20/30/40 +window.active.grip.bg.colorTo: rgb:60/70/80 + +window.inactive.grip.bg: sunken diagonal gradient +window.inactive.grip.bg.color: black +window.inactive.grip.bg.colorTo: rgb:30/40/50 + +window.active.button.toggled.bg: raised gradient diagonal +window.active.button.toggled.bg.color: rgb:90/94/98 +window.active.button.toggled.bg.colorTo: rgb:20/24/28 +window.active.button.toggled.image.color: white + +window.inactive.button.toggled.bg: raised gradient diagonal +window.inactive.button.toggled.bg.color: rgb:50/54/58 +window.inactive.button.toggled.bg.colorTo: black +window.inactive.button.toggled.image.color: rgb:70/74/78 + +window.active.button.disabled.bg: raised gradient diagonal +window.active.button.disabled.bg.color: rgb:90/94/98 +window.active.button.disabled.bg.colorTo: rgb:20/24/28 +window.active.button.disabled.image.color: grey + +window.inactive.button.disabled.bg: raised gradient diagonal +window.inactive.button.disabled.bg.color: rgb:50/54/58 +window.inactive.button.disabled.bg.colorTo: black +window.inactive.button.disabled.image.color: rgb:70/74/78 + +border.color: black +padding.width: 1 +borderWidth: 1 +window.handle.width: 4 + +window.active.label.text.font: sans:pixelsize=10 +menu.title.text.font: sans:pixelsize=10 +menu.items.font: sans:pixelsize=10 diff --git a/themes/artwiz-boxed/openbox-3/themerc.xml b/themes/artwiz-boxed/openbox-3/themerc.xml deleted file mode 100644 index 104f7a27..00000000 --- a/themes/artwiz-boxed/openbox-3/themerc.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - 4 - - - - - 1 - - - center - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - center - - <text> - <primary r="255" g="255" b="255" a="255"/> - </text> - <style>raised gradient diagonal</style> - <primary r="144" g="148" b="152" a="255"/> - <secondary r="32" g="36" b="40" a="255"/> - - - - - - - - - - - - - - - - - - - diff --git a/themes/bear2/openbox-3/themerc b/themes/bear2/openbox-3/themerc new file mode 100644 index 00000000..11f70634 --- /dev/null +++ b/themes/bear2/openbox-3/themerc @@ -0,0 +1,78 @@ +!!General + +window.handle.width: 4 +window.client.padding.width: 0 +border.Width: 1 +padding.width: 3 +menu.overlap: 2 +border.color: #4e4e4e +window.frameColor: #eeeeec +window.*.client.color: #eeeeec +*.text.justify: center + +!!Fonts + +window.active.label.text.font: sans:pixelsize=12:shadow=y:shadowoffset=1:shadowtint=3:bold +window.inactive.label.text.font: sans:pixelsize=12:shadow=y:shadowoffset=1:shadowtint=0:bold +menu.items.font: sans:pixelsize=12 +menu.title.text.font: sans:pixelsize=12:shadow=y:shadowoffset=1:shadowtint=30:bold + +!!Menu +menu.border.color: #9d9d9d +menu.title.bg: flat border vertical gradient +menu.title.bg.color: #3465A4 +menu.title.bg.colorTo: #407CCA +menu.title.bg.border.color: #729fcf +menu.title.text.color: #ffffff + +menu.items.bg: flat border solid +menu.items.bg.color: #eeeeec +menu.items.bg.border.color: #EFEBE7 + +menu.items.text.color: #444444 +menu.items.disabled.text.color: #babdb6 + +menu.items.active.bg: flat solid +menu.items.active.bg.color: #4481c0 +menu.items.active.bg.colorTo: #4175aa +menu.items.active.text.color: #f6f8fb +menu.items.active.bg.border.color: #416c98 + +!!Active + +window.active.title.bg: flat border gradient osx +window.active.title.bg.color: #3465A4 +window.active.title.bg.colorTo: #407CCA +window.active.title.bg.border.color: #699acd + +window.active.label.bg: parentrelative +window.active.label.text.color: #ffffff + +window.active.button.*.bg: parentrelative +window.active.button.*.image.color: #efefef +window.active.button.hover.bg.color: #729fcf +window.active.button.hover.image.color: #ffffff +window.active.button.pressed.bg.color: #a7cef2 +window.active.button.disabled.image.color: #dddddd + +window.active.handle.bg: raised solid +window.active.handle.bg.color: #E7e7e7 +window.*.grip.bg: parentrelative + +!!Inactive + +window.inactive.title.bg: flat border gradient osx +window.inactive.title.bg.color: #dcdcdc +window.inactive.title.bg.colorTo: #eeeeec +window.inactive.title.bg.border.color: #efefef +window.inactive.label.bg: parentrelative +window.inactive.label.text.color: #888a85 + +window.inactive.button.*.bg: parentrelative +window.inactive.button.*.image.color: #888a85 +window.inactive.button.pressed.bg.color: #d3d7cf +window.inactive.button.pressed.bg.color: #4f5051 +window.inactive.button.disabled.image.color: #ffffff + +window.inactive.handle.bg: raised solid +window.inactive.handle.bg.color: #E7e7e7 diff --git a/themes/bear2/openbox-3/themerc.xml b/themes/bear2/openbox-3/themerc.xml deleted file mode 100644 index 39d4babe..00000000 --- a/themes/bear2/openbox-3/themerc.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - 4 - - - - - 1 - - - - center - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - center - 2 - - <text> - <primary r="255" g="255" b="255" a="255"/> - <shadow> - <offset x="1" y="1"/> - <primary r="0" g="0" b="0" a="76"/> - </shadow> - </text> - <style>flat border vertical gradient</style> - <primary r="52" g="101" b="164" a="255"/> - <secondary r="64" g="124" b="202" a="255"/> - <border r="114" g="159" b="207" a="255"/> - - - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/orang/openbox-3/themerc b/themes/orang/openbox-3/themerc new file mode 100644 index 00000000..0cebbab9 --- /dev/null +++ b/themes/orang/openbox-3/themerc @@ -0,0 +1,100 @@ +!! i be a mess + +menu.title.bg: flat solid border +menu.title.bg.color: #ce5c00 +menu.title.bg.border.color: #fcaf3e +menu.title.text.color: #ffffff + +menu.items.bg: flat solid +#menu.items.bg.color: #ffffff +menu.items.bg.color: #d3d7cf +menu.items.text.color: #000000 +menu.items.disabled.text.color: #737573 + +menu.items.active.bg: flat solid +menu.items.active.bg.color: #ce5c00 +menu.items.active.text.color: #ffffff + +!! General window settings +*.justify: left + +!! focused window settings +window.active.client.color: #f7f7f7 + +window.active.title.bg: flat border solid +window.active.title.bg.color: #ce5c00 +window.active.title.bg.border.color: #fcaf3e + +window.active.handle.bg: flat solid border +window.active.handle.bg.color: #d3d7cf +window.active.handle.bg.border.color: #eeeeec +!window.active.handle.bg.color: #969494 +window.active.grip.bg: parentrelative + +window.active.label.bg: parentrelative +window.active.label.text.color: #ffffff + +window.active.button.*.bg: parentrelative +window.active.button.*.image.color: #ffffff + +window.active.button.pressed.bg: flat solid bevel1 +!window.active.button.pressed.bg.color: #888888 +window.active.button.pressed.bg.color: #f57900 +window.active.button.pressed.image.color: #d3d7cf + +!#hover +window.active.button.hover.bg: flat solid +window.active.button.hover.image.color: #ffffff +window.active.button.hover.bg.color: #fcaf3e + +window.active.button.disabled.bg: flat solid +window.active.button.disabled.bg.color: #dfb454 +window.active.button.disabled.image.color: #ffffff + + +!! unfocused window settings +window.inactive.client.color: #f7f7f7 + +window.inactive.title.bg: flat solid border +window.inactive.title.bg.color: #d3d7cf +window.inactive.title.bg.border.color: #dfe3db + +window.inactive.handle.bg: flat solid +window.inactive.handle.bg.color: #d3d7cf + +window.inactive.grip.bg: parentrelative + +window.inactive.label.bg: parentrelative +window.inactive.label.text.color: #888a85 + +window.inactive.button.*.bg: parentrelative +window.inactive.button.unpressed.image.color: #555555 + +window.inactive.button.pressed.bg: flat border solid +window.inactive.button.pressed.bg.color: #aaaaaa +window.inactive.button.pressed.bg.border.color: #e5e5e5 + +window.inactive.button.hover.bg: flat solid +window.inactive.button.hover.bg.color: #e3e3e3 + +window.inactive.button.disabled.bg:flat solid +window.inactive.button.disabled.bg.color: #e3e3e3 + + +!! Global width settings +border.Width: 1 +padding.width: 1 +window.handle.width: 3 +window.client.padding.width: 0 +menu.overlap: 2 + +!! Miscellaneous settings +border.color: #000000 + +!! font me! +window.active.label.text.font: sans:pixelsize=10:bold +window.inactive.label.text.font: sans:pixelsize=10:bold + +menu.title.text.font: sans:pixelsize=10:bold +menu.items.font: sans:pixelsize=9 + diff --git a/themes/orang/openbox-3/themerc.xml b/themes/orang/openbox-3/themerc.xml deleted file mode 100644 index 4b25b36b..00000000 --- a/themes/orang/openbox-3/themerc.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - 3 - - - - - 1 - - - - left - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - left - 2 - - <text> - <primary r="255" g="255" b="255" a="255"/> - </text> - <style>flat solid border</style> - <primary r="206" g="92" b="0" a="255"/> - <border r="252" g="175" b="62" a="255"/> - - - - - - - - - - - - - - - - - - - - diff --git a/themes/syscrash/openbox-3/themerc b/themes/syscrash/openbox-3/themerc new file mode 100644 index 00000000..63d693b0 --- /dev/null +++ b/themes/syscrash/openbox-3/themerc @@ -0,0 +1,113 @@ +!! syscrash's theme, based off nightm4re's flax or something + +!!--------------------------------------------------------------------------- +!! Dimensions + +border.width: 1 +border.color: #6d6d6d + +padding.width: 1 +window.handle.width: 0 +window.client.padding.width: 0 + +menu.overlap: 0 + +!!--------------------------------------------------------------------------- +!! Fonts + +window.active.label.text.font: verdana-7:style=bold:shadow=y +window.label.text.justify: left + +menu.title.text.font: verdana-7:style=bold:shadow=y +menu.title.text.justify: left + +menu.items.font: verdana-7 + +!!--------------------------------------------------------------------------- +!! Menu Settings + +menu.title.bg: flat gradient vertical +menu.title.bg.color: #4c4c4c +menu.title.bg.colorTo: #707070 +menu.title.text.color: white + +menu.items.bg: flat solid +menu.items.bg.color: #e6e6e0 +menu.items.text.color: #22221c + +menu.items.active.bg: flat solid +menu.items.active.bg.color: #4c4c4c +menu.items.active.text.color: #ffffff + +menu.items.disabled.text.color: #444438 + +!!--------------------------------------------------------------------------- +!! Window Settings + +window.active.padding.width: 10 +window.active.title.bg: flat solid +window.active.title.bg.color: #9b9b9b + +window.active.label.bg: flat gradient vertical border +window.active.label.bg.color: #4c4c4c +window.active.label.bg.colorTo: #707070 +window.active.label.text.color: white + +window.active.handle.bg: flat gradient crossdiagonal +window.active.handle.bg.color: #d3deda +window.active.handle.bg.colorTo: #9fbfc1 + +window.active.grip.bg: flat solid +window.active.grip.bg.color: #9fbfc1 + +window.active.client.color: #4c4c4c +window.inactive.client.color: #707070 + +window.inactive.title.bg: flat solid +window.inactive.title.bg.color: #9b9b9b + +window.inactive.label.bg: parentrelative +window.inactive.label.text.color: #4c4c4c + +window.inactive.handle.bg: flat solid +window.inactive.handle.bg.color: #e6e6e0 + +window.inactive.grip.bg: flat solid +window.inactive.grip.bg.color: #e6e6e0 + +!!--------------------------------------------------------------------------- +!! Button Settings + +window.active.button.unpressed.bg: flat gradient vertical border +window.active.button.unpressed.bg.color: #515151 +window.active.button.unpressed.bg.colorTo: #676767 +window.active.button.unpressed.image.color: white + +window.active.button.pressed.bg: flat gradient crossdiagonal border +window.active.button.pressed.bg.color: #d3deda +window.active.button.pressed.bg.colorTo: #9fbfc1 + +window.active.button.hover.bg: flat solid border +window.active.button.hover.bg.color: #e6e6e0 + +window.active.button.disabled.bg: parentrelative +window.active.button.disabled.image.color: #9fbfc1 + +!! without this it looks right +!!window.active.button.toggled.bg: flat solid +!!window.active.button.toggled.bg.color: #9fbfc1 + +window.inactive.button.unpressed.bg: parentrelative +window.inactive.button.unpressed.image.color: #4c4c4c + +window.inactive.button.hover.bg: flat solid border +window.inactive.button.hover.bg.color: #e6e6e0 +window.inactive.button.pressed.bg: flat gradient crossdiagonal border +window.inactive.button.pressed.bg.color: #d3deda +window.inactive.button.pressed.bg.colorTo: #9fbfc1 + +window.inactive.button.disabled.bg: flat solid +window.inactive.button.disabled.bg.image.color: #444438 + +!! window.inactive.button.toggled.bg: flat solid +!! window.inactive.button.toggled.bg.color: #444438 diff --git a/themes/syscrash/openbox-3/themerc.xml b/themes/syscrash/openbox-3/themerc.xml deleted file mode 100644 index bd8d15db..00000000 --- a/themes/syscrash/openbox-3/themerc.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - 0 - - - - - 1 - - - - left - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - left - 0 - - <text> - <primary r="255" g="255" b="255" a="255"/> - </text> - <style>flat gradient vertical</style> - <primary r="76" g="76" b="76" a="255"/> - <secondary r="112" g="112" b="112" a="255"/> - - - - - - - - - - - - - - - - - - - - diff --git a/tools/themetoxml/Makefile b/tools/themetoxml/Makefile deleted file mode 100644 index cfc46539..00000000 --- a/tools/themetoxml/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all clean install: - $(MAKE) -C ../.. -$(MAKEFLAGS) $@ - -.PHONY: all clean install diff --git a/tools/themetoxml/rgb.h b/tools/themetoxml/rgb.h deleted file mode 100644 index e077112f..00000000 --- a/tools/themetoxml/rgb.h +++ /dev/null @@ -1,762 +0,0 @@ -typedef struct { - const char *name; - int r; - int g; - int b; -} Colorname; - -Colorname colornames[] = { - { "snow", 255, 250, 250 }, - { "ghost white", 248, 248, 255 }, - { "GhostWhite", 248, 248, 255 }, - { "white smoke", 245, 245, 245 }, - { "WhiteSmoke", 245, 245, 245 }, - { "gainsboro", 220, 220, 220 }, - { "floral white", 255, 250, 240 }, - { "FloralWhite", 255, 250, 240 }, - { "old lace", 253, 245, 230 }, - { "OldLace", 253, 245, 230 }, - { "linen", 250, 240, 230 }, - { "antique white", 250, 235, 215 }, - { "AntiqueWhite", 250, 235, 215 }, - { "papaya whip", 255, 239, 213 }, - { "PapayaWhip", 255, 239, 213 }, - { "blanched almond", 255, 235, 205 }, - { "BlanchedAlmond", 255, 235, 205 }, - { "bisque", 255, 228, 196 }, - { "peach puff", 255, 218, 185 }, - { "PeachPuff", 255, 218, 185 }, - { "navajo white", 255, 222, 173 }, - { "NavajoWhite", 255, 222, 173 }, - { "moccasin", 255, 228, 181 }, - { "cornsilk", 255, 248, 220 }, - { "ivory", 255, 255, 240 }, - { "lemon chiffon", 255, 250, 205 }, - { "LemonChiffon", 255, 250, 205 }, - { "seashell", 255, 245, 238 }, - { "honeydew", 240, 255, 240 }, - { "mint cream", 245, 255, 250 }, - { "MintCream", 245, 255, 250 }, - { "azure", 240, 255, 255 }, - { "alice blue", 240, 248, 255 }, - { "AliceBlue", 240, 248, 255 }, - { "lavender", 230, 230, 250 }, - { "lavender blush", 255, 240, 245 }, - { "LavenderBlush", 255, 240, 245 }, - { "misty rose", 255, 228, 225 }, - { "MistyRose", 255, 228, 225 }, - { "white", 255, 255, 255 }, - { "black", 0, 0, 0 }, - { "dark slate gray", 47, 79, 79 }, - { "DarkSlateGray", 47, 79, 79 }, - { "dark slate grey", 47, 79, 79 }, - { "DarkSlateGrey", 47, 79, 79 }, - { "dim gray", 105, 105, 105 }, - { "DimGray", 105, 105, 105 }, - { "dim grey", 105, 105, 105 }, - { "DimGrey", 105, 105, 105 }, - { "slate gray", 112, 128, 144 }, - { "SlateGray", 112, 128, 144 }, - { "slate grey", 112, 128, 144 }, - { "SlateGrey", 112, 128, 144 }, - { "light slate gray", 119, 136, 153 }, - { "LightSlateGray", 119, 136, 153 }, - { "light slate grey", 119, 136, 153 }, - { "LightSlateGrey", 119, 136, 153 }, - { "gray", 190, 190, 190 }, - { "grey", 190, 190, 190 }, - { "light grey", 211, 211, 211 }, - { "LightGrey", 211, 211, 211 }, - { "light gray", 211, 211, 211 }, - { "LightGray", 211, 211, 211 }, - { "midnight blue", 25, 25, 112 }, - { "MidnightBlue", 25, 25, 112 }, - { "navy", 0, 0, 128 }, - { "navy blue", 0, 0, 128 }, - { "NavyBlue", 0, 0, 128 }, - { "cornflower blue", 100, 149, 237 }, - { "CornflowerBlue", 100, 149, 237 }, - { "dark slate blue", 72, 61, 139 }, - { "DarkSlateBlue", 72, 61, 139 }, - { "slate blue", 106, 90, 205 }, - { "SlateBlue", 106, 90, 205 }, - { "medium slate blue", 123, 104, 238 }, - { "MediumSlateBlue", 123, 104, 238 }, - { "light slate blue", 132, 112, 255 }, - { "LightSlateBlue", 132, 112, 255 }, - { "medium blue", 0, 0, 205 }, - { "MediumBlue", 0, 0, 205 }, - { "royal blue", 65, 105, 225 }, - { "RoyalBlue", 65, 105, 225 }, - { "blue", 0, 0, 255 }, - { "dodger blue", 30, 144, 255 }, - { "DodgerBlue", 30, 144, 255 }, - { "deep sky blue", 0, 191, 255 }, - { "DeepSkyBlue", 0, 191, 255 }, - { "sky blue", 135, 206, 235 }, - { "SkyBlue", 135, 206, 235 }, - { "light sky blue", 135, 206, 250 }, - { "LightSkyBlue", 135, 206, 250 }, - { "steel blue", 70, 130, 180 }, - { "SteelBlue", 70, 130, 180 }, - { "light steel blue", 176, 196, 222 }, - { "LightSteelBlue", 176, 196, 222 }, - { "light blue", 173, 216, 230 }, - { "LightBlue", 173, 216, 230 }, - { "powder blue", 176, 224, 230 }, - { "PowderBlue", 176, 224, 230 }, - { "pale turquoise", 175, 238, 238 }, - { "PaleTurquoise", 175, 238, 238 }, - { "dark turquoise", 0, 206, 209 }, - { "DarkTurquoise", 0, 206, 209 }, - { "medium turquoise", 72, 209, 204 }, - { "MediumTurquoise", 72, 209, 204 }, - { "turquoise", 64, 224, 208 }, - { "cyan", 0, 255, 255 }, - { "light cyan", 224, 255, 255 }, - { "LightCyan", 224, 255, 255 }, - { "cadet blue", 95, 158, 160 }, - { "CadetBlue", 95, 158, 160 }, - { "medium aquamarine", 102, 205, 170 }, - { "MediumAquamarine", 102, 205, 170 }, - { "aquamarine", 127, 255, 212 }, - { "dark green", 0, 100, 0 }, - { "DarkGreen", 0, 100, 0 }, - { "dark olive green", 85, 107, 47 }, - { "DarkOliveGreen", 85, 107, 47 }, - { "dark sea green", 143, 188, 143 }, - { "DarkSeaGreen", 143, 188, 143 }, - { "sea green", 46, 139, 87 }, - { "SeaGreen", 46, 139, 87 }, - { "medium sea green", 60, 179, 113 }, - { "MediumSeaGreen", 60, 179, 113 }, - { "light sea green", 32, 178, 170 }, - { "LightSeaGreen", 32, 178, 170 }, - { "pale green", 152, 251, 152 }, - { "PaleGreen", 152, 251, 152 }, - { "spring green", 0, 255, 127 }, - { "SpringGreen", 0, 255, 127 }, - { "lawn green", 124, 252, 0 }, - { "LawnGreen", 124, 252, 0 }, - { "green", 0, 255, 0 }, - { "chartreuse", 127, 255, 0 }, - { "medium spring green", 0, 250, 154 }, - { "MediumSpringGreen", 0, 250, 154 }, - { "green yellow", 173, 255, 47 }, - { "GreenYellow", 173, 255, 47 }, - { "lime green", 50, 205, 50 }, - { "LimeGreen", 50, 205, 50 }, - { "yellow green", 154, 205, 50 }, - { "YellowGreen", 154, 205, 50 }, - { "forest green", 34, 139, 34 }, - { "ForestGreen", 34, 139, 34 }, - { "olive drab", 107, 142, 35 }, - { "OliveDrab", 107, 142, 35 }, - { "dark khaki", 189, 183, 107 }, - { "DarkKhaki", 189, 183, 107 }, - { "khaki", 240, 230, 140 }, - { "pale goldenrod", 238, 232, 170 }, - { "PaleGoldenrod", 238, 232, 170 }, - { "light goldenrod yellow", 250, 250, 210 }, - { "LightGoldenrodYellow", 250, 250, 210 }, - { "light yellow", 255, 255, 224 }, - { "LightYellow", 255, 255, 224 }, - { "yellow", 255, 255, 0 }, - { "gold", 255, 215, 0 }, - { "light goldenrod", 238, 221, 130 }, - { "LightGoldenrod", 238, 221, 130 }, - { "goldenrod", 218, 165, 32 }, - { "dark goldenrod", 184, 134, 11 }, - { "DarkGoldenrod", 184, 134, 11 }, - { "rosy brown", 188, 143, 143 }, - { "RosyBrown", 188, 143, 143 }, - { "indian red", 205, 92, 92 }, - { "IndianRed", 205, 92, 92 }, - { "saddle brown", 139, 69, 19 }, - { "SaddleBrown", 139, 69, 19 }, - { "sienna", 160, 82, 45 }, - { "peru", 205, 133, 63 }, - { "burlywood", 222, 184, 135 }, - { "beige", 245, 245, 220 }, - { "wheat", 245, 222, 179 }, - { "sandy brown", 244, 164, 96 }, - { "SandyBrown", 244, 164, 96 }, - { "tan", 210, 180, 140 }, - { "chocolate", 210, 105, 30 }, - { "firebrick", 178, 34, 34 }, - { "brown", 165, 42, 42 }, - { "dark salmon", 233, 150, 122 }, - { "DarkSalmon", 233, 150, 122 }, - { "salmon", 250, 128, 114 }, - { "light salmon", 255, 160, 122 }, - { "LightSalmon", 255, 160, 122 }, - { "orange", 255, 165, 0 }, - { "dark orange", 255, 140, 0 }, - { "DarkOrange", 255, 140, 0 }, - { "coral", 255, 127, 80 }, - { "light coral", 240, 128, 128 }, - { "LightCoral", 240, 128, 128 }, - { "tomato", 255, 99, 71 }, - { "orange red", 255, 69, 0 }, - { "OrangeRed", 255, 69, 0 }, - { "red", 255, 0, 0 }, - { "hot pink", 255, 105, 180 }, - { "HotPink", 255, 105, 180 }, - { "deep pink", 255, 20, 147 }, - { "DeepPink", 255, 20, 147 }, - { "pink", 255, 192, 203 }, - { "light pink", 255, 182, 193 }, - { "LightPink", 255, 182, 193 }, - { "pale violet red", 219, 112, 147 }, - { "PaleVioletRed", 219, 112, 147 }, - { "maroon", 176, 48, 96 }, - { "medium violet red", 199, 21, 133 }, - { "MediumVioletRed", 199, 21, 133 }, - { "violet red", 208, 32, 144 }, - { "VioletRed", 208, 32, 144 }, - { "magenta", 255, 0, 255 }, - { "violet", 238, 130, 238 }, - { "plum", 221, 160, 221 }, - { "orchid", 218, 112, 214 }, - { "medium orchid", 186, 85, 211 }, - { "MediumOrchid", 186, 85, 211 }, - { "dark orchid", 153, 50, 204 }, - { "DarkOrchid", 153, 50, 204 }, - { "dark violet", 148, 0, 211 }, - { "DarkViolet", 148, 0, 211 }, - { "blue violet", 138, 43, 226 }, - { "BlueViolet", 138, 43, 226 }, - { "purple", 160, 32, 240 }, - { "medium purple", 147, 112, 219 }, - { "MediumPurple", 147, 112, 219 }, - { "thistle", 216, 191, 216 }, - { "snow1", 255, 250, 250 }, - { "snow2", 238, 233, 233 }, - { "snow3", 205, 201, 201 }, - { "snow4", 139, 137, 137 }, - { "seashell1", 255, 245, 238 }, - { "seashell2", 238, 229, 222 }, - { "seashell3", 205, 197, 191 }, - { "seashell4", 139, 134, 130 }, - { "AntiqueWhite1", 255, 239, 219 }, - { "AntiqueWhite2", 238, 223, 204 }, - { "AntiqueWhite3", 205, 192, 176 }, - { "AntiqueWhite4", 139, 131, 120 }, - { "bisque1", 255, 228, 196 }, - { "bisque2", 238, 213, 183 }, - { "bisque3", 205, 183, 158 }, - { "bisque4", 139, 125, 107 }, - { "PeachPuff1", 255, 218, 185 }, - { "PeachPuff2", 238, 203, 173 }, - { "PeachPuff3", 205, 175, 149 }, - { "PeachPuff4", 139, 119, 101 }, - { "NavajoWhite1", 255, 222, 173 }, - { "NavajoWhite2", 238, 207, 161 }, - { "NavajoWhite3", 205, 179, 139 }, - { "NavajoWhite4", 139, 121, 94 }, - { "LemonChiffon1", 255, 250, 205 }, - { "LemonChiffon2", 238, 233, 191 }, - { "LemonChiffon3", 205, 201, 165 }, - { "LemonChiffon4", 139, 137, 112 }, - { "cornsilk1", 255, 248, 220 }, - { "cornsilk2", 238, 232, 205 }, - { "cornsilk3", 205, 200, 177 }, - { "cornsilk4", 139, 136, 120 }, - { "ivory1", 255, 255, 240 }, - { "ivory2", 238, 238, 224 }, - { "ivory3", 205, 205, 193 }, - { "ivory4", 139, 139, 131 }, - { "honeydew1", 240, 255, 240 }, - { "honeydew2", 224, 238, 224 }, - { "honeydew3", 193, 205, 193 }, - { "honeydew4", 131, 139, 131 }, - { "LavenderBlush1", 255, 240, 245 }, - { "LavenderBlush2", 238, 224, 229 }, - { "LavenderBlush3", 205, 193, 197 }, - { "LavenderBlush4", 139, 131, 134 }, - { "MistyRose1", 255, 228, 225 }, - { "MistyRose2", 238, 213, 210 }, - { "MistyRose3", 205, 183, 181 }, - { "MistyRose4", 139, 125, 123 }, - { "azure1", 240, 255, 255 }, - { "azure2", 224, 238, 238 }, - { "azure3", 193, 205, 205 }, - { "azure4", 131, 139, 139 }, - { "SlateBlue1", 131, 111, 255 }, - { "SlateBlue2", 122, 103, 238 }, - { "SlateBlue3", 105, 89, 205 }, - { "SlateBlue4", 71, 60, 139 }, - { "RoyalBlue1", 72, 118, 255 }, - { "RoyalBlue2", 67, 110, 238 }, - { "RoyalBlue3", 58, 95, 205 }, - { "RoyalBlue4", 39, 64, 139 }, - { "blue1", 0, 0, 255 }, - { "blue2", 0, 0, 238 }, - { "blue3", 0, 0, 205 }, - { "blue4", 0, 0, 139 }, - { "DodgerBlue1", 30, 144, 255 }, - { "DodgerBlue2", 28, 134, 238 }, - { "DodgerBlue3", 24, 116, 205 }, - { "DodgerBlue4", 16, 78, 139 }, - { "SteelBlue1", 99, 184, 255 }, - { "SteelBlue2", 92, 172, 238 }, - { "SteelBlue3", 79, 148, 205 }, - { "SteelBlue4", 54, 100, 139 }, - { "DeepSkyBlue1", 0, 191, 255 }, - { "DeepSkyBlue2", 0, 178, 238 }, - { "DeepSkyBlue3", 0, 154, 205 }, - { "DeepSkyBlue4", 0, 104, 139 }, - { "SkyBlue1", 135, 206, 255 }, - { "SkyBlue2", 126, 192, 238 }, - { "SkyBlue3", 108, 166, 205 }, - { "SkyBlue4", 74, 112, 139 }, - { "LightSkyBlue1", 176, 226, 255 }, - { "LightSkyBlue2", 164, 211, 238 }, - { "LightSkyBlue3", 141, 182, 205 }, - { "LightSkyBlue4", 96, 123, 139 }, - { "SlateGray1", 198, 226, 255 }, - { "SlateGray2", 185, 211, 238 }, - { "SlateGray3", 159, 182, 205 }, - { "SlateGray4", 108, 123, 139 }, - { "LightSteelBlue1", 202, 225, 255 }, - { "LightSteelBlue2", 188, 210, 238 }, - { "LightSteelBlue3", 162, 181, 205 }, - { "LightSteelBlue4", 110, 123, 139 }, - { "LightBlue1", 191, 239, 255 }, - { "LightBlue2", 178, 223, 238 }, - { "LightBlue3", 154, 192, 205 }, - { "LightBlue4", 104, 131, 139 }, - { "LightCyan1", 224, 255, 255 }, - { "LightCyan2", 209, 238, 238 }, - { "LightCyan3", 180, 205, 205 }, - { "LightCyan4", 122, 139, 139 }, - { "PaleTurquoise1", 187, 255, 255 }, - { "PaleTurquoise2", 174, 238, 238 }, - { "PaleTurquoise3", 150, 205, 205 }, - { "PaleTurquoise4", 102, 139, 139 }, - { "CadetBlue1", 152, 245, 255 }, - { "CadetBlue2", 142, 229, 238 }, - { "CadetBlue3", 122, 197, 205 }, - { "CadetBlue4", 83, 134, 139 }, - { "turquoise1", 0, 245, 255 }, - { "turquoise2", 0, 229, 238 }, - { "turquoise3", 0, 197, 205 }, - { "turquoise4", 0, 134, 139 }, - { "cyan1", 0, 255, 255 }, - { "cyan2", 0, 238, 238 }, - { "cyan3", 0, 205, 205 }, - { "cyan4", 0, 139, 139 }, - { "DarkSlateGray1", 151, 255, 255 }, - { "DarkSlateGray2", 141, 238, 238 }, - { "DarkSlateGray3", 121, 205, 205 }, - { "DarkSlateGray4", 82, 139, 139 }, - { "aquamarine1", 127, 255, 212 }, - { "aquamarine2", 118, 238, 198 }, - { "aquamarine3", 102, 205, 170 }, - { "aquamarine4", 69, 139, 116 }, - { "DarkSeaGreen1", 193, 255, 193 }, - { "DarkSeaGreen2", 180, 238, 180 }, - { "DarkSeaGreen3", 155, 205, 155 }, - { "DarkSeaGreen4", 105, 139, 105 }, - { "SeaGreen1", 84, 255, 159 }, - { "SeaGreen2", 78, 238, 148 }, - { "SeaGreen3", 67, 205, 128 }, - { "SeaGreen4", 46, 139, 87 }, - { "PaleGreen1", 154, 255, 154 }, - { "PaleGreen2", 144, 238, 144 }, - { "PaleGreen3", 124, 205, 124 }, - { "PaleGreen4", 84, 139, 84 }, - { "SpringGreen1", 0, 255, 127 }, - { "SpringGreen2", 0, 238, 118 }, - { "SpringGreen3", 0, 205, 102 }, - { "SpringGreen4", 0, 139, 69 }, - { "green1", 0, 255, 0 }, - { "green2", 0, 238, 0 }, - { "green3", 0, 205, 0 }, - { "green4", 0, 139, 0 }, - { "chartreuse1", 127, 255, 0 }, - { "chartreuse2", 118, 238, 0 }, - { "chartreuse3", 102, 205, 0 }, - { "chartreuse4", 69, 139, 0 }, - { "OliveDrab1", 192, 255, 62 }, - { "OliveDrab2", 179, 238, 58 }, - { "OliveDrab3", 154, 205, 50 }, - { "OliveDrab4", 105, 139, 34 }, - { "DarkOliveGreen1", 202, 255, 112 }, - { "DarkOliveGreen2", 188, 238, 104 }, - { "DarkOliveGreen3", 162, 205, 90 }, - { "DarkOliveGreen4", 110, 139, 61 }, - { "khaki1", 255, 246, 143 }, - { "khaki2", 238, 230, 133 }, - { "khaki3", 205, 198, 115 }, - { "khaki4", 139, 134, 78 }, - { "LightGoldenrod1", 255, 236, 139 }, - { "LightGoldenrod2", 238, 220, 130 }, - { "LightGoldenrod3", 205, 190, 112 }, - { "LightGoldenrod4", 139, 129, 76 }, - { "LightYellow1", 255, 255, 224 }, - { "LightYellow2", 238, 238, 209 }, - { "LightYellow3", 205, 205, 180 }, - { "LightYellow4", 139, 139, 122 }, - { "yellow1", 255, 255, 0 }, - { "yellow2", 238, 238, 0 }, - { "yellow3", 205, 205, 0 }, - { "yellow4", 139, 139, 0 }, - { "gold1", 255, 215, 0 }, - { "gold2", 238, 201, 0 }, - { "gold3", 205, 173, 0 }, - { "gold4", 139, 117, 0 }, - { "goldenrod1", 255, 193, 37 }, - { "goldenrod2", 238, 180, 34 }, - { "goldenrod3", 205, 155, 29 }, - { "goldenrod4", 139, 105, 20 }, - { "DarkGoldenrod1", 255, 185, 15 }, - { "DarkGoldenrod2", 238, 173, 14 }, - { "DarkGoldenrod3", 205, 149, 12 }, - { "DarkGoldenrod4", 139, 101, 8 }, - { "RosyBrown1", 255, 193, 193 }, - { "RosyBrown2", 238, 180, 180 }, - { "RosyBrown3", 205, 155, 155 }, - { "RosyBrown4", 139, 105, 105 }, - { "IndianRed1", 255, 106, 106 }, - { "IndianRed2", 238, 99, 99 }, - { "IndianRed3", 205, 85, 85 }, - { "IndianRed4", 139, 58, 58 }, - { "sienna1", 255, 130, 71 }, - { "sienna2", 238, 121, 66 }, - { "sienna3", 205, 104, 57 }, - { "sienna4", 139, 71, 38 }, - { "burlywood1", 255, 211, 155 }, - { "burlywood2", 238, 197, 145 }, - { "burlywood3", 205, 170, 125 }, - { "burlywood4", 139, 115, 85 }, - { "wheat1", 255, 231, 186 }, - { "wheat2", 238, 216, 174 }, - { "wheat3", 205, 186, 150 }, - { "wheat4", 139, 126, 102 }, - { "tan1", 255, 165, 79 }, - { "tan2", 238, 154, 73 }, - { "tan3", 205, 133, 63 }, - { "tan4", 139, 90, 43 }, - { "chocolate1", 255, 127, 36 }, - { "chocolate2", 238, 118, 33 }, - { "chocolate3", 205, 102, 29 }, - { "chocolate4", 139, 69, 19 }, - { "firebrick1", 255, 48, 48 }, - { "firebrick2", 238, 44, 44 }, - { "firebrick3", 205, 38, 38 }, - { "firebrick4", 139, 26, 26 }, - { "brown1", 255, 64, 64 }, - { "brown2", 238, 59, 59 }, - { "brown3", 205, 51, 51 }, - { "brown4", 139, 35, 35 }, - { "salmon1", 255, 140, 105 }, - { "salmon2", 238, 130, 98 }, - { "salmon3", 205, 112, 84 }, - { "salmon4", 139, 76, 57 }, - { "LightSalmon1", 255, 160, 122 }, - { "LightSalmon2", 238, 149, 114 }, - { "LightSalmon3", 205, 129, 98 }, - { "LightSalmon4", 139, 87, 66 }, - { "orange1", 255, 165, 0 }, - { "orange2", 238, 154, 0 }, - { "orange3", 205, 133, 0 }, - { "orange4", 139, 90, 0 }, - { "DarkOrange1", 255, 127, 0 }, - { "DarkOrange2", 238, 118, 0 }, - { "DarkOrange3", 205, 102, 0 }, - { "DarkOrange4", 139, 69, 0 }, - { "coral1", 255, 114, 86 }, - { "coral2", 238, 106, 80 }, - { "coral3", 205, 91, 69 }, - { "coral4", 139, 62, 47 }, - { "tomato1", 255, 99, 71 }, - { "tomato2", 238, 92, 66 }, - { "tomato3", 205, 79, 57 }, - { "tomato4", 139, 54, 38 }, - { "OrangeRed1", 255, 69, 0 }, - { "OrangeRed2", 238, 64, 0 }, - { "OrangeRed3", 205, 55, 0 }, - { "OrangeRed4", 139, 37, 0 }, - { "red1", 255, 0, 0 }, - { "red2", 238, 0, 0 }, - { "red3", 205, 0, 0 }, - { "red4", 139, 0, 0 }, - { "DeepPink1", 255, 20, 147 }, - { "DeepPink2", 238, 18, 137 }, - { "DeepPink3", 205, 16, 118 }, - { "DeepPink4", 139, 10, 80 }, - { "HotPink1", 255, 110, 180 }, - { "HotPink2", 238, 106, 167 }, - { "HotPink3", 205, 96, 144 }, - { "HotPink4", 139, 58, 98 }, - { "pink1", 255, 181, 197 }, - { "pink2", 238, 169, 184 }, - { "pink3", 205, 145, 158 }, - { "pink4", 139, 99, 108 }, - { "LightPink1", 255, 174, 185 }, - { "LightPink2", 238, 162, 173 }, - { "LightPink3", 205, 140, 149 }, - { "LightPink4", 139, 95, 101 }, - { "PaleVioletRed1", 255, 130, 171 }, - { "PaleVioletRed2", 238, 121, 159 }, - { "PaleVioletRed3", 205, 104, 137 }, - { "PaleVioletRed4", 139, 71, 93 }, - { "maroon1", 255, 52, 179 }, - { "maroon2", 238, 48, 167 }, - { "maroon3", 205, 41, 144 }, - { "maroon4", 139, 28, 98 }, - { "VioletRed1", 255, 62, 150 }, - { "VioletRed2", 238, 58, 140 }, - { "VioletRed3", 205, 50, 120 }, - { "VioletRed4", 139, 34, 82 }, - { "magenta1", 255, 0, 255 }, - { "magenta2", 238, 0, 238 }, - { "magenta3", 205, 0, 205 }, - { "magenta4", 139, 0, 139 }, - { "orchid1", 255, 131, 250 }, - { "orchid2", 238, 122, 233 }, - { "orchid3", 205, 105, 201 }, - { "orchid4", 139, 71, 137 }, - { "plum1", 255, 187, 255 }, - { "plum2", 238, 174, 238 }, - { "plum3", 205, 150, 205 }, - { "plum4", 139, 102, 139 }, - { "MediumOrchid1", 224, 102, 255 }, - { "MediumOrchid2", 209, 95, 238 }, - { "MediumOrchid3", 180, 82, 205 }, - { "MediumOrchid4", 122, 55, 139 }, - { "DarkOrchid1", 191, 62, 255 }, - { "DarkOrchid2", 178, 58, 238 }, - { "DarkOrchid3", 154, 50, 205 }, - { "DarkOrchid4", 104, 34, 139 }, - { "purple1", 155, 48, 255 }, - { "purple2", 145, 44, 238 }, - { "purple3", 125, 38, 205 }, - { "purple4", 85, 26, 139 }, - { "MediumPurple1", 171, 130, 255 }, - { "MediumPurple2", 159, 121, 238 }, - { "MediumPurple3", 137, 104, 205 }, - { "MediumPurple4", 93, 71, 139 }, - { "thistle1", 255, 225, 255 }, - { "thistle2", 238, 210, 238 }, - { "thistle3", 205, 181, 205 }, - { "thistle4", 139, 123, 139 }, - { "gray0", 0, 0, 0 }, - { "grey0", 0, 0, 0 }, - { "gray1", 3, 3, 3 }, - { "grey1", 3, 3, 3 }, - { "gray2", 5, 5, 5 }, - { "grey2", 5, 5, 5 }, - { "gray3", 8, 8, 8 }, - { "grey3", 8, 8, 8 }, - { "gray4", 10, 10, 10 }, - { "grey4", 10, 10, 10 }, - { "gray5", 13, 13, 13 }, - { "grey5", 13, 13, 13 }, - { "gray6", 15, 15, 15 }, - { "grey6", 15, 15, 15 }, - { "gray7", 18, 18, 18 }, - { "grey7", 18, 18, 18 }, - { "gray8", 20, 20, 20 }, - { "grey8", 20, 20, 20 }, - { "gray9", 23, 23, 23 }, - { "grey9", 23, 23, 23 }, - { "gray10", 26, 26, 26 }, - { "grey10", 26, 26, 26 }, - { "gray11", 28, 28, 28 }, - { "grey11", 28, 28, 28 }, - { "gray12", 31, 31, 31 }, - { "grey12", 31, 31, 31 }, - { "gray13", 33, 33, 33 }, - { "grey13", 33, 33, 33 }, - { "gray14", 36, 36, 36 }, - { "grey14", 36, 36, 36 }, - { "gray15", 38, 38, 38 }, - { "grey15", 38, 38, 38 }, - { "gray16", 41, 41, 41 }, - { "grey16", 41, 41, 41 }, - { "gray17", 43, 43, 43 }, - { "grey17", 43, 43, 43 }, - { "gray18", 46, 46, 46 }, - { "grey18", 46, 46, 46 }, - { "gray19", 48, 48, 48 }, - { "grey19", 48, 48, 48 }, - { "gray20", 51, 51, 51 }, - { "grey20", 51, 51, 51 }, - { "gray21", 54, 54, 54 }, - { "grey21", 54, 54, 54 }, - { "gray22", 56, 56, 56 }, - { "grey22", 56, 56, 56 }, - { "gray23", 59, 59, 59 }, - { "grey23", 59, 59, 59 }, - { "gray24", 61, 61, 61 }, - { "grey24", 61, 61, 61 }, - { "gray25", 64, 64, 64 }, - { "grey25", 64, 64, 64 }, - { "gray26", 66, 66, 66 }, - { "grey26", 66, 66, 66 }, - { "gray27", 69, 69, 69 }, - { "grey27", 69, 69, 69 }, - { "gray28", 71, 71, 71 }, - { "grey28", 71, 71, 71 }, - { "gray29", 74, 74, 74 }, - { "grey29", 74, 74, 74 }, - { "gray30", 77, 77, 77 }, - { "grey30", 77, 77, 77 }, - { "gray31", 79, 79, 79 }, - { "grey31", 79, 79, 79 }, - { "gray32", 82, 82, 82 }, - { "grey32", 82, 82, 82 }, - { "gray33", 84, 84, 84 }, - { "grey33", 84, 84, 84 }, - { "gray34", 87, 87, 87 }, - { "grey34", 87, 87, 87 }, - { "gray35", 89, 89, 89 }, - { "grey35", 89, 89, 89 }, - { "gray36", 92, 92, 92 }, - { "grey36", 92, 92, 92 }, - { "gray37", 94, 94, 94 }, - { "grey37", 94, 94, 94 }, - { "gray38", 97, 97, 97 }, - { "grey38", 97, 97, 97 }, - { "gray39", 99, 99, 99 }, - { "grey39", 99, 99, 99 }, - { "gray40", 102, 102, 102 }, - { "grey40", 102, 102, 102 }, - { "gray41", 105, 105, 105 }, - { "grey41", 105, 105, 105 }, - { "gray42", 107, 107, 107 }, - { "grey42", 107, 107, 107 }, - { "gray43", 110, 110, 110 }, - { "grey43", 110, 110, 110 }, - { "gray44", 112, 112, 112 }, - { "grey44", 112, 112, 112 }, - { "gray45", 115, 115, 115 }, - { "grey45", 115, 115, 115 }, - { "gray46", 117, 117, 117 }, - { "grey46", 117, 117, 117 }, - { "gray47", 120, 120, 120 }, - { "grey47", 120, 120, 120 }, - { "gray48", 122, 122, 122 }, - { "grey48", 122, 122, 122 }, - { "gray49", 125, 125, 125 }, - { "grey49", 125, 125, 125 }, - { "gray50", 127, 127, 127 }, - { "grey50", 127, 127, 127 }, - { "gray51", 130, 130, 130 }, - { "grey51", 130, 130, 130 }, - { "gray52", 133, 133, 133 }, - { "grey52", 133, 133, 133 }, - { "gray53", 135, 135, 135 }, - { "grey53", 135, 135, 135 }, - { "gray54", 138, 138, 138 }, - { "grey54", 138, 138, 138 }, - { "gray55", 140, 140, 140 }, - { "grey55", 140, 140, 140 }, - { "gray56", 143, 143, 143 }, - { "grey56", 143, 143, 143 }, - { "gray57", 145, 145, 145 }, - { "grey57", 145, 145, 145 }, - { "gray58", 148, 148, 148 }, - { "grey58", 148, 148, 148 }, - { "gray59", 150, 150, 150 }, - { "grey59", 150, 150, 150 }, - { "gray60", 153, 153, 153 }, - { "grey60", 153, 153, 153 }, - { "gray61", 156, 156, 156 }, - { "grey61", 156, 156, 156 }, - { "gray62", 158, 158, 158 }, - { "grey62", 158, 158, 158 }, - { "gray63", 161, 161, 161 }, - { "grey63", 161, 161, 161 }, - { "gray64", 163, 163, 163 }, - { "grey64", 163, 163, 163 }, - { "gray65", 166, 166, 166 }, - { "grey65", 166, 166, 166 }, - { "gray66", 168, 168, 168 }, - { "grey66", 168, 168, 168 }, - { "gray67", 171, 171, 171 }, - { "grey67", 171, 171, 171 }, - { "gray68", 173, 173, 173 }, - { "grey68", 173, 173, 173 }, - { "gray69", 176, 176, 176 }, - { "grey69", 176, 176, 176 }, - { "gray70", 179, 179, 179 }, - { "grey70", 179, 179, 179 }, - { "gray71", 181, 181, 181 }, - { "grey71", 181, 181, 181 }, - { "gray72", 184, 184, 184 }, - { "grey72", 184, 184, 184 }, - { "gray73", 186, 186, 186 }, - { "grey73", 186, 186, 186 }, - { "gray74", 189, 189, 189 }, - { "grey74", 189, 189, 189 }, - { "gray75", 191, 191, 191 }, - { "grey75", 191, 191, 191 }, - { "gray76", 194, 194, 194 }, - { "grey76", 194, 194, 194 }, - { "gray77", 196, 196, 196 }, - { "grey77", 196, 196, 196 }, - { "gray78", 199, 199, 199 }, - { "grey78", 199, 199, 199 }, - { "gray79", 201, 201, 201 }, - { "grey79", 201, 201, 201 }, - { "gray80", 204, 204, 204 }, - { "grey80", 204, 204, 204 }, - { "gray81", 207, 207, 207 }, - { "grey81", 207, 207, 207 }, - { "gray82", 209, 209, 209 }, - { "grey82", 209, 209, 209 }, - { "gray83", 212, 212, 212 }, - { "grey83", 212, 212, 212 }, - { "gray84", 214, 214, 214 }, - { "grey84", 214, 214, 214 }, - { "gray85", 217, 217, 217 }, - { "grey85", 217, 217, 217 }, - { "gray86", 219, 219, 219 }, - { "grey86", 219, 219, 219 }, - { "gray87", 222, 222, 222 }, - { "grey87", 222, 222, 222 }, - { "gray88", 224, 224, 224 }, - { "grey88", 224, 224, 224 }, - { "gray89", 227, 227, 227 }, - { "grey89", 227, 227, 227 }, - { "gray90", 229, 229, 229 }, - { "grey90", 229, 229, 229 }, - { "gray91", 232, 232, 232 }, - { "grey91", 232, 232, 232 }, - { "gray92", 235, 235, 235 }, - { "grey92", 235, 235, 235 }, - { "gray93", 237, 237, 237 }, - { "grey93", 237, 237, 237 }, - { "gray94", 240, 240, 240 }, - { "grey94", 240, 240, 240 }, - { "gray95", 242, 242, 242 }, - { "grey95", 242, 242, 242 }, - { "gray96", 245, 245, 245 }, - { "grey96", 245, 245, 245 }, - { "gray97", 247, 247, 247 }, - { "grey97", 247, 247, 247 }, - { "gray98", 250, 250, 250 }, - { "grey98", 250, 250, 250 }, - { "gray99", 252, 252, 252 }, - { "grey99", 252, 252, 252 }, - { "gray100", 255, 255, 255 }, - { "grey100", 255, 255, 255 }, - { "dark grey", 169, 169, 169 }, - { "DarkGrey", 169, 169, 169 }, - { "dark gray", 169, 169, 169 }, - { "DarkGray", 169, 169, 169 }, - { "dark blue", 0, 0, 139 }, - { "DarkBlue", 0, 0, 139 }, - { "dark cyan", 0, 139, 139 }, - { "DarkCyan", 0, 139, 139 }, - { "dark magenta", 139, 0, 139 }, - { "DarkMagenta", 139, 0, 139 }, - { "dark red", 139, 0, 0 }, - { "DarkRed", 139, 0, 0 }, - { "light green", 144, 238, 144 }, - { "LightGreen", 144, 238, 144 }, - { 0, 0, 0, 0 } -}; diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c deleted file mode 100644 index 52645972..00000000 --- a/tools/themetoxml/themetoxml.c +++ /dev/null @@ -1,559 +0,0 @@ -/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- - - themetoxml.c for the Openbox window manager - Copyright (c) 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - See the COPYING file for a copy of the GNU General Public License. -*/ - -#include "rgb.h" - -#include -#include -#include -#include -#include -#include -#include - -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, gchar *rname, - gint *r, gint *g, gint *b); - -static int parse_inline_number(char *p) -{ - int neg = 1; - int res = 0; - if (*p == '-') { - neg = -1; - ++p; - } - for (; isdigit(*p); ++p) - res = res * 10 + *p - '0'; - res *= neg; - return res; -} - -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_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; - } - - g_free(rclass); - return ret; -} - -static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value) -{ - 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; - g_strstrip(*value); - ret = TRUE; - } - - g_free(rclass); - return ret; -} - -static gchar hextodec(gchar h) -{ - if (h >= '0' && h <= '9') return h - '0'; - else if (h >= 'a' && h <= 'f') return h - 'a' + 10; - else if (h >= 'A' && h <= 'F') return h - 'A' + 10; - return -1; -} - -static gboolean parse_color(gchar *c, gint *r, gint *g, gint *b) -{ - int dig1, dig2, i, color[3]; - int len = strlen(c); - - if (len > 4 && c[0] == 'r' && c[1] == 'g' && c[2] == 'b' && c[3] == ':') { - c += 4; - for (i = 0; i < 3; ++i) { - dig1 = hextodec(c[0]); - if (c[1] == '/') { dig2 = dig1; c+=2; } - else { dig2 = hextodec(c[1]); c+=3; } - - if (dig1 < 0 || dig2 < 0) return FALSE; - - color[i] = dig1*16 + dig2; - } - *r = color[0]; *g = color[1]; *b = color[2]; - return TRUE; - } else if ((len == 4 || len == 7) && c[0] == '#') { - c++; - for (i = 0; i < 3; ++i) { - dig1 = hextodec(c[0]); - if (len == 4) { dig2 = dig1; c++; } - else { dig2 = hextodec(c[1]); c+=2; } - - if (dig1 < 0 || dig2 < 0) return FALSE; - - color[i] = dig1*16 + dig2; - } - *r = color[0]; *g = color[1]; *b = color[2]; - return TRUE; - } else { - int i; - - for (i = 0; colornames[i].name != NULL; ++i) { - if (!strcmp(colornames[i].name, c)) { - *r = colornames[i].r; - *g = colornames[i].g; - *b = colornames[i].b; - return TRUE; - } - } - } - return FALSE; -} - -static gboolean read_color(XrmDatabase db, gchar *rname, - gint *r, gint *g, gint *b) -{ - gboolean ret = FALSE; - gchar *rclass = create_class_name(rname); - gchar *rettype; - XrmValue retvalue; - - if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && - retvalue.addr != NULL) { - ret = parse_color(retvalue.addr, r, g, b); - } - - g_free(rclass); - return ret; -} - -xmlNodePtr go(xmlNodePtr node, const char *s) -{ - xmlNodePtr p; - - for (p = node->children; p; p = p->next) { - if (!xmlStrcasecmp(p->name, (const xmlChar*) s)) - return p; - } - return xmlAddChild(node, xmlNewNode(NULL, (const xmlChar*) s)); -} - -static gchar number[20]; -static inline gchar* NUM(int i) { - g_snprintf(number, 20, "%d", i); return number; -} -static xmlDocPtr doc; -static xmlNodePtr root; - -#define GO1(a) (go(root, a)) -#define GO2(a,b) (go(GO1(a), b)) -#define GO3(a,b,c) (go(GO2(a, b), c)) -#define GO4(a,b,c,d) (go(GO3(a, b, c), d)) -#define GO5(a,b,c,d,e) (go(GO4(a, b, c, d), e)) -#define GO6(a,b,c,d,e,f) (go(GO5(a, b, c, d, e), f)) -#define GO7(a,b,c,d,e,f,g) (go(GO6(a, b, c, d, e, f), g)) - -#define CONT1(a,cont) (xmlNodeSetContent(GO1(a), (const xmlChar*)cont)) -#define CONT2(a,b,cont) (xmlNodeSetContent(GO2(a,b), (const xmlChar*)cont)) -#define CONT3(a,b,c,cont) (xmlNodeSetContent(GO3(a,b,c), (const xmlChar*)cont)) -#define CONT4(a,b,c,d,cont) (xmlNodeSetContent(GO4(a,b,c,d), (const xmlChar*)cont)) -#define CONT5(a,b,c,d,e,cont) (xmlNodeSetContent(GO5(a,b,c,d,e), (const xmlChar*)cont)) -#define CONT6(a,b,c,d,e,f,cont) (xmlNodeSetContent(GO6(a,b,c,d,e,f), (const xmlChar*)cont)) - -#define ATTR1(a,name,cont) (xmlSetProp(GO1(a), (const xmlChar*)name, (const xmlChar*)cont)) -#define ATTR2(a,b,name,cont) (xmlSetProp(GO2(a,b), (const xmlChar*)name, (const xmlChar*)cont)) -#define ATTR3(a,b,c,name,cont) (xmlSetProp(GO3(a,b,c), (const xmlChar*)name, (const xmlChar*)cont)) -#define ATTR4(a,b,c,d,name,cont) (xmlSetProp(GO4(a,b,c,d), (const xmlChar*)name, (const xmlChar*)cont)) -#define ATTR5(a,b,c,d,e,name,cont) (xmlSetProp(GO5(a,b,c,d,e), (const xmlChar*)name, (const xmlChar*)cont)) -#define ATTR6(a,b,c,d,e,f,name,cont) (xmlSetProp(GO6(a,b,c,d,e,f), (const xmlChar*)name, (const xmlChar*)cont)) -#define ATTR7(a,b,c,d,e,f,g,name,cont) (xmlSetProp(GO7(a,b,c,d,e,f,g), (const xmlChar*)name, (const xmlChar*)cont)) - -#define COLOR1(a,R,G,B,A) (ATTR1(a,"r",NUM(R)), \ - ATTR1(a,"g",NUM(G)), \ - ATTR1(a,"b",NUM(B)), \ - ATTR1(a,"a",NUM(A))) -#define COLOR2(a,b,R,G,B,A) (ATTR2(a,b,"r",NUM(R)), \ - ATTR2(a,b,"g",NUM(G)), \ - ATTR2(a,b,"b",NUM(B)), \ - ATTR2(a,b,"a",NUM(A))) -#define COLOR3(a,b,c,R,G,B,A) (ATTR3(a,b,c,"r",NUM(R)), \ - ATTR3(a,b,c,"g",NUM(G)), \ - ATTR3(a,b,c,"b",NUM(B)), \ - ATTR3(a,b,c,"a",NUM(A))) -#define COLOR4(a,b,c,d,R,G,B,A) (ATTR4(a,b,c,d,"r",NUM(R)), \ - ATTR4(a,b,c,d,"g",NUM(G)), \ - ATTR4(a,b,c,d,"b",NUM(B)), \ - ATTR4(a,b,c,d,"a",NUM(A))) -#define COLOR5(a,b,c,d,e,R,G,B,A) (ATTR5(a,b,c,d,e,"r",NUM(R)), \ - ATTR5(a,b,c,d,e,"g",NUM(G)), \ - ATTR5(a,b,c,d,e,"b",NUM(B)), \ - ATTR5(a,b,c,d,e,"a",NUM(A))) -#define COLOR6(a,b,c,d,e,f,R,G,B,A) (ATTR6(a,b,c,d,e,f,"r",NUM(R)), \ - ATTR6(a,b,c,d,e,f,"g",NUM(G)), \ - ATTR6(a,b,c,d,e,f,"b",NUM(B)), \ - ATTR6(a,b,c,d,e,f,"a",NUM(A))) - -#define APPEARANCE2(res,a,b) \ -{ \ - if (read_string(db, res, &s)) \ - CONT3(a, b, "style", s); \ - if (read_color(db, res".color", &i, &j, &k)) \ - COLOR3(a, b, "primary", i, j, k, 255); \ - if (read_color(db, res".colorTo", &i, &j, &k)) \ - COLOR3(a, b, "secondary", i, j, k, 255); \ - if (read_color(db, res".border.color", &i, &j, &k)) \ - COLOR3(a, b, "border", i, j, k, 255); \ - if (read_color(db, res".interlace.color", &i, &j, &k)) \ - COLOR3(a, b, "interlace", i, j, k, 255); \ -} - -#define APPEARANCE3(res,a,b,c) \ -{ \ - if (read_string(db, res, &s)) \ - CONT4(a, b, c, "style", s); \ - if (read_color(db, res".color", &i, &j, &k)) \ - COLOR4(a, b, c, "primary", i, j, k, 255); \ - if (read_color(db, res".colorTo", &i, &j, &k)) \ - COLOR4(a, b, c, "secondary", i, j, k, 255); \ - if (read_color(db, res".border.color", &i, &j, &k)) \ - COLOR4(a, b, c, "border", i, j, k, 255); \ - if (read_color(db, res".interlace.color", &i, &j, &k)) \ - COLOR4(a, b, c, "interlace", i, j, k, 255); \ -} - -#define APPEARANCE4(res,a,b,c,d) \ -{ \ - if (read_string(db, res, &s)) \ - CONT5(a, b, c, d, "style", s); \ - if (read_color(db, res".color", &i, &j, &k)) \ - COLOR5(a, b, c, d, "primary", i, j, k, 255); \ - if (read_color(db, res".colorTo", &i, &j, &k)) \ - COLOR5(a, b, c, d, "secondary", i, j, k, 255); \ - if (read_color(db, res".border.color", &i, &j, &k)) \ - COLOR5(a, b, c, d, "border", i, j, k, 255); \ - if (read_color(db, res".interlace.color", &i, &j, &k)) \ - COLOR5(a, b, c, d, "interlace", i, j, k, 255); \ -} - -int main(int argc, char **argv) -{ - XrmDatabase db; - int i,j,k; - gchar *s; - int ret = 0; - - if (argc > 1) { - fprintf(stderr, "themetoxml (C) 2007 Dana Jansens\n" - "This tool takes an older Openbox3 themerc file on stdin," - " and gives back the\n" - "theme in the newer themerc.xml XML style.\n"); - return 0; - } - { - gchar *buf = g_new(gchar, 1000); - gint sz = 1000; - gint r = 0, rthis; - - while ((rthis = read(0, buf + r, sz - r)) > 0) { - r+=rthis; - if (r==sz) { - sz+=1000; - buf = g_renew(gchar,buf,sz); - } - } - - - if ((db = XrmGetStringDatabase(buf)) == NULL) { - fprintf(stderr, "Unable to read the database from stdin\n"); - return 1; - } - g_free(buf); - } - - doc = xmlNewDoc((const xmlChar*) "1.0"); - xmlDocSetRootElement - (doc,(root = xmlNewNode(NULL, (const xmlChar*)"openbox_theme"))); - xmlSetProp(root, (const xmlChar*)"version", (const xmlChar*)"1"); - xmlSetProp(root, (const xmlChar*)"xmlns", - (const xmlChar*)"http://openbox.org/themerc"); - - if (read_int(db, "window.handle.width", &i)) - CONT2("dimensions", "handle", NUM(i)); - - if (read_int(db, "padding.width", &i)) { - ATTR2("dimensions", "padding", "x", NUM(i)); - ATTR2("dimensions", "padding", "y", NUM(i)); - } - - if (read_int(db, "borderWidth", &i)) { - CONT3("window", "border", "width", NUM(i)); - CONT3("menu", "border", "width", NUM(i)); - } else if (read_int(db, "border.width", &i)) { - CONT3("window", "border", "width", NUM(i)); - CONT3("menu", "border", "width", NUM(i)); - } - - if (read_color(db, "border.color", &i, &j, &k)) { - COLOR3("window", "border", "primary", i, j, k, 255); - COLOR3("menu", "border", "primary", i, j, k, 255); - } - - if (read_int(db, "window.client.padding.width", &i)) { - ATTR2("window", "clientpadding", "x", NUM(i)); - ATTR2("window", "clientpadding", "y", NUM(i)); - } - - if (read_string(db, "window.label.text.justify", &s)) { - if (!g_ascii_strcasecmp(s, "right")) s = "right"; - else if (!g_ascii_strcasecmp(s, "center")) s = "center"; - else s = "left"; - CONT2("window", "justify", s); - } - - if (read_string(db, "menu.title.text.justify", &s)) { - if (!g_ascii_strcasecmp(s, "right")) s = "right"; - else if (!g_ascii_strcasecmp(s, "center")) s = "center"; - else s = "left"; - CONT2("menu", "justify", s); - } - - if (read_int(db, "menu.overlap", &i)) - CONT2("menu", "overlap", NUM(i)); - - if (read_color(db, "window.active.client.color", &i, &j, &k)) - COLOR3("window","active","clientpadding",i,j,k,255); - - if (read_color(db, "window.inactive.client.color", &i, &j, &k)) - COLOR3("window","inactive","clientpadding",i,j,k,255); - - if (read_color(db, "window.active.label.text.color", &i, &j, &k)) - COLOR5("window","active","label","text","primary",i,j,k,255); - - if (read_color(db, "window.inactive.label.text.color", &i, &j, &k)) - COLOR5("window","inactive","label","text","primary",i,j,k,255); - - if (read_color(db, "window.active.button.unpressed.image.color", - &i, &j, &k)) - COLOR5("window","active","buttons","unpressed","image",i,j,k,255); - - if (read_color(db, "window.inactive.button.unpressed.image.color", - &i, &j, &k)) - COLOR5("window","inactive","buttons","unpressed","image",i,j,k,255); - - if (read_color(db, "window.active.button.pressed.image.color", - &i, &j, &k)) - COLOR5("window","active","buttons","pressed","image",i,j,k,255); - - if (read_color(db, "window.inactive.button.pressed.image.color", - &i, &j, &k)) - COLOR5("window","inactive","buttons","pressed","image",i,j,k,255); - - if (read_color(db, "window.active.button.disabled.image.color", - &i, &j, &k)) - COLOR5("window","active","buttons","disabled","image",i,j,k,255); - - if (read_color(db, "window.inactive.button.disabled.image.color", - &i, &j, &k)) - COLOR5("window","inactive","buttons","disabled","image",i,j,k,255); - - if (read_color(db, "window.active.button.hover.image.color", - &i, &j, &k)) - COLOR5("window","active","buttons","hover","image",i,j,k,255); - - if (read_color(db, "window.inactive.button.hover.image.color", - &i, &j, &k)) - COLOR5("window","inactive","buttons","hover","image",i,j,k,255); - - if (read_color(db, "window.active.button.toggled.image.color", - &i, &j, &k)) - COLOR5("window","active","buttons","toggled","image",i,j,k,255); - - if (read_color(db, "window.inactive.button.toggled.image.color", - &i, &j, &k)) - COLOR5("window","inactive","buttons","toggled","image",i,j,k,255); - - if (read_color(db, "menu.title.text.color", - &i, &j, &k)) - COLOR4("menu","title","text","primary",i,j,k,255); - - if (read_color(db, "menu.items.text.color", - &i, &j, &k)) - COLOR3("menu","inactive","primary",i,j,k,255); - - if (read_color(db, "menu.items.disabled.text.color", - &i, &j, &k)) - COLOR3("menu","disabled","primary",i,j,k,255); - - if (read_color(db, "menu.items.active.text.color", - &i, &j, &k)) - COLOR4("menu","active","text","primary",i,j,k,255); - - APPEARANCE3("window.active.title.bg", "window", "active", "titlebar"); - APPEARANCE3("window.inactive.title.bg", "window", "inactive", "titlebar"); - APPEARANCE3("window.active.label.bg", "window", "active", "label"); - APPEARANCE3("window.inactive.label.bg", "window", "inactive", "label"); - APPEARANCE3("window.active.handle.bg", "window", "active", "handle"); - APPEARANCE3("window.inactive.handle.bg", "window", "inactive", "handle"); - APPEARANCE3("window.active.grip.bg", "window", "active", "grip"); - APPEARANCE3("window.inactive.grip.bg", "window", "inactive", "grip"); - APPEARANCE2("menu.items.bg", "menu", "entries"); - APPEARANCE2("menu.items.active.bg", "menu", "active"); - APPEARANCE2("menu.title.bg", "menu", "title"); - - APPEARANCE4("window.active.button.disabled.bg", - "window", "active", "buttons", "disabled"); - APPEARANCE4("window.inactive.button.disabled.bg", - "window", "inactive", "buttons", "disabled"); - APPEARANCE4("window.active.button.pressed.bg", - "window", "active", "buttons", "pressed"); - APPEARANCE4("window.inactive.button.pressed.bg", - "window", "inactive", "buttons", "pressed"); - APPEARANCE4("window.active.button.toggled.bg", - "window", "active", "buttons", "toggled"); - APPEARANCE4("window.inactive.button.toggled.bg", - "window", "inactive", "buttons", "toggled"); - APPEARANCE4("window.active.button.unpressed.bg", - "window", "active", "buttons", "unpressed"); - APPEARANCE4("window.inactive.button.unpressed.bg", - "window", "inactive", "buttons", "unpressed"); - APPEARANCE4("window.active.button.hover.bg", - "window", "active", "buttons", "hover"); - APPEARANCE4("window.inactive.button.hover.bg", - "window", "inactive", "buttons", "hover"); - - if (read_string(db, "window.active.label.text.font", &s)) { - char *p; - if (strstr(s, "shadow=y")) { - if ((p = strstr(s, "shadowoffset="))) - i = parse_inline_number(p + strlen("shadowoffset=")); - else - i = 1; - ATTR6("window","active","label","text","shadow","offset", - "x",NUM(i)); - ATTR6("window","active","label","text","shadow","offset", - "y",NUM(i)); - } - if ((p = strstr(s, "shadowtint="))) - { - i = parse_inline_number(p + strlen("shadowtint=")); - j = (i > 0 ? 0 : 255); - i = ABS(i*255/100); - COLOR6("window","active","label","text","shadow","primary", - j,j,j,i); - } - } - - if (read_string(db, "window.inactive.label.text.font", &s)) { - char *p; - if (strstr(s, "shadow=y")) { - if ((p = strstr(s, "shadowoffset="))) - i = parse_inline_number(p + strlen("shadowoffset=")); - else - i = 1; - ATTR6("window","inactive","label","text","shadow","offset", - "x",NUM(i)); - ATTR6("window","inactive","label","text","shadow","offset", - "y",NUM(i)); - } - if ((p = strstr(s, "shadowtint="))) - { - i = parse_inline_number(p + strlen("shadowtint=")); - j = (i > 0 ? 0 : 255); - i = ABS(i*255/100); - COLOR6("window","inactive","label","text","shadow","primary", - j,j,j,i); - } - } - - if (read_string(db, "menu.title.text.font", &s)) { - char *p; - if (strstr(s, "shadow=y")) { - if ((p = strstr(s, "shadowoffset="))) - i = parse_inline_number(p + strlen("shadowoffset=")); - else - i = 1; - ATTR5("menu","title","text","shadow","offset","x",NUM(i)); - ATTR5("menu","title","text","shadow","offset","y",NUM(i)); - } - if ((p = strstr(s, "shadowtint="))) - { - i = parse_inline_number(p + strlen("shadowtint=")); - j = (i > 0 ? 0 : 255); - i = ABS(i*255/100); - COLOR5("menu","title","text","shadow","primary",j,j,j,i); - } - } - - if (read_string(db, "menu.items.font", &s)) { - char *p; - if (strstr(s, "shadow=y")) { - if ((p = strstr(s, "shadowoffset="))) - i = parse_inline_number(p + strlen("shadowoffset=")); - else - i = 1; - ATTR4("menu","inactive","shadow","offset","x",NUM(i)); - ATTR4("menu","inactive","shadow","offset","y",NUM(i)); - ATTR5("menu","active","text","shadow","offset","x",NUM(i)); - ATTR5("menu","active","text","shadow","offset","y",NUM(i)); - ATTR4("menu","disabled","shadow","offset","x",NUM(i)); - ATTR4("menu","disabled","shadow","offset","y",NUM(i)); - } - if ((p = strstr(s, "shadowtint="))) - { - i = parse_inline_number(p + strlen("shadowtint=")); - j = (i > 0 ? 0 : 255); - i = ABS(i*255/100); - COLOR4("menu","inactive","shadow","primary",j,j,j,i); - COLOR5("menu","active","text","shadow","primary",j,j,j,i); - COLOR4("menu","disabled","shadow","primary",j,j,j,i); - } - } - - if (xmlSaveFormatFile("-", doc, 1) < 0) { - fprintf(stderr, "Error writing the xml tree\n"); - ret = 1; - } - - xmlFreeDoc(doc); - return ret; -} -- 2.34.1