#include "mask.h"
#include "theme.h"
#include "icon.h"
+#include "parser/parse.h"
#include <X11/Xlib.h>
#include <X11/Xresource.h>
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 (!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)) {
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)) {
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) ||
"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_label,
+ theme->app_hilite_fg,
FALSE))
- set_default_appearance(theme->app_hilite_label);
+ set_default_appearance(theme->app_hilite_fg);
}
if (!read_appearance(db, inst,
"window.inactive.title.bg", theme->app_unhilite_bg,
"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_label,
+ theme->app_unhilite_fg,
FALSE))
- set_default_appearance(theme->app_unhilite_label);
+ set_default_appearance(theme->app_unhilite_fg);
}
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;
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 =
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;
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
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;
void RrThemeFree(RrTheme *theme)
{
if (theme) {
+ g_free(theme->path);
g_free(theme->name);
RrColorFree(theme->b_color);
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);
RrAppearanceFree(theme->a_clear_tex);
RrAppearanceFree(theme->app_hilite_bg);
RrAppearanceFree(theme->app_unhilite_bg);
+ RrAppearanceFree(theme->app_hilite_fg);
+ RrAppearanceFree(theme->app_unhilite_fg);
RrAppearanceFree(theme->app_hilite_label);
RrAppearanceFree(theme->app_unhilite_label);
+
+ g_free(theme);
}
}
static XrmDatabase loaddb(RrTheme *theme, char *name)
{
- XrmDatabase db;
+ GSList *it;
+ XrmDatabase db = NULL;
+ gchar *s;
- char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- 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, "themerc", NULL);
+ if (name[0] == '/') {
+ s = g_build_filename(name, "openbox-3", "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
- g_free(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))
+ {
+ s = g_build_filename(it->data, "themes", name,
+ "openbox-3", "themerc", NULL);
+ if ((db = XrmGetFileDatabase(s)))
+ theme->path = g_path_get_dirname(s);
+ g_free(s);
+ }
}
+
if (db == NULL) {
- char *s = g_build_filename(name, "themerc", NULL);
+ s = g_build_filename(name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
RrPixel32 *im, *p;
gint i;
- p = im = g_memdup(OB_DEFAULT_ICON_pixel_data,
- OB_DEFAULT_ICON_WIDTH * OB_DEFAULT_ICON_HEIGHT *
- sizeof(RrPixel32));
+ p = im = g_memdup(data, width * height * sizeof(RrPixel32));
- for (i = 0; i < OB_DEFAULT_ICON_WIDTH*OB_DEFAULT_ICON_HEIGHT; ++i) {
+ for (i = 0; i < width * height; ++i) {
guchar a = ((*p >> 24) & 0xff);
guchar b = ((*p >> 16) & 0xff);
guchar g = ((*p >> 8) & 0xff);
projects / chaz / openbox / blobdiff