#include <X11/Xlib.h>
#include <X11/Xresource.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
static XrmDatabase loaddb(RrTheme *theme, char *name);
static gboolean read_int(XrmDatabase db, char *rname, int *value);
mjust = RR_JUSTIFY_CENTER;
}
- /* load the title layout */
- 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, "menuOverlap", &theme->menu_overlap) ||
theme->menu_overlap < 0 || theme->menu_overlap > 20)
"window.button.pressed.focus.picColor",
&theme->titlebut_focused_pressed_color))
theme->titlebut_focused_pressed_color =
- theme->titlebut_focused_unpressed_color;
+ RrColorNew(inst,
+ theme->titlebut_focused_unpressed_color->r,
+ theme->titlebut_focused_unpressed_color->g,
+ theme->titlebut_focused_unpressed_color->b);
if (!read_color(db, inst,
"window.button.pressed.unfocus.picColor",
&theme->titlebut_unfocused_pressed_color))
theme->titlebut_unfocused_pressed_color =
- theme->titlebut_unfocused_unpressed_color;
+ RrColorNew(inst,
+ theme->titlebut_unfocused_unpressed_color->r,
+ theme->titlebut_unfocused_unpressed_color->g,
+ theme->titlebut_unfocused_unpressed_color->b);
if (!read_color(db, inst,
"window.button.disabled.focus.picColor",
&theme->titlebut_disabled_focused_color))
if (!read_color(db, inst,
"window.button.disabled.unfocus.picColor",
&theme->titlebut_disabled_unfocused_color))
- theme->titlebut_hover_unfocused_color = RrColorNew(inst, 0, 0, 0);
+ theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0);
if (!read_color(db, inst,
"window.button.hover.focus.picColor",
&theme->titlebut_hover_focused_color))
theme->titlebut_hover_focused_color =
- theme->titlebut_focused_unpressed_color;
+ RrColorNew(inst,
+ theme->titlebut_focused_unpressed_color->r,
+ theme->titlebut_focused_unpressed_color->g,
+ theme->titlebut_focused_unpressed_color->b);
if (!read_color(db, inst,
"window.button.hover.unfocus.picColor",
&theme->titlebut_hover_unfocused_color))
theme->titlebut_hover_unfocused_color =
- theme->titlebut_unfocused_unpressed_color;
+ RrColorNew(inst,
+ theme->titlebut_unfocused_unpressed_color->r,
+ theme->titlebut_unfocused_unpressed_color->g,
+ theme->titlebut_unfocused_unpressed_color->b);
if (!read_color(db, inst,
"menu.title.textColor", &theme->menu_title_color))
theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
theme->a_hover_focused_iconify =
RrAppearanceCopy(theme->a_hover_focused_max);
theme->a_hover_unfocused_iconify =
- RrAppearanceCopy(theme->a_hover_focused_max);
+ RrAppearanceCopy(theme->a_hover_unfocused_max);
theme->a_unfocused_unpressed_iconify =
RrAppearanceCopy(theme->a_unfocused_unpressed_max);
theme->a_unfocused_pressed_iconify =
RrColorFree(theme->cb_focused_color);
RrColorFree(theme->title_unfocused_color);
RrColorFree(theme->title_focused_color);
+ RrColorFree(theme->titlebut_disabled_focused_color);
+ RrColorFree(theme->titlebut_disabled_unfocused_color);
+ RrColorFree(theme->titlebut_hover_focused_color);
+ RrColorFree(theme->titlebut_hover_unfocused_color);
RrColorFree(theme->titlebut_unfocused_pressed_color);
RrColorFree(theme->titlebut_focused_pressed_color);
RrColorFree(theme->titlebut_unfocused_unpressed_color);
RrFontClose(theme->mtitlefont);
RrFontClose(theme->mfont);
- g_free(theme->title_layout);
-
RrAppearanceFree(theme->a_disabled_focused_max);
RrAppearanceFree(theme->a_disabled_unfocused_max);
RrAppearanceFree(theme->a_hover_focused_max);
{
XrmDatabase db;
- if ((db = XrmGetFileDatabase(name)))
- theme->path = g_path_get_dirname(name);
+ char *s = g_build_filename(name, "themerc", NULL);
+ if ((db = XrmGetFileDatabase(s)))
+ theme->path = g_path_get_dirname(s);
+ g_free(s);
if (db == NULL) {
char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- name, NULL);
+ name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
}
if (db == NULL) {
- char *s = g_build_filename(THEMEDIR, name, NULL);
+ char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
{
gboolean ret = FALSE;
char *s;
- char *data_dir;
int hx, hy; /* ignored */
unsigned int w, h;
unsigned char *b;
- data_dir = g_strdup_printf("%s_data", theme->name);
-
s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- data_dir, maskname, NULL);
+ theme->name, maskname, NULL);
if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
ret = TRUE;
else {
g_free(s);
- s = g_build_filename(THEMEDIR, data_dir, maskname, NULL);
+ s = g_build_filename(THEMEDIR, theme->name, maskname, NULL);
if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
ret = TRUE;
else {
g_free(s);
- s = g_build_filename(theme->path, data_dir, maskname, NULL);
+ s = g_build_filename(theme->path, maskname, NULL);
if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
ret = TRUE;
}
}
g_free(s);
- g_free(data_dir);
return ret;
}