static gboolean read_int(XrmDatabase db, char *rname, int *value);
static gboolean read_string(XrmDatabase db, char *rname, char **value);
static gboolean read_color(XrmDatabase db, const RrInstance *inst,
- gchar *rname, color_rgb **value);
+ gchar *rname, RrColor **value);
static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
gchar *rname, gchar *theme,
RrPixmapMask **value);
gchar *font_str;
RrTheme *theme;
- theme = g_new(RrTheme, 1);
+ theme = g_new0(RrTheme, 1);
theme->inst = inst;
}
/* load the font stuff */
- font_str = "arial:bold:pixelsize=10";
+ if (!read_string(db, "window.title.xftfont", &font_str))
+ font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50";
- theme->winfont_shadow = FALSE;
- if (read_string(db, "window.xft.flags", &str)) {
- if (g_strrstr(str, "shadow"))
- theme->winfont_shadow = TRUE;
- g_free(str);
+ if (!(theme->winfont = RrFontOpen(inst, font_str))) {
+ RrThemeFree(theme);
+ return NULL;
}
-
- if (!read_int(db, "window.xft.shadow.offset",
- &theme->winfont_shadow_offset))
- theme->winfont_shadow_offset = 1;
- if (!read_int(db, "window.xft.shadow.tint",
- &theme->winfont_shadow_tint) ||
- theme->winfont_shadow_tint < 100 || theme->winfont_shadow_tint > 100)
- theme->winfont_shadow_tint = 25;
-
- theme->winfont = font_open(inst, font_str);
- theme->winfont_height = font_height(theme->winfont, theme->winfont_shadow,
- theme->winfont_shadow_offset);
+ theme->winfont_height = RrFontHeight(theme->winfont);
winjust = RR_JUSTIFY_LEFT;
if (read_string(db, "window.justify", &str)) {
winjust = RR_JUSTIFY_RIGHT;
else if (!g_ascii_strcasecmp(str, "center"))
winjust = RR_JUSTIFY_CENTER;
- g_free(str);
}
- font_str = "arial-10:bold";
+ if (!read_string(db, "menu.title.xftfont", &font_str))
+ font_str = "arial,sans:bold:pixelsize=12:shadow=y";
- theme->mtitlefont_shadow = FALSE;
- if (read_string(db, "menu.title.xft.flags", &str)) {
- if (g_strrstr(str, "shadow"))
- theme->mtitlefont_shadow = TRUE;
- g_free(str);
+ if (!(theme->mtitlefont = RrFontOpen(inst, font_str))) {
+ RrThemeFree(theme);
+ return NULL;
}
-
- if (!read_int(db, "menu.title.xft.shadow.offset",
- &theme->mtitlefont_shadow_offset))
- theme->mtitlefont_shadow_offset = 1;
- if (!read_int(db, "menu.title.xft.shadow.tint",
- &theme->mtitlefont_shadow_tint) ||
- theme->mtitlefont_shadow_tint < 100 ||
- theme->mtitlefont_shadow_tint > 100)
- theme->mtitlefont_shadow_tint = 25;
-
- theme->mtitlefont = font_open(inst, font_str);
- theme->mtitlefont_height = font_height(theme->mtitlefont,
- theme->mtitlefont_shadow,
- theme->mtitlefont_shadow_offset);
+ theme->mtitlefont_height = RrFontHeight(theme->mtitlefont);
mtitlejust = RR_JUSTIFY_LEFT;
if (read_string(db, "menu.title.justify", &str)) {
mtitlejust = RR_JUSTIFY_RIGHT;
else if (!g_ascii_strcasecmp(str, "center"))
mtitlejust = RR_JUSTIFY_CENTER;
- g_free(str);
}
- font_str = "arial-8";
+ if (!read_string(db, "menu.frame.xftfont", &font_str))
+ font_str = "arial,sans:bold:pixelsize=11:shadow=y";
- theme->mfont_shadow = FALSE;
- if (read_string(db, "menu.frame.xft.flags", &str)) {
- if (g_strrstr(str, "shadow"))
- theme->mfont_shadow = TRUE;
- g_free(str);
+ if (!(theme->mfont = RrFontOpen(inst, font_str))) {
+ RrThemeFree(theme);
+ return NULL;
}
-
- if (!read_int(db, "menu.frame.xft.shadow.offset",
- &theme->mfont_shadow_offset))
- theme->mfont_shadow_offset = 1;
- if (!read_int(db, "menu.frame.xft.shadow.tint",
- &theme->mfont_shadow_tint) ||
- theme->mfont_shadow_tint < 100 ||
- theme->mfont_shadow_tint > 100)
- theme->mfont_shadow_tint = 25;
-
- theme->mfont = font_open(inst, font_str);
- theme->mfont_height = font_height(theme->mfont, theme->mfont_shadow,
- theme->mfont_shadow_offset);
+ theme->mfont_height = RrFontHeight(theme->mfont);
mjust = RR_JUSTIFY_LEFT;
if (read_string(db, "menu.frame.justify", &str)) {
mjust = RR_JUSTIFY_RIGHT;
else if (!g_ascii_strcasecmp(str, "center"))
mjust = RR_JUSTIFY_CENTER;
- g_free(str);
}
/* load the title layout */
- theme->title_layout = g_strdup("NLIMC");
+ if (!read_string(db, "window.title.layout", &font_str))
+ font_str = "NLIMC";
+ theme->title_layout = g_strdup(font_str);
+ /* load direct dimensions */
if (!read_int(db, "handleWidth", &theme->handle_height) ||
theme->handle_height < 0 || theme->handle_height > 100)
theme->handle_height = 6;
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;
- theme->a_focused_label->texture[0].data.text.shadow =
- theme->app_hilite_label->texture[0].data.text.shadow =
- theme->winfont_shadow;
- theme->a_focused_label->texture[0].data.text.offset =
- theme->app_hilite_label->texture[0].data.text.offset =
- theme->winfont_shadow_offset;
- theme->a_focused_label->texture[0].data.text.tint =
- theme->app_hilite_label->texture[0].data.text.tint =
- theme->winfont_shadow_tint;
theme->a_focused_label->texture[0].data.text.color =
theme->app_hilite_label->texture[0].data.text.color =
theme->title_focused_color;
theme->app_unhilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
theme->a_unfocused_label->texture[0].data.text.font =
theme->app_unhilite_label->texture[0].data.text.font = theme->winfont;
- theme->a_unfocused_label->texture[0].data.text.shadow =
- theme->app_unhilite_label->texture[0].data.text.shadow =
- theme->winfont_shadow;
- theme->a_unfocused_label->texture[0].data.text.offset =
- theme->app_unhilite_label->texture[0].data.text.offset =
- theme->winfont_shadow_offset;
- theme->a_unfocused_label->texture[0].data.text.tint =
- theme->app_unhilite_label->texture[0].data.text.tint =
- theme->winfont_shadow_tint;
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.shadow = theme->mtitlefont_shadow;
- theme->a_menu_title->texture[0].data.text.offset =
- theme->mtitlefont_shadow_offset;
- theme->a_menu_title->texture[0].data.text.tint =
- theme->mtitlefont_shadow_tint;
theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color;
theme->a_menu_item->surface.grad =
theme->a_menu_item->texture[0].data.text.font =
theme->a_menu_disabled->texture[0].data.text.font =
theme->a_menu_hilite->texture[0].data.text.font = theme->mfont;
- theme->a_menu_item->texture[0].data.text.shadow =
- theme->a_menu_disabled->texture[0].data.text.shadow =
- theme->a_menu_hilite->texture[0].data.text.shadow =
- theme->mfont_shadow;
- theme->a_menu_item->texture[0].data.text.offset =
- theme->a_menu_disabled->texture[0].data.text.offset =
- theme->a_menu_hilite->texture[0].data.text.offset =
- theme->mfont_shadow_offset;
- theme->a_menu_item->texture[0].data.text.tint =
- theme->a_menu_disabled->texture[0].data.text.tint =
- theme->a_menu_hilite->texture[0].data.text.tint =
- theme->mfont_shadow_tint;
theme->a_menu_item->texture[0].data.text.color = theme->menu_color;
theme->a_menu_disabled->texture[0].data.text.color =
theme->menu_disabled_color;
RrPixmapMaskFree(theme->iconify_mask);
RrPixmapMaskFree(theme->close_mask);
- font_close(theme->winfont);
- font_close(theme->mtitlefont);
- font_close(theme->mfont);
+ RrFontClose(theme->winfont);
+ RrFontClose(theme->mtitlefont);
+ RrFontClose(theme->mfont);
g_free(theme->title_layout);
if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
retvalue.addr != NULL) {
- *value = g_strdup(retvalue.addr);
+ *value = retvalue.addr;
ret = TRUE;
}
}
static gboolean read_color(XrmDatabase db, const RrInstance *inst,
- gchar *rname, color_rgb **value)
+ gchar *rname, RrColor **value)
{
gboolean ret = FALSE;
char *rclass = create_class_name(rname);
if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
retvalue.addr != NULL) {
- color_rgb *c = RrColorParse(inst, retvalue.addr);
+ RrColor *c = RrColorParse(inst, retvalue.addr);
if (c != NULL) {
*value = c;
ret = TRUE;
char *rclass = create_class_name(rname);
char *rettype;
char *s;
- char *button_dir;
+ char *data_dir;
XrmValue retvalue;
int hx, hy; /* ignored */
unsigned int w, h;
if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
retvalue.addr != NULL) {
- button_dir = g_strdup_printf("%s_data", theme);
+ data_dir = g_strdup_printf("%s_data", theme);
s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- button_dir, retvalue.addr, NULL);
+ data_dir, retvalue.addr, NULL);
if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
ret = TRUE;
else {
g_free(s);
- s = g_build_filename(THEMEDIR, button_dir, retvalue.addr, NULL);
+ s = g_build_filename(THEMEDIR, data_dir, retvalue.addr, NULL);
if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
ret = TRUE;
}
g_free(s);
- g_free(button_dir);
+ g_free(data_dir);
}
g_free(rclass);
if (strstr(tex, "gradient") != NULL) {
if (strstr(tex, "crossdiagonal") != NULL)
*grad = RR_SURFACE_CROSS_DIAGONAL;
- else if (strstr(tex, "rectangle") != NULL)
- *grad = RR_SURFACE_RECTANGLE;
else if (strstr(tex, "pyramid") != NULL)
*grad = RR_SURFACE_PYRAMID;
- else if (strstr(tex, "pipecross") != NULL)
- *grad = RR_SURFACE_PIPECROSS;
- else if (strstr(tex, "elliptic") != NULL)
- *grad = RR_SURFACE_PIPECROSS;
else if (strstr(tex, "horizontal") != NULL)
*grad = RR_SURFACE_HORIZONTAL;
else if (strstr(tex, "vertical") != NULL)