X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=b1cce15bc29ba5627f31d1a01d1c59ce6b33e115;hb=766e7ae9bfeb1dc0454d7b5b37296b91859831cb;hp=d8bd41f04704ff9ab7010cb0b7c937193b25ee4e;hpb=e91814e99f8e71fdf2d930acf43988110969547d;p=chaz%2Fopenbox diff --git a/render/theme.c b/render/theme.c index d8bd41f0..b1cce15b 100644 --- a/render/theme.c +++ b/render/theme.c @@ -1,8 +1,29 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + theme.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson + 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" #include "mask.h" #include "theme.h" +#include "icon.h" +#include "parser/parse.h" #include #include @@ -10,9 +31,9 @@ #include #include -static XrmDatabase loaddb(RrTheme *theme, char *name); -static gboolean read_int(XrmDatabase db, char *rname, int *value); -static gboolean read_string(XrmDatabase db, char *rname, char **value); +static XrmDatabase loaddb(RrTheme *theme, gchar *name); +static gboolean read_int(XrmDatabase db, gchar *rname, gint *value); +static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value); static gboolean read_color(XrmDatabase db, const RrInstance *inst, gchar *rname, RrColor **value); static gboolean read_mask(const RrInstance *inst, @@ -21,6 +42,7 @@ static gboolean read_mask(const RrInstance *inst, static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, gchar *rname, RrAppearance *value, gboolean allow_trans); +static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) @@ -58,213 +80,209 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_unfocused_handle = RrAppearanceNew(inst, 0); theme->a_menu = RrAppearanceNew(inst, 0); theme->a_menu_title = RrAppearanceNew(inst, 1); - theme->a_menu_item = RrAppearanceNew(inst, 0); + theme->a_menu_normal = RrAppearanceNew(inst, 0); theme->a_menu_disabled = RrAppearanceNew(inst, 0); - theme->a_menu_hilite = RrAppearanceNew(inst, 0); - theme->a_menu_text_item = RrAppearanceNew(inst, 1); + theme->a_menu_selected = RrAppearanceNew(inst, 0); + theme->a_menu_text_normal = RrAppearanceNew(inst, 1); theme->a_menu_text_disabled = RrAppearanceNew(inst, 1); - theme->a_menu_text_hilite = RrAppearanceNew(inst, 1); - theme->a_menu_bullet = RrAppearanceNew(inst, 1); + theme->a_menu_text_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->app_hilite_bg = RrAppearanceNew(inst, 0); - theme->app_unhilite_bg = 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); } /* load the font stuff */ - if (!read_string(db, "window.focus.font", &font_str)) + 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.unfocus.font", &font_str)) + 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.justify", &str)) { + if (read_string(db, "window.label.text.justify", &str)) { if (!g_ascii_strcasecmp(str, "right")) winjust = RR_JUSTIFY_RIGHT; else if (!g_ascii_strcasecmp(str, "center")) winjust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.title.font", &font_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.justify", &str)) { + if (read_string(db, "menu.title.text.justify", &str)) { if (!g_ascii_strcasecmp(str, "right")) mtitlejust = RR_JUSTIFY_RIGHT; else if (!g_ascii_strcasecmp(str, "center")) mtitlejust = RR_JUSTIFY_CENTER; } - if (!read_string(db, "menu.frame.font", &font_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, "menuOverlap", &theme->menu_overlap) || - theme->menu_overlap < 0 || theme->menu_overlap > 20) + if (!read_int(db, "menu.overlap", &theme->menu_overlap) || + theme->menu_overlap < 0 || theme->menu_overlap > 20) theme->menu_overlap = 0; - if (!read_int(db, "handleWidth", &theme->handle_height)) + if (!read_int(db, "window.handle.width", &theme->handle_height)) theme->handle_height = 6; if (!theme->handle_height) theme->show_handle = FALSE; if (theme->handle_height <= 0 || theme->handle_height > 100) theme->handle_height = 6; - if (!read_int(db, "bevelWidth", &theme->bevel) || - theme->bevel <= 0 || theme->bevel > 100) - theme->bevel = 3; - if (!read_int(db, "borderWidth", &theme->bwidth) || - theme->bwidth < 0 || theme->bwidth > 100) + if (!read_int(db, "padding.width", &theme->padding) || + 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 = 1; - if (!read_int(db, "frameWidth", &theme->cbwidth) || - theme->cbwidth < 0 || theme->cbwidth > 100) - theme->cbwidth = theme->bevel; + if (!read_int(db, "window.client.padding.width", &theme->cbwidth) || + theme->cbwidth < 0 || theme->cbwidth > 100) + theme->cbwidth = theme->padding; /* load colors */ if (!read_color(db, inst, - "borderColor", &theme->b_color)) - theme->b_color = RrColorNew(inst, 0, 0, 0); + "border.color", &theme->b_color)) + theme->b_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, - "window.frame.focusColor", &theme->cb_focused_color)) - theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + "window.active.client.color", + &theme->cb_focused_color)) + theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "window.frame.unfocusColor",&theme->cb_unfocused_color)) - theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); + "window.inactive.client.color", + &theme->cb_unfocused_color)) + theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "window.label.focus.textColor", + "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.label.unfocus.textColor", + "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.button.focus.picColor", + "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.button.unfocus.picColor", + "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.button.pressed.focus.picColor", + "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, theme->titlebut_focused_unpressed_color->b); if (!read_color(db, inst, - "window.button.pressed.unfocus.picColor", + "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, theme->titlebut_unfocused_unpressed_color->b); if (!read_color(db, inst, - "window.button.disabled.focus.picColor", + "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.button.disabled.unfocus.picColor", + "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.button.hover.focus.picColor", + "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, theme->titlebut_focused_unpressed_color->b); if (!read_color(db, inst, - "window.button.hover.unfocus.picColor", + "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, theme->titlebut_unfocused_unpressed_color->b); if (!read_color(db, inst, - "window.button.toggled.focus.picColor", + "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, theme->titlebut_focused_pressed_color->b); if (!read_color(db, inst, - "window.button.toggled.unfocus.picColor", + "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, theme->titlebut_unfocused_pressed_color->b); if (!read_color(db, inst, - "menu.title.textColor", &theme->menu_title_color)) + "menu.title.text.color", &theme->menu_title_color)) theme->menu_title_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, - "menu.frame.textColor", &theme->menu_color)) + "menu.items.text.color", &theme->menu_color)) theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff); if (!read_color(db, inst, - "menu.bullet.picColor", &theme->menu_bullet_color)) - theme->menu_bullet_color = RrColorNew(inst, 0, 0, 0); - if (!read_color(db, inst, - "menu.frame.disableColor", &theme->menu_disabled_color)) + "menu.items.disabled.text.color", + &theme->menu_disabled_color)) theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); if (!read_color(db, inst, - "menu.hilite.textColor", &theme->menu_hilite_color)) - theme->menu_hilite_color = RrColorNew(inst, 0, 0, 0); - + "menu.items.active.text.color", + &theme->menu_selected_color)) + theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) { if (!read_mask(inst, "max_pressed.xbm", theme, @@ -283,14 +301,14 @@ 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); + theme->max_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); } { guchar data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; - theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); + theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); } theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask); theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask); @@ -315,13 +333,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } else { { guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f }; - theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); + theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); } theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask); theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask); theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask); } + theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH, + OB_DEFAULT_ICON_HEIGHT, + OB_DEFAULT_ICON_pixel_data); + if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) { if (!read_mask(inst, "desk_pressed.xbm", theme, &theme->desk_pressed_mask)) { @@ -343,12 +365,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } else { { guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; - theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); + theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); } { guchar data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 }; theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7, - (char*)data); + (gchar*)data); } theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask); theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask); @@ -376,12 +398,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } else { { guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 }; - theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); + theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); } { guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f }; theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7, - (char*)data); + (gchar*)data); } theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask); theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask); @@ -404,7 +426,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) } else { { guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 }; - theme->close_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data); + theme->close_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data); } theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask); theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask); @@ -413,97 +435,93 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) { guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; - theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (char*)data); + theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (gchar*)data); } /* read the decoration textures */ if (!read_appearance(db, inst, - "window.title.focus", theme->a_focused_title, + "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.title.unfocus", theme->a_unfocused_title, + "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.label.focus", theme->a_focused_label, + "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.label.unfocus", theme->a_unfocused_label, + "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.handle.focus", theme->a_focused_handle, + "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.handle.unfocus",theme->a_unfocused_handle, + "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.grip.focus", theme->a_focused_grip, + "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.grip.unfocus", theme->a_unfocused_grip, + "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.frame", theme->a_menu, + "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", theme->a_menu_title, + "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.hilite", theme->a_menu_hilite, + "menu.items.active.bg", theme->a_menu_selected, TRUE)) - set_default_appearance(theme->a_menu_hilite); + set_default_appearance(theme->a_menu_selected); /* read the appearances for rendering non-decorations */ - if (!read_appearance(db, inst, - "window.title.focus", theme->app_hilite_bg, - FALSE)) - set_default_appearance(theme->app_hilite_bg); - if (!read_appearance(db, inst, - "window.label.focus", theme->app_hilite_label, - TRUE)) - set_default_appearance(theme->app_hilite_label); - if (!read_appearance(db, inst, - "window.title.unfocus", theme->app_unhilite_bg, - FALSE)) - set_default_appearance(theme->app_unhilite_bg); - if (!read_appearance(db, inst, - "window.label.unfocus", theme->app_unhilite_label, - TRUE)) - set_default_appearance(theme->app_unhilite_label); + theme->app_hilite_bg = RrAppearanceCopy(theme->a_focused_title); + theme->app_hilite_label = RrAppearanceCopy(theme->a_focused_label); + 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); + theme->app_unhilite_bg = RrAppearanceCopy(theme->a_unfocused_title); + theme->app_unhilite_label = RrAppearanceCopy(theme->a_unfocused_label); + 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, - "window.button.disabled.focus", - theme->a_disabled_focused_max, + "window.active.button.disabled.bg", + theme->a_disabled_focused_max, TRUE)) set_default_appearance(theme->a_disabled_focused_max); if (!read_appearance(db, inst, - "window.button.disabled.unfocus", - theme->a_disabled_unfocused_max, + "window.inactive.button.disabled.bg", + theme->a_disabled_unfocused_max, TRUE)) set_default_appearance(theme->a_disabled_unfocused_max); if (!read_appearance(db, inst, - "window.button.pressed.focus", - theme->a_focused_pressed_max, + "window.active.button.pressed.bg", + theme->a_focused_pressed_max, TRUE)) set_default_appearance(theme->a_focused_pressed_max); if (!read_appearance(db, inst, - "window.button.pressed.unfocus", - theme->a_unfocused_pressed_max, + "window.inactive.button.pressed.bg", + theme->a_unfocused_pressed_max, TRUE)) set_default_appearance(theme->a_unfocused_pressed_max); if (!read_appearance(db, inst, - "window.button.toggled.focus", - theme->a_toggled_focused_max, + "window.active.button.toggled.bg", + theme->a_toggled_focused_max, TRUE)) { RrAppearanceFree(theme->a_toggled_focused_max); @@ -511,8 +529,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RrAppearanceCopy(theme->a_focused_pressed_max); } if (!read_appearance(db, inst, - "window.button.toggled.unfocus", - theme->a_toggled_unfocused_max, + "window.inactive.button.toggled.bg", + theme->a_toggled_unfocused_max, TRUE)) { RrAppearanceFree(theme->a_toggled_unfocused_max); @@ -520,18 +538,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RrAppearanceCopy(theme->a_unfocused_pressed_max); } if (!read_appearance(db, inst, - "window.button.focus", - theme->a_focused_unpressed_max, + "window.active.button.unpressed.bg", + 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.button.unfocus", - theme->a_unfocused_unpressed_max, + "window.inactive.button.unpressed.bg", + 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.button.hover.focus", - theme->a_hover_focused_max, + "window.active.button.hover.bg", + theme->a_hover_focused_max, TRUE)) { RrAppearanceFree(theme->a_hover_focused_max); @@ -539,8 +557,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) RrAppearanceCopy(theme->a_focused_unpressed_max); } if (!read_appearance(db, inst, - "window.button.hover.unfocus", - theme->a_hover_unfocused_max, + "window.inactive.button.hover.bg", + theme->a_hover_unfocused_max, TRUE)) { RrAppearanceFree(theme->a_hover_unfocused_max); @@ -574,7 +592,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); @@ -624,12 +642,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_icon->surface.grad = theme->a_clear->surface.grad = theme->a_clear_tex->surface.grad = - theme->a_menu_item->surface.grad = + theme->a_menu_normal->surface.grad = theme->a_menu_disabled->surface.grad = - theme->a_menu_text_item->surface.grad = + theme->a_menu_text_normal->surface.grad = theme->a_menu_text_disabled->surface.grad = - theme->a_menu_text_hilite->surface.grad = - theme->a_menu_bullet->surface.grad = RR_SURFACE_PARENTREL; + theme->a_menu_text_selected->surface.grad = + theme->a_menu_bullet_normal->surface.grad = + theme->a_menu_bullet_selected->surface.grad = RR_SURFACE_PARENTREL; /* set up the textures */ theme->a_focused_label->texture[0].type = @@ -638,7 +657,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; @@ -646,36 +665,36 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->a_unfocused_label->texture[0].type = theme->app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT; theme->a_unfocused_label->texture[0].data.text.justify = winjust; - theme->app_unhilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + 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_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_item->texture[0].type = + theme->a_menu_text_normal->texture[0].type = theme->a_menu_text_disabled->texture[0].type = - theme->a_menu_text_hilite->texture[0].type = RR_TEXTURE_TEXT; - theme->a_menu_text_item->texture[0].data.text.justify = + theme->a_menu_text_selected->texture[0].type = RR_TEXTURE_TEXT; + theme->a_menu_text_normal->texture[0].data.text.justify = theme->a_menu_text_disabled->texture[0].data.text.justify = - theme->a_menu_text_hilite->texture[0].data.text.justify = + theme->a_menu_text_selected->texture[0].data.text.justify = RR_JUSTIFY_LEFT; - theme->a_menu_text_item->texture[0].data.text.font = + theme->a_menu_text_normal->texture[0].data.text.font = theme->a_menu_text_disabled->texture[0].data.text.font = - theme->a_menu_text_hilite->texture[0].data.text.font = theme->mfont; - theme->a_menu_text_item->texture[0].data.text.color = theme->menu_color; + 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; - theme->a_menu_text_hilite->texture[0].data.text.color = - theme->menu_hilite_color; - theme->a_menu_bullet->texture[0].data.mask.color = - theme->menu_bullet_color; + theme->a_menu_text_selected->texture[0].data.text.color = + theme->menu_selected_color; theme->a_disabled_focused_max->texture[0].type = theme->a_disabled_unfocused_max->texture[0].type = @@ -723,7 +742,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->texture[0].type = RR_TEXTURE_MASK; + 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 = @@ -794,7 +814,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) 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->texture[0].data.mask.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 = @@ -846,21 +867,45 @@ 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 = theme->a_unfocused_pressed_iconify->texture[0].data.mask.color = theme->titlebut_unfocused_pressed_color; - theme->a_menu_bullet->texture[0].data.mask.color = - theme->menu_bullet_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; XrmDestroyDatabase(db); - theme->label_height = theme->winfont_height; - theme->title_height = theme->label_height + theme->bevel * 2; + { + 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); + + /* 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)); + */ + 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; + theme->grip_width = 25; return theme; } @@ -868,6 +913,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) void RrThemeFree(RrTheme *theme) { if (theme) { + g_free(theme->path); g_free(theme->name); RrColorFree(theme->b_color); @@ -888,8 +934,9 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_color); RrColorFree(theme->menu_title_color); RrColorFree(theme->menu_disabled_color); - RrColorFree(theme->menu_hilite_color); - RrColorFree(theme->menu_bullet_color); + RrColorFree(theme->menu_selected_color); + + g_free(theme->def_win_icon); RrPixmapMaskFree(theme->max_mask); RrPixmapMaskFree(theme->max_toggled_mask); @@ -916,10 +963,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); @@ -978,39 +1025,60 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_unfocused_handle); RrAppearanceFree(theme->a_menu); RrAppearanceFree(theme->a_menu_title); - RrAppearanceFree(theme->a_menu_item); + RrAppearanceFree(theme->a_menu_normal); RrAppearanceFree(theme->a_menu_disabled); - RrAppearanceFree(theme->a_menu_hilite); - RrAppearanceFree(theme->a_menu_text_item); + RrAppearanceFree(theme->a_menu_selected); + RrAppearanceFree(theme->a_menu_text_normal); RrAppearanceFree(theme->a_menu_text_disabled); - RrAppearanceFree(theme->a_menu_text_hilite); + RrAppearanceFree(theme->a_menu_text_selected); + RrAppearanceFree(theme->a_menu_bullet_normal); + RrAppearanceFree(theme->a_menu_bullet_selected); RrAppearanceFree(theme->a_clear); 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) +static XrmDatabase loaddb(RrTheme *theme, gchar *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 ((db = XrmGetFileDatabase(s))) + 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); + } 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); + 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); - if ((db = XrmGetFileDatabase(s))) + s = g_build_filename(name, "themerc", NULL); + if ((db = XrmGetFileDatabase(s))) theme->path = g_path_get_dirname(s); g_free(s); } @@ -1018,50 +1086,50 @@ static XrmDatabase loaddb(RrTheme *theme, char *name) return db; } -static char *create_class_name(char *rname) +static gchar *create_class_name(gchar *rname) { - char *rclass = g_strdup(rname); - char *p = rclass; + gchar *rclass = g_strdup(rname); + gchar *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; } -static gboolean read_int(XrmDatabase db, char *rname, int *value) +static gboolean read_int(XrmDatabase db, gchar *rname, gint *value) { gboolean ret = FALSE; - char *rclass = create_class_name(rname); - char *rettype, *end; + gchar *rclass = create_class_name(rname); + gchar *rettype, *end; 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 = (gint)strtol(retvalue.addr, &end, 10); + if (end != retvalue.addr) + ret = TRUE; } g_free(rclass); return ret; } -static gboolean read_string(XrmDatabase db, char *rname, char **value) +static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value) { gboolean ret = FALSE; - char *rclass = create_class_name(rname); - char *rettype; + gchar *rclass = create_class_name(rname); + gchar *rettype; 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); @@ -1072,17 +1140,17 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst, gchar *rname, RrColor **value) { gboolean ret = FALSE; - char *rclass = create_class_name(rname); - char *rettype; + gchar *rclass = create_class_name(rname); + gchar *rettype; 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); @@ -1094,15 +1162,15 @@ static gboolean read_mask(const RrInstance *inst, RrPixmapMask **value) { gboolean ret = FALSE; - char *s; - int hx, hy; /* ignored */ - unsigned int w, h; - unsigned char *b; + gchar *s; + gint hx, hy; /* ignored */ + guint w, h; + guchar *b; s = g_build_filename(theme->path, maskname, NULL); if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) { ret = TRUE; - *value = RrPixmapMaskNew(inst, w, h, (char*)b); + *value = RrPixmapMaskNew(inst, w, h, (gchar*)b); XFree(b); } g_free(s); @@ -1115,52 +1183,56 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad, gboolean *interlaced, gboolean *border, gboolean allow_trans) { - char *t; + gchar *t; /* 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; - - *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; + 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, "mirrorhorizontal") != NULL) + *grad = RR_SURFACE_MIRROR_HORIZONTAL; + else if (strstr(tex, "horizontal") != NULL) + *grad = RR_SURFACE_HORIZONTAL; + else if (strstr(tex, "vertical") != NULL) + *grad = RR_SURFACE_VERTICAL; + else if (strstr(tex, "splitvertical") != NULL) + *grad = RR_SURFACE_SPLIT_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; } } @@ -1170,38 +1242,38 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, gboolean allow_trans) { gboolean ret = FALSE; - char *rclass = create_class_name(rname); - char *cname, *ctoname, *bcname, *icname; - char *rettype; + gchar *rclass = create_class_name(rname); + gchar *cname, *ctoname, *bcname, *icname; + gchar *rettype; XrmValue retvalue; cname = g_strconcat(rname, ".color", NULL); ctoname = g_strconcat(rname, ".colorTo", NULL); - bcname = g_strconcat(rname, ".borderColor", NULL); - icname = g_strconcat(rname, ".interlaceColor", NULL); + bcname = g_strconcat(rname, ".border.color", NULL); + 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); @@ -1222,3 +1294,28 @@ static void set_default_appearance(RrAppearance *a) a->surface.primary = RrColorNew(a->inst, 0, 0, 0); a->surface.secondary = RrColorNew(a->inst, 0, 0, 0); } + +/* Reads the output from gimp's C-Source file format into valid RGBA data for + an RrTextureRGBA. */ +static RrPixel32* read_c_image(gint width, gint height, const guint8 *data) +{ + RrPixel32 *im, *p; + gint i; + + p = im = g_memdup(data, width * height * sizeof(RrPixel32)); + + for (i = 0; i < width * height; ++i) { + guchar a = ((*p >> 24) & 0xff); + guchar b = ((*p >> 16) & 0xff); + guchar g = ((*p >> 8) & 0xff); + guchar r = ((*p >> 0) & 0xff); + + *p = ((r << RrDefaultRedOffset) + + (g << RrDefaultGreenOffset) + + (b << RrDefaultBlueOffset) + + (a << RrDefaultAlphaOffset)); + p++; + } + + return im; +}