X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=40ec1c57b6a1d4501d246f16080c77caaa4ecaaf;hb=34446063fa6f954f81200f2778c099865b374d2c;hp=8ad8c8415a998a8206835b0abf6baad0cd029a65;hpb=c1b2fc5324522f74a14a5cfa210c95e1509a6e7f;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index 8ad8c841..40ec1c57 100644 --- a/render/theme.c +++ b/render/theme.c @@ -1,3 +1,21 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + theme.c for the Openbox window manager + Copyright (c) 2003 Ben Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "render.h" #include "color.h" #include "font.h" @@ -74,26 +92,24 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->app_hilite_bg = RrAppearanceNew(inst, 0); theme->app_unhilite_bg = RrAppearanceNew(inst, 0); - theme->app_hilite_fg = RrAppearanceNew(inst, 0); - theme->app_unhilite_fg = RrAppearanceNew(inst, 0); theme->app_hilite_label = RrAppearanceNew(inst, 1); theme->app_unhilite_label = RrAppearanceNew(inst, 1); if (name) { - db = loaddb(theme, name); + db = loaddb(theme, name); if (db == NULL) { - g_warning("Failed to load the theme '%s'\n" + g_warning("Failed to load the theme '%s'\n" "Falling back to the default: '%s'", name, DEFAULT_THEME); - } else + } else theme->name = g_path_get_basename(name); } if (db == NULL) { - db = loaddb(theme, DEFAULT_THEME); - if (db == NULL) { - g_warning("Failed to load the theme '%s'.", DEFAULT_THEME); - return NULL; - } else + db = loaddb(theme, DEFAULT_THEME); + if (db == NULL) { + g_warning("Failed to load the theme '%s'.", DEFAULT_THEME); + return NULL; + } else theme->name = g_path_get_basename(DEFAULT_THEME); } @@ -101,21 +117,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_string(db, "window.active.label.text.font", &font_str)) font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50"; - if (!(theme->winfont_focused = RrFontOpen(inst, font_str))) { + if (!(theme->win_font_focused = RrFontOpen(inst, font_str))) { RrThemeFree(theme); return NULL; } - theme->winfont_height = RrFontHeight(theme->winfont_focused); + theme->win_font_height = RrFontHeight(theme->win_font_focused); if (!read_string(db, "window.inactive.label.text.font", &font_str)) /* font_str will already be set to the last one */; - if (!(theme->winfont_unfocused = RrFontOpen(inst, font_str))) { + if (!(theme->win_font_unfocused = RrFontOpen(inst, font_str))) { RrThemeFree(theme); return NULL; } - theme->winfont_height = MAX(theme->winfont_height, - RrFontHeight(theme->winfont_unfocused)); + theme->win_font_height = MAX(theme->win_font_height, + RrFontHeight(theme->win_font_unfocused)); winjust = RR_JUSTIFY_LEFT; if (read_string(db, "window.label.text.justify", &str)) { @@ -128,11 +144,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_string(db, "menu.title.text.font", &font_str)) font_str = "arial,sans:bold:pixelsize=12:shadow=y"; - if (!(theme->mtitlefont = RrFontOpen(inst, font_str))) { + if (!(theme->menu_title_font = RrFontOpen(inst, font_str))) { RrThemeFree(theme); return NULL; } - theme->mtitlefont_height = RrFontHeight(theme->mtitlefont); + theme->menu_title_font_height = RrFontHeight(theme->menu_title_font); mtitlejust = RR_JUSTIFY_LEFT; if (read_string(db, "menu.title.text.justify", &str)) { @@ -145,15 +161,15 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_string(db, "menu.items.font", &font_str)) font_str = "arial,sans:bold:pixelsize=11:shadow=y"; - if (!(theme->mfont = RrFontOpen(inst, font_str))) { + if (!(theme->menu_font = RrFontOpen(inst, font_str))) { RrThemeFree(theme); return NULL; } - theme->mfont_height = RrFontHeight(theme->mfont); + theme->menu_font_height = RrFontHeight(theme->menu_font); /* load direct dimensions */ if (!read_int(db, "menu.overlap", &theme->menu_overlap) || - theme->menu_overlap < 0 || theme->menu_overlap > 20) + theme->menu_overlap < 0 || theme->menu_overlap > 20) theme->menu_overlap = 0; if (!read_int(db, "window.handle.width", &theme->handle_height)) theme->handle_height = 6; @@ -162,48 +178,48 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (theme->handle_height <= 0 || theme->handle_height > 100) theme->handle_height = 6; if (!read_int(db, "padding.width", &theme->padding) || - theme->padding < 0 || theme->padding > 100) + theme->padding < 0 || theme->padding > 100) theme->padding = 3; if (!read_int(db, "border.width", &theme->bwidth) || - theme->bwidth < 0 || theme->bwidth > 100) + theme->bwidth < 0 || theme->bwidth > 100) theme->bwidth = 1; if (!read_int(db, "window.client.padding.width", &theme->cbwidth) || - theme->cbwidth < 0 || theme->cbwidth > 100) + theme->cbwidth < 0 || theme->cbwidth > 100) theme->cbwidth = theme->padding; /* load colors */ if (!read_color(db, inst, "border.color", &theme->b_color)) - theme->b_color = RrColorNew(inst, 0, 0, 0); + theme->b_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, "window.active.client.color", &theme->cb_focused_color)) - theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, "window.inactive.client.color", &theme->cb_unfocused_color)) - theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, "window.active.label.text.color", &theme->title_focused_color)) - theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); + theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0); if (!read_color(db, inst, "window.inactive.label.text.color", &theme->title_unfocused_color)) - theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, "window.active.button.unpressed.image.color", &theme->titlebut_focused_unpressed_color)) - theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0); + theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, "window.inactive.button.unpressed.image.color", &theme->titlebut_unfocused_unpressed_color)) - theme->titlebut_unfocused_unpressed_color = + theme->titlebut_unfocused_unpressed_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, "window.active.button.pressed.image.color", &theme->titlebut_focused_pressed_color)) - theme->titlebut_focused_pressed_color = + theme->titlebut_focused_pressed_color = RrColorNew(inst, theme->titlebut_focused_unpressed_color->r, theme->titlebut_focused_unpressed_color->g, @@ -211,7 +227,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_color(db, inst, "window.inactive.button.pressed.image.color", &theme->titlebut_unfocused_pressed_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, @@ -219,16 +235,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_color(db, inst, "window.active.button.disabled.image.color", &theme->titlebut_disabled_focused_color)) - theme->titlebut_disabled_focused_color = + theme->titlebut_disabled_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, "window.inactive.button.disabled.image.color", &theme->titlebut_disabled_unfocused_color)) - theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); + theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, "window.active.button.hover.image.color", &theme->titlebut_hover_focused_color)) - theme->titlebut_hover_focused_color = + theme->titlebut_hover_focused_color = RrColorNew(inst, theme->titlebut_focused_unpressed_color->r, theme->titlebut_focused_unpressed_color->g, @@ -236,7 +252,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_color(db, inst, "window.inactive.button.hover.image.color", &theme->titlebut_hover_unfocused_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, @@ -244,7 +260,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_color(db, inst, "window.active.button.toggled.image.color", &theme->titlebut_toggled_focused_color)) - theme->titlebut_toggled_focused_color = + theme->titlebut_toggled_focused_color = RrColorNew(inst, theme->titlebut_focused_pressed_color->r, theme->titlebut_focused_pressed_color->g, @@ -252,7 +268,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_color(db, inst, "window.inactive.button.toggled.image.color", &theme->titlebut_toggled_unfocused_color)) - theme->titlebut_toggled_unfocused_color = + theme->titlebut_toggled_unfocused_color = RrColorNew(inst, theme->titlebut_unfocused_pressed_color->r, theme->titlebut_unfocused_pressed_color->g, @@ -289,7 +305,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_mask(inst, "max_hover.xbm", theme, &theme->max_hover_mask)) { theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask); } - } else { + } else { { guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; theme->max_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); @@ -430,47 +446,47 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_appearance(db, inst, "window.active.title.bg", theme->a_focused_title, FALSE)) - set_default_appearance(theme->a_focused_title); + set_default_appearance(theme->a_focused_title); if (!read_appearance(db, inst, "window.inactive.title.bg", theme->a_unfocused_title, FALSE)) - set_default_appearance(theme->a_unfocused_title); + set_default_appearance(theme->a_unfocused_title); if (!read_appearance(db, inst, "window.active.label.bg", theme->a_focused_label, TRUE)) - set_default_appearance(theme->a_focused_label); + set_default_appearance(theme->a_focused_label); if (!read_appearance(db, inst, "window.inactive.label.bg", theme->a_unfocused_label, TRUE)) - set_default_appearance(theme->a_unfocused_label); + set_default_appearance(theme->a_unfocused_label); if (!read_appearance(db, inst, "window.active.handle.bg", theme->a_focused_handle, FALSE)) - set_default_appearance(theme->a_focused_handle); + set_default_appearance(theme->a_focused_handle); if (!read_appearance(db, inst, "window.inactive.handle.bg",theme->a_unfocused_handle, FALSE)) - set_default_appearance(theme->a_unfocused_handle); + set_default_appearance(theme->a_unfocused_handle); if (!read_appearance(db, inst, "window.active.grip.bg", theme->a_focused_grip, TRUE)) - set_default_appearance(theme->a_focused_grip); + set_default_appearance(theme->a_focused_grip); if (!read_appearance(db, inst, "window.inactive.grip.bg", theme->a_unfocused_grip, TRUE)) - set_default_appearance(theme->a_unfocused_grip); + 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); + set_default_appearance(theme->a_menu); if (!read_appearance(db, inst, "menu.title.bg", theme->a_menu_title, FALSE)) - set_default_appearance(theme->a_menu_title); + set_default_appearance(theme->a_menu_title); if (!read_appearance(db, inst, "menu.items.active.bg", theme->a_menu_selected, TRUE)) - set_default_appearance(theme->a_menu_selected); + set_default_appearance(theme->a_menu_selected); /* read the appearances for rendering non-decorations */ if (!read_appearance(db, inst, @@ -481,17 +497,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "window.active.label.bg", theme->app_hilite_label, TRUE)) set_default_appearance(theme->app_hilite_label); - if (!read_appearance(db, inst, - "window.active.label.bg", theme->app_hilite_fg, - TRUE)) - set_default_appearance(theme->app_hilite_fg); - else if (theme->app_hilite_label->surface.grad == RR_SURFACE_PARENTREL) { - if (!read_appearance(db, inst, - "window.active.title.bg", - theme->app_hilite_fg, - FALSE)) - set_default_appearance(theme->app_hilite_fg); - } + if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL) + theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_label); + else + theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_title); if (!read_appearance(db, inst, "window.inactive.title.bg", theme->app_unhilite_bg, FALSE)) @@ -500,18 +509,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "window.inactive.label.bg", theme->app_unhilite_label, TRUE)) set_default_appearance(theme->app_unhilite_label); - if (!read_appearance(db, inst, - "window.inactive.label.bg", theme->app_unhilite_fg, - TRUE)) - set_default_appearance(theme->app_unhilite_fg); - else if (theme->app_unhilite_label->surface.grad == RR_SURFACE_PARENTREL) { - if (!read_appearance(db, inst, - "window.inactive.title.bg", - theme->app_unhilite_fg, - FALSE)) - set_default_appearance(theme->app_unhilite_fg); - } - + if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) + theme->app_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_label); + else + theme->app_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_title); /* read buttons textures */ if (!read_appearance(db, inst, @@ -531,12 +532,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) set_default_appearance(theme->a_focused_pressed_max); if (!read_appearance(db, inst, "window.inactive.button.pressed.bg", - theme->a_unfocused_pressed_max, + theme->a_unfocused_pressed_max, TRUE)) set_default_appearance(theme->a_unfocused_pressed_max); if (!read_appearance(db, inst, "window.active.button.toggled.bg", - theme->a_toggled_focused_max, + theme->a_toggled_focused_max, TRUE)) { RrAppearanceFree(theme->a_toggled_focused_max); @@ -545,7 +546,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } if (!read_appearance(db, inst, "window.inactive.button.toggled.bg", - theme->a_toggled_unfocused_max, + theme->a_toggled_unfocused_max, TRUE)) { RrAppearanceFree(theme->a_toggled_unfocused_max); @@ -554,17 +555,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } if (!read_appearance(db, inst, "window.active.button.unpressed.bg", - theme->a_focused_unpressed_max, + theme->a_focused_unpressed_max, TRUE)) - set_default_appearance(theme->a_focused_unpressed_max); + set_default_appearance(theme->a_focused_unpressed_max); if (!read_appearance(db, inst, "window.inactive.button.unpressed.bg", - theme->a_unfocused_unpressed_max, + theme->a_unfocused_unpressed_max, TRUE)) - set_default_appearance(theme->a_unfocused_unpressed_max); + set_default_appearance(theme->a_unfocused_unpressed_max); if (!read_appearance(db, inst, "window.active.button.hover.bg", - theme->a_hover_focused_max, + theme->a_hover_focused_max, TRUE)) { RrAppearanceFree(theme->a_hover_focused_max); @@ -573,7 +574,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } if (!read_appearance(db, inst, "window.inactive.button.hover.bg", - theme->a_hover_unfocused_max, + theme->a_hover_unfocused_max, TRUE)) { RrAppearanceFree(theme->a_hover_unfocused_max); @@ -607,7 +608,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RrAppearanceCopy(theme->a_hover_unfocused_max); theme->a_toggled_focused_desk = RrAppearanceCopy(theme->a_toggled_focused_max); - theme->a_toggled_unfocused_desk = + theme->a_toggled_unfocused_desk = RrAppearanceCopy(theme->a_toggled_unfocused_max); theme->a_unfocused_unpressed_desk = RrAppearanceCopy(theme->a_unfocused_unpressed_max); @@ -672,7 +673,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_focused_label->texture[0].data.text.font = theme->app_hilite_label->texture[0].data.text.font = - theme->winfont_focused; + theme->win_font_focused; theme->a_focused_label->texture[0].data.text.color = theme->app_hilite_label->texture[0].data.text.color = theme->title_focused_color; @@ -684,14 +685,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RR_JUSTIFY_LEFT; theme->a_unfocused_label->texture[0].data.text.font = theme->app_unhilite_label->texture[0].data.text.font = - theme->winfont_unfocused; + theme->win_font_unfocused; theme->a_unfocused_label->texture[0].data.text.color = theme->app_unhilite_label->texture[0].data.text.color = theme->title_unfocused_color; theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT; theme->a_menu_title->texture[0].data.text.justify = mtitlejust; - theme->a_menu_title->texture[0].data.text.font = theme->mtitlefont; + theme->a_menu_title->texture[0].data.text.font = theme->menu_title_font; theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color; theme->a_menu_text_normal->texture[0].type = @@ -703,7 +704,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RR_JUSTIFY_LEFT; theme->a_menu_text_normal->texture[0].data.text.font = theme->a_menu_text_disabled->texture[0].data.text.font = - theme->a_menu_text_selected->texture[0].data.text.font = theme->mfont; + theme->a_menu_text_selected->texture[0].data.text.font = + theme->menu_font; theme->a_menu_text_normal->texture[0].data.text.color = theme->menu_color; theme->a_menu_text_disabled->texture[0].data.text.color = theme->menu_disabled_color; @@ -881,7 +883,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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_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 = @@ -895,26 +897,28 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) XrmDestroyDatabase(db); { - gint fl, ft, fr, fb; - gint ul, ut, ur, ub; + 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->winfont_height - + MAX(ft + fb, ut + ub); + theme->label_height = theme->win_font_height + MAX(ft + fb, ut + ub); /* 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 right now, so if anyone complains, here is how to keep text from going over the title's bevel/border with a padding.width of 0 and a bevelless/borderless label - RrMargins(theme->a_focused_title, &fl, &ft, &fr, &fb); - RrMargins(theme->a_unfocused_title, &ul, &ut, &ur, &ub); - theme->title_height = theme->label_height + - MAX(MAX(theme->padding * 2, ft + fb), - MAX(theme->padding * 2, ut + ub)); + RrMargins(theme->a_focused_title, &fl, &ft, &fr, &fb); + RrMargins(theme->a_unfocused_title, &ul, &ut, &ur, &ub); + theme->title_height = theme->label_height + + MAX(MAX(theme->padding * 2, ft + fb), + MAX(theme->padding * 2, ut + ub)); */ theme->title_height = theme->label_height + theme->padding * 2; + /* this should match the above title_height given the same font size + for both. */ + theme->menu_title_height = theme->menu_title_font_height + + theme->padding * 2; } theme->button_size = theme->label_height - 2; theme->grip_width = theme->title_height * 1.5; @@ -975,10 +979,10 @@ void RrThemeFree(RrTheme *theme) RrPixmapMaskFree(theme->close_pressed_mask); RrPixmapMaskFree(theme->menu_bullet_mask); - RrFontClose(theme->winfont_focused); - RrFontClose(theme->winfont_unfocused); - RrFontClose(theme->mtitlefont); - RrFontClose(theme->mfont); + RrFontClose(theme->win_font_focused); + RrFontClose(theme->win_font_unfocused); + RrFontClose(theme->menu_title_font); + RrFontClose(theme->menu_font); RrAppearanceFree(theme->a_disabled_focused_max); RrAppearanceFree(theme->a_disabled_unfocused_max); @@ -1066,10 +1070,17 @@ static XrmDatabase loaddb(RrTheme *theme, char *name) if (name[0] == '/') { s = g_build_filename(name, "openbox-3", "themerc", NULL); - if ((db = XrmGetFileDatabase(s))) + if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s); } else { + /* XXX backwards compatibility, remove me sometime later */ + s = g_build_filename(g_get_home_dir(), ".themes", name, + "openbox-3", "themerc", NULL); + if ((db = XrmGetFileDatabase(s))) + theme->path = g_path_get_dirname(s); + g_free(s); + for (it = parse_xdg_data_dir_paths(); !db && it; it = g_slist_next(it)) { @@ -1083,7 +1094,7 @@ static XrmDatabase loaddb(RrTheme *theme, char *name) if (db == NULL) { s = g_build_filename(name, "themerc", NULL); - if ((db = XrmGetFileDatabase(s))) + if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s); } @@ -1097,11 +1108,11 @@ static char *create_class_name(char *rname) char *p = rclass; while (TRUE) { - *p = toupper(*p); - p = strchr(p+1, '.'); - if (p == NULL) break; - ++p; - if (*p == '\0') break; + *p = toupper(*p); + p = strchr(p+1, '.'); + if (p == NULL) break; + ++p; + if (*p == '\0') break; } return rclass; } @@ -1114,10 +1125,10 @@ static gboolean read_int(XrmDatabase db, char *rname, int *value) XrmValue retvalue; if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && - retvalue.addr != NULL) { - *value = (int)strtol(retvalue.addr, &end, 10); - if (end != retvalue.addr) - ret = TRUE; + retvalue.addr != NULL) { + *value = (int)strtol(retvalue.addr, &end, 10); + if (end != retvalue.addr) + ret = TRUE; } g_free(rclass); @@ -1132,9 +1143,9 @@ static gboolean read_string(XrmDatabase db, char *rname, char **value) XrmValue retvalue; if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && - retvalue.addr != NULL) { - *value = retvalue.addr; - ret = TRUE; + retvalue.addr != NULL) { + *value = retvalue.addr; + ret = TRUE; } g_free(rclass); @@ -1150,12 +1161,12 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst, XrmValue retvalue; if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && - retvalue.addr != NULL) { - RrColor *c = RrColorParse(inst, retvalue.addr); - if (c != NULL) { - *value = c; - ret = TRUE; - } + retvalue.addr != NULL) { + RrColor *c = RrColorParse(inst, retvalue.addr); + if (c != NULL) { + *value = c; + ret = TRUE; + } } g_free(rclass); @@ -1192,48 +1203,48 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, /* convert to all lowercase */ for (t = tex; *t != '\0'; ++t) - *t = g_ascii_tolower(*t); + *t = g_ascii_tolower(*t); if (allow_trans && strstr(tex, "parentrelative") != NULL) { - *grad = RR_SURFACE_PARENTREL; + *grad = RR_SURFACE_PARENTREL; } else { - if (strstr(tex, "gradient") != NULL) { - if (strstr(tex, "crossdiagonal") != NULL) - *grad = RR_SURFACE_CROSS_DIAGONAL; - else if (strstr(tex, "pyramid") != NULL) - *grad = RR_SURFACE_PYRAMID; - else if (strstr(tex, "horizontal") != NULL) - *grad = RR_SURFACE_HORIZONTAL; - else if (strstr(tex, "vertical") != NULL) - *grad = RR_SURFACE_VERTICAL; - else - *grad = RR_SURFACE_DIAGONAL; - } else { - *grad = RR_SURFACE_SOLID; - } - - if (strstr(tex, "sunken") != NULL) - *relief = RR_RELIEF_SUNKEN; - else if (strstr(tex, "flat") != NULL) - *relief = RR_RELIEF_FLAT; - else - *relief = RR_RELIEF_RAISED; + if (strstr(tex, "gradient") != NULL) { + if (strstr(tex, "crossdiagonal") != NULL) + *grad = RR_SURFACE_CROSS_DIAGONAL; + else if (strstr(tex, "pyramid") != NULL) + *grad = RR_SURFACE_PYRAMID; + else if (strstr(tex, "horizontal") != NULL) + *grad = RR_SURFACE_HORIZONTAL; + else if (strstr(tex, "vertical") != NULL) + *grad = RR_SURFACE_VERTICAL; + else + *grad = RR_SURFACE_DIAGONAL; + } else { + *grad = RR_SURFACE_SOLID; + } + + if (strstr(tex, "sunken") != NULL) + *relief = RR_RELIEF_SUNKEN; + else if (strstr(tex, "flat") != NULL) + *relief = RR_RELIEF_FLAT; + else + *relief = RR_RELIEF_RAISED; - *border = FALSE; - if (*relief == RR_RELIEF_FLAT) { - if (strstr(tex, "border") != NULL) - *border = TRUE; - } else { - if (strstr(tex, "bevel2") != NULL) - *bevel = RR_BEVEL_2; - else - *bevel = RR_BEVEL_1; - } - - if (strstr(tex, "interlaced") != NULL) - *interlaced = TRUE; - else - *interlaced = FALSE; + *border = FALSE; + if (*relief == RR_RELIEF_FLAT) { + if (strstr(tex, "border") != NULL) + *border = TRUE; + } else { + if (strstr(tex, "bevel2") != NULL) + *bevel = RR_BEVEL_2; + else + *bevel = RR_BEVEL_1; + } + + if (strstr(tex, "interlaced") != NULL) + *interlaced = TRUE; + else + *interlaced = FALSE; } } @@ -1254,27 +1265,27 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, icname = g_strconcat(rname, ".interlace.color", NULL); if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && - retvalue.addr != NULL) { - parse_appearance(retvalue.addr, - &value->surface.grad, - &value->surface.relief, - &value->surface.bevel, - &value->surface.interlaced, - &value->surface.border, + retvalue.addr != NULL) { + parse_appearance(retvalue.addr, + &value->surface.grad, + &value->surface.relief, + &value->surface.bevel, + &value->surface.interlaced, + &value->surface.border, allow_trans); - if (!read_color(db, inst, cname, &value->surface.primary)) - value->surface.primary = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, ctoname, &value->surface.secondary)) - value->surface.secondary = RrColorNew(inst, 0, 0, 0); - if (value->surface.border) - if (!read_color(db, inst, bcname, - &value->surface.border_color)) - value->surface.border_color = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, cname, &value->surface.primary)) + value->surface.primary = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, ctoname, &value->surface.secondary)) + value->surface.secondary = RrColorNew(inst, 0, 0, 0); + if (value->surface.border) + if (!read_color(db, inst, bcname, + &value->surface.border_color)) + value->surface.border_color = RrColorNew(inst, 0, 0, 0); if (value->surface.interlaced) - if (!read_color(db, inst, icname, - &value->surface.interlace_color)) - value->surface.interlace_color = RrColorNew(inst, 0, 0, 0); - ret = TRUE; + if (!read_color(db, inst, icname, + &value->surface.interlace_color)) + value->surface.interlace_color = RrColorNew(inst, 0, 0, 0); + ret = TRUE; } g_free(icname);