X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=15b7e3c9357b11f1d13786f331bb77a86a79142e;hb=aca8327244e0e1ebc4e367a57339ff2dc944782c;hp=95b48896132c0ae1f13e05dfe5894a0140db6527;hpb=45087efbcdeec8a4cc985125a656a4bd6e9f3b3e;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 95b48896..15b7e3c9 100644 --- a/render/theme.c +++ b/render/theme.c @@ -40,63 +40,79 @@ static void parse_style(gchar *tex, RrSurfaceColorType *grad, RrReliefType *relief, RrBevelType *bevel, gboolean *interlaced, gboolean *border, gboolean allow_trans); -static gboolean read_mask(ParseState *ps, gchar *maskname, +static gboolean read_mask(ParseState *ps, const gchar *maskname, RrPixmapMask **value); static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); -static xmlNodePtr find_node(xmlNodePtr n, gchar *names[]); -static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[], +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, gchar *names[], +static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[], gchar **string); -static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[], +static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[], RrColor **color, gchar *alpha); - static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[], + 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, gchar *names[], +static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[], RrAppearance *a); -static gboolean find_appearance(ParseState *ps, xmlNodePtr n, gchar *names[], +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...) (gchar*[]){args,NULL} +#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, +RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, + gboolean allow_fallback, RrFont *active_window_font, RrFont *inactive_window_font, - RrFont *menu_title_font, RrFont *menu_item_font) + RrFont *menu_title_font, RrFont *menu_item_font, + RrFont *osd_font) { ParseState ps; xmlNodePtr root; RrJustify winjust, mtitlejust; gchar *str; RrTheme *theme; + gboolean userdef; if (name) { if (!parse_load_theme(name, &ps.doc, &root, &ps.path)) { - g_warning("Falling back to the default theme: '%s'", - DEFAULT_THEME); + g_message("Unable to load the theme '%s'", name); + if (allow_fallback) + g_message("Falling back to the default theme '%s'", + DEFAULT_THEME); /* make it fall back to default theme */ name = NULL; } } - if (!name) { - if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path)) + if (name == NULL) { + if (allow_fallback) { + if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path)) { + g_message("Unable to load the theme '%s'", DEFAULT_THEME); + return NULL; + } + } else return NULL; } + ps.inst = inst; theme = g_new0(RrTheme, 1); theme->inst = inst; + theme->name = g_strdup(name ? name : DEFAULT_THEME); theme->a_disabled_focused_max = RrAppearanceNew(inst, 1); theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1); theme->a_hover_focused_max = RrAppearanceNew(inst, 1); theme->a_hover_unfocused_max = RrAppearanceNew(inst, 1); - theme->a_toggled_focused_max = RrAppearanceNew(inst, 1); - theme->a_toggled_unfocused_max = RrAppearanceNew(inst, 1); + theme->a_toggled_focused_pressed_max = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_pressed_max = RrAppearanceNew(inst, 1); + theme->a_toggled_focused_unpressed_max = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_unpressed_max = RrAppearanceNew(inst, 1); + theme->a_toggled_hover_focused_max = RrAppearanceNew(inst, 1); + theme->a_toggled_hover_unfocused_max = RrAppearanceNew(inst, 1); theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); @@ -111,17 +127,24 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_focused_handle = RrAppearanceNew(inst, 0); theme->a_unfocused_handle = RrAppearanceNew(inst, 0); theme->a_menu = RrAppearanceNew(inst, 0); - theme->a_menu_title = RrAppearanceNew(inst, 1); + theme->a_menu_title = RrAppearanceNew(inst, 0); + theme->a_menu_text_title = RrAppearanceNew(inst, 1); theme->a_menu_normal = RrAppearanceNew(inst, 0); theme->a_menu_disabled = RrAppearanceNew(inst, 0); + theme->a_menu_disabled_selected = RrAppearanceNew(inst, 0); theme->a_menu_selected = RrAppearanceNew(inst, 0); theme->a_menu_text_normal = RrAppearanceNew(inst, 1); - theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); theme->a_menu_text_selected = RrAppearanceNew(inst, 1); + theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); + theme->a_menu_text_disabled_selected = RrAppearanceNew(inst, 1); theme->a_menu_bullet_normal = RrAppearanceNew(inst, 1); theme->a_menu_bullet_selected = RrAppearanceNew(inst, 1); theme->a_clear = RrAppearanceNew(inst, 0); theme->a_clear_tex = RrAppearanceNew(inst, 1); + theme->osd_hilite_bg = RrAppearanceNew(inst, 0); + theme->osd_hilite_label = RrAppearanceNew(inst, 1); + theme->osd_hilite_fg = RrAppearanceNew(inst, 0); + theme->osd_unhilite_fg = RrAppearanceNew(inst, 0); /* load the font stuff */ @@ -143,6 +166,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, winjust = RR_JUSTIFY_RIGHT; else if (strcmp(str, "center") == 0) winjust = RR_JUSTIFY_CENTER; + g_free(str); } if (menu_title_font) { @@ -157,6 +181,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, mtitlejust = RR_JUSTIFY_RIGHT; else if (strcmp(str, "center") == 0) mtitlejust = RR_JUSTIFY_CENTER; + g_free(str); } if (menu_item_font) { @@ -165,6 +190,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, } else theme->menu_font = RrFontOpenDefault(inst); + if (osd_font) { + theme->osd_font = osd_font; + RrFontRef(osd_font); + } else + theme->osd_font = RrFontOpenDefault(inst); + /* load direct dimensions */ if (!FIND(int, L("menu","overlap"), &theme->menu_overlap, -100, 100)) @@ -177,31 +208,56 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, &theme->paddingx, &theme->paddingy, 0, 100, 0, 100)) theme->paddingx = theme->paddingy = 3; - if (!FIND(int, L("window","border","width"), + if (!FIND(int, L("dimensions","window","border"), &theme->fbwidth, 0, 100)) theme->fbwidth = 1; /* menu border width inherits from frame border width */ - if (!FIND(int, L("menu","border","width"), + if (!FIND(int, L("dimensions","menu","border"), &theme->mbwidth, 0, 100)) theme->mbwidth = theme->fbwidth; - if (!FIND(point, L("window","clientpadding"), &theme->cbwidthx, - &theme->cbwidthy, 0, 100, 0, 100)) + if (!FIND(point, L("dimensions","window","clientpadding"), + &theme->cbwidthx, &theme->cbwidthy, 0, 100, 0, 100)) theme->cbwidthx = theme->cbwidthy = 1; /* load colors */ - if (!FIND(color, L("window","border","primary"), - &theme->frame_b_color, NULL)) - theme->frame_b_color = RrColorNew(inst, 0, 0, 0); - - /* menu border color inherits from frame border color */ - if (!FIND(color, L("menu","border","primary"), - &theme->menu_b_color, NULL)) - theme->menu_b_color = RrColorNew(inst, - theme->frame_b_color->r, - theme->frame_b_color->g, - theme->frame_b_color->b); + if (!FIND(color, L("window","active","border"), + &theme->frame_focused_border_color, NULL)) + theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0); + /* title separator focused color inherits from focused boder color */ + if (!FIND(color, L("window","active","titleseparator"), + &theme->title_separator_focused_color, NULL)) + theme->title_separator_focused_color = + RrColorNew(inst, + theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); + /* frame unfocused border color inherits from frame focused border color */ + if (!FIND(color, L("window","inactive","border"), + &theme->frame_unfocused_border_color, NULL)) + theme->frame_unfocused_border_color = + RrColorNew(inst, + theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); + /* title separator unfocused color inherits from unfocused boder color */ + if (!FIND(color, L("window","inactive","titleseparator"), + &theme->title_separator_unfocused_color, NULL)) + theme->title_separator_unfocused_color = + RrColorNew(inst, + theme->frame_unfocused_border_color->r, + theme->frame_unfocused_border_color->g, + theme->frame_unfocused_border_color->b); + + /* menu border color inherits from frame focused border color */ + if (!FIND(color, L("menu","border"), + &theme->menu_border_color, NULL)) + theme->menu_border_color = + RrColorNew(inst, + theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); if (!FIND(color, L("window","active","clientpadding"), &theme->cb_focused_color, NULL)) theme->cb_focused_color = RrColorNew(inst, 255, 255, 255); @@ -211,7 +267,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, if (!FIND(color, L("window","active","label","text","primary"), &theme->title_focused_color, NULL)) theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); - if (!FIND(color, L("osd","text","primary"), + if (!FIND(color, L("osd","label","text","primary"), &theme->osd_color, NULL)) theme->osd_color = RrColorNew(inst, theme->title_focused_color->r, @@ -263,20 +319,54 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, 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)) - theme->titlebut_toggled_focused_color = + if (!FIND(color, + L("window","active","buttons","toggled-pressed","image"), + &theme->titlebut_toggled_focused_pressed_color, NULL)) + theme->titlebut_toggled_focused_pressed_color = + RrColorNew(inst, + theme->titlebut_focused_pressed_color->r, + theme->titlebut_focused_pressed_color->g, + theme->titlebut_focused_pressed_color->b); + if (!FIND(color, + L("window","inactive","buttons","toggled-pressed","image"), + &theme->titlebut_toggled_unfocused_pressed_color, NULL)) + theme->titlebut_toggled_unfocused_pressed_color = + RrColorNew(inst, + theme->titlebut_unfocused_pressed_color->r, + theme->titlebut_unfocused_pressed_color->g, + theme->titlebut_unfocused_pressed_color->b); + if (!FIND(color, + L("window","active","buttons","toggled-unpressed","image"), + &theme->titlebut_toggled_focused_unpressed_color, NULL)) + theme->titlebut_toggled_focused_unpressed_color = RrColorNew(inst, theme->titlebut_focused_pressed_color->r, theme->titlebut_focused_pressed_color->g, theme->titlebut_focused_pressed_color->b); - if (!FIND(color, L("window","inactive","buttons","toggled","image"), - &theme->titlebut_toggled_unfocused_color, NULL)) - theme->titlebut_toggled_unfocused_color = + if (!FIND(color, + L("window","inactive","buttons","toggled-unpressed","image"), + &theme->titlebut_toggled_unfocused_unpressed_color, NULL)) + theme->titlebut_toggled_unfocused_unpressed_color = RrColorNew(inst, theme->titlebut_unfocused_pressed_color->r, theme->titlebut_unfocused_pressed_color->g, theme->titlebut_unfocused_pressed_color->b); + if (!FIND(color, + L("window","active","buttons","toggled-hover","image"), + &theme->titlebut_toggled_hover_focused_color, NULL)) + theme->titlebut_toggled_hover_focused_color = + RrColorNew(inst, + theme->titlebut_toggled_focused_unpressed_color->r, + theme->titlebut_toggled_focused_unpressed_color->g, + theme->titlebut_toggled_focused_unpressed_color->b); + if (!FIND(color, + L("window","inactive","buttons","toggled-hover","image"), + &theme->titlebut_toggled_hover_unfocused_color, NULL)) + theme->titlebut_toggled_hover_unfocused_color = + RrColorNew(inst, + theme->titlebut_toggled_unfocused_unpressed_color->r, + theme->titlebut_toggled_unfocused_unpressed_color->g, + theme->titlebut_toggled_unfocused_unpressed_color->b); if (!FIND(color, L("menu","title","text","primary"), &theme->menu_title_color, NULL)) theme->menu_title_color = RrColorNew(inst, 0, 0, 0); @@ -285,6 +375,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, if (!FIND(color, L("menu","disabled","primary"), &theme->menu_disabled_color, NULL)) theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); + if (!FIND(color, L("menu","active-disabled","text","primary"), + &theme->menu_disabled_selected_color, NULL)) + theme->menu_disabled_selected_color = + RrColorNew(inst, + theme->menu_disabled_color->r, + theme->menu_disabled_color->g, + theme->menu_disabled_color->b); if (!FIND(color, L("menu","active","text","primary"), &theme->menu_selected_color, NULL)) theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); @@ -295,7 +392,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); theme->title_focused_shadow_alpha = 50; } - if (!FIND(color, L("osd","text","shadow","primary"), + if (!FIND(color, L("osd","label","text","shadow","primary"), &theme->osd_shadow_color, &theme->osd_shadow_alpha)) { theme->osd_shadow_color = @@ -343,129 +440,138 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->menu_text_disabled_shadow_alpha = theme->menu_text_normal_shadow_alpha; } + if (!FIND(color, L("menu","active-disabled","shadow","primary"), + &theme->menu_text_disabled_selected_shadow_color, + &theme->menu_text_disabled_selected_shadow_alpha)) + { + theme->menu_text_disabled_selected_shadow_color = + RrColorNew(inst, theme->menu_text_disabled_shadow_color->r, + theme->menu_text_disabled_shadow_color->g, + theme->menu_text_disabled_shadow_color->b); + theme->menu_text_disabled_selected_shadow_alpha = + theme->menu_text_disabled_shadow_alpha; + } /* load the image masks */ - if (read_mask(&ps, "max.xbm", &theme->max_mask)) { - if (!read_mask(&ps, "max_pressed.xbm", &theme->max_pressed_mask)) - theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); - if (!read_mask(&ps, "max_toggled.xbm", &theme->max_toggled_mask)) - theme->max_toggled_mask = - RrPixmapMaskCopy(theme->max_pressed_mask); - if (!read_mask(&ps, "max_disabled.xbm", &theme->max_disabled_mask)) - theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); - if (!read_mask(&ps, "max_hover.xbm", &theme->max_hover_mask)) - theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); - } else { - { - guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; - theme->max_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); - } - { - guchar data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; - theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); + + /* maximize button masks */ + userdef = TRUE; + if (!read_mask(&ps, "max.xbm", &theme->max_mask)) { + guchar data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; + theme->max_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + userdef = FALSE; + } + if (!read_mask(&ps, "max_toggled.xbm", &theme->max_toggled_mask)) { + if (userdef) + theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask); + else { + guchar data[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; + theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data); } + } + if (!read_mask(&ps, "max_pressed.xbm", &theme->max_pressed_mask)) theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); + if (!read_mask(&ps, "max_disabled.xbm", &theme->max_disabled_mask)) theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); + if (!read_mask(&ps, "max_hover.xbm", &theme->max_hover_mask)) theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); + if (!read_mask(&ps, "max_toggled_pressed.xbm", + &theme->max_toggled_pressed_mask)) + theme->max_toggled_pressed_mask = + RrPixmapMaskCopy(theme->max_toggled_mask); + if (!read_mask(&ps, "max_toggled_hover.xbm", + &theme->max_toggled_hover_mask)) + theme->max_toggled_hover_mask = + RrPixmapMaskCopy(theme->max_toggled_mask); + + /* iconify button masks */ + if (!read_mask(&ps, "iconify.xbm", &theme->iconify_mask)) { + guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; + theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } - - if (read_mask(&ps, "iconify.xbm", &theme->iconify_mask)) { - if (!read_mask(&ps, "iconify_pressed.xbm", - &theme->iconify_pressed_mask)) - theme->iconify_pressed_mask = - RrPixmapMaskCopy(theme->iconify_mask); - if (!read_mask(&ps, "iconify_disabled.xbm", - &theme->iconify_disabled_mask)) - theme->iconify_disabled_mask = - RrPixmapMaskCopy(theme->iconify_mask); - if (!read_mask(&ps, "iconify_hover.xbm", &theme->iconify_hover_mask)) - theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); - } else { - { - guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; - theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); - } + if (!read_mask(&ps, "iconify_pressed.xbm", &theme->iconify_pressed_mask)) theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask); + if (!read_mask(&ps, "iconify_disabled.xbm", &theme->iconify_disabled_mask)) theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask); + if (!read_mask(&ps, "iconify_hover.xbm", &theme->iconify_hover_mask)) theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); - } - theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH, - OB_DEFAULT_ICON_HEIGHT, - OB_DEFAULT_ICON_pixel_data); - - if (read_mask(&ps, "desk.xbm", &theme->desk_mask)) { - if (!read_mask(&ps, "desk_pressed.xbm", &theme->desk_pressed_mask)) - theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); - if (!read_mask(&ps, "desk_toggled.xbm", &theme->desk_toggled_mask)) + /* all desktops button masks */ + userdef = TRUE; + if (!read_mask(&ps, "desk.xbm", &theme->desk_mask)) { + guchar data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; + theme->desk_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + userdef = FALSE; + } + if (!read_mask(&ps, "desk_toggled.xbm", &theme->desk_toggled_mask)) { + if (userdef) + theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask); + else { + guchar data[] = { 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 }; theme->desk_toggled_mask = - RrPixmapMaskCopy(theme->desk_pressed_mask); - if (!read_mask(&ps, "desk_disabled.xbm", &theme->desk_disabled_mask)) - theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); - if (!read_mask(&ps, "desk_hover.xbm", &theme->desk_hover_mask)) - theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); - } else { - { - guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; - theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); - } - { - guchar data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 }; - theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7, - (gchar*)data); + RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } + } + if (!read_mask(&ps, "desk_pressed.xbm", &theme->desk_pressed_mask)) theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); + if (!read_mask(&ps, "desk_disabled.xbm", &theme->desk_disabled_mask)) theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); + if (!read_mask(&ps, "desk_hover.xbm", &theme->desk_hover_mask)) theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); + if (!read_mask(&ps, "desk_toggled_pressed.xbm", + &theme->desk_toggled_pressed_mask)) + theme->desk_toggled_pressed_mask = + RrPixmapMaskCopy(theme->desk_toggled_mask); + if (!read_mask(&ps, "desk_toggled_hover.xbm", + &theme->desk_toggled_hover_mask)) + theme->desk_toggled_hover_mask = + RrPixmapMaskCopy(theme->desk_toggled_mask); + + /* shade button masks */ + if (!read_mask(&ps, "shade.xbm", &theme->shade_mask)) { + guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; + theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } - - if (read_mask(&ps, "shade.xbm", &theme->shade_mask)) { - if (!read_mask(&ps, "shade_pressed.xbm", &theme->shade_pressed_mask)) - theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); - if (!read_mask(&ps, "shade_toggled.xbm", &theme->shade_toggled_mask)) - theme->shade_toggled_mask = - RrPixmapMaskCopy(theme->shade_pressed_mask); - if (!read_mask(&ps, "shade_disabled.xbm", &theme->shade_disabled_mask)) - theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); - if (!read_mask(&ps, "shade_hover.xbm", &theme->shade_hover_mask)) - theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); - } else { - { - guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; - theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); - } - { - guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f }; - theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7, - (gchar*)data); - } + if (!read_mask(&ps, "shade_toggled.xbm", &theme->shade_toggled_mask)) + theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(&ps, "shade_pressed.xbm", &theme->shade_pressed_mask)) theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(&ps, "shade_disabled.xbm", &theme->shade_disabled_mask)) theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(&ps, "shade_hover.xbm", &theme->shade_hover_mask)) theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(&ps, "shade_toggled_pressed.xbm", + &theme->shade_toggled_pressed_mask)) + theme->shade_toggled_pressed_mask = + RrPixmapMaskCopy(theme->shade_toggled_mask); + if (!read_mask(&ps, "shade_toggled_hover.xbm", + &theme->shade_toggled_hover_mask)) + theme->shade_toggled_hover_mask = + RrPixmapMaskCopy(theme->shade_toggled_mask); + + /* close button masks */ + if (!read_mask(&ps, "close.xbm", &theme->close_mask)) { + guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; + theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } - - if (read_mask(&ps, "close.xbm", &theme->close_mask)) { - if (!read_mask(&ps, "close_pressed.xbm", &theme->close_pressed_mask)) - theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); - if (!read_mask(&ps, "close_disabled.xbm", &theme->close_disabled_mask)) - theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); - if (!read_mask(&ps, "close_hover.xbm", &theme->close_hover_mask)) - theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); - } else { - { - guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; - theme->close_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); - } + if (!read_mask(&ps, "close_pressed.xbm", &theme->close_pressed_mask)) theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); + if (!read_mask(&ps, "close_disabled.xbm", &theme->close_disabled_mask)) theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); + if (!read_mask(&ps, "close_hover.xbm", &theme->close_hover_mask)) theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); - } + /* submenu bullet mask */ if (!read_mask(&ps, "bullet.xbm", &theme->menu_bullet_mask)) { guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (gchar*)data); } + /* setup the default window icon */ + theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH, + OB_DEFAULT_ICON_HEIGHT, + OB_DEFAULT_ICON_pixel_data); + /* read the decoration textures */ if (!FIND(appearance, L("window","active","titlebar"), theme->a_focused_title, FALSE)) @@ -493,22 +599,42 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, set_default_appearance(theme->a_unfocused_grip); if (!FIND(appearance, L("menu","entries"), theme->a_menu, FALSE)) set_default_appearance(theme->a_menu); - if (!FIND(appearance, L("menu","title"), theme->a_menu_title, FALSE)) + if (!FIND(appearance, L("menu","title"), theme->a_menu_title, TRUE)) set_default_appearance(theme->a_menu_title); if (!FIND(appearance, L("menu", "active"), theme->a_menu_selected, TRUE)) set_default_appearance(theme->a_menu_selected); + if (!FIND(appearance, L("menu", "active-disabled"), + theme->a_menu_disabled_selected, TRUE)) + theme->a_menu_disabled_selected = + RrAppearanceCopy(theme->a_menu_selected); - /* read the appearances for rendering non-decorations */ - theme->osd_hilite_bg = RrAppearanceCopy(theme->a_focused_title); - theme->osd_hilite_label = RrAppearanceCopy(theme->a_focused_label); - if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL) - theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_label); - else - theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_title); - if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) - theme->osd_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_label); - else - theme->osd_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_title); + /* read appearances for non-decorations (on-screen-display) */ + if (!FIND(appearance, L("osd", "background"), theme->osd_hilite_bg, FALSE)) { + RrAppearanceFree(theme->osd_hilite_bg); + theme->osd_hilite_bg = RrAppearanceCopy(theme->a_focused_title); + } + if (!FIND(appearance, L("osd", "label"), theme->osd_hilite_label, TRUE)) { + RrAppearanceFree(theme->osd_hilite_label); + theme->osd_hilite_label = RrAppearanceCopy(theme->a_focused_label); + } + /* osd_hilite_fg can't be parentrel */ + if (!FIND(appearance, L("osd", "hilight"), theme->osd_hilite_fg, FALSE)) { + RrAppearanceFree(theme->osd_hilite_fg); + if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL) + theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_label); + else + theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_title); + } + /* osd_unhilite_fg can't be parentrel either */ + if (!FIND(appearance, L("osd", "unhilight"), theme->osd_unhilite_fg, + FALSE)) + { + RrAppearanceFree(theme->osd_unhilite_fg); + if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) + theme->osd_unhilite_fg=RrAppearanceCopy(theme->a_unfocused_label); + else + theme->osd_unhilite_fg=RrAppearanceCopy(theme->a_unfocused_title); + } /* read buttons textures */ if (!FIND(appearance, L("window","active","buttons","disabled"), @@ -523,20 +649,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, if (!FIND(appearance, L("window","inactive","buttons","pressed"), 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)) - { - 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)) - { - 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)) set_default_appearance(theme->a_focused_unpressed_max); @@ -557,6 +669,48 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_hover_unfocused_max = RrAppearanceCopy(theme->a_unfocused_unpressed_max); } + if (!FIND(appearance, L("window","active","buttons","toggled-pressed"), + theme->a_toggled_focused_pressed_max, TRUE)) + { + RrAppearanceFree(theme->a_toggled_focused_pressed_max); + theme->a_toggled_focused_pressed_max = + RrAppearanceCopy(theme->a_focused_pressed_max); + } + if (!FIND(appearance, L("window","inactive","buttons","toggled-pressed"), + theme->a_toggled_unfocused_pressed_max, TRUE)) + { + RrAppearanceFree(theme->a_toggled_unfocused_pressed_max); + theme->a_toggled_unfocused_pressed_max = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + } + if (!FIND(appearance, L("window","active","buttons","toggled-unpressed"), + theme->a_toggled_focused_unpressed_max, TRUE)) + { + RrAppearanceFree(theme->a_toggled_focused_unpressed_max); + theme->a_toggled_focused_unpressed_max = + RrAppearanceCopy(theme->a_focused_pressed_max); + } + if (!FIND(appearance, L("window","inactive","buttons","toggled-unpressed"), + theme->a_toggled_unfocused_unpressed_max, TRUE)) + { + RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max); + theme->a_toggled_unfocused_unpressed_max = + RrAppearanceCopy(theme->a_unfocused_pressed_max); + } + if (!FIND(appearance, L("window","active","buttons","toggled-hover"), + theme->a_toggled_hover_focused_max, TRUE)) + { + RrAppearanceFree(theme->a_toggled_hover_focused_max); + theme->a_toggled_hover_focused_max = + RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + } + if (!FIND(appearance, L("window","inactive","buttons","toggled-hover"), + theme->a_toggled_hover_unfocused_max, TRUE)) + { + RrAppearanceFree(theme->a_toggled_hover_unfocused_max); + theme->a_toggled_hover_unfocused_max = + RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + } theme->a_disabled_focused_close = RrAppearanceCopy(theme->a_disabled_focused_max); @@ -582,10 +736,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, RrAppearanceCopy(theme->a_hover_focused_max); theme->a_hover_unfocused_desk = RrAppearanceCopy(theme->a_hover_unfocused_max); - theme->a_toggled_focused_desk = - RrAppearanceCopy(theme->a_toggled_focused_max); - theme->a_toggled_unfocused_desk = - RrAppearanceCopy(theme->a_toggled_unfocused_max); + theme->a_toggled_focused_pressed_desk = + RrAppearanceCopy(theme->a_toggled_focused_pressed_max); + theme->a_toggled_unfocused_pressed_desk = + RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); + theme->a_toggled_focused_unpressed_desk = + RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + theme->a_toggled_unfocused_unpressed_desk = + RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + theme->a_toggled_hover_focused_desk = + RrAppearanceCopy(theme->a_toggled_hover_focused_max); + theme->a_toggled_hover_unfocused_desk = + RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); theme->a_unfocused_unpressed_desk = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_desk = @@ -602,10 +764,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, RrAppearanceCopy(theme->a_hover_focused_max); theme->a_hover_unfocused_shade = RrAppearanceCopy(theme->a_hover_unfocused_max); - theme->a_toggled_focused_shade = - RrAppearanceCopy(theme->a_toggled_focused_max); - theme->a_toggled_unfocused_shade = - RrAppearanceCopy(theme->a_toggled_unfocused_max); + theme->a_toggled_focused_pressed_shade = + RrAppearanceCopy(theme->a_toggled_focused_pressed_max); + theme->a_toggled_unfocused_pressed_shade = + RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); + theme->a_toggled_focused_unpressed_shade = + RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + theme->a_toggled_unfocused_unpressed_shade = + RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + theme->a_toggled_hover_focused_shade = + RrAppearanceCopy(theme->a_toggled_hover_focused_max); + theme->a_toggled_hover_unfocused_shade = + RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); theme->a_unfocused_unpressed_shade = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_shade = @@ -634,11 +804,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_icon->surface.grad = theme->a_clear->surface.grad = theme->a_clear_tex->surface.grad = + theme->a_menu_text_title->surface.grad = theme->a_menu_normal->surface.grad = theme->a_menu_disabled->surface.grad = theme->a_menu_text_normal->surface.grad = - theme->a_menu_text_disabled->surface.grad = theme->a_menu_text_selected->surface.grad = + theme->a_menu_text_disabled->surface.grad = + theme->a_menu_text_disabled_selected->surface.grad = theme->a_menu_bullet_normal->surface.grad = theme->a_menu_bullet_selected->surface.grad = RR_SURFACE_PARENTREL; @@ -648,8 +820,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_focused_label->texture[0].data.text.justify = winjust; theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_focused_label->texture[0].data.text.font = - theme->osd_hilite_label->texture[0].data.text.font = theme->win_font_focused; + theme->osd_hilite_label->texture[0].data.text.font = theme->osd_font; theme->a_focused_label->texture[0].data.text.color = theme->title_focused_color; theme->osd_hilite_label->texture[0].data.text.color = @@ -664,7 +836,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_focused_label->texture[0].data.text.shadow_alpha = theme->title_focused_shadow_alpha; - if (!FIND(shadow, L("osd","text","shadow","offset"), + if (!FIND(shadow, L("osd","label","text","shadow","offset"), theme->osd_hilite_label)) { theme->osd_hilite_label->texture[0].data.text.shadow_offset_x = @@ -693,36 +865,44 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_unfocused_label->texture[0].data.text.shadow_alpha = theme->title_unfocused_shadow_alpha; - theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT; - theme->a_menu_title->texture[0].data.text.justify = mtitlejust; - theme->a_menu_title->texture[0].data.text.font = theme->menu_title_font; - theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color; + theme->a_menu_text_title->texture[0].type = RR_TEXTURE_TEXT; + theme->a_menu_text_title->texture[0].data.text.justify = mtitlejust; + theme->a_menu_text_title->texture[0].data.text.font = + theme->menu_title_font; + theme->a_menu_text_title->texture[0].data.text.color = + theme->menu_title_color; if (!FIND(shadow, L("menu","title","text","shadow","offset"), - theme->a_menu_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->a_menu_text_title)) + theme->a_menu_text_title->texture[0].data.text.shadow_offset_x = + theme->a_menu_text_title->texture[0].data.text.shadow_offset_y = 0; + theme->a_menu_text_title->texture[0].data.text.shadow_color = theme->menu_title_shadow_color; - theme->a_menu_title->texture[0].data.text.shadow_alpha = + theme->a_menu_text_title->texture[0].data.text.shadow_alpha = theme->menu_title_shadow_alpha; theme->a_menu_text_normal->texture[0].type = + theme->a_menu_text_selected->texture[0].type = theme->a_menu_text_disabled->texture[0].type = - theme->a_menu_text_selected->texture[0].type = RR_TEXTURE_TEXT; + theme->a_menu_text_disabled_selected->texture[0].type = + RR_TEXTURE_TEXT; theme->a_menu_text_normal->texture[0].data.text.justify = - theme->a_menu_text_disabled->texture[0].data.text.justify = theme->a_menu_text_selected->texture[0].data.text.justify = + theme->a_menu_text_disabled->texture[0].data.text.justify = + theme->a_menu_text_disabled_selected->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_menu_text_normal->texture[0].data.text.font = - theme->a_menu_text_disabled->texture[0].data.text.font = theme->a_menu_text_selected->texture[0].data.text.font = + theme->a_menu_text_disabled->texture[0].data.text.font = + theme->a_menu_text_disabled_selected->texture[0].data.text.font = theme->menu_font; theme->a_menu_text_normal->texture[0].data.text.color = theme->menu_color; - theme->a_menu_text_disabled->texture[0].data.text.color = - theme->menu_disabled_color; theme->a_menu_text_selected->texture[0].data.text.color = theme->menu_selected_color; + theme->a_menu_text_disabled->texture[0].data.text.color = + theme->menu_disabled_color; + theme->a_menu_text_disabled_selected->texture[0].data.text.color = + theme->menu_disabled_selected_color; if (!FIND(shadow, L("menu","inactive","shadow","offset"), theme->a_menu_text_normal)) @@ -739,6 +919,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_x = theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_y = 0; + if (!FIND(shadow, L("menu","active-disabled","shadow","offset"), + theme->a_menu_text_disabled_selected)) + theme->a_menu_text_disabled_selected-> + texture[0].data.text.shadow_offset_x = 0; + theme->a_menu_text_disabled_selected-> + 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 = @@ -751,13 +937,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->menu_text_disabled_shadow_color; theme->a_menu_text_disabled->texture[0].data.text.shadow_alpha = theme->menu_text_disabled_shadow_alpha; + theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_color = + theme->menu_text_disabled_selected_shadow_color; + theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_alpha = + theme->menu_text_disabled_selected_shadow_alpha; theme->a_disabled_focused_max->texture[0].type = theme->a_disabled_unfocused_max->texture[0].type = theme->a_hover_focused_max->texture[0].type = theme->a_hover_unfocused_max->texture[0].type = - theme->a_toggled_focused_max->texture[0].type = - theme->a_toggled_unfocused_max->texture[0].type = + theme->a_toggled_focused_pressed_max->texture[0].type = + theme->a_toggled_unfocused_pressed_max->texture[0].type = + theme->a_toggled_focused_unpressed_max->texture[0].type = + theme->a_toggled_unfocused_unpressed_max->texture[0].type = + theme->a_toggled_hover_focused_max->texture[0].type = + theme->a_toggled_hover_unfocused_max->texture[0].type = theme->a_focused_unpressed_max->texture[0].type = theme->a_focused_pressed_max->texture[0].type = theme->a_unfocused_unpressed_max->texture[0].type = @@ -774,8 +968,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_disabled_unfocused_desk->texture[0].type = theme->a_hover_focused_desk->texture[0].type = theme->a_hover_unfocused_desk->texture[0].type = - theme->a_toggled_focused_desk->texture[0].type = - theme->a_toggled_unfocused_desk->texture[0].type = + theme->a_toggled_focused_pressed_desk->texture[0].type = + theme->a_toggled_unfocused_pressed_desk->texture[0].type = + theme->a_toggled_focused_unpressed_desk->texture[0].type = + theme->a_toggled_unfocused_unpressed_desk->texture[0].type = + theme->a_toggled_hover_focused_desk->texture[0].type = + theme->a_toggled_hover_unfocused_desk->texture[0].type = theme->a_focused_unpressed_desk->texture[0].type = theme->a_focused_pressed_desk->texture[0].type = theme->a_unfocused_unpressed_desk->texture[0].type = @@ -784,8 +982,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_disabled_unfocused_shade->texture[0].type = theme->a_hover_focused_shade->texture[0].type = theme->a_hover_unfocused_shade->texture[0].type = - theme->a_toggled_focused_shade->texture[0].type = - theme->a_toggled_unfocused_shade->texture[0].type = + theme->a_toggled_focused_pressed_shade->texture[0].type = + theme->a_toggled_unfocused_pressed_shade->texture[0].type = + theme->a_toggled_focused_unpressed_shade->texture[0].type = + theme->a_toggled_unfocused_unpressed_shade->texture[0].type = + theme->a_toggled_hover_focused_shade->texture[0].type = + theme->a_toggled_hover_unfocused_shade->texture[0].type = theme->a_focused_unpressed_shade->texture[0].type = theme->a_focused_pressed_shade->texture[0].type = theme->a_unfocused_unpressed_shade->texture[0].type = @@ -813,9 +1015,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_focused_unpressed_max->texture[0].data.mask.mask = theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = theme->max_mask; - theme->a_toggled_focused_max->texture[0].data.mask.mask = - theme->a_toggled_unfocused_max->texture[0].data.mask.mask = + theme->a_toggled_focused_pressed_max->texture[0].data.mask.mask = + theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.mask = + theme->max_toggled_pressed_mask; + theme->a_toggled_focused_unpressed_max->texture[0].data.mask.mask = + theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.mask = theme->max_toggled_mask; + theme->a_toggled_hover_focused_max->texture[0].data.mask.mask = + theme->a_toggled_hover_unfocused_max->texture[0].data.mask.mask = + theme->max_toggled_hover_mask; theme->a_disabled_focused_close->texture[0].data.mask.mask = theme->a_disabled_unfocused_close->texture[0].data.mask.mask = theme->close_disabled_mask; @@ -840,9 +1048,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_focused_unpressed_desk->texture[0].data.mask.mask = theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = theme->desk_mask; - theme->a_toggled_focused_desk->texture[0].data.mask.mask = - theme->a_toggled_unfocused_desk->texture[0].data.mask.mask = + theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask = + theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.mask = + theme->desk_toggled_pressed_mask; + theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.mask = + theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.mask = theme->desk_toggled_mask; + theme->a_toggled_hover_focused_desk->texture[0].data.mask.mask = + theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.mask = + theme->desk_toggled_hover_mask; theme->a_disabled_focused_shade->texture[0].data.mask.mask = theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = theme->shade_disabled_mask; @@ -855,9 +1069,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_focused_unpressed_shade->texture[0].data.mask.mask = theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = theme->shade_mask; - theme->a_toggled_focused_shade->texture[0].data.mask.mask = - theme->a_toggled_unfocused_shade->texture[0].data.mask.mask = + theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask = + theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.mask = + theme->shade_toggled_pressed_mask; + theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.mask = + theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.mask = theme->shade_toggled_mask; + theme->a_toggled_hover_focused_shade->texture[0].data.mask.mask = + theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.mask = + theme->shade_toggled_hover_mask; theme->a_disabled_focused_iconify->texture[0].data.mask.mask = theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = theme->iconify_disabled_mask; @@ -897,14 +1117,30 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_hover_unfocused_shade->texture[0].data.mask.color = theme->a_hover_unfocused_iconify->texture[0].data.mask.color = theme->titlebut_hover_unfocused_color; - theme->a_toggled_focused_max->texture[0].data.mask.color = - theme->a_toggled_focused_desk->texture[0].data.mask.color = - theme->a_toggled_focused_shade->texture[0].data.mask.color = - theme->titlebut_toggled_focused_color; - theme->a_toggled_unfocused_max->texture[0].data.mask.color = - theme->a_toggled_unfocused_desk->texture[0].data.mask.color = - theme->a_toggled_unfocused_shade->texture[0].data.mask.color = - theme->titlebut_toggled_unfocused_color; + theme->a_toggled_hover_focused_max->texture[0].data.mask.color = + theme->a_toggled_hover_focused_desk->texture[0].data.mask.color = + theme->a_toggled_hover_focused_shade->texture[0].data.mask.color = + theme->titlebut_toggled_hover_focused_color; + theme->a_toggled_hover_unfocused_max->texture[0].data.mask.color = + theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.color = + theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.color = + theme->titlebut_toggled_hover_unfocused_color; + theme->a_toggled_focused_pressed_max->texture[0].data.mask.color = + theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color = + theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color = + theme->titlebut_toggled_focused_pressed_color; + theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.color = + theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.color = + theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.color = + theme->titlebut_toggled_unfocused_pressed_color; + theme->a_toggled_focused_unpressed_max->texture[0].data.mask.color = + theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.color = + theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.color = + theme->titlebut_toggled_focused_unpressed_color; + theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.color = + theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.color = + theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.color= + theme->titlebut_toggled_unfocused_unpressed_color; theme->a_focused_unpressed_max->texture[0].data.mask.color = theme->a_focused_unpressed_close->texture[0].data.mask.color = theme->a_focused_unpressed_desk->texture[0].data.mask.color = @@ -939,7 +1175,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, { gint ft, fb, fl, fr, ut, ub, ul, ur; - RrAppearance *a, *b, *c; + RrAppearance *a, *b, *c, *d; /* caluclate the font heights*/ a = theme->a_focused_label; @@ -951,22 +1187,26 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, MAX(theme->win_font_height, RrFontHeight(theme->win_font_unfocused, a->texture[0].data.text.shadow_offset_y)); - a = theme->a_menu_title; + a = theme->a_menu_text_title; theme->menu_title_font_height = RrFontHeight(theme->menu_title_font, a->texture[0].data.text.shadow_offset_y); a = theme->a_menu_text_normal; b = theme->a_menu_text_selected; c = theme->a_menu_text_disabled; + d = theme->a_menu_text_disabled_selected; theme->menu_font_height = RrFontHeight(theme->menu_font, MAX(a->texture[0].data.text.shadow_offset_y, MAX(b->texture[0].data.text.shadow_offset_y, - c->texture[0].data.text.shadow_offset_y))); + MAX(c->texture[0].data.text.shadow_offset_y, + d->texture[0].data.text.shadow_offset_y + )))); RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb); RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub); theme->label_height = theme->win_font_height + MAX(ft + fb, ut + ub); + theme->label_height += theme->label_height & 1; /* this would be nice I think, since padding.width can now be 0, but it breaks frame.c horribly and I don't feel like fixing that @@ -980,15 +1220,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, MAX(theme->padding * 2, ut + ub)); */ theme->title_height = theme->label_height + theme->paddingy * 2; - /* this should match the above title_height given the same font size - for both. */ - theme->menu_title_height = theme->menu_title_font_height + + + RrMargins(theme->a_menu_title, &ul, &ut, &ur, &ub); + theme->menu_title_label_height = theme->menu_title_font_height+ut+ub; + theme->menu_title_height = theme->menu_title_label_height + theme->paddingy * 2; } theme->button_size = theme->label_height - 2; theme->grip_width = 25; - theme->top_grip_height = MAX(theme->handle_height, - theme->title_height / 4); return theme; } @@ -996,8 +1235,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, void RrThemeFree(RrTheme *theme) { if (theme) { - RrColorFree(theme->menu_b_color); - RrColorFree(theme->frame_b_color); + g_free(theme->name); + + RrColorFree(theme->menu_border_color); + RrColorFree(theme->frame_focused_border_color); + RrColorFree(theme->frame_unfocused_border_color); + RrColorFree(theme->title_separator_focused_color); + RrColorFree(theme->title_separator_unfocused_color); RrColorFree(theme->cb_unfocused_color); RrColorFree(theme->cb_focused_color); RrColorFree(theme->title_focused_color); @@ -1006,16 +1250,21 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->titlebut_disabled_unfocused_color); RrColorFree(theme->titlebut_hover_focused_color); RrColorFree(theme->titlebut_hover_unfocused_color); - RrColorFree(theme->titlebut_toggled_focused_color); - RrColorFree(theme->titlebut_toggled_unfocused_color); RrColorFree(theme->titlebut_focused_pressed_color); RrColorFree(theme->titlebut_unfocused_pressed_color); RrColorFree(theme->titlebut_focused_unpressed_color); RrColorFree(theme->titlebut_unfocused_unpressed_color); + RrColorFree(theme->titlebut_toggled_hover_focused_color); + RrColorFree(theme->titlebut_toggled_hover_unfocused_color); + RrColorFree(theme->titlebut_toggled_focused_pressed_color); + RrColorFree(theme->titlebut_toggled_unfocused_pressed_color); + RrColorFree(theme->titlebut_toggled_focused_unpressed_color); + RrColorFree(theme->titlebut_toggled_unfocused_unpressed_color); RrColorFree(theme->menu_title_color); RrColorFree(theme->menu_color); - RrColorFree(theme->menu_disabled_color); RrColorFree(theme->menu_selected_color); + RrColorFree(theme->menu_disabled_color); + RrColorFree(theme->menu_disabled_selected_color); RrColorFree(theme->title_focused_shadow_color); RrColorFree(theme->title_unfocused_shadow_color); RrColorFree(theme->osd_color); @@ -1024,21 +1273,28 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_text_normal_shadow_color); RrColorFree(theme->menu_text_selected_shadow_color); RrColorFree(theme->menu_text_disabled_shadow_color); + RrColorFree(theme->menu_text_disabled_selected_shadow_color); g_free(theme->def_win_icon); RrPixmapMaskFree(theme->max_mask); RrPixmapMaskFree(theme->max_toggled_mask); + RrPixmapMaskFree(theme->max_toggled_hover_mask); + RrPixmapMaskFree(theme->max_toggled_pressed_mask); RrPixmapMaskFree(theme->max_disabled_mask); RrPixmapMaskFree(theme->max_hover_mask); RrPixmapMaskFree(theme->max_pressed_mask); RrPixmapMaskFree(theme->desk_mask); RrPixmapMaskFree(theme->desk_toggled_mask); + RrPixmapMaskFree(theme->desk_toggled_hover_mask); + RrPixmapMaskFree(theme->desk_toggled_pressed_mask); RrPixmapMaskFree(theme->desk_disabled_mask); RrPixmapMaskFree(theme->desk_hover_mask); RrPixmapMaskFree(theme->desk_pressed_mask); RrPixmapMaskFree(theme->shade_mask); RrPixmapMaskFree(theme->shade_toggled_mask); + RrPixmapMaskFree(theme->shade_toggled_hover_mask); + RrPixmapMaskFree(theme->shade_toggled_pressed_mask); RrPixmapMaskFree(theme->shade_disabled_mask); RrPixmapMaskFree(theme->shade_hover_mask); RrPixmapMaskFree(theme->shade_pressed_mask); @@ -1061,12 +1317,16 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_disabled_unfocused_max); RrAppearanceFree(theme->a_hover_focused_max); RrAppearanceFree(theme->a_hover_unfocused_max); - RrAppearanceFree(theme->a_toggled_focused_max); - RrAppearanceFree(theme->a_toggled_unfocused_max); RrAppearanceFree(theme->a_focused_unpressed_max); RrAppearanceFree(theme->a_focused_pressed_max); RrAppearanceFree(theme->a_unfocused_unpressed_max); RrAppearanceFree(theme->a_unfocused_pressed_max); + RrAppearanceFree(theme->a_toggled_hover_focused_max); + RrAppearanceFree(theme->a_toggled_hover_unfocused_max); + RrAppearanceFree(theme->a_toggled_focused_unpressed_max); + RrAppearanceFree(theme->a_toggled_focused_pressed_max); + RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max); + RrAppearanceFree(theme->a_toggled_unfocused_pressed_max); RrAppearanceFree(theme->a_disabled_focused_close); RrAppearanceFree(theme->a_disabled_unfocused_close); RrAppearanceFree(theme->a_hover_focused_close); @@ -1079,22 +1339,30 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_disabled_unfocused_desk); RrAppearanceFree(theme->a_hover_focused_desk); RrAppearanceFree(theme->a_hover_unfocused_desk); - RrAppearanceFree(theme->a_toggled_focused_desk); - RrAppearanceFree(theme->a_toggled_unfocused_desk); RrAppearanceFree(theme->a_focused_unpressed_desk); RrAppearanceFree(theme->a_focused_pressed_desk); RrAppearanceFree(theme->a_unfocused_unpressed_desk); RrAppearanceFree(theme->a_unfocused_pressed_desk); + RrAppearanceFree(theme->a_toggled_hover_focused_desk); + RrAppearanceFree(theme->a_toggled_hover_unfocused_desk); + RrAppearanceFree(theme->a_toggled_focused_unpressed_desk); + RrAppearanceFree(theme->a_toggled_focused_pressed_desk); + RrAppearanceFree(theme->a_toggled_unfocused_unpressed_desk); + RrAppearanceFree(theme->a_toggled_unfocused_pressed_desk); RrAppearanceFree(theme->a_disabled_focused_shade); RrAppearanceFree(theme->a_disabled_unfocused_shade); RrAppearanceFree(theme->a_hover_focused_shade); RrAppearanceFree(theme->a_hover_unfocused_shade); - RrAppearanceFree(theme->a_toggled_focused_shade); - RrAppearanceFree(theme->a_toggled_unfocused_shade); RrAppearanceFree(theme->a_focused_unpressed_shade); RrAppearanceFree(theme->a_focused_pressed_shade); RrAppearanceFree(theme->a_unfocused_unpressed_shade); RrAppearanceFree(theme->a_unfocused_pressed_shade); + RrAppearanceFree(theme->a_toggled_hover_focused_shade); + RrAppearanceFree(theme->a_toggled_hover_unfocused_shade); + RrAppearanceFree(theme->a_toggled_focused_unpressed_shade); + RrAppearanceFree(theme->a_toggled_focused_pressed_shade); + RrAppearanceFree(theme->a_toggled_unfocused_unpressed_shade); + RrAppearanceFree(theme->a_toggled_unfocused_pressed_shade); RrAppearanceFree(theme->a_disabled_focused_iconify); RrAppearanceFree(theme->a_disabled_unfocused_iconify); RrAppearanceFree(theme->a_hover_focused_iconify); @@ -1114,12 +1382,15 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_unfocused_handle); RrAppearanceFree(theme->a_menu); RrAppearanceFree(theme->a_menu_title); + RrAppearanceFree(theme->a_menu_text_title); RrAppearanceFree(theme->a_menu_normal); - RrAppearanceFree(theme->a_menu_disabled); RrAppearanceFree(theme->a_menu_selected); + RrAppearanceFree(theme->a_menu_disabled); + RrAppearanceFree(theme->a_menu_disabled_selected); RrAppearanceFree(theme->a_menu_text_normal); - RrAppearanceFree(theme->a_menu_text_disabled); RrAppearanceFree(theme->a_menu_text_selected); + RrAppearanceFree(theme->a_menu_text_disabled); + RrAppearanceFree(theme->a_menu_text_disabled_selected); RrAppearanceFree(theme->a_menu_bullet_normal); RrAppearanceFree(theme->a_menu_bullet_selected); RrAppearanceFree(theme->a_clear); @@ -1133,7 +1404,7 @@ void RrThemeFree(RrTheme *theme) } } -static gboolean read_mask(ParseState *ps, gchar *maskname, +static gboolean read_mask(ParseState *ps, const gchar *maskname, RrPixmapMask **value) { gboolean ret = FALSE; @@ -1221,33 +1492,36 @@ static void parse_style(gchar *tex, RrSurfaceColorType *grad, } else { *grad = RR_SURFACE_SOLID; } + } - if (strstr(tex, "sunken") != NULL) - *relief = RR_RELIEF_SUNKEN; - else if (strstr(tex, "flat") != NULL) - *relief = RR_RELIEF_FLAT; - else - *relief = RR_RELIEF_RAISED; - - *border = FALSE; - if (*relief == RR_RELIEF_FLAT) { - if (strstr(tex, "border") != NULL) - *border = TRUE; - } else { - if (strstr(tex, "bevel2") != NULL) - *bevel = RR_BEVEL_2; - else - *bevel = RR_BEVEL_1; - } + if (strstr(tex, "sunken") != NULL) + *relief = RR_RELIEF_SUNKEN; + else if (strstr(tex, "flat") != NULL) + *relief = RR_RELIEF_FLAT; + else if (strstr(tex, "raised") != NULL) + *relief = RR_RELIEF_RAISED; + else + *relief = (*grad == RR_SURFACE_PARENTREL) ? + RR_RELIEF_FLAT : RR_RELIEF_RAISED; - if (strstr(tex, "interlaced") != NULL) - *interlaced = TRUE; + *border = FALSE; + if (*relief == RR_RELIEF_FLAT) { + if (strstr(tex, "border") != NULL) + *border = TRUE; + } else { + if (strstr(tex, "bevel2") != NULL) + *bevel = RR_BEVEL_2; else - *interlaced = FALSE; + *bevel = RR_BEVEL_1; } + + if (strstr(tex, "interlaced") != NULL) + *interlaced = TRUE; + else + *interlaced = FALSE; } -static xmlNodePtr find_node(xmlNodePtr n, gchar *names[]) +static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[]) { gint i; @@ -1256,7 +1530,7 @@ static xmlNodePtr find_node(xmlNodePtr n, gchar *names[]) return n; } -static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[], +static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[], gint *integer, gint lower, gint upper) { gint i; @@ -1271,7 +1545,7 @@ static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[], return FALSE; } -static gboolean find_string(ParseState *ps, xmlNodePtr n, gchar *names[], +static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[], gchar **string) { if ((n = find_node(n, names))) { @@ -1281,7 +1555,7 @@ static gboolean find_string(ParseState *ps, xmlNodePtr n, gchar *names[], return FALSE; } -static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[], +static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[], RrColor **color, gchar *alpha) { if ((n = find_node(n, names))) { @@ -1301,7 +1575,7 @@ static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[], return FALSE; } -static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[], +static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[], gint *x, gint *y, gint lowx, gint upx, gint lowy, gint upy) { @@ -1318,7 +1592,7 @@ static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[], return FALSE; } -static gboolean find_shadow(ParseState *ps, xmlNodePtr n, gchar *names[], +static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[], RrAppearance *a) { return find_point(ps, n, names, @@ -1327,7 +1601,7 @@ static gboolean find_shadow(ParseState *ps, xmlNodePtr n, gchar *names[], -20, 20, -20, 20); } -static gboolean find_appearance(ParseState *ps, xmlNodePtr n, gchar *names[], +static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[], RrAppearance *a, gboolean allow_trans) { xmlNodePtr n2;