From 765cb7df72146dcc811498c7dfab273d9edb526a Mon Sep 17 00:00:00 2001 From: Benoit Gschwind (Noth Date: Sun, 17 Feb 2008 12:38:55 +0100 Subject: [PATCH] keepborder is an theme option now --- engines/default/config.c | 1859 ++++++++++++++++++++++++---------------------- engines/default/config.h | 2 + engines/default/plugin.c | 4 +- 3 files changed, 988 insertions(+), 877 deletions(-) diff --git a/engines/default/config.c b/engines/default/config.c index 6cbd6f6..9a8d879 100644 --- a/engines/default/config.c +++ b/engines/default/config.c @@ -45,68 +45,67 @@ gint load_theme_config(const RrInstance *inst, const gchar *name, { RrJustify winjust, mtitlejust; gchar *str; - ObFrameThemeConfig * theme = &theme_config; gboolean userdef; - 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_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); - theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1); - theme->a_focused_grip = RrAppearanceNew(inst, 0); - theme->a_unfocused_grip = RrAppearanceNew(inst, 0); - theme->a_focused_title = RrAppearanceNew(inst, 0); - theme->a_unfocused_title = RrAppearanceNew(inst, 0); - theme->a_focused_label = RrAppearanceNew(inst, 1); - theme->a_unfocused_label = RrAppearanceNew(inst, 1); - theme->a_icon = RrAppearanceNew(inst, 1); - 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, 0); - theme->a_menu_text_title = RrAppearanceNew(inst, 1); - theme->a_menu_normal = RrAppearanceNew(inst, 0); - theme->a_menu_selected = RrAppearanceNew(inst, 0); - theme->a_menu_disabled = RrAppearanceNew(inst, 0); - theme->a_menu_disabled_selected = RrAppearanceNew(inst, 0); - theme->a_menu_text_normal = 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); + theme_config.name = g_strdup(name ? name : DEFAULT_THEME); + + theme_config.a_disabled_focused_max = RrAppearanceNew(inst, 1); + theme_config.a_disabled_unfocused_max = RrAppearanceNew(inst, 1); + theme_config.a_hover_focused_max = RrAppearanceNew(inst, 1); + theme_config.a_hover_unfocused_max = RrAppearanceNew(inst, 1); + theme_config.a_toggled_focused_unpressed_max = RrAppearanceNew(inst, 1); + theme_config.a_toggled_unfocused_unpressed_max = RrAppearanceNew(inst, 1); + theme_config.a_toggled_hover_focused_max = RrAppearanceNew(inst, 1); + theme_config.a_toggled_hover_unfocused_max = RrAppearanceNew(inst, 1); + theme_config.a_toggled_focused_pressed_max = RrAppearanceNew(inst, 1); + theme_config.a_toggled_unfocused_pressed_max = RrAppearanceNew(inst, 1); + theme_config.a_focused_unpressed_max = RrAppearanceNew(inst, 1); + theme_config.a_focused_pressed_max = RrAppearanceNew(inst, 1); + theme_config.a_unfocused_unpressed_max = RrAppearanceNew(inst, 1); + theme_config.a_unfocused_pressed_max = RrAppearanceNew(inst, 1); + theme_config.a_focused_grip = RrAppearanceNew(inst, 0); + theme_config.a_unfocused_grip = RrAppearanceNew(inst, 0); + theme_config.a_focused_title = RrAppearanceNew(inst, 0); + theme_config.a_unfocused_title = RrAppearanceNew(inst, 0); + theme_config.a_focused_label = RrAppearanceNew(inst, 1); + theme_config.a_unfocused_label = RrAppearanceNew(inst, 1); + theme_config.a_icon = RrAppearanceNew(inst, 1); + theme_config.a_focused_handle = RrAppearanceNew(inst, 0); + theme_config.a_unfocused_handle = RrAppearanceNew(inst, 0); + theme_config.a_menu = RrAppearanceNew(inst, 0); + theme_config.a_menu_title = RrAppearanceNew(inst, 0); + theme_config.a_menu_text_title = RrAppearanceNew(inst, 1); + theme_config.a_menu_normal = RrAppearanceNew(inst, 0); + theme_config.a_menu_selected = RrAppearanceNew(inst, 0); + theme_config.a_menu_disabled = RrAppearanceNew(inst, 0); + theme_config.a_menu_disabled_selected = RrAppearanceNew(inst, 0); + theme_config.a_menu_text_normal = RrAppearanceNew(inst, 1); + theme_config.a_menu_text_selected = RrAppearanceNew(inst, 1); + theme_config.a_menu_text_disabled = RrAppearanceNew(inst, 1); + theme_config.a_menu_text_disabled_selected = RrAppearanceNew(inst, 1); + theme_config.a_menu_bullet_normal = RrAppearanceNew(inst, 1); + theme_config.a_menu_bullet_selected = RrAppearanceNew(inst, 1); + theme_config.a_clear = RrAppearanceNew(inst, 0); + theme_config.a_clear_tex = RrAppearanceNew(inst, 1); + theme_config.osd_hilite_bg = RrAppearanceNew(inst, 0); + theme_config.osd_hilite_label = RrAppearanceNew(inst, 1); + theme_config.osd_hilite_fg = RrAppearanceNew(inst, 0); + theme_config.osd_unhilite_fg = RrAppearanceNew(inst, 0); /* load the font stuff */ if (active_window_font) { - theme->win_font_focused = active_window_font; + theme_config.win_font_focused = active_window_font; RrFontRef(active_window_font); } else - theme->win_font_focused = RrFontOpenDefault(inst); + theme_config.win_font_focused = RrFontOpenDefault(inst); if (inactive_window_font) { - theme->win_font_unfocused = inactive_window_font; + theme_config.win_font_unfocused = inactive_window_font; RrFontRef(inactive_window_font); } else - theme->win_font_unfocused = RrFontOpenDefault(inst); + theme_config.win_font_unfocused = RrFontOpenDefault(inst); winjust = RR_JUSTIFY_LEFT; if (read_string(db, "window.label.text.justify", &str)) { @@ -117,11 +116,11 @@ gint load_theme_config(const RrInstance *inst, const gchar *name, } if (menu_title_font) { - theme->menu_title_font = menu_title_font; + theme_config.menu_title_font = menu_title_font; RrFontRef(menu_title_font); } else - theme->menu_title_font = RrFontOpenDefault(inst); + theme_config.menu_title_font = RrFontOpenDefault(inst); mtitlejust = RR_JUSTIFY_LEFT; if (read_string(db, "menu.title.text.justify", &str)) { @@ -132,592 +131,647 @@ gint load_theme_config(const RrInstance *inst, const gchar *name, } if (menu_item_font) { - theme->menu_font = menu_item_font; + theme_config.menu_font = menu_item_font; RrFontRef(menu_item_font); } else - theme->menu_font = RrFontOpenDefault(inst); + theme_config.menu_font = RrFontOpenDefault(inst); if (osd_font) { - theme->osd_font = osd_font; + theme_config.osd_font = osd_font; RrFontRef(osd_font); } else - theme->osd_font = RrFontOpenDefault(inst); + theme_config.osd_font = RrFontOpenDefault(inst); + if (!read_int(db, "window.keepborder", &theme_config.config_theme_keepborder)) { + theme_config.config_theme_keepborder = 0; + } /* load direct dimensions */ - if (!read_int(db, "menu.overlap", &theme->menu_overlap) - || 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 < 0 || theme->handle_height > 100) - theme->handle_height = 6; - 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; + if (!read_int(db, "menu.overlap", &theme_config.menu_overlap) + || theme_config.menu_overlap < -100 || theme_config.menu_overlap + > 100) + theme_config.menu_overlap = 0; + if (!read_int(db, "window.handle.width", &theme_config.handle_height) + || theme_config.handle_height < 0 || theme_config.handle_height + > 100) + theme_config.handle_height = 6; + if (!read_int(db, "padding.width", &theme_config.paddingx) + || theme_config.paddingx < 0 || theme_config.paddingx> 100) + theme_config.paddingx = 3; + if (!read_int(db, "padding.height", &theme_config.paddingy) + || theme_config.paddingy < 0 || theme_config.paddingy> 100) + theme_config.paddingy = theme_config.paddingx; + if (!read_int(db, "border.width", &theme_config.fbwidth) + || theme_config.fbwidth < 0 || theme_config.fbwidth> 100) + theme_config.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; + if (!read_int(db, "menu.border.width", &theme_config.mbwidth) + || theme_config.mbwidth < 0 || theme_config.mbwidth> 100) + theme_config.mbwidth = theme_config.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; + if (!read_int(db, "osd.border.width", &theme_config.obwidth) + || theme_config.obwidth < 0 || theme_config.obwidth> 100) + theme_config.obwidth = theme_config.fbwidth; + if (!read_int(db, "window.client.padding.width", &theme_config.cbwidthx) + || theme_config.cbwidthx < 0 || theme_config.cbwidthx> 100) + theme_config.cbwidthx = theme_config.paddingx; + if (!read_int(db, "window.client.padding.height", &theme_config.cbwidthy) + || theme_config.cbwidthy < 0 || theme_config.cbwidthy> 100) + theme_config.cbwidthy = theme_config.cbwidthx; /* load colors */ if (!read_color(db, inst, "window.active.border.color", - &theme->frame_focused_border_color) && !read_color(db, inst, - "border.color", &theme->frame_focused_border_color)) - theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0); + &theme_config.frame_focused_border_color) && !read_color(db, inst, + "border.color", &theme_config.frame_focused_border_color)) + theme_config.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); + &theme_config.title_separator_focused_color)) + theme_config.title_separator_focused_color = RrColorNew(inst, + theme_config.frame_focused_border_color->r, + theme_config.frame_focused_border_color->g, + theme_config.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); + &theme_config.frame_unfocused_border_color)) + theme_config.frame_unfocused_border_color = RrColorNew(inst, + theme_config.frame_focused_border_color->r, + theme_config.frame_focused_border_color->g, + theme_config.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); + &theme_config.title_separator_unfocused_color)) + theme_config.title_separator_unfocused_color = RrColorNew(inst, + theme_config.frame_unfocused_border_color->r, + theme_config.frame_unfocused_border_color->g, + theme_config.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); + if (!read_color(db, inst, "menu.border.color", + &theme_config.menu_border_color)) + theme_config.menu_border_color = RrColorNew(inst, + theme_config.frame_focused_border_color->r, + theme_config.frame_focused_border_color->g, + theme_config.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, "osd.border.color", + &theme_config.osd_border_color)) + theme_config.osd_border_color = RrColorNew(inst, + theme_config.frame_focused_border_color->r, + theme_config.frame_focused_border_color->g, + theme_config.frame_focused_border_color->b); if (!read_color(db, inst, "window.active.client.color", - &theme->cb_focused_color)) - theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + &theme_config.cb_focused_color)) + theme_config.cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, "window.inactive.client.color", - &theme->cb_unfocused_color)) - theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + &theme_config.cb_unfocused_color)) + theme_config.cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, "window.active.label.text.color", - &theme->title_focused_color)) - theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); - if (!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); + &theme_config.title_focused_color)) + theme_config.title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); + if (!read_color(db, inst, "osd.label.text.color", &theme_config.osd_color)) + theme_config.osd_color = RrColorNew(inst, + theme_config.title_focused_color->r, + theme_config.title_focused_color->g, + theme_config.title_focused_color->b); if (!read_color(db, inst, "window.inactive.label.text.color", - &theme->title_unfocused_color)) - theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + &theme_config.title_unfocused_color)) + theme_config.title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, "window.active.button.unpressed.image.color", - &theme->titlebut_focused_unpressed_color)) - theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0); + &theme_config.titlebut_focused_unpressed_color)) + theme_config.titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, + 0); if (!read_color(db, inst, "window.inactive.button.unpressed.image.color", - &theme->titlebut_unfocused_unpressed_color)) - theme->titlebut_unfocused_unpressed_color = RrColorNew(inst, 0xff, - 0xff, 0xff); + &theme_config.titlebut_unfocused_unpressed_color)) + theme_config.titlebut_unfocused_unpressed_color = RrColorNew(inst, + 0xff, 0xff, 0xff); if (!read_color(db, inst, "window.active.button.pressed.image.color", - &theme->titlebut_focused_pressed_color)) - theme->titlebut_focused_pressed_color = RrColorNew(inst, - theme->titlebut_focused_unpressed_color->r, - theme->titlebut_focused_unpressed_color->g, - theme->titlebut_focused_unpressed_color->b); + &theme_config.titlebut_focused_pressed_color)) + theme_config.titlebut_focused_pressed_color = RrColorNew(inst, + theme_config.titlebut_focused_unpressed_color->r, + theme_config.titlebut_focused_unpressed_color->g, + theme_config.titlebut_focused_unpressed_color->b); if (!read_color(db, inst, "window.inactive.button.pressed.image.color", - &theme->titlebut_unfocused_pressed_color)) - theme->titlebut_unfocused_pressed_color = RrColorNew(inst, - theme->titlebut_unfocused_unpressed_color->r, - theme->titlebut_unfocused_unpressed_color->g, - theme->titlebut_unfocused_unpressed_color->b); + &theme_config.titlebut_unfocused_pressed_color)) + theme_config.titlebut_unfocused_pressed_color = RrColorNew(inst, + theme_config.titlebut_unfocused_unpressed_color->r, + theme_config.titlebut_unfocused_unpressed_color->g, + theme_config.titlebut_unfocused_unpressed_color->b); if (!read_color(db, inst, "window.active.button.disabled.image.color", - &theme->titlebut_disabled_focused_color)) - theme->titlebut_disabled_focused_color = RrColorNew(inst, 0xff, 0xff, - 0xff); + &theme_config.titlebut_disabled_focused_color)) + theme_config.titlebut_disabled_focused_color = RrColorNew(inst, 0xff, + 0xff, 0xff); if (!read_color(db, inst, "window.inactive.button.disabled.image.color", - &theme->titlebut_disabled_unfocused_color)) - theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); + &theme_config.titlebut_disabled_unfocused_color)) + theme_config.titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, + 0); if (!read_color(db, inst, "window.active.button.hover.image.color", - &theme->titlebut_hover_focused_color)) - theme->titlebut_hover_focused_color = RrColorNew(inst, - theme->titlebut_focused_unpressed_color->r, - theme->titlebut_focused_unpressed_color->g, - theme->titlebut_focused_unpressed_color->b); + &theme_config.titlebut_hover_focused_color)) + theme_config.titlebut_hover_focused_color = RrColorNew(inst, + theme_config.titlebut_focused_unpressed_color->r, + theme_config.titlebut_focused_unpressed_color->g, + theme_config.titlebut_focused_unpressed_color->b); if (!read_color(db, inst, "window.inactive.button.hover.image.color", - &theme->titlebut_hover_unfocused_color)) - theme->titlebut_hover_unfocused_color = RrColorNew(inst, - theme->titlebut_unfocused_unpressed_color->r, - theme->titlebut_unfocused_unpressed_color->g, - theme->titlebut_unfocused_unpressed_color->b); + &theme_config.titlebut_hover_unfocused_color)) + theme_config.titlebut_hover_unfocused_color = RrColorNew(inst, + theme_config.titlebut_unfocused_unpressed_color->r, + theme_config.titlebut_unfocused_unpressed_color->g, + theme_config.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_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); + &theme_config.titlebut_toggled_focused_unpressed_color) + && !read_color(db, inst, + "window.active.button.toggled.image.color", + &theme_config.titlebut_toggled_focused_unpressed_color)) + theme_config.titlebut_toggled_focused_unpressed_color = RrColorNew( + inst, theme_config.titlebut_focused_pressed_color->r, + theme_config.titlebut_focused_pressed_color->g, + theme_config.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_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); + &theme_config.titlebut_toggled_unfocused_unpressed_color) + && !read_color(db, inst, + "window.inactive.button.toggled.image.color", + &theme_config.titlebut_toggled_unfocused_unpressed_color)) + theme_config.titlebut_toggled_unfocused_unpressed_color = RrColorNew( + inst, theme_config.titlebut_unfocused_pressed_color->r, + theme_config.titlebut_unfocused_pressed_color->g, + theme_config.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); + &theme_config.titlebut_toggled_hover_focused_color)) + theme_config.titlebut_toggled_hover_focused_color = RrColorNew(inst, + theme_config.titlebut_toggled_focused_unpressed_color->r, + theme_config.titlebut_toggled_focused_unpressed_color->g, + theme_config.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); + &theme_config.titlebut_toggled_hover_unfocused_color)) + theme_config.titlebut_toggled_hover_unfocused_color = RrColorNew(inst, + theme_config.titlebut_toggled_unfocused_unpressed_color->r, + theme_config.titlebut_toggled_unfocused_unpressed_color->g, + theme_config.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); + &theme_config.titlebut_toggled_focused_pressed_color)) + theme_config.titlebut_toggled_focused_pressed_color = RrColorNew(inst, + theme_config.titlebut_focused_pressed_color->r, + theme_config.titlebut_focused_pressed_color->g, + theme_config.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, - theme->titlebut_unfocused_pressed_color->b); - if (!read_color(db, inst, "menu.title.text.color", &theme->menu_title_color)) - theme->menu_title_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, "menu.items.text.color", &theme->menu_color)) - theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); + &theme_config.titlebut_toggled_unfocused_pressed_color)) + theme_config.titlebut_toggled_unfocused_pressed_color = RrColorNew( + inst, theme_config.titlebut_unfocused_pressed_color->r, + theme_config.titlebut_unfocused_pressed_color->g, + theme_config.titlebut_unfocused_pressed_color->b); + if (!read_color(db, inst, "menu.title.text.color", + &theme_config.menu_title_color)) + theme_config.menu_title_color = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, "menu.items.text.color", &theme_config.menu_color)) + theme_config.menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, "menu.items.disabled.text.color", - &theme->menu_disabled_color)) - theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); + &theme_config.menu_disabled_color)) + theme_config.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); + &theme_config.menu_disabled_selected_color)) + theme_config.menu_disabled_selected_color = RrColorNew(inst, + theme_config.menu_disabled_color->r, + theme_config.menu_disabled_color->g, + theme_config.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); + &theme_config.menu_selected_color)) + theme_config.menu_selected_color = RrColorNew(inst, 0, 0, 0); /* load the image masks */ /* maximize button masks */ userdef = TRUE; - if (!read_mask(inst, path, theme, "max.xbm", &theme->max_mask)) { + if (!read_mask(inst, path, &theme_config, "max.xbm", &theme_config.max_mask)) { guchar data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; - theme->max_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme_config.max_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); userdef = FALSE; } - if (!read_mask(inst, path, theme, "max_toggled.xbm", - &theme->max_toggled_mask)) { + if (!read_mask(inst, path, &theme_config, "max_toggled.xbm", + &theme_config.max_toggled_mask)) { if (userdef) - theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask); + theme_config.max_toggled_mask + = RrPixmapMaskCopy(theme_config.max_mask); else { guchar data[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; - theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme_config.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); + if (!read_mask(inst, path, &theme_config, "max_pressed.xbm", + &theme_config.max_pressed_mask)) + theme_config.max_pressed_mask = RrPixmapMaskCopy(theme_config.max_mask); + if (!read_mask(inst, path, &theme_config, "max_disabled.xbm", + &theme_config.max_disabled_mask)) + theme_config.max_disabled_mask + = RrPixmapMaskCopy(theme_config.max_mask); + if (!read_mask(inst, path, &theme_config, "max_hover.xbm", + &theme_config.max_hover_mask)) + theme_config.max_hover_mask = RrPixmapMaskCopy(theme_config.max_mask); + if (!read_mask(inst, path, &theme_config, "max_toggled_pressed.xbm", + &theme_config.max_toggled_pressed_mask)) + theme_config.max_toggled_pressed_mask + = RrPixmapMaskCopy(theme_config.max_toggled_mask); + if (!read_mask(inst, path, &theme_config, "max_toggled_hover.xbm", + &theme_config.max_toggled_hover_mask)) + theme_config.max_toggled_hover_mask + = RrPixmapMaskCopy(theme_config.max_toggled_mask); /* iconify button masks */ - if (!read_mask(inst, path, theme, "iconify.xbm", &theme->iconify_mask)) { + if (!read_mask(inst, path, &theme_config, "iconify.xbm", + &theme_config.iconify_mask)) { guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; - theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme_config.iconify_mask = RrPixmapMaskNew(inst, 6, 6, (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); + if (!read_mask(inst, path, &theme_config, "iconify_pressed.xbm", + &theme_config.iconify_pressed_mask)) + theme_config.iconify_pressed_mask + = RrPixmapMaskCopy(theme_config.iconify_mask); + if (!read_mask(inst, path, &theme_config, "iconify_disabled.xbm", + &theme_config.iconify_disabled_mask)) + theme_config.iconify_disabled_mask + = RrPixmapMaskCopy(theme_config.iconify_mask); + if (!read_mask(inst, path, &theme_config, "iconify_hover.xbm", + &theme_config.iconify_hover_mask)) + theme_config.iconify_hover_mask + = RrPixmapMaskCopy(theme_config.iconify_mask); /* all desktops button masks */ userdef = TRUE; - if (!read_mask(inst, path, theme, "desk.xbm", &theme->desk_mask)) { + if (!read_mask(inst, path, &theme_config, "desk.xbm", + &theme_config.desk_mask)) { guchar data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; - theme->desk_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme_config.desk_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); userdef = FALSE; } - if (!read_mask(inst, path, theme, "desk_toggled.xbm", - &theme->desk_toggled_mask)) { + if (!read_mask(inst, path, &theme_config, "desk_toggled.xbm", + &theme_config.desk_toggled_mask)) { if (userdef) - theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask); + theme_config.desk_toggled_mask + = RrPixmapMaskCopy(theme_config.desk_mask); else { guchar data[] = { 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 }; - theme->desk_toggled_mask - = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme_config.desk_toggled_mask = 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); + if (!read_mask(inst, path, &theme_config, "desk_pressed.xbm", + &theme_config.desk_pressed_mask)) + theme_config.desk_pressed_mask + = RrPixmapMaskCopy(theme_config.desk_mask); + if (!read_mask(inst, path, &theme_config, "desk_disabled.xbm", + &theme_config.desk_disabled_mask)) + theme_config.desk_disabled_mask + = RrPixmapMaskCopy(theme_config.desk_mask); + if (!read_mask(inst, path, &theme_config, "desk_hover.xbm", + &theme_config.desk_hover_mask)) + theme_config.desk_hover_mask = RrPixmapMaskCopy(theme_config.desk_mask); + if (!read_mask(inst, path, &theme_config, "desk_toggled_pressed.xbm", + &theme_config.desk_toggled_pressed_mask)) + theme_config.desk_toggled_pressed_mask + = RrPixmapMaskCopy(theme_config.desk_toggled_mask); + if (!read_mask(inst, path, &theme_config, "desk_toggled_hover.xbm", + &theme_config.desk_toggled_hover_mask)) + theme_config.desk_toggled_hover_mask + = RrPixmapMaskCopy(theme_config.desk_toggled_mask); /* shade button masks */ - if (!read_mask(inst, path, theme, "shade.xbm", &theme->shade_mask)) { + if (!read_mask(inst, path, &theme_config, "shade.xbm", + &theme_config.shade_mask)) { guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; - theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme_config.shade_mask = RrPixmapMaskNew(inst, 6, 6, (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); + if (!read_mask(inst, path, &theme_config, "shade_toggled.xbm", + &theme_config.shade_toggled_mask)) + theme_config.shade_toggled_mask + = RrPixmapMaskCopy(theme_config.shade_mask); + if (!read_mask(inst, path, &theme_config, "shade_pressed.xbm", + &theme_config.shade_pressed_mask)) + theme_config.shade_pressed_mask + = RrPixmapMaskCopy(theme_config.shade_mask); + if (!read_mask(inst, path, &theme_config, "shade_disabled.xbm", + &theme_config.shade_disabled_mask)) + theme_config.shade_disabled_mask + = RrPixmapMaskCopy(theme_config.shade_mask); + if (!read_mask(inst, path, &theme_config, "shade_hover.xbm", + &theme_config.shade_hover_mask)) + theme_config.shade_hover_mask + = RrPixmapMaskCopy(theme_config.shade_mask); + if (!read_mask(inst, path, &theme_config, "shade_toggled_pressed.xbm", + &theme_config.shade_toggled_pressed_mask)) + theme_config.shade_toggled_pressed_mask + = RrPixmapMaskCopy(theme_config.shade_toggled_mask); + if (!read_mask(inst, path, &theme_config, "shade_toggled_hover.xbm", + &theme_config.shade_toggled_hover_mask)) + theme_config.shade_toggled_hover_mask + = RrPixmapMaskCopy(theme_config.shade_toggled_mask); /* close button masks */ - if (!read_mask(inst, path, theme, "close.xbm", &theme->close_mask)) { + if (!read_mask(inst, path, &theme_config, "close.xbm", + &theme_config.close_mask)) { guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; - theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + theme_config.close_mask = RrPixmapMaskNew(inst, 6, 6, (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, path, &theme_config, "close_pressed.xbm", + &theme_config.close_pressed_mask)) + theme_config.close_pressed_mask + = RrPixmapMaskCopy(theme_config.close_mask); + if (!read_mask(inst, path, &theme_config, "close_disabled.xbm", + &theme_config.close_disabled_mask)) + theme_config.close_disabled_mask + = RrPixmapMaskCopy(theme_config.close_mask); + if (!read_mask(inst, path, &theme_config, "close_hover.xbm", + &theme_config.close_hover_mask)) + theme_config.close_hover_mask + = RrPixmapMaskCopy(theme_config.close_mask); /* submenu bullet mask */ - if (!read_mask(inst, path, theme, "bullet.xbm", &theme->menu_bullet_mask)) { + if (!read_mask(inst, path, &theme_config, "bullet.xbm", + &theme_config.menu_bullet_mask)) { guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; - theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (gchar*)data); + theme_config.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, + theme_config.def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH, OB_DEFAULT_ICON_HEIGHT, OB_DEFAULT_ICON_pixel_data); /* the toggled hover mask = the toggled unpressed mask (i.e. no change) */ - theme->max_toggled_hover_mask = RrPixmapMaskCopy(theme->max_toggled_mask); - theme->desk_toggled_hover_mask = RrPixmapMaskCopy(theme->desk_toggled_mask); - theme->shade_toggled_hover_mask - = RrPixmapMaskCopy(theme->shade_toggled_mask); + theme_config.max_toggled_hover_mask + = RrPixmapMaskCopy(theme_config.max_toggled_mask); + theme_config.desk_toggled_hover_mask + = RrPixmapMaskCopy(theme_config.desk_toggled_mask); + theme_config.shade_toggled_hover_mask + = RrPixmapMaskCopy(theme_config.shade_toggled_mask); /* the toggled pressed mask = the toggled unpressed mask (i.e. no change)*/ - theme->max_toggled_pressed_mask = RrPixmapMaskCopy(theme->max_toggled_mask); - theme->desk_toggled_pressed_mask - = RrPixmapMaskCopy(theme->desk_toggled_mask); - theme->shade_toggled_pressed_mask - = RrPixmapMaskCopy(theme->shade_toggled_mask); + theme_config.max_toggled_pressed_mask + = RrPixmapMaskCopy(theme_config.max_toggled_mask); + theme_config.desk_toggled_pressed_mask + = RrPixmapMaskCopy(theme_config.desk_toggled_mask); + theme_config.shade_toggled_pressed_mask + = RrPixmapMaskCopy(theme_config.shade_toggled_mask); /* read the decoration textures */ if (!read_appearance(db, inst, "window.active.title.bg", - theme->a_focused_title, FALSE)) - set_default_appearance(theme->a_focused_title); + theme_config.a_focused_title, FALSE)) + set_default_appearance(theme_config.a_focused_title); if (!read_appearance(db, inst, "window.inactive.title.bg", - theme->a_unfocused_title, FALSE)) - set_default_appearance(theme->a_unfocused_title); + theme_config.a_unfocused_title, FALSE)) + set_default_appearance(theme_config.a_unfocused_title); if (!read_appearance(db, inst, "window.active.label.bg", - theme->a_focused_label, TRUE)) - set_default_appearance(theme->a_focused_label); + theme_config.a_focused_label, TRUE)) + set_default_appearance(theme_config.a_focused_label); if (!read_appearance(db, inst, "window.inactive.label.bg", - theme->a_unfocused_label, TRUE)) - set_default_appearance(theme->a_unfocused_label); + theme_config.a_unfocused_label, TRUE)) + set_default_appearance(theme_config.a_unfocused_label); if (!read_appearance(db, inst, "window.active.handle.bg", - theme->a_focused_handle, FALSE)) - set_default_appearance(theme->a_focused_handle); + theme_config.a_focused_handle, FALSE)) + set_default_appearance(theme_config.a_focused_handle); if (!read_appearance(db, inst, "window.inactive.handle.bg", - theme->a_unfocused_handle, FALSE)) - set_default_appearance(theme->a_unfocused_handle); + theme_config.a_unfocused_handle, FALSE)) + set_default_appearance(theme_config.a_unfocused_handle); if (!read_appearance(db, inst, "window.active.grip.bg", - theme->a_focused_grip, TRUE)) - set_default_appearance(theme->a_focused_grip); + theme_config.a_focused_grip, TRUE)) + set_default_appearance(theme_config.a_focused_grip); if (!read_appearance(db, inst, "window.inactive.grip.bg", - theme->a_unfocused_grip, TRUE)) - set_default_appearance(theme->a_unfocused_grip); - if (!read_appearance(db, inst, "menu.items.bg", theme->a_menu, FALSE)) - set_default_appearance(theme->a_menu); - if (!read_appearance(db, inst, "menu.title.bg", theme->a_menu_title, TRUE)) - set_default_appearance(theme->a_menu_title); + theme_config.a_unfocused_grip, TRUE)) + set_default_appearance(theme_config.a_unfocused_grip); + if (!read_appearance(db, inst, "menu.items.bg", theme_config.a_menu, FALSE)) + set_default_appearance(theme_config.a_menu); + if (!read_appearance(db, inst, "menu.title.bg", theme_config.a_menu_title, + TRUE)) + set_default_appearance(theme_config.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); + theme_config.a_menu_selected, TRUE)) + set_default_appearance(theme_config.a_menu_selected); + theme_config.a_menu_disabled_selected + = RrAppearanceCopy(theme_config.a_menu_selected); /* 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.bg", theme_config.osd_hilite_bg, FALSE)) { + RrAppearanceFree(theme_config.osd_hilite_bg); + theme_config.osd_hilite_bg + = RrAppearanceCopy(theme_config.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); + if (!read_appearance(db, inst, "osd.label.bg", + theme_config.osd_hilite_label, TRUE)) { + RrAppearanceFree(theme_config.osd_hilite_label); + theme_config.osd_hilite_label + = RrAppearanceCopy(theme_config.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); + if (!read_appearance(db, inst, "osd.hilight.bg", + theme_config.osd_hilite_fg, FALSE)) { + RrAppearanceFree(theme_config.osd_hilite_fg); + if (theme_config.a_focused_label->surface.grad != RR_SURFACE_PARENTREL) + theme_config.osd_hilite_fg + = RrAppearanceCopy(theme_config.a_focused_label); else - theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_title); + theme_config.osd_hilite_fg + = RrAppearanceCopy(theme_config.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); + if (!read_appearance(db, inst, "osd.unhilight.bg", + theme_config.osd_unhilite_fg, FALSE)) { + RrAppearanceFree(theme_config.osd_unhilite_fg); + if (theme_config.a_unfocused_label->surface.grad + != RR_SURFACE_PARENTREL) + theme_config.osd_unhilite_fg + =RrAppearanceCopy(theme_config.a_unfocused_label); else - theme->osd_unhilite_fg=RrAppearanceCopy(theme->a_unfocused_title); + theme_config.osd_unhilite_fg + =RrAppearanceCopy(theme_config.a_unfocused_title); } /* read buttons textures */ if (!read_appearance(db, inst, "window.active.button.disabled.bg", - theme->a_disabled_focused_max, TRUE)) - set_default_appearance(theme->a_disabled_focused_max); + theme_config.a_disabled_focused_max, TRUE)) + set_default_appearance(theme_config.a_disabled_focused_max); if (!read_appearance(db, inst, "window.inactive.button.disabled.bg", - theme->a_disabled_unfocused_max, TRUE)) - set_default_appearance(theme->a_disabled_unfocused_max); + theme_config.a_disabled_unfocused_max, TRUE)) + set_default_appearance(theme_config.a_disabled_unfocused_max); if (!read_appearance(db, inst, "window.active.button.pressed.bg", - theme->a_focused_pressed_max, TRUE)) - set_default_appearance(theme->a_focused_pressed_max); + theme_config.a_focused_pressed_max, TRUE)) + set_default_appearance(theme_config.a_focused_pressed_max); if (!read_appearance(db, inst, "window.inactive.button.pressed.bg", - theme->a_unfocused_pressed_max, TRUE)) - set_default_appearance(theme->a_unfocused_pressed_max); + theme_config.a_unfocused_pressed_max, TRUE)) + set_default_appearance(theme_config.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_unpressed_max, TRUE)) { - RrAppearanceFree(theme->a_toggled_focused_unpressed_max); - theme->a_toggled_focused_unpressed_max - = RrAppearanceCopy(theme->a_focused_pressed_max); + theme_config.a_toggled_focused_unpressed_max, TRUE) + && !read_appearance(db, inst, "window.active.button.toggled.bg", + theme_config.a_toggled_focused_unpressed_max, TRUE)) { + RrAppearanceFree(theme_config.a_toggled_focused_unpressed_max); + theme_config.a_toggled_focused_unpressed_max + = RrAppearanceCopy(theme_config.a_focused_pressed_max); } if (!read_appearance(db, inst, "window.inactive.button.toggled.unpressed.bg", - theme->a_toggled_unfocused_unpressed_max, TRUE) + theme_config.a_toggled_unfocused_unpressed_max, TRUE) && !read_appearance(db, inst, "window.inactive.button.toggled.bg", - theme->a_toggled_unfocused_unpressed_max, TRUE)) { - RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max); - theme->a_toggled_unfocused_unpressed_max - = RrAppearanceCopy(theme->a_unfocused_pressed_max); + theme_config.a_toggled_unfocused_unpressed_max, TRUE)) { + RrAppearanceFree(theme_config.a_toggled_unfocused_unpressed_max); + theme_config.a_toggled_unfocused_unpressed_max + = RrAppearanceCopy(theme_config.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); + theme_config.a_toggled_hover_focused_max, TRUE)) { + RrAppearanceFree(theme_config.a_toggled_hover_focused_max); + theme_config.a_toggled_hover_focused_max + = RrAppearanceCopy(theme_config.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); + theme_config.a_toggled_hover_unfocused_max, TRUE)) { + RrAppearanceFree(theme_config.a_toggled_hover_unfocused_max); + theme_config.a_toggled_hover_unfocused_max + = RrAppearanceCopy(theme_config.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); + theme_config.a_toggled_focused_pressed_max, TRUE)) { + RrAppearanceFree(theme_config.a_toggled_focused_pressed_max); + theme_config.a_toggled_focused_pressed_max + = RrAppearanceCopy(theme_config.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_pressed_max); - theme->a_toggled_unfocused_pressed_max - = RrAppearanceCopy(theme->a_unfocused_pressed_max); + theme_config.a_toggled_unfocused_pressed_max, TRUE)) { + RrAppearanceFree(theme_config.a_toggled_unfocused_pressed_max); + theme_config.a_toggled_unfocused_pressed_max + = RrAppearanceCopy(theme_config.a_unfocused_pressed_max); } if (!read_appearance(db, inst, "window.active.button.unpressed.bg", - theme->a_focused_unpressed_max, TRUE)) - set_default_appearance(theme->a_focused_unpressed_max); + theme_config.a_focused_unpressed_max, TRUE)) + set_default_appearance(theme_config.a_focused_unpressed_max); if (!read_appearance(db, inst, "window.inactive.button.unpressed.bg", - theme->a_unfocused_unpressed_max, TRUE)) - set_default_appearance(theme->a_unfocused_unpressed_max); + theme_config.a_unfocused_unpressed_max, TRUE)) + set_default_appearance(theme_config.a_unfocused_unpressed_max); if (!read_appearance(db, inst, "window.active.button.hover.bg", - theme->a_hover_focused_max, TRUE)) { - RrAppearanceFree(theme->a_hover_focused_max); - theme->a_hover_focused_max - = RrAppearanceCopy(theme->a_focused_unpressed_max); + theme_config.a_hover_focused_max, TRUE)) { + RrAppearanceFree(theme_config.a_hover_focused_max); + theme_config.a_hover_focused_max + = RrAppearanceCopy(theme_config.a_focused_unpressed_max); } if (!read_appearance(db, inst, "window.inactive.button.hover.bg", - theme->a_hover_unfocused_max, TRUE)) { - RrAppearanceFree(theme->a_hover_unfocused_max); - theme->a_hover_unfocused_max - = RrAppearanceCopy(theme->a_unfocused_unpressed_max); + theme_config.a_hover_unfocused_max, TRUE)) { + RrAppearanceFree(theme_config.a_hover_unfocused_max); + theme_config.a_hover_unfocused_max + = RrAppearanceCopy(theme_config.a_unfocused_unpressed_max); } - theme->a_disabled_focused_close - = RrAppearanceCopy(theme->a_disabled_focused_max); - theme->a_disabled_unfocused_close - = RrAppearanceCopy(theme->a_disabled_unfocused_max); - theme->a_hover_focused_close = RrAppearanceCopy(theme->a_hover_focused_max); - theme->a_hover_unfocused_close - = RrAppearanceCopy(theme->a_hover_unfocused_max); - theme->a_unfocused_unpressed_close - = RrAppearanceCopy(theme->a_unfocused_unpressed_max); - theme->a_unfocused_pressed_close - = RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_focused_unpressed_close - = RrAppearanceCopy(theme->a_focused_unpressed_max); - theme->a_focused_pressed_close - = RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_disabled_focused_desk - = RrAppearanceCopy(theme->a_disabled_focused_max); - theme->a_disabled_unfocused_desk - = RrAppearanceCopy(theme->a_disabled_unfocused_max); - 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_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 - = RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_focused_unpressed_desk - = RrAppearanceCopy(theme->a_focused_unpressed_max); - theme->a_focused_pressed_desk - = RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_disabled_focused_shade - = RrAppearanceCopy(theme->a_disabled_focused_max); - theme->a_disabled_unfocused_shade - = RrAppearanceCopy(theme->a_disabled_unfocused_max); - theme->a_hover_focused_shade = RrAppearanceCopy(theme->a_hover_focused_max); - theme->a_hover_unfocused_shade - = RrAppearanceCopy(theme->a_hover_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 - = RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_focused_unpressed_shade - = RrAppearanceCopy(theme->a_focused_unpressed_max); - theme->a_focused_pressed_shade - = RrAppearanceCopy(theme->a_focused_pressed_max); - theme->a_disabled_focused_iconify - = RrAppearanceCopy(theme->a_disabled_focused_max); - theme->a_disabled_unfocused_iconify - = RrAppearanceCopy(theme->a_disabled_focused_max); - theme->a_hover_focused_iconify - = RrAppearanceCopy(theme->a_hover_focused_max); - theme->a_hover_unfocused_iconify - = RrAppearanceCopy(theme->a_hover_unfocused_max); - theme->a_unfocused_unpressed_iconify - = RrAppearanceCopy(theme->a_unfocused_unpressed_max); - theme->a_unfocused_pressed_iconify - = RrAppearanceCopy(theme->a_unfocused_pressed_max); - theme->a_focused_unpressed_iconify - = RrAppearanceCopy(theme->a_focused_unpressed_max); - theme->a_focused_pressed_iconify - = RrAppearanceCopy(theme->a_focused_pressed_max); - - 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_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; + theme_config.a_disabled_focused_close + = RrAppearanceCopy(theme_config.a_disabled_focused_max); + theme_config.a_disabled_unfocused_close + = RrAppearanceCopy(theme_config.a_disabled_unfocused_max); + theme_config.a_hover_focused_close + = RrAppearanceCopy(theme_config.a_hover_focused_max); + theme_config.a_hover_unfocused_close + = RrAppearanceCopy(theme_config.a_hover_unfocused_max); + theme_config.a_unfocused_unpressed_close + = RrAppearanceCopy(theme_config.a_unfocused_unpressed_max); + theme_config.a_unfocused_pressed_close + = RrAppearanceCopy(theme_config.a_unfocused_pressed_max); + theme_config.a_focused_unpressed_close + = RrAppearanceCopy(theme_config.a_focused_unpressed_max); + theme_config.a_focused_pressed_close + = RrAppearanceCopy(theme_config.a_focused_pressed_max); + theme_config.a_disabled_focused_desk + = RrAppearanceCopy(theme_config.a_disabled_focused_max); + theme_config.a_disabled_unfocused_desk + = RrAppearanceCopy(theme_config.a_disabled_unfocused_max); + theme_config.a_hover_focused_desk + = RrAppearanceCopy(theme_config.a_hover_focused_max); + theme_config.a_hover_unfocused_desk + = RrAppearanceCopy(theme_config.a_hover_unfocused_max); + theme_config.a_toggled_hover_focused_desk + = RrAppearanceCopy(theme_config.a_toggled_hover_focused_max); + theme_config.a_toggled_hover_unfocused_desk + = RrAppearanceCopy(theme_config.a_toggled_hover_unfocused_max); + theme_config.a_toggled_focused_unpressed_desk + = RrAppearanceCopy(theme_config.a_toggled_focused_unpressed_max); + theme_config.a_toggled_unfocused_unpressed_desk + = RrAppearanceCopy(theme_config.a_toggled_unfocused_unpressed_max); + theme_config.a_toggled_focused_pressed_desk + = RrAppearanceCopy(theme_config.a_toggled_focused_pressed_max); + theme_config.a_toggled_unfocused_pressed_desk + = RrAppearanceCopy(theme_config.a_toggled_unfocused_pressed_max); + theme_config.a_unfocused_unpressed_desk + = RrAppearanceCopy(theme_config.a_unfocused_unpressed_max); + theme_config.a_unfocused_pressed_desk + = RrAppearanceCopy(theme_config.a_unfocused_pressed_max); + theme_config.a_focused_unpressed_desk + = RrAppearanceCopy(theme_config.a_focused_unpressed_max); + theme_config.a_focused_pressed_desk + = RrAppearanceCopy(theme_config.a_focused_pressed_max); + theme_config.a_disabled_focused_shade + = RrAppearanceCopy(theme_config.a_disabled_focused_max); + theme_config.a_disabled_unfocused_shade + = RrAppearanceCopy(theme_config.a_disabled_unfocused_max); + theme_config.a_hover_focused_shade + = RrAppearanceCopy(theme_config.a_hover_focused_max); + theme_config.a_hover_unfocused_shade + = RrAppearanceCopy(theme_config.a_hover_unfocused_max); + theme_config.a_toggled_hover_focused_shade + = RrAppearanceCopy(theme_config.a_toggled_hover_focused_max); + theme_config.a_toggled_hover_unfocused_shade + = RrAppearanceCopy(theme_config.a_toggled_hover_unfocused_max); + theme_config.a_toggled_focused_unpressed_shade + = RrAppearanceCopy(theme_config.a_toggled_focused_unpressed_max); + theme_config.a_toggled_unfocused_unpressed_shade + = RrAppearanceCopy(theme_config.a_toggled_unfocused_unpressed_max); + theme_config.a_toggled_focused_pressed_shade + = RrAppearanceCopy(theme_config.a_toggled_focused_pressed_max); + theme_config.a_toggled_unfocused_pressed_shade + = RrAppearanceCopy(theme_config.a_toggled_unfocused_pressed_max); + theme_config.a_unfocused_unpressed_shade + = RrAppearanceCopy(theme_config.a_unfocused_unpressed_max); + theme_config.a_unfocused_pressed_shade + = RrAppearanceCopy(theme_config.a_unfocused_pressed_max); + theme_config.a_focused_unpressed_shade + = RrAppearanceCopy(theme_config.a_focused_unpressed_max); + theme_config.a_focused_pressed_shade + = RrAppearanceCopy(theme_config.a_focused_pressed_max); + theme_config.a_disabled_focused_iconify + = RrAppearanceCopy(theme_config.a_disabled_focused_max); + theme_config.a_disabled_unfocused_iconify + = RrAppearanceCopy(theme_config.a_disabled_focused_max); + theme_config.a_hover_focused_iconify + = RrAppearanceCopy(theme_config.a_hover_focused_max); + theme_config.a_hover_unfocused_iconify + = RrAppearanceCopy(theme_config.a_hover_unfocused_max); + theme_config.a_unfocused_unpressed_iconify + = RrAppearanceCopy(theme_config.a_unfocused_unpressed_max); + theme_config.a_unfocused_pressed_iconify + = RrAppearanceCopy(theme_config.a_unfocused_pressed_max); + theme_config.a_focused_unpressed_iconify + = RrAppearanceCopy(theme_config.a_focused_unpressed_max); + theme_config.a_focused_pressed_iconify + = RrAppearanceCopy(theme_config.a_focused_pressed_max); + + theme_config.a_icon->surface.grad = RR_SURFACE_PARENTREL; + theme_config.a_clear->surface.grad = RR_SURFACE_PARENTREL; + theme_config.a_clear_tex->surface.grad = RR_SURFACE_PARENTREL; + theme_config.a_menu_text_title->surface.grad = RR_SURFACE_PARENTREL; + theme_config.a_menu_normal->surface.grad = RR_SURFACE_PARENTREL; + theme_config.a_menu_disabled->surface.grad = RR_SURFACE_PARENTREL; + theme_config.a_menu_text_normal->surface.grad = RR_SURFACE_PARENTREL; + theme_config.a_menu_text_selected->surface.grad = RR_SURFACE_PARENTREL; + theme_config.a_menu_text_disabled->surface.grad = RR_SURFACE_PARENTREL; + theme_config.a_menu_text_disabled_selected->surface.grad + = RR_SURFACE_PARENTREL; + theme_config.a_menu_bullet_normal->surface.grad = RR_SURFACE_PARENTREL; + theme_config.a_menu_bullet_selected->surface.grad = RR_SURFACE_PARENTREL; /* set up the textures */ - theme->a_focused_label->texture[0].type = RR_TEXTURE_TEXT; - theme->a_focused_label->texture[0].data.text.justify = winjust; - theme->a_focused_label->texture[0].data.text.font=theme->win_font_focused; - theme->a_focused_label->texture[0].data.text.color - = theme->title_focused_color; + theme_config.a_focused_label->texture[0].type = RR_TEXTURE_TEXT; + theme_config.a_focused_label->texture[0].data.text.justify = winjust; + theme_config.a_focused_label->texture[0].data.text.font + =theme_config.win_font_focused; + theme_config.a_focused_label->texture[0].data.text.color + = theme_config.title_focused_color; if (read_string(db, "window.active.label.text.font", &str)) { char *p; @@ -728,32 +782,37 @@ gint load_theme_config(const RrInstance *inst, const gchar *name, 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_config.a_focused_label->texture[0].data.text.shadow_offset_x + = i; + theme_config.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); + 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_config.title_focused_shadow_color = RrColorNew(inst, j, j, j); + theme_config.title_focused_shadow_alpha = i; } else { - theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->title_focused_shadow_alpha = 50; + theme_config.title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); + theme_config.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_config.a_focused_label->texture[0].data.text.shadow_color + = theme_config.title_focused_shadow_color; + theme_config.a_focused_label->texture[0].data.text.shadow_alpha + = theme_config.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; + theme_config.osd_hilite_label->texture[0].type = RR_TEXTURE_TEXT; + theme_config.osd_hilite_label->texture[0].data.text.justify + = RR_JUSTIFY_LEFT; + theme_config.osd_hilite_label->texture[0].data.text.font + = theme_config.osd_font; + theme_config.osd_hilite_label->texture[0].data.text.color + = theme_config.osd_color; if (read_string(db, "osd.label.text.font", &str)) { char *p; @@ -764,55 +823,59 @@ gint load_theme_config(const RrInstance *inst, const gchar *name, 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; + theme_config.a_focused_label->texture[0].data.text.shadow_offset_x + = i; + theme_config.a_focused_label->texture[0].data.text.shadow_offset_y + = i; + theme_config.osd_hilite_label->texture[0].data.text.shadow_offset_x + = i; + theme_config.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); + 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; + theme_config.title_focused_shadow_color = RrColorNew(inst, j, j, j); + theme_config.title_focused_shadow_alpha = i; + theme_config.osd_shadow_color = RrColorNew(inst, j, j, j); + theme_config.osd_shadow_alpha = i; } else { - theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->title_focused_shadow_alpha = 50; - theme->osd_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->osd_shadow_alpha = 50; + theme_config.title_focused_shadow_color = RrColorNew(inst, 0, 0, 0); + theme_config.title_focused_shadow_alpha = 50; + theme_config.osd_shadow_color = RrColorNew(inst, 0, 0, 0); + theme_config.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); + theme_config.osd_hilite_label->texture[0].data.text.shadow_offset_x + = theme_config.a_focused_label->texture[0].data.text.shadow_offset_x; + theme_config.osd_hilite_label->texture[0].data.text.shadow_offset_y + = theme_config.a_focused_label->texture[0].data.text.shadow_offset_y; + if (theme_config.title_focused_shadow_color) + theme_config.osd_shadow_color = RrColorNew(inst, + theme_config.title_focused_shadow_color->r, + theme_config.title_focused_shadow_color->g, + theme_config.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_config.osd_shadow_color = RrColorNew(inst, 0, 0, 0); + theme_config.osd_shadow_alpha = theme_config.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_config.osd_hilite_label->texture[0].data.text.shadow_color + = theme_config.osd_shadow_color; + theme_config.osd_hilite_label->texture[0].data.text.shadow_alpha + = theme_config.osd_shadow_alpha; - theme->a_unfocused_label->texture[0].type = RR_TEXTURE_TEXT; - theme->a_unfocused_label->texture[0].data.text.justify = winjust; - theme->a_unfocused_label->texture[0].data.text.font - = theme->win_font_unfocused; - theme->a_unfocused_label->texture[0].data.text.color - = theme->title_unfocused_color; + theme_config.a_unfocused_label->texture[0].type = RR_TEXTURE_TEXT; + theme_config.a_unfocused_label->texture[0].data.text.justify = winjust; + theme_config.a_unfocused_label->texture[0].data.text.font + = theme_config.win_font_unfocused; + theme_config.a_unfocused_label->texture[0].data.text.color + = theme_config.title_unfocused_color; if (read_string(db, "window.inactive.label.text.font", &str)) { char *p; @@ -823,34 +886,38 @@ gint load_theme_config(const RrInstance *inst, const gchar *name, 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; + theme_config.a_unfocused_label->texture[0].data.text.shadow_offset_x + = i; + theme_config.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); + 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; + theme_config.title_unfocused_shadow_color = RrColorNew(inst, j, j, + j); + theme_config.title_unfocused_shadow_alpha = i; } else { - theme->title_unfocused_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->title_unfocused_shadow_alpha = 50; + theme_config.title_unfocused_shadow_color = RrColorNew(inst, 0, 0, + 0); + theme_config.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_config.a_unfocused_label->texture[0].data.text.shadow_color + = theme_config.title_unfocused_shadow_color; + theme_config.a_unfocused_label->texture[0].data.text.shadow_alpha + = theme_config.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; + theme_config.a_menu_text_title->texture[0].type = RR_TEXTURE_TEXT; + theme_config.a_menu_text_title->texture[0].data.text.justify = mtitlejust; + theme_config.a_menu_text_title->texture[0].data.text.font + = theme_config.menu_title_font; + theme_config.a_menu_text_title->texture[0].data.text.color + = theme_config.menu_title_color; if (read_string(db, "menu.title.text.font", &str)) { char *p; @@ -861,50 +928,53 @@ gint load_theme_config(const RrInstance *inst, const gchar *name, 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; + theme_config.a_menu_text_title->texture[0].data.text.shadow_offset_x + = i; + theme_config.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); + 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; + theme_config.menu_title_shadow_color = RrColorNew(inst, j, j, j); + theme_config.menu_title_shadow_alpha = i; } else { - theme->menu_title_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_title_shadow_alpha = 50; + theme_config.menu_title_shadow_color = RrColorNew(inst, 0, 0, 0); + theme_config.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_config.a_menu_text_title->texture[0].data.text.shadow_color + = theme_config.menu_title_shadow_color; + theme_config.a_menu_text_title->texture[0].data.text.shadow_alpha + = theme_config.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_disabled_selected->texture[0].type + theme_config.a_menu_text_normal->texture[0].type + = theme_config.a_menu_text_selected->texture[0].type + = theme_config.a_menu_text_disabled->texture[0].type + = theme_config.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 + theme_config.a_menu_text_normal->texture[0].data.text.justify + = theme_config.a_menu_text_selected->texture[0].data.text.justify + = theme_config.a_menu_text_disabled->texture[0].data.text.justify + = theme_config.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_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_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; + theme_config.a_menu_text_normal->texture[0].data.text.font + = theme_config.a_menu_text_selected->texture[0].data.text.font + = theme_config.a_menu_text_disabled->texture[0].data.text.font + = theme_config.a_menu_text_disabled_selected->texture[0].data.text.font + = theme_config.menu_font; + theme_config.a_menu_text_normal->texture[0].data.text.color + = theme_config.menu_color; + theme_config.a_menu_text_selected->texture[0].data.text.color + = theme_config.menu_selected_color; + theme_config.a_menu_text_disabled->texture[0].data.text.color + = theme_config.menu_disabled_color; + theme_config.a_menu_text_disabled_selected->texture[0].data.text.color + = theme_config.menu_disabled_selected_color; if (read_string(db, "menu.items.font", &str)) { char *p; @@ -915,310 +985,347 @@ gint load_theme_config(const RrInstance *inst, const gchar *name, i = parse_inline_number(p + strlen("shadowoffset=")); else i = 1; - theme->a_menu_text_normal-> + theme_config.a_menu_text_normal-> texture[0].data.text.shadow_offset_x = i; - theme->a_menu_text_normal-> + theme_config.a_menu_text_normal-> texture[0].data.text.shadow_offset_y = i; - theme->a_menu_text_selected-> + theme_config.a_menu_text_selected-> texture[0].data.text.shadow_offset_x = i; - theme->a_menu_text_selected-> + theme_config.a_menu_text_selected-> texture[0].data.text.shadow_offset_y = i; - theme->a_menu_text_disabled-> + theme_config.a_menu_text_disabled-> texture[0].data.text.shadow_offset_x = i; - theme->a_menu_text_disabled-> + theme_config.a_menu_text_disabled-> texture[0].data.text.shadow_offset_y = i; - theme->a_menu_text_disabled_selected-> + theme_config.a_menu_text_disabled_selected-> texture[0].data.text.shadow_offset_x = i; - theme->a_menu_text_disabled_selected-> + theme_config.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); + 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; + theme_config.menu_text_normal_shadow_color = RrColorNew(inst, j, j, + j); + theme_config.menu_text_selected_shadow_color = RrColorNew(inst, j, + j, j); + theme_config.menu_text_disabled_shadow_color = RrColorNew(inst, j, + j, j); + theme_config.menu_text_normal_shadow_alpha = i; + theme_config.menu_text_selected_shadow_alpha = i; + theme_config.menu_text_disabled_shadow_alpha = i; + theme_config.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_config.menu_text_normal_shadow_color = RrColorNew(inst, 0, 0, + 0); + theme_config.menu_text_selected_shadow_color = RrColorNew(inst, 0, + 0, 0); + theme_config.menu_text_disabled_shadow_color = RrColorNew(inst, 0, + 0, 0); + theme_config.menu_text_normal_shadow_alpha = 50; + theme_config.menu_text_selected_shadow_alpha = 50; + theme_config.menu_text_disabled_selected_shadow_alpha = 50; } } - theme->a_menu_text_normal->texture[0].data.text.shadow_color - = theme->menu_text_normal_shadow_color; - theme->a_menu_text_normal->texture[0].data.text.shadow_alpha - = 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->max_disabled_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_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->max_mask; - theme->a_toggled_hover_focused_max->texture[0].data.mask.mask - = theme->a_toggled_hover_unfocused_max->texture[0].data.mask.mask - = theme->max_toggled_hover_mask; - theme->a_toggled_focused_unpressed_max->texture[0].data.mask.mask - = theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.mask - = theme->max_toggled_mask; - theme->a_toggled_focused_pressed_max->texture[0].data.mask.mask - = theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.mask - = theme->max_toggled_pressed_mask; - theme->a_disabled_focused_close->texture[0].data.mask.mask - = theme->a_disabled_unfocused_close->texture[0].data.mask.mask - = theme->close_disabled_mask; - 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_unfocused_pressed_close->texture[0].data.mask.mask - = theme->close_pressed_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->desk_disabled_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_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->desk_mask; - theme->a_toggled_hover_focused_desk->texture[0].data.mask.mask - = theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.mask - = theme->desk_toggled_hover_mask; - theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.mask - = theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.mask - = theme->desk_toggled_mask; - theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask - = theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.mask - = theme->desk_toggled_pressed_mask; - theme->a_disabled_focused_shade->texture[0].data.mask.mask - = theme->a_disabled_unfocused_shade->texture[0].data.mask.mask - = theme->shade_disabled_mask; - 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_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->shade_mask; - theme->a_toggled_hover_focused_shade->texture[0].data.mask.mask - = theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.mask - = theme->shade_toggled_hover_mask; - theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.mask - = theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.mask - = theme->shade_toggled_mask; - theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask - = theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.mask - = theme->shade_toggled_pressed_mask; - theme->a_disabled_focused_iconify->texture[0].data.mask.mask - = theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask - = theme->iconify_disabled_mask; - 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_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->iconify_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->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->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->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->titlebut_hover_unfocused_color; - theme->a_toggled_hover_focused_max->texture[0].data.mask.color - = theme->a_toggled_hover_focused_desk->texture[0].data.mask.color - = theme->a_toggled_hover_focused_shade->texture[0].data.mask.color - = theme->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_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->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_iconify->texture[0].data.mask.color - = theme->titlebut_unfocused_pressed_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->menu_selected_color; + theme_config.a_menu_text_normal->texture[0].data.text.shadow_color + = theme_config.menu_text_normal_shadow_color; + theme_config.a_menu_text_normal->texture[0].data.text.shadow_alpha + = theme_config.menu_text_normal_shadow_alpha; + theme_config.a_menu_text_selected->texture[0].data.text.shadow_color + = theme_config.menu_text_selected_shadow_color; + theme_config.a_menu_text_selected->texture[0].data.text.shadow_alpha + = theme_config.menu_text_selected_shadow_alpha; + theme_config.a_menu_text_disabled->texture[0].data.text.shadow_color + = theme_config.menu_text_disabled_shadow_color; + theme_config.a_menu_text_disabled->texture[0].data.text.shadow_alpha + = theme_config.menu_text_disabled_shadow_alpha; + theme_config.a_menu_text_disabled_selected->texture[0].data.text.shadow_color + = theme_config.menu_text_disabled_shadow_color; + theme_config.a_menu_text_disabled_selected->texture[0].data.text.shadow_alpha + = theme_config.menu_text_disabled_shadow_alpha; + + theme_config.a_disabled_focused_max->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_disabled_unfocused_max->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_hover_focused_max->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_hover_unfocused_max->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_toggled_hover_focused_max->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_toggled_hover_unfocused_max->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_focused_unpressed_max->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_unfocused_unpressed_max->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_focused_pressed_max->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_unfocused_pressed_max->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_focused_unpressed_max->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_focused_pressed_max->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_unfocused_unpressed_max->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_unfocused_pressed_max->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_disabled_focused_close->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_disabled_unfocused_close->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_hover_focused_close->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_hover_unfocused_close->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_focused_unpressed_close->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_focused_pressed_close->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_unfocused_unpressed_close->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_unfocused_pressed_close->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_disabled_focused_desk->texture[0].type = RR_TEXTURE_MASK; + + theme_config.a_disabled_unfocused_desk->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_hover_focused_desk->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_hover_unfocused_desk->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_toggled_hover_focused_desk->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_hover_unfocused_desk->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_focused_unpressed_desk->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_unfocused_unpressed_desk->texture[0].type + = RR_TEXTURE_MASK; + + theme_config.a_toggled_focused_pressed_desk->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_unfocused_pressed_desk->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_focused_unpressed_desk->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_focused_pressed_desk->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_unfocused_unpressed_desk->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_unfocused_pressed_desk->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_disabled_focused_shade->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_disabled_unfocused_shade->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_hover_focused_shade->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_hover_unfocused_shade->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_toggled_hover_focused_shade->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_hover_unfocused_shade->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_focused_unpressed_shade->texture[0].type + = RR_TEXTURE_MASK; + + theme_config.a_toggled_unfocused_unpressed_shade->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_focused_pressed_shade->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_toggled_unfocused_pressed_shade->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_focused_unpressed_shade->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_focused_pressed_shade->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_unfocused_unpressed_shade->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_unfocused_pressed_shade->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_disabled_focused_iconify->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_disabled_unfocused_iconify->texture[0].type + = RR_TEXTURE_MASK; + + theme_config.a_hover_focused_iconify->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_hover_unfocused_iconify->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_focused_unpressed_iconify->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_focused_pressed_iconify->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_unfocused_unpressed_iconify->texture[0].type + = RR_TEXTURE_MASK; + theme_config.a_unfocused_pressed_iconify->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_menu_bullet_normal->texture[0].type = RR_TEXTURE_MASK; + theme_config.a_menu_bullet_selected->texture[0].type = RR_TEXTURE_MASK; + + theme_config.a_disabled_focused_max->texture[0].data.mask.mask + = theme_config.a_disabled_unfocused_max->texture[0].data.mask.mask + = theme_config.max_disabled_mask; + theme_config.a_hover_focused_max->texture[0].data.mask.mask + = theme_config.a_hover_unfocused_max->texture[0].data.mask.mask + = theme_config.max_hover_mask; + theme_config.a_focused_pressed_max->texture[0].data.mask.mask + = theme_config.a_unfocused_pressed_max->texture[0].data.mask.mask + = theme_config.max_pressed_mask; + theme_config.a_focused_unpressed_max->texture[0].data.mask.mask + = theme_config.a_unfocused_unpressed_max->texture[0].data.mask.mask + = theme_config.max_mask; + theme_config.a_toggled_hover_focused_max->texture[0].data.mask.mask + = theme_config.a_toggled_hover_unfocused_max->texture[0].data.mask.mask + = theme_config.max_toggled_hover_mask; + theme_config.a_toggled_focused_unpressed_max->texture[0].data.mask.mask + = theme_config.a_toggled_unfocused_unpressed_max->texture[0].data.mask.mask + = theme_config.max_toggled_mask; + theme_config.a_toggled_focused_pressed_max->texture[0].data.mask.mask + = theme_config.a_toggled_unfocused_pressed_max->texture[0].data.mask.mask + = theme_config.max_toggled_pressed_mask; + theme_config.a_disabled_focused_close->texture[0].data.mask.mask + = theme_config.a_disabled_unfocused_close->texture[0].data.mask.mask + = theme_config.close_disabled_mask; + theme_config.a_hover_focused_close->texture[0].data.mask.mask + = theme_config.a_hover_unfocused_close->texture[0].data.mask.mask + = theme_config.close_hover_mask; + theme_config.a_focused_pressed_close->texture[0].data.mask.mask + = theme_config.a_unfocused_pressed_close->texture[0].data.mask.mask + = theme_config.close_pressed_mask; + theme_config.a_focused_unpressed_close->texture[0].data.mask.mask + = theme_config.a_unfocused_unpressed_close->texture[0].data.mask.mask + = theme_config.close_mask; + theme_config.a_disabled_focused_desk->texture[0].data.mask.mask + = theme_config.a_disabled_unfocused_desk->texture[0].data.mask.mask + = theme_config.desk_disabled_mask; + theme_config.a_hover_focused_desk->texture[0].data.mask.mask + = theme_config.a_hover_unfocused_desk->texture[0].data.mask.mask + = theme_config.desk_hover_mask; + theme_config.a_focused_pressed_desk->texture[0].data.mask.mask + = theme_config.a_unfocused_pressed_desk->texture[0].data.mask.mask + = theme_config.desk_pressed_mask; + theme_config.a_focused_unpressed_desk->texture[0].data.mask.mask + = theme_config.a_unfocused_unpressed_desk->texture[0].data.mask.mask + = theme_config.desk_mask; + theme_config.a_toggled_hover_focused_desk->texture[0].data.mask.mask + = theme_config.a_toggled_hover_unfocused_desk->texture[0].data.mask.mask + = theme_config.desk_toggled_hover_mask; + theme_config.a_toggled_focused_unpressed_desk->texture[0].data.mask.mask + = theme_config.a_toggled_unfocused_unpressed_desk->texture[0].data.mask.mask + = theme_config.desk_toggled_mask; + theme_config.a_toggled_focused_pressed_desk->texture[0].data.mask.mask + = theme_config.a_toggled_unfocused_pressed_desk->texture[0].data.mask.mask + = theme_config.desk_toggled_pressed_mask; + theme_config.a_disabled_focused_shade->texture[0].data.mask.mask + = theme_config.a_disabled_unfocused_shade->texture[0].data.mask.mask + = theme_config.shade_disabled_mask; + theme_config.a_hover_focused_shade->texture[0].data.mask.mask + = theme_config.a_hover_unfocused_shade->texture[0].data.mask.mask + = theme_config.shade_hover_mask; + theme_config.a_focused_pressed_shade->texture[0].data.mask.mask + = theme_config.a_unfocused_pressed_shade->texture[0].data.mask.mask + = theme_config.shade_pressed_mask; + theme_config.a_focused_unpressed_shade->texture[0].data.mask.mask + = theme_config.a_unfocused_unpressed_shade->texture[0].data.mask.mask + = theme_config.shade_mask; + theme_config.a_toggled_hover_focused_shade->texture[0].data.mask.mask + = theme_config.a_toggled_hover_unfocused_shade->texture[0].data.mask.mask + = theme_config.shade_toggled_hover_mask; + theme_config.a_toggled_focused_unpressed_shade->texture[0].data.mask.mask + = theme_config.a_toggled_unfocused_unpressed_shade->texture[0].data.mask.mask + = theme_config.shade_toggled_mask; + theme_config.a_toggled_focused_pressed_shade->texture[0].data.mask.mask + = theme_config.a_toggled_unfocused_pressed_shade->texture[0].data.mask.mask + = theme_config.shade_toggled_pressed_mask; + theme_config.a_disabled_focused_iconify->texture[0].data.mask.mask + = theme_config.a_disabled_unfocused_iconify->texture[0].data.mask.mask + = theme_config.iconify_disabled_mask; + theme_config.a_hover_focused_iconify->texture[0].data.mask.mask + = theme_config.a_hover_unfocused_iconify->texture[0].data.mask.mask + = theme_config.iconify_hover_mask; + theme_config.a_focused_pressed_iconify->texture[0].data.mask.mask + = theme_config.a_unfocused_pressed_iconify->texture[0].data.mask.mask + = theme_config.iconify_pressed_mask; + theme_config.a_focused_unpressed_iconify->texture[0].data.mask.mask + = theme_config.a_unfocused_unpressed_iconify->texture[0].data.mask.mask + = theme_config.iconify_mask; + theme_config.a_menu_bullet_normal->texture[0].data.mask.mask + = theme_config.a_menu_bullet_selected->texture[0].data.mask.mask + = theme_config.menu_bullet_mask; + theme_config.a_disabled_focused_max->texture[0].data.mask.color + = theme_config.a_disabled_focused_close->texture[0].data.mask.color + = theme_config.a_disabled_focused_desk->texture[0].data.mask.color + = theme_config.a_disabled_focused_shade->texture[0].data.mask.color + = theme_config.a_disabled_focused_iconify->texture[0].data.mask.color + = theme_config.titlebut_disabled_focused_color; + theme_config.a_disabled_unfocused_max->texture[0].data.mask.color + = theme_config.a_disabled_unfocused_close->texture[0].data.mask.color + = theme_config.a_disabled_unfocused_desk->texture[0].data.mask.color + = theme_config.a_disabled_unfocused_shade->texture[0].data.mask.color + = theme_config.a_disabled_unfocused_iconify->texture[0].data.mask.color + = theme_config.titlebut_disabled_unfocused_color; + theme_config.a_hover_focused_max->texture[0].data.mask.color + = theme_config.a_hover_focused_close->texture[0].data.mask.color + = theme_config.a_hover_focused_desk->texture[0].data.mask.color + = theme_config.a_hover_focused_shade->texture[0].data.mask.color + = theme_config.a_hover_focused_iconify->texture[0].data.mask.color + = theme_config.titlebut_hover_focused_color; + theme_config.a_hover_unfocused_max->texture[0].data.mask.color + = theme_config.a_hover_unfocused_close->texture[0].data.mask.color + = theme_config.a_hover_unfocused_desk->texture[0].data.mask.color + = theme_config.a_hover_unfocused_shade->texture[0].data.mask.color + = theme_config.a_hover_unfocused_iconify->texture[0].data.mask.color + = theme_config.titlebut_hover_unfocused_color; + theme_config.a_toggled_hover_focused_max->texture[0].data.mask.color + = theme_config.a_toggled_hover_focused_desk->texture[0].data.mask.color + = theme_config.a_toggled_hover_focused_shade->texture[0].data.mask.color + = theme_config.titlebut_toggled_hover_focused_color; + theme_config.a_toggled_hover_unfocused_max->texture[0].data.mask.color + = theme_config.a_toggled_hover_unfocused_desk->texture[0].data.mask.color + = theme_config.a_toggled_hover_unfocused_shade->texture[0].data.mask.color + = theme_config.titlebut_toggled_hover_unfocused_color; + theme_config.a_toggled_focused_unpressed_max->texture[0].data.mask.color + = theme_config.a_toggled_focused_unpressed_desk->texture[0].data.mask.color + = theme_config.a_toggled_focused_unpressed_shade->texture[0].data.mask.color + = theme_config.titlebut_toggled_focused_unpressed_color; + theme_config.a_toggled_unfocused_unpressed_max->texture[0].data.mask.color + = theme_config.a_toggled_unfocused_unpressed_desk->texture[0].data.mask.color + = theme_config.a_toggled_unfocused_unpressed_shade->texture[0].data.mask.color + = theme_config.titlebut_toggled_unfocused_unpressed_color; + theme_config.a_toggled_focused_pressed_max->texture[0].data.mask.color + = theme_config.a_toggled_focused_pressed_desk->texture[0].data.mask.color + = theme_config.a_toggled_focused_pressed_shade->texture[0].data.mask.color + = theme_config.titlebut_toggled_focused_pressed_color; + theme_config.a_toggled_unfocused_pressed_max->texture[0].data.mask.color + = theme_config.a_toggled_unfocused_pressed_desk->texture[0].data.mask.color + = theme_config.a_toggled_unfocused_pressed_shade->texture[0].data.mask.color + = theme_config.titlebut_toggled_unfocused_pressed_color; + theme_config.a_focused_unpressed_max->texture[0].data.mask.color + = theme_config.a_focused_unpressed_close->texture[0].data.mask.color + = theme_config.a_focused_unpressed_desk->texture[0].data.mask.color + = theme_config.a_focused_unpressed_shade->texture[0].data.mask.color + = theme_config.a_focused_unpressed_iconify->texture[0].data.mask.color + = theme_config.titlebut_focused_unpressed_color; + theme_config.a_focused_pressed_max->texture[0].data.mask.color + = theme_config.a_focused_pressed_close->texture[0].data.mask.color + = theme_config.a_focused_pressed_desk->texture[0].data.mask.color + = theme_config.a_focused_pressed_shade->texture[0].data.mask.color + = theme_config.a_focused_pressed_iconify->texture[0].data.mask.color + = theme_config.titlebut_focused_pressed_color; + theme_config.a_unfocused_unpressed_max->texture[0].data.mask.color + = theme_config.a_unfocused_unpressed_close->texture[0].data.mask.color + = theme_config.a_unfocused_unpressed_desk->texture[0].data.mask.color + = theme_config.a_unfocused_unpressed_shade->texture[0].data.mask.color + = theme_config.a_unfocused_unpressed_iconify->texture[0].data.mask.color + = theme_config.titlebut_unfocused_unpressed_color; + theme_config.a_unfocused_pressed_max->texture[0].data.mask.color + = theme_config.a_unfocused_pressed_close->texture[0].data.mask.color + = theme_config.a_unfocused_pressed_desk->texture[0].data.mask.color + = theme_config.a_unfocused_pressed_shade->texture[0].data.mask.color + = theme_config.a_unfocused_pressed_iconify->texture[0].data.mask.color + = theme_config.titlebut_unfocused_pressed_color; + theme_config.a_menu_bullet_normal->texture[0].data.mask.color + = theme_config.menu_color; + theme_config.a_menu_bullet_selected->texture[0].data.mask.color + = theme_config.menu_selected_color; /* 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); + theme_config.win_font_height = RrFontHeight(theme_config.win_font_focused, + theme_config.a_focused_label->texture[0].data.text.shadow_offset_y); + theme_config.win_font_height + = MAX( + theme_config.win_font_height, + RrFontHeight( + theme_config.win_font_focused, + theme_config.a_unfocused_label->texture[0].data.text.shadow_offset_y)); + theme_config.menu_title_font_height + = RrFontHeight( + theme_config.menu_title_font, + theme_config.a_menu_text_title->texture[0].data.text.shadow_offset_y); + theme_config.menu_font_height + = RrFontHeight( + theme_config.menu_font, + theme_config.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; + RrMargins(theme_config.a_focused_label, &fl, &ft, &fr, &fb); + RrMargins(theme_config.a_unfocused_label, &ul, &ut, &ur, &ub); + theme_config.label_height = theme_config.win_font_height + MAX(ft + fb, + ut + ub); + theme_config.label_height += theme_config.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 @@ -1231,15 +1338,17 @@ gint load_theme_config(const RrInstance *inst, const gchar *name, MAX(MAX(theme->padding * 2, ft + fb), MAX(theme->padding * 2, ut + ub)); */ - 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_config.title_height = theme_config.label_height + + theme_config.paddingy * 2; + + RrMargins(theme_config.a_menu_title, &ul, &ut, &ur, &ub); + theme_config.menu_title_label_height + = theme_config.menu_title_font_height+ut+ub; + theme_config.menu_title_height = theme_config.menu_title_label_height + + theme_config.paddingy * 2; } - theme->button_size = theme->label_height - 2; - theme->grip_width = 25; + theme_config.button_size = theme_config.label_height - 2; + theme_config.grip_width = 25; return 1; } diff --git a/engines/default/config.h b/engines/default/config.h index 9f0e9a4..fb40101 100644 --- a/engines/default/config.h +++ b/engines/default/config.h @@ -52,6 +52,8 @@ struct _ObFrameThemeConfig gint grip_width; gint menu_title_label_height; gint menu_title_height; + + gint config_theme_keepborder; /* style settings - colors */ RrColor *menu_border_color; diff --git a/engines/default/plugin.c b/engines/default/plugin.c index 4f587d6..195e4b0 100644 --- a/engines/default/plugin.c +++ b/engines/default/plugin.c @@ -810,8 +810,8 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake) /* do this before changing the frame's status like max_horz max_vert */ frame_adjust_cursors(self); - if (self->decorations & OB_FRAME_DECOR_BORDER) { -/* || (plugin.config_theme_keepborder)) { */ + if (self->decorations & OB_FRAME_DECOR_BORDER + || (theme_config.config_theme_keepborder)) { self->bwidth = theme_config.fbwidth; } else { -- 1.5.3.7