X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=6118cdf92d21c1be42d5b87e6098edd5d18fae87;hb=fdabb69f4f25596df972caa76c85c2aeba26226e;hp=3b44b525379d6656c8ee33c3a7d0c15a0711d204;hpb=b10b0000db35990d37a06985f3c5ec1dc0039c3b;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 3b44b525..6118cdf9 100644 --- a/render/theme.c +++ b/render/theme.c @@ -1,7 +1,8 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- theme.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +23,7 @@ #include "mask.h" #include "theme.h" #include "icon.h" -#include "parser/parse.h" +#include "obt/parse.h" #include #include @@ -30,40 +31,71 @@ #include #include -static XrmDatabase loaddb(RrTheme *theme, gchar *name); -static gboolean read_int(XrmDatabase db, gchar *rname, gint *value); -static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value); +static XrmDatabase loaddb(const gchar *name, gchar **path); +static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value); +static gboolean read_string(XrmDatabase db, const gchar *rname, gchar **value); static gboolean read_color(XrmDatabase db, const RrInstance *inst, - gchar *rname, RrColor **value); -static gboolean read_mask(const RrInstance *inst, - gchar *maskname, RrTheme *theme, + const gchar *rname, RrColor **value); +static gboolean read_mask(const RrInstance *inst, const gchar *path, + RrTheme *theme, const gchar *maskname, RrPixmapMask **value); static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, - gchar *rname, RrAppearance *value, + 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); -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 *osd_font) { XrmDatabase db = NULL; RrJustify winjust, mtitlejust; gchar *str; - gchar *font_str; RrTheme *theme; + gchar *path; + gboolean userdef; + + if (name) { + db = loaddb(name, &path); + if (db == NULL) { + g_message("Unable to load the theme '%s'", name); + if (allow_fallback) + g_message("Falling back to the default theme '%s'", + DEFAULT_THEME); + /* fallback to the default theme */ + name = NULL; + } + } + if (name == NULL) { + if (allow_fallback) { + db = loaddb(DEFAULT_THEME, &path); + if (db == NULL) { + g_message("Unable to load the theme '%s'", DEFAULT_THEME); + return NULL; + } + } else + return NULL; + } theme = g_new0(RrTheme, 1); theme->inst = inst; - - theme->show_handle = TRUE; + 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_unpressed_max = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_unpressed_max = RrAppearanceNew(inst, 1); + theme->a_toggled_hover_focused_max = RrAppearanceNew(inst, 1); + theme->a_toggled_hover_unfocused_max = RrAppearanceNew(inst, 1); + theme->a_toggled_focused_pressed_max = RrAppearanceNew(inst, 1); + theme->a_toggled_unfocused_pressed_max = RrAppearanceNew(inst, 1); theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1); theme->a_focused_pressed_max = RrAppearanceNew(inst, 1); theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); @@ -78,55 +110,37 @@ 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_selected = RrAppearanceNew(inst, 0); + theme->a_menu_disabled = RrAppearanceNew(inst, 0); + /* a_menu_disabled_selected is copied from a_menu_selected */ theme->a_menu_text_normal = RrAppearanceNew(inst, 1); - theme->a_menu_text_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); - - if (name) { - db = loaddb(theme, name); - if (db == NULL) { - g_warning("Failed to load the theme '%s'\n" - "Falling back to the default: '%s'", - name, DEFAULT_THEME); - } else - theme->name = g_path_get_basename(name); - } - if (db == NULL) { - db = loaddb(theme, DEFAULT_THEME); - if (db == NULL) { - g_warning("Failed to load the theme '%s'.", DEFAULT_THEME); - return NULL; - } else - theme->name = g_path_get_basename(DEFAULT_THEME); - } + theme->osd_hilite_bg = RrAppearanceNew(inst, 0); + theme->osd_hilite_label = RrAppearanceNew(inst, 1); + theme->osd_hilite_fg = RrAppearanceNew(inst, 0); + theme->osd_unhilite_fg = RrAppearanceNew(inst, 0); /* load the font stuff */ - if (!read_string(db, "window.active.label.text.font", &font_str)) - font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50"; - - if (!(theme->win_font_focused = RrFontOpen(inst, font_str))) { - RrThemeFree(theme); - return NULL; - } - theme->win_font_height = RrFontHeight(theme->win_font_focused); - - if (!read_string(db, "window.inactive.label.text.font", &font_str)) - /* font_str will already be set to the last one */; - - if (!(theme->win_font_unfocused = RrFontOpen(inst, font_str))) { - RrThemeFree(theme); - return NULL; - } - theme->win_font_height = MAX(theme->win_font_height, - RrFontHeight(theme->win_font_unfocused)); + if (active_window_font) { + theme->win_font_focused = active_window_font; + RrFontRef(active_window_font); + } else + theme->win_font_focused = RrFontOpenDefault(inst); + + if (inactive_window_font) { + theme->win_font_unfocused = inactive_window_font; + RrFontRef(inactive_window_font); + } else + theme->win_font_unfocused = RrFontOpenDefault(inst); winjust = RR_JUSTIFY_LEFT; if (read_string(db, "window.label.text.justify", &str)) { @@ -136,14 +150,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) winjust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.title.text.font", &font_str)) - font_str = "arial,sans:bold:pixelsize=12:shadow=y"; - - if (!(theme->menu_title_font = RrFontOpen(inst, font_str))) { - RrThemeFree(theme); - return NULL; - } - theme->menu_title_font_height = RrFontHeight(theme->menu_title_font); + if (menu_title_font) { + theme->menu_title_font = menu_title_font; + RrFontRef(menu_title_font); + } else + theme->menu_title_font = RrFontOpenDefault(inst); mtitlejust = RR_JUSTIFY_LEFT; if (read_string(db, "menu.title.text.justify", &str)) { @@ -153,39 +164,98 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) mtitlejust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.items.font", &font_str)) - font_str = "arial,sans:bold:pixelsize=11:shadow=y"; + if (menu_item_font) { + theme->menu_font = menu_item_font; + RrFontRef(menu_item_font); + } else + theme->menu_font = RrFontOpenDefault(inst); - if (!(theme->menu_font = RrFontOpen(inst, font_str))) { - RrThemeFree(theme); - return NULL; - } - theme->menu_font_height = RrFontHeight(theme->menu_font); + if (osd_font) { + theme->osd_font = osd_font; + RrFontRef(osd_font); + } else + theme->osd_font = RrFontOpenDefault(inst); /* load direct dimensions */ if (!read_int(db, "menu.overlap", &theme->menu_overlap) || - theme->menu_overlap < 0 || theme->menu_overlap > 20) + theme->menu_overlap < -100 || theme->menu_overlap > 100) theme->menu_overlap = 0; - if (!read_int(db, "window.handle.width", &theme->handle_height)) - theme->handle_height = 6; - if (!theme->handle_height) - theme->show_handle = FALSE; - if (theme->handle_height <= 0 || theme->handle_height > 100) + if (!read_int(db, "window.handle.width", &theme->handle_height) || + theme->handle_height < 0 || theme->handle_height > 100) theme->handle_height = 6; - if (!read_int(db, "padding.width", &theme->padding) || - theme->padding < 0 || theme->padding > 100) - theme->padding = 3; - if (!read_int(db, "border.width", &theme->bwidth) || - theme->bwidth < 0 || theme->bwidth > 100) - theme->bwidth = 1; - if (!read_int(db, "window.client.padding.width", &theme->cbwidth) || - theme->cbwidth < 0 || theme->cbwidth > 100) - theme->cbwidth = theme->padding; + if (!read_int(db, "padding.width", &theme->paddingx) || + theme->paddingx < 0 || theme->paddingx > 100) + theme->paddingx = 3; + if (!read_int(db, "padding.height", &theme->paddingy) || + theme->paddingy < 0 || theme->paddingy > 100) + theme->paddingy = theme->paddingx; + if (!read_int(db, "border.width", &theme->fbwidth) || + theme->fbwidth < 0 || theme->fbwidth > 100) + theme->fbwidth = 1; + /* menu border width inherits from the frame border width */ + if (!read_int(db, "menu.border.width", &theme->mbwidth) || + theme->mbwidth < 0 || theme->mbwidth > 100) + theme->mbwidth = theme->fbwidth; + /* osd border width inherits from the frame border width */ + if (!read_int(db, "osd.border.width", &theme->obwidth) || + theme->obwidth < 0 || theme->obwidth > 100) + theme->obwidth = theme->fbwidth; + if (!read_int(db, "window.client.padding.width", &theme->cbwidthx) || + theme->cbwidthx < 0 || theme->cbwidthx > 100) + theme->cbwidthx = theme->paddingx; + if (!read_int(db, "window.client.padding.height", &theme->cbwidthy) || + theme->cbwidthy < 0 || theme->cbwidthy > 100) + theme->cbwidthy = theme->cbwidthx; /* load colors */ if (!read_color(db, inst, - "border.color", &theme->b_color)) - theme->b_color = RrColorNew(inst, 0, 0, 0); + "window.active.border.color", + &theme->frame_focused_border_color) && + !read_color(db, inst, + "border.color", + &theme->frame_focused_border_color)) + theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0); + /* title separator focused color inherits from focused boder color */ + if (!read_color(db, inst, + "window.active.title.separator.color", + &theme->title_separator_focused_color)) + theme->title_separator_focused_color = + RrColorNew(inst, + theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); + /* unfocused border color inherits from frame focused border color */ + if (!read_color(db, inst, + "window.inactive.border.color", + &theme->frame_unfocused_border_color)) + theme->frame_unfocused_border_color = + RrColorNew(inst, theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); + /* title separator unfocused color inherits from unfocused boder color */ + if (!read_color(db, inst, + "window.inactive.title.separator.color", + &theme->title_separator_unfocused_color)) + theme->title_separator_unfocused_color = + RrColorNew(inst, + theme->frame_unfocused_border_color->r, + theme->frame_unfocused_border_color->g, + theme->frame_unfocused_border_color->b); + + /* menu border color inherits from frame focused border color */ + if (!read_color(db, inst, "menu.border.color", &theme->menu_border_color)) + theme->menu_border_color = + RrColorNew(inst, + theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); + /* osd border color inherits from frame focused border color */ + if (!read_color(db, inst, "osd.border.color", &theme->osd_border_color)) + theme->osd_border_color = + RrColorNew(inst, + theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); if (!read_color(db, inst, "window.active.client.color", &theme->cb_focused_color)) @@ -198,6 +268,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "window.active.label.text.color", &theme->title_focused_color)) theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); + if (!read_color(db, inst, "osd.label.text.color", &theme->osd_color)) + theme->osd_color = RrColorNew(inst, + theme->title_focused_color->r, + theme->title_focused_color->g, + theme->title_focused_color->b); if (!read_color(db, inst, "window.inactive.label.text.color", &theme->title_unfocused_color)) @@ -253,17 +328,55 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->titlebut_unfocused_unpressed_color->g, theme->titlebut_unfocused_unpressed_color->b); if (!read_color(db, inst, + "window.active.button.toggled.unpressed.image.color", + &theme->titlebut_toggled_focused_unpressed_color) && + !read_color(db, inst, "window.active.button.toggled.image.color", - &theme->titlebut_toggled_focused_color)) - theme->titlebut_toggled_focused_color = + &theme->titlebut_toggled_focused_unpressed_color)) + theme->titlebut_toggled_focused_unpressed_color = RrColorNew(inst, theme->titlebut_focused_pressed_color->r, theme->titlebut_focused_pressed_color->g, theme->titlebut_focused_pressed_color->b); if (!read_color(db, inst, + "window.inactive.button.toggled.unpressed.image.color", + &theme->titlebut_toggled_unfocused_unpressed_color) && + !read_color(db, inst, "window.inactive.button.toggled.image.color", - &theme->titlebut_toggled_unfocused_color)) - theme->titlebut_toggled_unfocused_color = + &theme->titlebut_toggled_unfocused_unpressed_color)) + theme->titlebut_toggled_unfocused_unpressed_color = + RrColorNew(inst, + theme->titlebut_unfocused_pressed_color->r, + theme->titlebut_unfocused_pressed_color->g, + theme->titlebut_unfocused_pressed_color->b); + if (!read_color(db, inst, + "window.active.button.toggled.hover.image.color", + &theme->titlebut_toggled_hover_focused_color)) + theme->titlebut_toggled_hover_focused_color = + RrColorNew(inst, + theme->titlebut_toggled_focused_unpressed_color->r, + theme->titlebut_toggled_focused_unpressed_color->g, + theme->titlebut_toggled_focused_unpressed_color->b); + if (!read_color(db, inst, + "window.inactive.button.toggled.hover.image.color", + &theme->titlebut_toggled_hover_unfocused_color)) + theme->titlebut_toggled_hover_unfocused_color = + RrColorNew(inst, + theme->titlebut_toggled_unfocused_unpressed_color->r, + theme->titlebut_toggled_unfocused_unpressed_color->g, + theme->titlebut_toggled_unfocused_unpressed_color->b); + if (!read_color(db, inst, + "window.active.button.toggled.pressed.image.color", + &theme->titlebut_toggled_focused_pressed_color)) + theme->titlebut_toggled_focused_pressed_color = + RrColorNew(inst, + theme->titlebut_focused_pressed_color->r, + theme->titlebut_focused_pressed_color->g, + theme->titlebut_focused_pressed_color->b); + if (!read_color(db, inst, + "window.inactive.button.toggled.pressed.image.color", + &theme->titlebut_toggled_unfocused_pressed_color)) + theme->titlebut_toggled_unfocused_pressed_color = RrColorNew(inst, theme->titlebut_unfocused_pressed_color->r, theme->titlebut_unfocused_pressed_color->g, @@ -278,165 +391,158 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "menu.items.disabled.text.color", &theme->menu_disabled_color)) theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, + "menu.items.active.disabled.text.color", + &theme->menu_disabled_selected_color)) + theme->menu_disabled_selected_color = + RrColorNew(inst, + theme->menu_disabled_color->r, + theme->menu_disabled_color->g, + theme->menu_disabled_color->b); if (!read_color(db, inst, "menu.items.active.text.color", &theme->menu_selected_color)) theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); - - if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) { - if (!read_mask(inst, "max_pressed.xbm", theme, - &theme->max_pressed_mask)) { - theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); - } - if (!read_mask(inst, "max_toggled.xbm", theme, - &theme->max_toggled_mask)) { - theme->max_toggled_mask = - RrPixmapMaskCopy(theme->max_pressed_mask); - } - if (!read_mask(inst, "max_disabled.xbm", theme, - &theme->max_disabled_mask)) { - theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); - } - if (!read_mask(inst, "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 }; - 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); + + /* load the image masks */ + + /* maximize button masks */ + userdef = TRUE; + if (!read_mask(inst, path, theme, "max.xbm", &theme->max_mask)) { + guchar data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; + theme->max_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + userdef = FALSE; + } + if (!read_mask(inst, path, theme, "max_toggled.xbm", + &theme->max_toggled_mask)) + { + if (userdef) + theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask); + else { + guchar data[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; + theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data); } + } + if (!read_mask(inst, path, theme, "max_pressed.xbm", + &theme->max_pressed_mask)) theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); + if (!read_mask(inst,path,theme,"max_disabled.xbm", + &theme->max_disabled_mask)) theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); + if (!read_mask(inst, path, theme, "max_hover.xbm", &theme->max_hover_mask)) theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); + if (!read_mask(inst, path, theme, "max_toggled_pressed.xbm", + &theme->max_toggled_pressed_mask)) + theme->max_toggled_pressed_mask = + RrPixmapMaskCopy(theme->max_toggled_mask); + if (!read_mask(inst, path, theme, "max_toggled_hover.xbm", + &theme->max_toggled_hover_mask)) + theme->max_toggled_hover_mask = + RrPixmapMaskCopy(theme->max_toggled_mask); + + /* iconify button masks */ + if (!read_mask(inst, path, theme, "iconify.xbm", &theme->iconify_mask)) { + guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; + theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } - - if (read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) { - if (!read_mask(inst, "iconify_pressed.xbm", theme, - &theme->iconify_pressed_mask)) { - theme->iconify_pressed_mask = - RrPixmapMaskCopy(theme->iconify_mask); - } - if (!read_mask(inst, "iconify_disabled.xbm", theme, - &theme->iconify_disabled_mask)) { - theme->iconify_disabled_mask = - RrPixmapMaskCopy(theme->iconify_mask); - } - if (!read_mask(inst, "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 }; - theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); - } + if (!read_mask(inst, path, theme, "iconify_pressed.xbm", + &theme->iconify_pressed_mask)) theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask); + if (!read_mask(inst, path, theme, "iconify_disabled.xbm", + &theme->iconify_disabled_mask)) theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask); + if (!read_mask(inst, path, theme, "iconify_hover.xbm", + &theme->iconify_hover_mask)) theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); - } - - theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH, - OB_DEFAULT_ICON_HEIGHT, - OB_DEFAULT_ICON_pixel_data); - if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) { - if (!read_mask(inst, "desk_pressed.xbm", theme, - &theme->desk_pressed_mask)) { - theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); - } - if (!read_mask(inst, "desk_toggled.xbm", theme, - &theme->desk_toggled_mask)) { + /* all desktops button masks */ + userdef = TRUE; + if (!read_mask(inst, path, theme, "desk.xbm", &theme->desk_mask)) { + guchar data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; + theme->desk_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + userdef = FALSE; + } + if (!read_mask(inst, path, theme, "desk_toggled.xbm", + &theme->desk_toggled_mask)) { + if (userdef) + theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask); + else { + guchar data[] = { 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 }; theme->desk_toggled_mask = - RrPixmapMaskCopy(theme->desk_pressed_mask); - } - if (!read_mask(inst, "desk_disabled.xbm", theme, - &theme->desk_disabled_mask)) { - theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); - } - if (!read_mask(inst, "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 }; - 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(inst, path, theme, "desk_pressed.xbm", + &theme->desk_pressed_mask)) theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); + if (!read_mask(inst, path, theme, "desk_disabled.xbm", + &theme->desk_disabled_mask)) theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); + if (!read_mask(inst, path, theme, "desk_hover.xbm", + &theme->desk_hover_mask)) theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask); + if (!read_mask(inst, path, theme, "desk_toggled_pressed.xbm", + &theme->desk_toggled_pressed_mask)) + theme->desk_toggled_pressed_mask = + RrPixmapMaskCopy(theme->desk_toggled_mask); + if (!read_mask(inst, path, theme, "desk_toggled_hover.xbm", + &theme->desk_toggled_hover_mask)) + theme->desk_toggled_hover_mask = + RrPixmapMaskCopy(theme->desk_toggled_mask); + + /* shade button masks */ + if (!read_mask(inst, path, theme, "shade.xbm", &theme->shade_mask)) { + guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; + theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } - - if (read_mask(inst, "shade.xbm", theme, &theme->shade_mask)) { - if (!read_mask(inst, "shade_pressed.xbm", theme, - &theme->shade_pressed_mask)) { - theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); - } - if (!read_mask(inst, "shade_toggled.xbm", theme, - &theme->shade_toggled_mask)) { - theme->shade_toggled_mask = - RrPixmapMaskCopy(theme->shade_pressed_mask); - } - if (!read_mask(inst, "shade_disabled.xbm", theme, - &theme->shade_disabled_mask)) { - theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); - } - if (!read_mask(inst, "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 }; - 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(inst, path, theme, "shade_toggled.xbm", + &theme->shade_toggled_mask)) + theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(inst, path, theme, "shade_pressed.xbm", + &theme->shade_pressed_mask)) theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(inst, path, theme, "shade_disabled.xbm", + &theme->shade_disabled_mask)) theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(inst, path, theme, "shade_hover.xbm", + &theme->shade_hover_mask)) theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask); + if (!read_mask(inst, path, theme, "shade_toggled_pressed.xbm", + &theme->shade_toggled_pressed_mask)) + theme->shade_toggled_pressed_mask = + RrPixmapMaskCopy(theme->shade_toggled_mask); + if (!read_mask(inst, path, theme, "shade_toggled_hover.xbm", + &theme->shade_toggled_hover_mask)) + theme->shade_toggled_hover_mask = + RrPixmapMaskCopy(theme->shade_toggled_mask); + + /* close button masks */ + if (!read_mask(inst, path, theme, "close.xbm", &theme->close_mask)) { + guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; + theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); } - - if (read_mask(inst, "close.xbm", theme, &theme->close_mask)) { - if (!read_mask(inst, "close_pressed.xbm", theme, - &theme->close_pressed_mask)) { - theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); - } - if (!read_mask(inst, "close_disabled.xbm", theme, - &theme->close_disabled_mask)) { - theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); - } - if (!read_mask(inst, "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 }; - theme->close_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); - } + if (!read_mask(inst, path, theme, "close_pressed.xbm", + &theme->close_pressed_mask)) theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); + if (!read_mask(inst, path, theme, "close_disabled.xbm", + &theme->close_disabled_mask)) theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); + if (!read_mask(inst, path, theme, "close_hover.xbm", + &theme->close_hover_mask)) theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask); - } - if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) { + /* submenu bullet mask */ + if (!read_mask(inst, path, theme, "bullet.xbm", &theme->menu_bullet_mask)) + { guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (gchar*)data); } + /* 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 (!read_appearance(db, inst, "window.active.title.bg", theme->a_focused_title, @@ -476,26 +582,43 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) set_default_appearance(theme->a_menu); if (!read_appearance(db, inst, "menu.title.bg", theme->a_menu_title, - FALSE)) + TRUE)) set_default_appearance(theme->a_menu_title); if (!read_appearance(db, inst, "menu.items.active.bg", theme->a_menu_selected, TRUE)) set_default_appearance(theme->a_menu_selected); + theme->a_menu_disabled_selected = + RrAppearanceCopy(theme->a_menu_selected); - /* read the appearances for rendering non-decorations */ - theme->app_hilite_bg = RrAppearanceCopy(theme->a_focused_title); - theme->app_hilite_label = RrAppearanceCopy(theme->a_focused_label); - if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL) - theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_label); - else - theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_title); - theme->app_unhilite_bg = RrAppearanceCopy(theme->a_unfocused_title); - theme->app_unhilite_label = RrAppearanceCopy(theme->a_unfocused_label); - if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) - theme->app_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_label); - else - theme->app_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_title); + /* read appearances for non-decorations (on-screen-display) */ + if (!read_appearance(db, inst, "osd.bg", theme->osd_hilite_bg, FALSE)) { + RrAppearanceFree(theme->osd_hilite_bg); + theme->osd_hilite_bg = RrAppearanceCopy(theme->a_focused_title); + } + if (!read_appearance(db, inst, "osd.label.bg", + theme->osd_hilite_label, TRUE)) { + RrAppearanceFree(theme->osd_hilite_label); + theme->osd_hilite_label = RrAppearanceCopy(theme->a_focused_label); + } + /* osd_hilite_fg can't be parentrel */ + if (!read_appearance(db, inst, "osd.hilight.bg", + theme->osd_hilite_fg, FALSE)) { + RrAppearanceFree(theme->osd_hilite_fg); + if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL) + theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_label); + else + theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_title); + } + /* osd_unhilite_fg can't be parentrel either */ + if (!read_appearance(db, inst, "osd.unhilight.bg", + theme->osd_unhilite_fg, FALSE)) { + RrAppearanceFree(theme->osd_unhilite_fg); + if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) + theme->osd_unhilite_fg=RrAppearanceCopy(theme->a_unfocused_label); + else + theme->osd_unhilite_fg=RrAppearanceCopy(theme->a_unfocused_title); + } /* read buttons textures */ if (!read_appearance(db, inst, @@ -519,21 +642,65 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) TRUE)) set_default_appearance(theme->a_unfocused_pressed_max); if (!read_appearance(db, inst, + "window.active.button.toggled.unpressed.bg", + theme->a_toggled_focused_unpressed_max, + TRUE) && + !read_appearance(db, inst, "window.active.button.toggled.bg", - theme->a_toggled_focused_max, + theme->a_toggled_focused_unpressed_max, TRUE)) { - RrAppearanceFree(theme->a_toggled_focused_max); - theme->a_toggled_focused_max = + RrAppearanceFree(theme->a_toggled_focused_unpressed_max); + theme->a_toggled_focused_unpressed_max = RrAppearanceCopy(theme->a_focused_pressed_max); } if (!read_appearance(db, inst, + "window.inactive.button.toggled.unpressed.bg", + theme->a_toggled_unfocused_unpressed_max, + TRUE) && + !read_appearance(db, inst, "window.inactive.button.toggled.bg", - theme->a_toggled_unfocused_max, + 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 (!read_appearance(db, inst, + "window.active.button.toggled.hover.bg", + theme->a_toggled_hover_focused_max, + TRUE)) + { + RrAppearanceFree(theme->a_toggled_hover_focused_max); + theme->a_toggled_hover_focused_max = + RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + } + if (!read_appearance(db, inst, + "window.inactive.button.toggled.hover.bg", + theme->a_toggled_hover_unfocused_max, + TRUE)) + { + RrAppearanceFree(theme->a_toggled_hover_unfocused_max); + theme->a_toggled_hover_unfocused_max = + RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + } + if (!read_appearance(db, inst, + "window.active.button.toggled.pressed.bg", + theme->a_toggled_focused_pressed_max, + TRUE)) + { + RrAppearanceFree(theme->a_toggled_focused_pressed_max); + theme->a_toggled_focused_pressed_max = + RrAppearanceCopy(theme->a_focused_pressed_max); + } + if (!read_appearance(db, inst, + "window.inactive.button.toggled.pressed.bg", + theme->a_toggled_unfocused_pressed_max, TRUE)) { - RrAppearanceFree(theme->a_toggled_unfocused_max); - theme->a_toggled_unfocused_max = + RrAppearanceFree(theme->a_toggled_unfocused_pressed_max); + theme->a_toggled_unfocused_pressed_max = RrAppearanceCopy(theme->a_unfocused_pressed_max); } if (!read_appearance(db, inst, @@ -588,11 +755,19 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_hover_focused_desk = RrAppearanceCopy(theme->a_hover_focused_max); theme->a_hover_unfocused_desk = - RrAppearanceCopy(theme->a_hover_unfocused_max); - theme->a_toggled_focused_desk = - RrAppearanceCopy(theme->a_toggled_focused_max); - theme->a_toggled_unfocused_desk = - RrAppearanceCopy(theme->a_toggled_unfocused_max); + RrAppearanceCopy(theme->a_hover_unfocused_max); + theme->a_toggled_hover_focused_desk = + RrAppearanceCopy(theme->a_toggled_hover_focused_max); + theme->a_toggled_hover_unfocused_desk = + RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); + theme->a_toggled_focused_unpressed_desk = + RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + theme->a_toggled_unfocused_unpressed_desk = + RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + theme->a_toggled_focused_pressed_desk = + RrAppearanceCopy(theme->a_toggled_focused_pressed_max); + theme->a_toggled_unfocused_pressed_desk = + RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); theme->a_unfocused_unpressed_desk = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_desk = @@ -609,10 +784,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_hover_focused_shade = + RrAppearanceCopy(theme->a_toggled_hover_focused_max); + theme->a_toggled_hover_unfocused_shade = + RrAppearanceCopy(theme->a_toggled_hover_unfocused_max); + theme->a_toggled_focused_unpressed_shade = + RrAppearanceCopy(theme->a_toggled_focused_unpressed_max); + theme->a_toggled_unfocused_unpressed_shade = + RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max); + theme->a_toggled_focused_pressed_shade = + RrAppearanceCopy(theme->a_toggled_focused_pressed_max); + theme->a_toggled_unfocused_pressed_shade = + RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max); theme->a_unfocused_unpressed_shade = RrAppearanceCopy(theme->a_unfocused_unpressed_max); theme->a_unfocused_pressed_shade = @@ -641,250 +824,531 @@ 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; /* set up the textures */ - theme->a_focused_label->texture[0].type = - theme->app_hilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme->a_focused_label->texture[0].type = RR_TEXTURE_TEXT; theme->a_focused_label->texture[0].data.text.justify = winjust; - theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; - theme->a_focused_label->texture[0].data.text.font = - theme->app_hilite_label->texture[0].data.text.font = - theme->win_font_focused; + theme->a_focused_label->texture[0].data.text.font=theme->win_font_focused; theme->a_focused_label->texture[0].data.text.color = - theme->app_hilite_label->texture[0].data.text.color = theme->title_focused_color; - theme->a_unfocused_label->texture[0].type = - theme->app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT; + if (read_string(db, "window.active.label.text.font", &str)) { + char *p; + gint i = 0; + gint j; + if (strstr(str, "shadow=y")) { + if ((p = strstr(str, "shadowoffset="))) + i = parse_inline_number(p + strlen("shadowoffset=")); + else + i = 1; + theme->a_focused_label->texture[0].data.text.shadow_offset_x = i; + theme->a_focused_label->texture[0].data.text.shadow_offset_y = i; + } + if ((p = strstr(str, "shadowtint="))) + { + i = parse_inline_number(p + strlen("shadowtint=")); + j = (i > 0 ? 0 : 255); + i = ABS(i*255/100); + + theme->title_focused_shadow_color = RrColorNew(inst, j, j, j); + theme->title_focused_shadow_alpha = i; + } else { + theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->title_focused_shadow_alpha = 50; + } + } + + theme->a_focused_label->texture[0].data.text.shadow_color = + theme->title_focused_shadow_color; + theme->a_focused_label->texture[0].data.text.shadow_alpha = + theme->title_focused_shadow_alpha; + + theme->osd_hilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + theme->osd_hilite_label->texture[0].data.text.font = theme->osd_font; + theme->osd_hilite_label->texture[0].data.text.color = theme->osd_color; + + if (read_string(db, "osd.label.text.font", &str)) { + char *p; + gint i = 0; + gint j; + if (strstr(str, "shadow=y")) { + if ((p = strstr(str, "shadowoffset="))) + i = parse_inline_number(p + strlen("shadowoffset=")); + else + i = 1; + theme->a_focused_label->texture[0].data.text.shadow_offset_x = i; + theme->a_focused_label->texture[0].data.text.shadow_offset_y = i; + theme->osd_hilite_label->texture[0].data.text.shadow_offset_x = i; + theme->osd_hilite_label->texture[0].data.text.shadow_offset_y = i; + } + if ((p = strstr(str, "shadowtint="))) + { + i = parse_inline_number(p + strlen("shadowtint=")); + j = (i > 0 ? 0 : 255); + i = ABS(i*255/100); + + theme->title_focused_shadow_color = RrColorNew(inst, j, j, j); + theme->title_focused_shadow_alpha = i; + theme->osd_shadow_color = RrColorNew(inst, j, j, j); + theme->osd_shadow_alpha = i; + } else { + theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->title_focused_shadow_alpha = 50; + theme->osd_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->osd_shadow_alpha = 50; + } + } else { + /* inherit the font settings from the focused label */ + theme->osd_hilite_label->texture[0].data.text.shadow_offset_x = + theme->a_focused_label->texture[0].data.text.shadow_offset_x; + theme->osd_hilite_label->texture[0].data.text.shadow_offset_y = + theme->a_focused_label->texture[0].data.text.shadow_offset_y; + if (theme->title_focused_shadow_color) + theme->osd_shadow_color = + RrColorNew(inst, + theme->title_focused_shadow_color->r, + theme->title_focused_shadow_color->g, + theme->title_focused_shadow_color->b); + else + theme->osd_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->osd_shadow_alpha = theme->title_focused_shadow_alpha; + } + + theme->osd_hilite_label->texture[0].data.text.shadow_color = + theme->osd_shadow_color; + theme->osd_hilite_label->texture[0].data.text.shadow_alpha = + theme->osd_shadow_alpha; + + theme->a_unfocused_label->texture[0].type = RR_TEXTURE_TEXT; theme->a_unfocused_label->texture[0].data.text.justify = winjust; - theme->app_unhilite_label->texture[0].data.text.justify = - RR_JUSTIFY_LEFT; theme->a_unfocused_label->texture[0].data.text.font = - theme->app_unhilite_label->texture[0].data.text.font = theme->win_font_unfocused; theme->a_unfocused_label->texture[0].data.text.color = - theme->app_unhilite_label->texture[0].data.text.color = theme->title_unfocused_color; - theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT; - theme->a_menu_title->texture[0].data.text.justify = mtitlejust; - theme->a_menu_title->texture[0].data.text.font = theme->menu_title_font; - theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color; + if (read_string(db, "window.inactive.label.text.font", &str)) { + char *p; + gint i = 0; + gint j; + if (strstr(str, "shadow=y")) { + if ((p = strstr(str, "shadowoffset="))) + i = parse_inline_number(p + strlen("shadowoffset=")); + else + i = 1; + theme->a_unfocused_label->texture[0].data.text.shadow_offset_x = i; + theme->a_unfocused_label->texture[0].data.text.shadow_offset_y = i; + } + if ((p = strstr(str, "shadowtint="))) + { + i = parse_inline_number(p + strlen("shadowtint=")); + j = (i > 0 ? 0 : 255); + i = ABS(i*255/100); + + theme->title_unfocused_shadow_color = RrColorNew(inst, j, j, j); + theme->title_unfocused_shadow_alpha = i; + } else { + theme->title_unfocused_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->title_unfocused_shadow_alpha = 50; + } + } + + theme->a_unfocused_label->texture[0].data.text.shadow_color = + theme->title_unfocused_shadow_color; + theme->a_unfocused_label->texture[0].data.text.shadow_alpha = + theme->title_unfocused_shadow_alpha; + + 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 (read_string(db, "menu.title.text.font", &str)) { + char *p; + gint i = 0; + gint j; + if (strstr(str, "shadow=y")) { + if ((p = strstr(str, "shadowoffset="))) + i = parse_inline_number(p + strlen("shadowoffset=")); + else + i = 1; + theme->a_menu_text_title->texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_title->texture[0].data.text.shadow_offset_y = i; + } + if ((p = strstr(str, "shadowtint="))) + { + i = parse_inline_number(p + strlen("shadowtint=")); + j = (i > 0 ? 0 : 255); + i = ABS(i*255/100); + + theme->menu_title_shadow_color = RrColorNew(inst, j, j, j); + theme->menu_title_shadow_alpha = i; + } else { + theme->menu_title_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->menu_title_shadow_alpha = 50; + } + } + + theme->a_menu_text_title->texture[0].data.text.shadow_color = + theme->menu_title_shadow_color; + theme->a_menu_text_title->texture[0].data.text.shadow_alpha = + theme->menu_title_shadow_alpha; theme->a_menu_text_normal->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_normal->texture[0].data.text.justify = - theme->a_menu_text_disabled->texture[0].data.text.justify = + theme->a_menu_text_selected->texture[0].type = + theme->a_menu_text_disabled->texture[0].type = + theme->a_menu_text_disabled_selected->texture[0].type = + RR_TEXTURE_TEXT; + theme->a_menu_text_normal->texture[0].data.text.justify = theme->a_menu_text_selected->texture[0].data.text.justify = + theme->a_menu_text_disabled->texture[0].data.text.justify = + theme->a_menu_text_disabled_selected->texture[0].data.text.justify = 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 (read_string(db, "menu.items.font", &str)) { + char *p; + gint i = 0; + gint j; + if (strstr(str, "shadow=y")) { + if ((p = strstr(str, "shadowoffset="))) + i = parse_inline_number(p + strlen("shadowoffset=")); + else + i = 1; + theme->a_menu_text_normal-> + texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_normal-> + texture[0].data.text.shadow_offset_y = i; + theme->a_menu_text_selected-> + texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_selected-> + texture[0].data.text.shadow_offset_y = i; + theme->a_menu_text_disabled-> + texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_disabled-> + texture[0].data.text.shadow_offset_y = i; + theme->a_menu_text_disabled_selected-> + texture[0].data.text.shadow_offset_x = i; + theme->a_menu_text_disabled_selected-> + texture[0].data.text.shadow_offset_y = i; + } + if ((p = strstr(str, "shadowtint="))) + { + i = parse_inline_number(p + strlen("shadowtint=")); + j = (i > 0 ? 0 : 255); + i = ABS(i*255/100); + + theme->menu_text_normal_shadow_color = RrColorNew(inst, j, j, j); + theme->menu_text_selected_shadow_color = RrColorNew(inst, j, j, j); + theme->menu_text_disabled_shadow_color = RrColorNew(inst, j, j, j); + theme->menu_text_normal_shadow_alpha = i; + theme->menu_text_selected_shadow_alpha = i; + theme->menu_text_disabled_shadow_alpha = i; + theme->menu_text_disabled_selected_shadow_alpha = i; + } else { + theme->menu_text_normal_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->menu_text_selected_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->menu_text_disabled_shadow_color = RrColorNew(inst, 0, 0, 0); + theme->menu_text_normal_shadow_alpha = 50; + theme->menu_text_selected_shadow_alpha = 50; + theme->menu_text_disabled_selected_shadow_alpha = 50; + } + } - theme->a_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_focused_unpressed_max->texture[0].type = - theme->a_focused_pressed_max->texture[0].type = - theme->a_unfocused_unpressed_max->texture[0].type = - theme->a_unfocused_pressed_max->texture[0].type = - theme->a_disabled_focused_close->texture[0].type = - theme->a_disabled_unfocused_close->texture[0].type = - theme->a_hover_focused_close->texture[0].type = - theme->a_hover_unfocused_close->texture[0].type = - theme->a_focused_unpressed_close->texture[0].type = - theme->a_focused_pressed_close->texture[0].type = - theme->a_unfocused_unpressed_close->texture[0].type = - theme->a_unfocused_pressed_close->texture[0].type = - theme->a_disabled_focused_desk->texture[0].type = - theme->a_disabled_unfocused_desk->texture[0].type = - theme->a_hover_focused_desk->texture[0].type = - theme->a_hover_unfocused_desk->texture[0].type = - theme->a_toggled_focused_desk->texture[0].type = - theme->a_toggled_unfocused_desk->texture[0].type = - theme->a_focused_unpressed_desk->texture[0].type = - theme->a_focused_pressed_desk->texture[0].type = - theme->a_unfocused_unpressed_desk->texture[0].type = - theme->a_unfocused_pressed_desk->texture[0].type = - theme->a_disabled_focused_shade->texture[0].type = - theme->a_disabled_unfocused_shade->texture[0].type = - theme->a_hover_focused_shade->texture[0].type = - theme->a_hover_unfocused_shade->texture[0].type = - theme->a_toggled_focused_shade->texture[0].type = - theme->a_toggled_unfocused_shade->texture[0].type = - theme->a_focused_unpressed_shade->texture[0].type = - theme->a_focused_pressed_shade->texture[0].type = - theme->a_unfocused_unpressed_shade->texture[0].type = - theme->a_unfocused_pressed_shade->texture[0].type = - theme->a_disabled_focused_iconify->texture[0].type = - theme->a_disabled_unfocused_iconify->texture[0].type = - theme->a_hover_focused_iconify->texture[0].type = - theme->a_hover_unfocused_iconify->texture[0].type = - theme->a_focused_unpressed_iconify->texture[0].type = - theme->a_focused_pressed_iconify->texture[0].type = - theme->a_unfocused_unpressed_iconify->texture[0].type = + theme->a_menu_text_normal->texture[0].data.text.shadow_color = + theme->menu_text_normal_shadow_color; + theme->a_menu_text_normal->texture[0].data.text.shadow_alpha = + theme->menu_text_normal_shadow_alpha; + theme->a_menu_text_selected->texture[0].data.text.shadow_color = + theme->menu_text_selected_shadow_color; + theme->a_menu_text_selected->texture[0].data.text.shadow_alpha = + theme->menu_text_selected_shadow_alpha; + theme->a_menu_text_disabled->texture[0].data.text.shadow_color = + theme->menu_text_disabled_shadow_color; + theme->a_menu_text_disabled->texture[0].data.text.shadow_alpha = + theme->menu_text_disabled_shadow_alpha; + theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_color = + theme->menu_text_disabled_shadow_color; + theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_alpha = + theme->menu_text_disabled_shadow_alpha; + + theme->a_disabled_focused_max->texture[0].type = + theme->a_disabled_unfocused_max->texture[0].type = + theme->a_hover_focused_max->texture[0].type = + theme->a_hover_unfocused_max->texture[0].type = + theme->a_toggled_hover_focused_max->texture[0].type = + theme->a_toggled_hover_unfocused_max->texture[0].type = + theme->a_toggled_focused_unpressed_max->texture[0].type = + theme->a_toggled_unfocused_unpressed_max->texture[0].type = + theme->a_toggled_focused_pressed_max->texture[0].type = + theme->a_toggled_unfocused_pressed_max->texture[0].type = + theme->a_focused_unpressed_max->texture[0].type = + theme->a_focused_pressed_max->texture[0].type = + theme->a_unfocused_unpressed_max->texture[0].type = + theme->a_unfocused_pressed_max->texture[0].type = + theme->a_disabled_focused_close->texture[0].type = + theme->a_disabled_unfocused_close->texture[0].type = + theme->a_hover_focused_close->texture[0].type = + theme->a_hover_unfocused_close->texture[0].type = + theme->a_focused_unpressed_close->texture[0].type = + theme->a_focused_pressed_close->texture[0].type = + theme->a_unfocused_unpressed_close->texture[0].type = + theme->a_unfocused_pressed_close->texture[0].type = + theme->a_disabled_focused_desk->texture[0].type = + theme->a_disabled_unfocused_desk->texture[0].type = + theme->a_hover_focused_desk->texture[0].type = + theme->a_hover_unfocused_desk->texture[0].type = + theme->a_toggled_hover_focused_desk->texture[0].type = + theme->a_toggled_hover_unfocused_desk->texture[0].type = + theme->a_toggled_focused_unpressed_desk->texture[0].type = + theme->a_toggled_unfocused_unpressed_desk->texture[0].type = + theme->a_toggled_focused_pressed_desk->texture[0].type = + theme->a_toggled_unfocused_pressed_desk->texture[0].type = + theme->a_focused_unpressed_desk->texture[0].type = + theme->a_focused_pressed_desk->texture[0].type = + theme->a_unfocused_unpressed_desk->texture[0].type = + theme->a_unfocused_pressed_desk->texture[0].type = + theme->a_disabled_focused_shade->texture[0].type = + theme->a_disabled_unfocused_shade->texture[0].type = + theme->a_hover_focused_shade->texture[0].type = + theme->a_hover_unfocused_shade->texture[0].type = + theme->a_toggled_hover_focused_shade->texture[0].type = + theme->a_toggled_hover_unfocused_shade->texture[0].type = + theme->a_toggled_focused_unpressed_shade->texture[0].type = + theme->a_toggled_unfocused_unpressed_shade->texture[0].type = + theme->a_toggled_focused_pressed_shade->texture[0].type = + theme->a_toggled_unfocused_pressed_shade->texture[0].type = + theme->a_focused_unpressed_shade->texture[0].type = + theme->a_focused_pressed_shade->texture[0].type = + theme->a_unfocused_unpressed_shade->texture[0].type = + theme->a_unfocused_pressed_shade->texture[0].type = + theme->a_disabled_focused_iconify->texture[0].type = + theme->a_disabled_unfocused_iconify->texture[0].type = + theme->a_hover_focused_iconify->texture[0].type = + theme->a_hover_unfocused_iconify->texture[0].type = + theme->a_focused_unpressed_iconify->texture[0].type = + theme->a_focused_pressed_iconify->texture[0].type = + theme->a_unfocused_unpressed_iconify->texture[0].type = theme->a_unfocused_pressed_iconify->texture[0].type = theme->a_menu_bullet_normal->texture[0].type = theme->a_menu_bullet_selected->texture[0].type = RR_TEXTURE_MASK; - - theme->a_disabled_focused_max->texture[0].data.mask.mask = - theme->a_disabled_unfocused_max->texture[0].data.mask.mask = + + theme->a_disabled_focused_max->texture[0].data.mask.mask = + theme->a_disabled_unfocused_max->texture[0].data.mask.mask = theme->max_disabled_mask; - theme->a_hover_focused_max->texture[0].data.mask.mask = - theme->a_hover_unfocused_max->texture[0].data.mask.mask = + theme->a_hover_focused_max->texture[0].data.mask.mask = + theme->a_hover_unfocused_max->texture[0].data.mask.mask = theme->max_hover_mask; - theme->a_focused_pressed_max->texture[0].data.mask.mask = + theme->a_focused_pressed_max->texture[0].data.mask.mask = theme->a_unfocused_pressed_max->texture[0].data.mask.mask = theme->max_pressed_mask; - theme->a_focused_unpressed_max->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = + theme->a_focused_unpressed_max->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = theme->max_mask; - theme->a_toggled_focused_max->texture[0].data.mask.mask = - theme->a_toggled_unfocused_max->texture[0].data.mask.mask = + theme->a_toggled_hover_focused_max->texture[0].data.mask.mask = + theme->a_toggled_hover_unfocused_max->texture[0].data.mask.mask = + theme->max_toggled_hover_mask; + theme->a_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_disabled_focused_close->texture[0].data.mask.mask = - theme->a_disabled_unfocused_close->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_disabled_focused_close->texture[0].data.mask.mask = + theme->a_disabled_unfocused_close->texture[0].data.mask.mask = theme->close_disabled_mask; - theme->a_hover_focused_close->texture[0].data.mask.mask = - theme->a_hover_unfocused_close->texture[0].data.mask.mask = + theme->a_hover_focused_close->texture[0].data.mask.mask = + theme->a_hover_unfocused_close->texture[0].data.mask.mask = theme->close_hover_mask; - theme->a_focused_pressed_close->texture[0].data.mask.mask = + theme->a_focused_pressed_close->texture[0].data.mask.mask = theme->a_unfocused_pressed_close->texture[0].data.mask.mask = theme->close_pressed_mask; - theme->a_focused_unpressed_close->texture[0].data.mask.mask = + theme->a_focused_unpressed_close->texture[0].data.mask.mask = theme->a_unfocused_unpressed_close->texture[0].data.mask.mask = theme->close_mask; - theme->a_disabled_focused_desk->texture[0].data.mask.mask = - theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = + theme->a_disabled_focused_desk->texture[0].data.mask.mask = + theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = theme->desk_disabled_mask; - theme->a_hover_focused_desk->texture[0].data.mask.mask = - theme->a_hover_unfocused_desk->texture[0].data.mask.mask = + theme->a_hover_focused_desk->texture[0].data.mask.mask = + theme->a_hover_unfocused_desk->texture[0].data.mask.mask = theme->desk_hover_mask; - theme->a_focused_pressed_desk->texture[0].data.mask.mask = + theme->a_focused_pressed_desk->texture[0].data.mask.mask = theme->a_unfocused_pressed_desk->texture[0].data.mask.mask = theme->desk_pressed_mask; - theme->a_focused_unpressed_desk->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = + theme->a_focused_unpressed_desk->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = theme->desk_mask; - theme->a_toggled_focused_desk->texture[0].data.mask.mask = - theme->a_toggled_unfocused_desk->texture[0].data.mask.mask = + theme->a_toggled_hover_focused_desk->texture[0].data.mask.mask = + theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.mask = + theme->desk_toggled_hover_mask; + theme->a_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_disabled_focused_shade->texture[0].data.mask.mask = - theme->a_disabled_unfocused_shade->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_disabled_focused_shade->texture[0].data.mask.mask = + theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = theme->shade_disabled_mask; - theme->a_hover_focused_shade->texture[0].data.mask.mask = - theme->a_hover_unfocused_shade->texture[0].data.mask.mask = + theme->a_hover_focused_shade->texture[0].data.mask.mask = + theme->a_hover_unfocused_shade->texture[0].data.mask.mask = theme->shade_hover_mask; - theme->a_focused_pressed_shade->texture[0].data.mask.mask = + theme->a_focused_pressed_shade->texture[0].data.mask.mask = theme->a_unfocused_pressed_shade->texture[0].data.mask.mask = theme->shade_pressed_mask; - theme->a_focused_unpressed_shade->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = + theme->a_focused_unpressed_shade->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = theme->shade_mask; - theme->a_toggled_focused_shade->texture[0].data.mask.mask = - theme->a_toggled_unfocused_shade->texture[0].data.mask.mask = + theme->a_toggled_hover_focused_shade->texture[0].data.mask.mask = + theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.mask = + theme->shade_toggled_hover_mask; + theme->a_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_disabled_focused_iconify->texture[0].data.mask.mask = - theme->a_disabled_unfocused_iconify->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_disabled_focused_iconify->texture[0].data.mask.mask = + theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = theme->iconify_disabled_mask; - theme->a_hover_focused_iconify->texture[0].data.mask.mask = - theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = + theme->a_hover_focused_iconify->texture[0].data.mask.mask = + theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = theme->iconify_hover_mask; - theme->a_focused_pressed_iconify->texture[0].data.mask.mask = + theme->a_focused_pressed_iconify->texture[0].data.mask.mask = theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask = theme->iconify_pressed_mask; - theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = + theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = + theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = theme->iconify_mask; - theme->a_menu_bullet_normal->texture[0].data.mask.mask = - theme->a_menu_bullet_selected->texture[0].data.mask.mask = + theme->a_menu_bullet_normal->texture[0].data.mask.mask = + theme->a_menu_bullet_selected->texture[0].data.mask.mask = theme->menu_bullet_mask; - theme->a_disabled_focused_max->texture[0].data.mask.color = - theme->a_disabled_focused_close->texture[0].data.mask.color = - theme->a_disabled_focused_desk->texture[0].data.mask.color = - theme->a_disabled_focused_shade->texture[0].data.mask.color = - theme->a_disabled_focused_iconify->texture[0].data.mask.color = + theme->a_disabled_focused_max->texture[0].data.mask.color = + theme->a_disabled_focused_close->texture[0].data.mask.color = + theme->a_disabled_focused_desk->texture[0].data.mask.color = + theme->a_disabled_focused_shade->texture[0].data.mask.color = + theme->a_disabled_focused_iconify->texture[0].data.mask.color = theme->titlebut_disabled_focused_color; - theme->a_disabled_unfocused_max->texture[0].data.mask.color = - theme->a_disabled_unfocused_close->texture[0].data.mask.color = - theme->a_disabled_unfocused_desk->texture[0].data.mask.color = - theme->a_disabled_unfocused_shade->texture[0].data.mask.color = - theme->a_disabled_unfocused_iconify->texture[0].data.mask.color = + theme->a_disabled_unfocused_max->texture[0].data.mask.color = + theme->a_disabled_unfocused_close->texture[0].data.mask.color = + theme->a_disabled_unfocused_desk->texture[0].data.mask.color = + theme->a_disabled_unfocused_shade->texture[0].data.mask.color = + theme->a_disabled_unfocused_iconify->texture[0].data.mask.color = theme->titlebut_disabled_unfocused_color; - theme->a_hover_focused_max->texture[0].data.mask.color = - theme->a_hover_focused_close->texture[0].data.mask.color = - theme->a_hover_focused_desk->texture[0].data.mask.color = - theme->a_hover_focused_shade->texture[0].data.mask.color = - theme->a_hover_focused_iconify->texture[0].data.mask.color = + theme->a_hover_focused_max->texture[0].data.mask.color = + theme->a_hover_focused_close->texture[0].data.mask.color = + theme->a_hover_focused_desk->texture[0].data.mask.color = + theme->a_hover_focused_shade->texture[0].data.mask.color = + theme->a_hover_focused_iconify->texture[0].data.mask.color = theme->titlebut_hover_focused_color; - theme->a_hover_unfocused_max->texture[0].data.mask.color = - theme->a_hover_unfocused_close->texture[0].data.mask.color = - theme->a_hover_unfocused_desk->texture[0].data.mask.color = - theme->a_hover_unfocused_shade->texture[0].data.mask.color = - theme->a_hover_unfocused_iconify->texture[0].data.mask.color = + theme->a_hover_unfocused_max->texture[0].data.mask.color = + theme->a_hover_unfocused_close->texture[0].data.mask.color = + theme->a_hover_unfocused_desk->texture[0].data.mask.color = + theme->a_hover_unfocused_shade->texture[0].data.mask.color = + theme->a_hover_unfocused_iconify->texture[0].data.mask.color = theme->titlebut_hover_unfocused_color; - theme->a_toggled_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_focused_unpressed_max->texture[0].data.mask.color = - theme->a_focused_unpressed_close->texture[0].data.mask.color = - theme->a_focused_unpressed_desk->texture[0].data.mask.color = - theme->a_focused_unpressed_shade->texture[0].data.mask.color = - theme->a_focused_unpressed_iconify->texture[0].data.mask.color = + theme->a_toggled_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_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_toggled_focused_pressed_max->texture[0].data.mask.color = + theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color = + theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color = + theme->titlebut_toggled_focused_pressed_color; + theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.color = + theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.color = + theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.color = + theme->titlebut_toggled_unfocused_pressed_color; + theme->a_focused_unpressed_max->texture[0].data.mask.color = + theme->a_focused_unpressed_close->texture[0].data.mask.color = + theme->a_focused_unpressed_desk->texture[0].data.mask.color = + theme->a_focused_unpressed_shade->texture[0].data.mask.color = + theme->a_focused_unpressed_iconify->texture[0].data.mask.color = theme->titlebut_focused_unpressed_color; - theme->a_focused_pressed_max->texture[0].data.mask.color = - theme->a_focused_pressed_close->texture[0].data.mask.color = - theme->a_focused_pressed_desk->texture[0].data.mask.color = - theme->a_focused_pressed_shade->texture[0].data.mask.color = + theme->a_focused_pressed_max->texture[0].data.mask.color = + theme->a_focused_pressed_close->texture[0].data.mask.color = + theme->a_focused_pressed_desk->texture[0].data.mask.color = + theme->a_focused_pressed_shade->texture[0].data.mask.color = theme->a_focused_pressed_iconify->texture[0].data.mask.color = theme->titlebut_focused_pressed_color; - theme->a_unfocused_unpressed_max->texture[0].data.mask.color = - theme->a_unfocused_unpressed_close->texture[0].data.mask.color = - theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = - theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = - theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = + theme->a_unfocused_unpressed_max->texture[0].data.mask.color = + theme->a_unfocused_unpressed_close->texture[0].data.mask.color = + theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = + theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = + theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = theme->titlebut_unfocused_unpressed_color; - theme->a_unfocused_pressed_max->texture[0].data.mask.color = - theme->a_unfocused_pressed_close->texture[0].data.mask.color = - theme->a_unfocused_pressed_desk->texture[0].data.mask.color = - theme->a_unfocused_pressed_shade->texture[0].data.mask.color = + theme->a_unfocused_pressed_max->texture[0].data.mask.color = + theme->a_unfocused_pressed_close->texture[0].data.mask.color = + theme->a_unfocused_pressed_desk->texture[0].data.mask.color = + theme->a_unfocused_pressed_shade->texture[0].data.mask.color = theme->a_unfocused_pressed_iconify->texture[0].data.mask.color = theme->titlebut_unfocused_pressed_color; - theme->a_menu_bullet_normal->texture[0].data.mask.color = + theme->a_menu_bullet_normal->texture[0].data.mask.color = theme->menu_color; - theme->a_menu_bullet_selected->texture[0].data.mask.color = + theme->a_menu_bullet_selected->texture[0].data.mask.color = theme->menu_selected_color; + g_free(path); XrmDestroyDatabase(db); + /* set the font heights */ + theme->win_font_height = RrFontHeight + (theme->win_font_focused, + theme->a_focused_label->texture[0].data.text.shadow_offset_y); + theme->win_font_height = + MAX(theme->win_font_height, + RrFontHeight + (theme->win_font_focused, + theme->a_unfocused_label->texture[0].data.text.shadow_offset_y)); + theme->menu_title_font_height = RrFontHeight + (theme->menu_title_font, + theme->a_menu_text_title->texture[0].data.text.shadow_offset_y); + theme->menu_font_height = RrFontHeight + (theme->menu_font, + theme->a_menu_text_normal->texture[0].data.text.shadow_offset_y); + + /* calculate some last extents */ { gint ft, fb, fl, fr, ut, ub, ul, ur; 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 % 2; /* this would be nice I think, since padding.width can now be 0, but it breaks frame.c horribly and I don't feel like fixing that @@ -897,14 +1361,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) MAX(MAX(theme->padding * 2, ft + fb), MAX(theme->padding * 2, ut + ub)); */ - theme->title_height = theme->label_height + theme->padding * 2; - /* this should match the above title_height given the same font size - for both. */ - theme->menu_title_height = theme->menu_title_font_height + - theme->padding * 2; + theme->title_height = theme->label_height + theme->paddingy * 2; + + 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 = theme->title_height * 1.5; + theme->grip_width = 25; return theme; } @@ -912,43 +1377,67 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) void RrThemeFree(RrTheme *theme) { if (theme) { - g_free(theme->path); g_free(theme->name); - RrColorFree(theme->b_color); + RrColorFree(theme->menu_border_color); + RrColorFree(theme->osd_border_color); + RrColorFree(theme->frame_focused_border_color); + RrColorFree(theme->frame_unfocused_border_color); + RrColorFree(theme->title_separator_focused_color); + RrColorFree(theme->title_separator_unfocused_color); RrColorFree(theme->cb_unfocused_color); RrColorFree(theme->cb_focused_color); - RrColorFree(theme->title_unfocused_color); RrColorFree(theme->title_focused_color); + RrColorFree(theme->title_unfocused_color); RrColorFree(theme->titlebut_disabled_focused_color); RrColorFree(theme->titlebut_disabled_unfocused_color); RrColorFree(theme->titlebut_hover_focused_color); RrColorFree(theme->titlebut_hover_unfocused_color); - RrColorFree(theme->titlebut_toggled_focused_color); - RrColorFree(theme->titlebut_toggled_unfocused_color); - RrColorFree(theme->titlebut_unfocused_pressed_color); + RrColorFree(theme->titlebut_toggled_hover_focused_color); + RrColorFree(theme->titlebut_toggled_hover_unfocused_color); + RrColorFree(theme->titlebut_toggled_focused_pressed_color); + RrColorFree(theme->titlebut_toggled_unfocused_pressed_color); + RrColorFree(theme->titlebut_toggled_focused_unpressed_color); + RrColorFree(theme->titlebut_toggled_unfocused_unpressed_color); RrColorFree(theme->titlebut_focused_pressed_color); - RrColorFree(theme->titlebut_unfocused_unpressed_color); + RrColorFree(theme->titlebut_unfocused_pressed_color); RrColorFree(theme->titlebut_focused_unpressed_color); - RrColorFree(theme->menu_color); + RrColorFree(theme->titlebut_unfocused_unpressed_color); RrColorFree(theme->menu_title_color); - RrColorFree(theme->menu_disabled_color); + RrColorFree(theme->menu_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); + RrColorFree(theme->osd_shadow_color); + RrColorFree(theme->menu_title_shadow_color); + RrColorFree(theme->menu_text_normal_shadow_color); + RrColorFree(theme->menu_text_selected_shadow_color); + RrColorFree(theme->menu_text_disabled_shadow_color); + 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); @@ -962,7 +1451,7 @@ void RrThemeFree(RrTheme *theme) RrPixmapMaskFree(theme->close_pressed_mask); RrPixmapMaskFree(theme->menu_bullet_mask); - RrFontClose(theme->win_font_focused); + RrFontClose(theme->win_font_focused); RrFontClose(theme->win_font_unfocused); RrFontClose(theme->menu_title_font); RrFontClose(theme->menu_font); @@ -971,8 +1460,12 @@ 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_toggled_hover_focused_max); + RrAppearanceFree(theme->a_toggled_hover_unfocused_max); + RrAppearanceFree(theme->a_toggled_focused_unpressed_max); + RrAppearanceFree(theme->a_toggled_focused_pressed_max); + RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max); + RrAppearanceFree(theme->a_toggled_unfocused_pressed_max); RrAppearanceFree(theme->a_focused_unpressed_max); RrAppearanceFree(theme->a_focused_pressed_max); RrAppearanceFree(theme->a_unfocused_unpressed_max); @@ -989,8 +1482,12 @@ 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_toggled_hover_focused_desk); + RrAppearanceFree(theme->a_toggled_hover_unfocused_desk); + RrAppearanceFree(theme->a_toggled_focused_unpressed_desk); + RrAppearanceFree(theme->a_toggled_focused_pressed_desk); + RrAppearanceFree(theme->a_toggled_unfocused_unpressed_desk); + RrAppearanceFree(theme->a_toggled_unfocused_pressed_desk); RrAppearanceFree(theme->a_focused_unpressed_desk); RrAppearanceFree(theme->a_focused_pressed_desk); RrAppearanceFree(theme->a_unfocused_unpressed_desk); @@ -999,8 +1496,12 @@ void RrThemeFree(RrTheme *theme) 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_toggled_hover_focused_shade); + RrAppearanceFree(theme->a_toggled_hover_unfocused_shade); + RrAppearanceFree(theme->a_toggled_focused_unpressed_shade); + RrAppearanceFree(theme->a_toggled_focused_pressed_shade); + RrAppearanceFree(theme->a_toggled_unfocused_unpressed_shade); + RrAppearanceFree(theme->a_toggled_unfocused_pressed_shade); RrAppearanceFree(theme->a_focused_unpressed_shade); RrAppearanceFree(theme->a_focused_pressed_shade); RrAppearanceFree(theme->a_unfocused_unpressed_shade); @@ -1024,28 +1525,29 @@ 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); RrAppearanceFree(theme->a_clear_tex); - RrAppearanceFree(theme->app_hilite_bg); - RrAppearanceFree(theme->app_unhilite_bg); - RrAppearanceFree(theme->app_hilite_fg); - RrAppearanceFree(theme->app_unhilite_fg); - RrAppearanceFree(theme->app_hilite_label); - RrAppearanceFree(theme->app_unhilite_label); + RrAppearanceFree(theme->osd_hilite_bg); + RrAppearanceFree(theme->osd_hilite_fg); + RrAppearanceFree(theme->osd_hilite_label); + RrAppearanceFree(theme->osd_unhilite_fg); g_free(theme); } } -static XrmDatabase loaddb(RrTheme *theme, gchar *name) +static XrmDatabase loaddb(const gchar *name, gchar **path) { GSList *it; XrmDatabase db = NULL; @@ -1054,14 +1556,14 @@ static XrmDatabase loaddb(RrTheme *theme, gchar *name) if (name[0] == '/') { s = g_build_filename(name, "openbox-3", "themerc", NULL); if ((db = XrmGetFileDatabase(s))) - theme->path = g_path_get_dirname(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))) - theme->path = g_path_get_dirname(s); + *path = g_path_get_dirname(s); g_free(s); for (it = parse_xdg_data_dir_paths(); !db && it; @@ -1070,7 +1572,7 @@ static XrmDatabase loaddb(RrTheme *theme, gchar *name) s = g_build_filename(it->data, "themes", name, "openbox-3", "themerc", NULL); if ((db = XrmGetFileDatabase(s))) - theme->path = g_path_get_dirname(s); + *path = g_path_get_dirname(s); g_free(s); } } @@ -1078,14 +1580,14 @@ static XrmDatabase loaddb(RrTheme *theme, gchar *name) if (db == NULL) { s = g_build_filename(name, "themerc", NULL); if ((db = XrmGetFileDatabase(s))) - theme->path = g_path_get_dirname(s); + *path = g_path_get_dirname(s); g_free(s); } return db; } -static gchar *create_class_name(gchar *rname) +static gchar *create_class_name(const gchar *rname) { gchar *rclass = g_strdup(rname); gchar *p = rclass; @@ -1100,13 +1602,13 @@ static gchar *create_class_name(gchar *rname) return rclass; } -static gboolean read_int(XrmDatabase db, gchar *rname, gint *value) +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); @@ -1118,13 +1620,13 @@ static gboolean read_int(XrmDatabase db, gchar *rname, gint *value) return ret; } -static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value) +static gboolean read_string(XrmDatabase db, const 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; @@ -1136,13 +1638,13 @@ static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value) } static gboolean read_color(XrmDatabase db, const RrInstance *inst, - gchar *rname, RrColor **value) + const gchar *rname, RrColor **value) { 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); @@ -1156,8 +1658,8 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst, return ret; } -static gboolean read_mask(const RrInstance *inst, - gchar *maskname, RrTheme *theme, +static gboolean read_mask(const RrInstance *inst, const gchar *path, + RrTheme *theme, const gchar *maskname, RrPixmapMask **value) { gboolean ret = FALSE; @@ -1166,7 +1668,7 @@ static gboolean read_mask(const RrInstance *inst, guint w, h; guchar *b; - s = g_build_filename(theme->path, maskname, NULL); + 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); @@ -1196,8 +1698,12 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, *grad = RR_SURFACE_CROSS_DIAGONAL; else if (strstr(tex, "pyramid") != NULL) *grad = RR_SURFACE_PYRAMID; + else if (strstr(tex, "mirrorhorizontal") != NULL) + *grad = RR_SURFACE_MIRROR_HORIZONTAL; else if (strstr(tex, "horizontal") != NULL) *grad = RR_SURFACE_HORIZONTAL; + else if (strstr(tex, "splitvertical") != NULL) + *grad = RR_SURFACE_SPLIT_VERTICAL; else if (strstr(tex, "vertical") != NULL) *grad = RR_SURFACE_VERTICAL; else @@ -1205,47 +1711,56 @@ static void parse_appearance(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 gboolean read_appearance(XrmDatabase db, const RrInstance *inst, - gchar *rname, RrAppearance *value, + const gchar *rname, RrAppearance *value, gboolean allow_trans) { gboolean ret = FALSE; gchar *rclass = create_class_name(rname); - gchar *cname, *ctoname, *bcname, *icname; + gchar *cname, *ctoname, *bcname, *icname, *hname, *sname; + gchar *csplitname, *ctosplitname; gchar *rettype; XrmValue retvalue; + gint i; cname = g_strconcat(rname, ".color", NULL); ctoname = g_strconcat(rname, ".colorTo", NULL); bcname = g_strconcat(rname, ".border.color", NULL); icname = g_strconcat(rname, ".interlace.color", NULL); + hname = g_strconcat(rname, ".highlight", NULL); + sname = g_strconcat(rname, ".shadow", NULL); + csplitname = g_strconcat(rname, ".color.splitTo", NULL); + ctosplitname = g_strconcat(rname, ".colorTo.splitTo", NULL); if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { @@ -1268,9 +1783,52 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, if (!read_color(db, inst, icname, &value->surface.interlace_color)) value->surface.interlace_color = RrColorNew(inst, 0, 0, 0); + if (read_int(db, hname, &i) && i >= 0) + value->surface.bevel_light_adjust = i; + if (read_int(db, sname, &i) && i >= 0 && i <= 256) + value->surface.bevel_dark_adjust = i; + + if (value->surface.grad == RR_SURFACE_SPLIT_VERTICAL) { + gint r, g, b; + + if (!read_color(db, inst, csplitname, + &value->surface.split_primary)) + { + r = value->surface.primary->r; + r += r >> 2; + g = value->surface.primary->g; + g += g >> 2; + b = value->surface.primary->b; + b += b >> 2; + if (r > 0xFF) r = 0xFF; + if (g > 0xFF) g = 0xFF; + if (b > 0xFF) b = 0xFF; + value->surface.split_primary = RrColorNew(inst, r, g, b); + } + + if (!read_color(db, inst, ctosplitname, + &value->surface.split_secondary)) + { + r = value->surface.secondary->r; + r += r >> 4; + g = value->surface.secondary->g; + g += g >> 4; + b = value->surface.secondary->b; + b += b >> 4; + if (r > 0xFF) r = 0xFF; + if (g > 0xFF) g = 0xFF; + if (b > 0xFF) b = 0xFF; + value->surface.split_secondary = RrColorNew(inst, r, g, b); + } + } + ret = TRUE; } + g_free(ctosplitname); + g_free(csplitname); + g_free(sname); + g_free(hname); g_free(icname); g_free(bcname); g_free(ctoname); @@ -1279,6 +1837,20 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, return ret; } +static int parse_inline_number(const 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 void set_default_appearance(RrAppearance *a) { a->surface.grad = RR_SURFACE_SOLID;