+/* -*- 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-2007 Dana 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 <X11/Xlib.h>
-#include <X11/Xresource.h>
-
-static XrmDatabase loaddb(char *theme);
-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, RrColor **value);
-static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
- gchar *rname, gchar *theme,
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+typedef struct {
+ xmlDocPtr doc;
+ const RrInstance *inst;
+ gchar *path;
+} ParseState;
+
+static void parse_style(gchar *tex, RrSurfaceColorType *grad,
+ RrReliefType *relief, RrBevelType *bevel,
+ gboolean *interlaced, gboolean *border,
+ gboolean allow_trans);
+static gboolean read_mask(ParseState *ps, const gchar *maskname,
RrPixmapMask **value);
-static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
- gchar *rname, RrAppearance *value);
+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)
+static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[]);
+static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ gint *integer, gint lower, gint upper);
+static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ const gchar **string);
+static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ RrColor **color, gchar *alpha);
+ static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ gint *x, gint *y,
+ gint lowx, gint lowy, gint upx, gint upy);
+static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ RrAppearance *a);
+static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ RrAppearance *a, gboolean allow_trans);
+
+/* make a null terminated array out of a list of strings */
+#define L(args...) (const gchar*[]){args,NULL}
+/* shortcut to the various find_* functions */
+#define FIND(type, args...) find_##type(&ps, root, args)
+
+RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
+ RrFont *active_window_font, RrFont *inactive_window_font,
+ RrFont *menu_title_font, RrFont *menu_item_font)
{
- XrmDatabase db = NULL;
- RrJustify winjust, mtitlejust, mjust;
- gchar *str;
- gchar *font_str;
+ ParseState ps;
+ xmlNodePtr root;
+ RrJustify winjust, mtitlejust;
+ const gchar *str;
RrTheme *theme;
- theme = g_new(RrTheme, 1);
+ if (name) {
+ if (!parse_load_theme(name, &ps.doc, &root, &ps.path)) {
+ g_warning("Falling back to the default theme: '%s'",
+ DEFAULT_THEME);
+ /* make it fall back to default theme */
+ name = NULL;
+ }
+ }
+ if (!name) {
+ if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path))
+ return NULL;
+ }
+ ps.inst = inst;
+ theme = g_new0(RrTheme, 1);
theme->inst = inst;
- theme->b_color = theme->cb_unfocused_color = theme->cb_focused_color =
- theme->title_unfocused_color = theme->title_focused_color =
- theme->titlebut_unfocused_color = theme->titlebut_focused_color =
- theme->menu_color = theme->menu_title_color =
- theme->menu_disabled_color = theme->menu_hilite_color = NULL;
- theme->winfont = theme->mtitlefont = theme->mfont = NULL;
- theme->title_layout = NULL;
- theme->max_set_mask = theme->max_unset_mask = NULL;
- theme->desk_set_mask = theme->desk_unset_mask = NULL;
- theme->shade_set_mask = theme->shade_unset_mask = NULL;
- theme->iconify_mask = theme->close_mask = NULL;
-
+ theme->a_disabled_focused_max = RrAppearanceNew(inst, 1);
+ theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1);
+ theme->a_hover_focused_max = RrAppearanceNew(inst, 1);
+ theme->a_hover_unfocused_max = RrAppearanceNew(inst, 1);
+ theme->a_toggled_focused_pressed_max = RrAppearanceNew(inst, 1);
+ theme->a_toggled_unfocused_pressed_max = RrAppearanceNew(inst, 1);
+ theme->a_toggled_focused_unpressed_max = RrAppearanceNew(inst, 1);
+ theme->a_toggled_unfocused_unpressed_max = RrAppearanceNew(inst, 1);
+ theme->a_toggled_hover_focused_max = RrAppearanceNew(inst, 1);
+ theme->a_toggled_hover_unfocused_max = RrAppearanceNew(inst, 1);
theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1);
theme->a_focused_pressed_max = RrAppearanceNew(inst, 1);
- theme->a_focused_pressed_set_max = RrAppearanceNew(inst, 1);
theme->a_unfocused_unpressed_max = RrAppearanceNew(inst, 1);
theme->a_unfocused_pressed_max = RrAppearanceNew(inst, 1);
- theme->a_unfocused_pressed_set_max = RrAppearanceNew(inst, 1);
- theme->a_focused_unpressed_close = NULL;
- theme->a_focused_pressed_close = NULL;
- theme->a_unfocused_unpressed_close = NULL;
- theme->a_unfocused_pressed_close = NULL;
- theme->a_focused_unpressed_desk = NULL;
- theme->a_focused_pressed_desk = NULL;
- theme->a_focused_pressed_set_desk = NULL;
- theme->a_unfocused_unpressed_desk = NULL;
- theme->a_unfocused_pressed_desk = NULL;
- theme->a_unfocused_pressed_set_desk = NULL;
- theme->a_focused_unpressed_shade = NULL;
- theme->a_focused_pressed_shade = NULL;
- theme->a_focused_pressed_set_shade = NULL;
- theme->a_unfocused_unpressed_shade = NULL;
- theme->a_unfocused_pressed_shade = NULL;
- theme->a_unfocused_pressed_set_shade = NULL;
- theme->a_focused_unpressed_iconify = NULL;
- theme->a_focused_pressed_iconify = NULL;
- theme->a_unfocused_unpressed_iconify = NULL;
- theme->a_unfocused_pressed_iconify = NULL;
theme->a_focused_grip = RrAppearanceNew(inst, 0);
theme->a_unfocused_grip = RrAppearanceNew(inst, 0);
theme->a_focused_title = RrAppearanceNew(inst, 0);
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, 1);
- theme->a_menu_disabled = RrAppearanceNew(inst, 1);
- theme->a_menu_hilite = RrAppearanceNew(inst, 1);
+ theme->a_menu_normal = RrAppearanceNew(inst, 0);
+ theme->a_menu_disabled = RrAppearanceNew(inst, 0);
+ 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_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);
- theme->app_icon = RrAppearanceNew(inst, 1);
+ /* load the font stuff */
- if (name) {
- db = loaddb(name);
- if (db == NULL) {
- g_warning("Failed to load the theme '%s'", name);
- g_message("Falling back to the default: '%s'", DEFAULT_THEME);
- } else
- theme->name = g_strdup(name);
- }
- if (db == NULL) {
- db = loaddb(DEFAULT_THEME);
- if (db == NULL) {
- g_warning("Failed to load the theme '%s'.", DEFAULT_THEME);
- return NULL;
- } else
- theme->name = g_strdup(DEFAULT_THEME);
- }
+ if (active_window_font) {
+ theme->win_font_focused = active_window_font;
+ RrFontRef(active_window_font);
+ } else
+ theme->win_font_focused = RrFontOpenDefault(inst);
- /* load the font stuff */
- font_str = "arial:bold:pixelsize=10";
-
- 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 (!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);
+ if (inactive_window_font) {
+ theme->win_font_unfocused = inactive_window_font;
+ RrFontRef(inactive_window_font);
+ } else
+ theme->win_font_unfocused = RrFontOpenDefault(inst);
winjust = RR_JUSTIFY_LEFT;
- if (read_string(db, "window.justify", &str)) {
- if (!g_ascii_strcasecmp(str, "right"))
+ if (FIND(string, L( "window", "justify"), &str)) {
+ if (strcmp(str, "right") == 0)
winjust = RR_JUSTIFY_RIGHT;
- else if (!g_ascii_strcasecmp(str, "center"))
+ else if (strcmp(str, "center") == 0)
winjust = RR_JUSTIFY_CENTER;
- g_free(str);
}
- font_str = "arial-10:bold";
-
- 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 (!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);
+ if (menu_title_font) {
+ theme->menu_title_font = menu_title_font;
+ RrFontRef(menu_title_font);
+ } else
+ theme->menu_title_font = RrFontOpenDefault(inst);
mtitlejust = RR_JUSTIFY_LEFT;
- if (read_string(db, "menu.title.justify", &str)) {
- if (!g_ascii_strcasecmp(str, "right"))
+ if (FIND(string, L("menu", "justify"), &str)) {
+ if (strcmp(str, "right") == 0)
mtitlejust = RR_JUSTIFY_RIGHT;
- else if (!g_ascii_strcasecmp(str, "center"))
+ else if (strcmp(str, "center") == 0)
mtitlejust = RR_JUSTIFY_CENTER;
- g_free(str);
}
- font_str = "arial-8";
+ if (menu_item_font) {
+ theme->menu_font = menu_item_font;
+ RrFontRef(menu_item_font);
+ } else
+ theme->menu_font = RrFontOpenDefault(inst);
- 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 (!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;
+ /* load direct dimensions */
+ if (!FIND(int, L("menu","overlap"),
+ &theme->menu_overlap, -100, 100))
+ theme->menu_overlap = 0;
+
+ if (!FIND(int, L("dimensions","handle"), &theme->handle_height, 0, 100))
+ theme->handle_height = 6;
- theme->mfont = font_open(inst, font_str);
- theme->mfont_height = font_height(theme->mfont, theme->mfont_shadow,
- theme->mfont_shadow_offset);
+ if (!FIND(point, L("dimensions","padding"),
+ &theme->paddingx, &theme->paddingy, 0, 100, 0, 100))
+ theme->paddingx = theme->paddingy = 3;
- mjust = RR_JUSTIFY_LEFT;
- if (read_string(db, "menu.frame.justify", &str)) {
- if (!g_ascii_strcasecmp(str, "right"))
- mjust = RR_JUSTIFY_RIGHT;
- else if (!g_ascii_strcasecmp(str, "center"))
- mjust = RR_JUSTIFY_CENTER;
- g_free(str);
- }
+ if (!FIND(int, L("window","border","width"),
+ &theme->fbwidth, 0, 100))
+ theme->fbwidth = 1;
- /* load the title layout */
- theme->title_layout = g_strdup("NLIMC");
+ /* menu border width inherits from frame border width */
+ if (!FIND(int, L("menu","border","width"),
+ &theme->mbwidth, 0, 100))
+ theme->mbwidth = theme->fbwidth;
- if (!read_int(db, "handleWidth", &theme->handle_height) ||
- 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) theme->bwidth = 1;
- if (!read_int(db, "frameWidth", &theme->cbwidth) ||
- theme->cbwidth < 0 || theme->cbwidth > 100)
- theme->cbwidth = theme->bevel;
+ if (!FIND(point, L("window","clientpadding"), &theme->cbwidthx,
+ &theme->cbwidthy, 0, 100, 0, 100))
+ theme->cbwidthx = theme->cbwidthy = 1;
/* load colors */
- if (!read_color(db, inst,
- "borderColor", &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);
- if (!read_color(db, inst,
- "window.frame.unfocusColor",&theme->cb_unfocused_color))
- theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
- if (!read_color(db, inst,
- "window.label.focus.textColor",
- &theme->title_focused_color))
- theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0);
- if (!read_color(db, inst,
- "window.label.unfocus.textColor",
- &theme->title_unfocused_color))
- theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
- if (!read_color(db, inst,
- "window.button.focus.picColor",
- &theme->titlebut_focused_color))
- theme->titlebut_focused_color = RrColorNew(inst, 0, 0, 0);
- if (!read_color(db, inst,
- "window.button.unfocus.picColor",
- &theme->titlebut_unfocused_color))
- theme->titlebut_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
- if (!read_color(db, inst,
- "menu.title.textColor", &theme->menu_title_color))
+ if (!FIND(color, L("window","border","primary"),
+ &theme->frame_b_color, NULL))
+ theme->frame_b_color = RrColorNew(inst, 0, 0, 0);
+
+ /* menu border color inherits from frame border color */
+ if (!FIND(color, L("menu","border","primary"),
+ &theme->menu_b_color, NULL))
+ theme->menu_b_color = RrColorNew(inst,
+ theme->frame_b_color->r,
+ theme->frame_b_color->g,
+ theme->frame_b_color->b);
+ if (!FIND(color, L("window","active","clientpadding"),
+ &theme->cb_focused_color, NULL))
+ theme->cb_focused_color = RrColorNew(inst, 255, 255, 255);
+ if (!FIND(color, L("window","inactive","clientpadding"),
+ &theme->cb_unfocused_color, NULL))
+ theme->cb_unfocused_color = RrColorNew(inst, 255, 255, 255);
+ if (!FIND(color, L("window","active","label","text","primary"),
+ &theme->title_focused_color, NULL))
+ theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0);
+ if (!FIND(color, L("osd","text","primary"),
+ &theme->osd_color, NULL))
+ theme->osd_color = RrColorNew(inst,
+ theme->title_focused_color->r,
+ theme->title_focused_color->g,
+ theme->title_focused_color->b);
+ if (!FIND(color, L("window","inactive","label","text","primary"),
+ &theme->title_unfocused_color, NULL))
+ theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+ if (!FIND(color, L("window","active","buttons","unpressed","image"),
+ &theme->titlebut_focused_unpressed_color, NULL))
+ theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0);
+ if (!FIND(color, L("window","inactive","buttons", "unpressed","image"),
+ &theme->titlebut_unfocused_unpressed_color, NULL))
+ theme->titlebut_unfocused_unpressed_color =
+ RrColorNew(inst, 0xff, 0xff, 0xff);
+ if (!FIND(color, L("window","active","buttons","pressed","image"),
+ &theme->titlebut_focused_pressed_color, NULL))
+ 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 (!FIND(color, L("window","inactive","buttons","pressed","image"),
+ &theme->titlebut_unfocused_pressed_color, NULL))
+ 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 (!FIND(color, L("window","active","buttons","disabled","image"),
+ &theme->titlebut_disabled_focused_color, NULL))
+ theme->titlebut_disabled_focused_color =
+ RrColorNew(inst, 0xff, 0xff, 0xff);
+ if (!FIND(color, L("window","inactive","buttons","disabled","image"),
+ &theme->titlebut_disabled_unfocused_color, NULL))
+ theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0);
+ if (!FIND(color,
+ L("window","active","buttons","hover","image"),
+ &theme->titlebut_hover_focused_color, NULL))
+ 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 (!FIND(color, L("window","inactive","buttons","hover","image"),
+ &theme->titlebut_hover_unfocused_color, NULL))
+ 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 (!FIND(color,
+ L("window","active","buttons","toggled-pressed","image"),
+ &theme->titlebut_toggled_focused_pressed_color, NULL))
+ theme->titlebut_toggled_focused_pressed_color =
+ RrColorNew(inst,
+ theme->titlebut_focused_pressed_color->r,
+ theme->titlebut_focused_pressed_color->g,
+ theme->titlebut_focused_pressed_color->b);
+ if (!FIND(color,
+ L("window","inactive","buttons","toggled-pressed","image"),
+ &theme->titlebut_toggled_unfocused_pressed_color, NULL))
+ theme->titlebut_toggled_unfocused_pressed_color =
+ RrColorNew(inst,
+ theme->titlebut_unfocused_pressed_color->r,
+ theme->titlebut_unfocused_pressed_color->g,
+ theme->titlebut_unfocused_pressed_color->b);
+ if (!FIND(color,
+ L("window","active","buttons","toggled-unpressed","image"),
+ &theme->titlebut_toggled_focused_unpressed_color, NULL))
+ theme->titlebut_toggled_focused_unpressed_color =
+ RrColorNew(inst,
+ theme->titlebut_focused_unpressed_color->r,
+ theme->titlebut_focused_unpressed_color->g,
+ theme->titlebut_focused_unpressed_color->b);
+ if (!FIND(color,
+ L("window","inactive","buttons","toggled-unpressed","image"),
+ &theme->titlebut_toggled_unfocused_unpressed_color, NULL))
+ theme->titlebut_toggled_unfocused_unpressed_color =
+ RrColorNew(inst,
+ theme->titlebut_unfocused_unpressed_color->r,
+ theme->titlebut_unfocused_unpressed_color->g,
+ theme->titlebut_unfocused_unpressed_color->b);
+ if (!FIND(color,
+ L("window","active","buttons","toggled-hover","image"),
+ &theme->titlebut_toggled_hover_focused_color, NULL))
+ theme->titlebut_toggled_hover_focused_color =
+ RrColorNew(inst,
+ theme->titlebut_toggled_focused_unpressed_color->r,
+ theme->titlebut_toggled_focused_unpressed_color->g,
+ theme->titlebut_toggled_focused_unpressed_color->b);
+ if (!FIND(color,
+ L("window","inactive","buttons","toggled-hover","image"),
+ &theme->titlebut_toggled_hover_unfocused_color, NULL))
+ theme->titlebut_toggled_hover_unfocused_color =
+ RrColorNew(inst,
+ theme->titlebut_toggled_unfocused_unpressed_color->r,
+ theme->titlebut_toggled_unfocused_unpressed_color->g,
+ theme->titlebut_toggled_unfocused_unpressed_color->b);
+ if (!FIND(color, L("menu","title","text","primary"),
+ &theme->menu_title_color, NULL))
theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
- if (!read_color(db, inst,
- "menu.frame.textColor", &theme->menu_color))
+ if (!FIND(color, L("menu","inactive","primary"), &theme->menu_color, NULL))
theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
- if (!read_color(db, inst,
- "menu.frame.disableColor", &theme->menu_disabled_color))
+ if (!FIND(color, L("menu","disabled","primary"),
+ &theme->menu_disabled_color, NULL))
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);
-
- if (read_mask(db, inst,
- "window.button.max.mask", name, &theme->max_unset_mask)){
- if (!read_mask(db, inst,
- "window.button.max.toggled.mask", name,
- &theme->max_set_mask)) {
- theme->max_set_mask = RrPixmapMaskCopy(theme->max_unset_mask);
- }
+ if (!FIND(color, L("menu","active","text","primary"),
+ &theme->menu_selected_color, NULL))
+ theme->menu_selected_color = RrColorNew(inst, 0, 0, 0);
+ if (!FIND(color, L("window","active","label","text","shadow","primary"),
+ &theme->title_focused_shadow_color,
+ &theme->title_focused_shadow_alpha))
+ {
+ theme->title_focused_shadow_color = RrColorNew(inst, 0, 0, 0);
+ theme->title_focused_shadow_alpha = 50;
+ }
+ if (!FIND(color, L("osd","text","shadow","primary"),
+ &theme->osd_shadow_color, &theme->osd_shadow_alpha))
+ {
+ theme->osd_shadow_color =
+ RrColorNew(inst, theme->title_focused_shadow_color->r,
+ theme->title_focused_shadow_color->g,
+ theme->title_focused_shadow_color->b);
+ theme->osd_shadow_alpha = theme->title_focused_shadow_alpha;
+ }
+ if (!FIND(color, L("window","inactive","label","text","shadow","primary"),
+ &theme->title_unfocused_shadow_color,
+ &theme->title_unfocused_shadow_alpha))
+ {
+ theme->title_unfocused_shadow_color = RrColorNew(inst, 0, 0, 0);
+ theme->title_unfocused_shadow_alpha = 50;
+ }
+ if (!FIND(color, L("menu","title","text","shadow","primary"),
+ &theme->menu_title_shadow_color,
+ &theme->menu_title_shadow_alpha))
+ {
+ theme->menu_title_shadow_color = RrColorNew(inst, 0, 0, 0);
+ theme->menu_title_shadow_alpha = 50;
+ }
+ if (!FIND(color, L("menu","inactive","shadow","primary"),
+ &theme->menu_text_normal_shadow_color,
+ &theme->menu_text_normal_shadow_alpha))
+ {
+ theme->menu_text_normal_shadow_color = RrColorNew(inst, 0, 0, 0);
+ theme->menu_text_normal_shadow_alpha = 50;
+ }
+ if (!FIND(color, L("menu","active","text","shadow","primary"),
+ &theme->menu_text_selected_shadow_color,
+ &theme->menu_text_selected_shadow_alpha))
+ {
+ theme->menu_text_selected_shadow_color = RrColorNew(inst, 0, 0, 0);
+ theme->menu_text_selected_shadow_alpha = 50;
+ }
+ if (!FIND(color, L("menu","disabled","shadow","primary"),
+ &theme->menu_text_disabled_shadow_color,
+ &theme->menu_text_disabled_shadow_alpha))
+ {
+ theme->menu_text_disabled_shadow_color =
+ RrColorNew(inst, theme->menu_text_normal_shadow_color->r,
+ theme->menu_text_normal_shadow_color->g,
+ theme->menu_text_normal_shadow_color->b);
+ theme->menu_text_disabled_shadow_alpha =
+ theme->menu_text_normal_shadow_alpha;
+ }
+
+ /* load the image masks */
+ if (read_mask(&ps, "max.xbm", &theme->max_mask)) {
+ if (!read_mask(&ps, "max_pressed.xbm", &theme->max_pressed_mask))
+ theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
+ if (!read_mask(&ps, "max_toggled.xbm", &theme->max_toggled_mask))
+ theme->max_toggled_mask =
+ RrPixmapMaskCopy(theme->max_pressed_mask);
+ if (!read_mask(&ps, "max_toggled_pressed.xbm",
+ &theme->max_toggled_pressed_mask))
+ theme->max_toggled_pressed_mask =
+ RrPixmapMaskCopy(theme->max_toggled_mask);
+ if (!read_mask(&ps, "max_toggled_hover.xbm",
+ &theme->max_toggled_hover_mask))
+ theme->max_toggled_hover_mask =
+ RrPixmapMaskCopy(theme->max_toggled_mask);
+ if (!read_mask(&ps, "max_disabled.xbm", &theme->max_disabled_mask))
+ theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
+ if (!read_mask(&ps, "max_hover.xbm", &theme->max_hover_mask))
+ theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
} else {
{
- char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
- theme->max_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
+ theme->max_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data);
}
{
- char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
- theme->max_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
+ 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);
+ theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
+ theme->desk_toggled_pressed_mask =
+ RrPixmapMaskCopy(theme->desk_toggled_mask);
+ theme->desk_toggled_hover_mask =
+ RrPixmapMaskCopy(theme->desk_toggled_mask);
}
- if (!read_mask(db, inst,
- "window.button.icon.mask", name,
- &theme->iconify_mask)) {
- char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
- theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ if (read_mask(&ps, "iconify.xbm", &theme->iconify_mask)) {
+ if (!read_mask(&ps, "iconify_pressed.xbm",
+ &theme->iconify_pressed_mask))
+ theme->iconify_pressed_mask =
+ RrPixmapMaskCopy(theme->iconify_mask);
+ if (!read_mask(&ps, "iconify_disabled.xbm",
+ &theme->iconify_disabled_mask))
+ theme->iconify_disabled_mask =
+ RrPixmapMaskCopy(theme->iconify_mask);
+ if (!read_mask(&ps, "iconify_hover.xbm", &theme->iconify_hover_mask))
+ theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
+ } else {
+ {
+ guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
+ 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);
}
- if (read_mask(db, inst,
- "window.button.stick.mask", name,
- &theme->desk_unset_mask)) {
- if (!read_mask(db, inst, "window.button.stick.toggled.mask", name,
- &theme->desk_set_mask)) {
- theme->desk_set_mask =
- RrPixmapMaskCopy(theme->desk_unset_mask);
- }
+ theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH,
+ OB_DEFAULT_ICON_HEIGHT,
+ OB_DEFAULT_ICON_pixel_data);
+
+ if (read_mask(&ps, "desk.xbm", &theme->desk_mask)) {
+ if (!read_mask(&ps, "desk_pressed.xbm", &theme->desk_pressed_mask))
+ theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+ if (!read_mask(&ps, "desk_toggled.xbm", &theme->desk_toggled_mask))
+ theme->desk_toggled_mask =
+ RrPixmapMaskCopy(theme->desk_pressed_mask);
+ if (!read_mask(&ps, "desk_toggled_pressed.xbm",
+ &theme->desk_toggled_pressed_mask))
+ theme->desk_toggled_pressed_mask =
+ RrPixmapMaskCopy(theme->desk_toggled_mask);
+ if (!read_mask(&ps, "desk_toggled_hover.xbm",
+ &theme->desk_toggled_hover_mask))
+ theme->desk_toggled_hover_mask =
+ RrPixmapMaskCopy(theme->desk_toggled_mask);
+ if (!read_mask(&ps, "desk_disabled.xbm", &theme->desk_disabled_mask))
+ theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+ if (!read_mask(&ps, "desk_hover.xbm", &theme->desk_hover_mask))
+ theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
} else {
{
- char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
- theme->desk_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
+ theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data);
}
{
- char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
- theme->desk_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
+ theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7,
+ (gchar*)data);
}
+ theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+ theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+ theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
+ theme->desk_toggled_pressed_mask =
+ RrPixmapMaskCopy(theme->desk_toggled_mask);
+ theme->desk_toggled_hover_mask =
+ RrPixmapMaskCopy(theme->desk_toggled_mask);
}
- if (read_mask(db, inst, "window.button.shade.mask", name,
- &theme->shade_unset_mask)) {
- if (!read_mask(db, inst, "window.button.shade.toggled.mask", name,
- &theme->shade_set_mask)) {
- theme->shade_set_mask =
- RrPixmapMaskCopy(theme->shade_unset_mask);
- }
+ if (read_mask(&ps, "shade.xbm", &theme->shade_mask)) {
+ if (!read_mask(&ps, "shade_pressed.xbm", &theme->shade_pressed_mask))
+ theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
+ if (!read_mask(&ps, "shade_toggled.xbm", &theme->shade_toggled_mask))
+ theme->shade_toggled_mask =
+ RrPixmapMaskCopy(theme->shade_pressed_mask);
+ if (!read_mask(&ps, "shade_toggled_pressed.xbm",
+ &theme->shade_toggled_pressed_mask))
+ theme->shade_toggled_pressed_mask =
+ RrPixmapMaskCopy(theme->shade_toggled_mask);
+ if (!read_mask(&ps, "shade_toggled_hover.xbm",
+ &theme->shade_toggled_hover_mask))
+ theme->shade_toggled_hover_mask =
+ RrPixmapMaskCopy(theme->shade_toggled_mask);
+ if (!read_mask(&ps, "shade_disabled.xbm", &theme->shade_disabled_mask))
+ theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
+ if (!read_mask(&ps, "shade_hover.xbm", &theme->shade_hover_mask))
+ theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
} else {
{
- char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
- theme->shade_unset_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
+ 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,
+ (gchar*)data);
}
+ theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
+ theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
+ theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
+ theme->shade_toggled_pressed_mask =
+ RrPixmapMaskCopy(theme->shade_toggled_mask);
+ theme->shade_toggled_hover_mask =
+ RrPixmapMaskCopy(theme->shade_toggled_mask);
+ }
+
+ if (read_mask(&ps, "close.xbm", &theme->close_mask)) {
+ if (!read_mask(&ps, "close_pressed.xbm", &theme->close_pressed_mask))
+ theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
+ if (!read_mask(&ps, "close_disabled.xbm", &theme->close_disabled_mask))
+ theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
+ if (!read_mask(&ps, "close_hover.xbm", &theme->close_hover_mask))
+ theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
+ } else {
{
- char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
- theme->shade_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
+ 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);
+ theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
}
- if (!read_mask(db, inst, "window.button.close.mask", name,
- &theme->close_mask)) {
- char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
- theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data);
- }
+ if (!read_mask(&ps, "bullet.xbm", &theme->menu_bullet_mask)) {
+ guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 };
+ 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))
- set_default_appearance(theme->a_focused_title);
- if (!read_appearance(db, inst,
- "window.title.unfocus", theme->a_unfocused_title))
- set_default_appearance(theme->a_unfocused_title);
- if (!read_appearance(db, inst,
- "window.label.focus", theme->a_focused_label))
- set_default_appearance(theme->a_focused_label);
- if (!read_appearance(db, inst,
- "window.label.unfocus", theme->a_unfocused_label))
- set_default_appearance(theme->a_unfocused_label);
- if (!read_appearance(db, inst,
- "window.handle.focus", theme->a_focused_handle))
- set_default_appearance(theme->a_focused_handle);
- if (!read_appearance(db, inst,
- "window.handle.unfocus",theme->a_unfocused_handle))
- set_default_appearance(theme->a_unfocused_handle);
- if (!read_appearance(db, inst,
- "window.grip.focus", theme->a_focused_grip))
- set_default_appearance(theme->a_focused_grip);
- if (!read_appearance(db, inst,
- "window.grip.unfocus", theme->a_unfocused_grip))
- set_default_appearance(theme->a_unfocused_grip);
- if (!read_appearance(db, inst,
- "menu.frame", theme->a_menu))
- set_default_appearance(theme->a_menu);
- if (!read_appearance(db, inst,
- "menu.title", theme->a_menu_title))
- set_default_appearance(theme->a_menu_title);
- if (!read_appearance(db, inst,
- "menu.hilite", theme->a_menu_hilite))
- set_default_appearance(theme->a_menu_hilite);
+ if (!FIND(appearance, L("window","active","titlebar"),
+ theme->a_focused_title, FALSE))
+ set_default_appearance(theme->a_focused_title);
+ if (!FIND(appearance, L("window","inactive","titlebar"),
+ theme->a_unfocused_title, FALSE))
+ set_default_appearance(theme->a_unfocused_title);
+ if (!FIND(appearance, L("window","active","label"),
+ theme->a_focused_label, TRUE))
+ set_default_appearance(theme->a_focused_label);
+ if (!FIND(appearance, L("window","inactive","label"),
+ theme->a_unfocused_label, TRUE))
+ set_default_appearance(theme->a_unfocused_label);
+ if (!FIND(appearance, L("window","active","handle"),
+ theme->a_focused_handle, FALSE))
+ set_default_appearance(theme->a_focused_handle);
+ if (!FIND(appearance, L("window","inactive","handle"),
+ theme->a_unfocused_handle, FALSE))
+ set_default_appearance(theme->a_unfocused_handle);
+ if (!FIND(appearance, L("window","active","grip"),
+ theme->a_focused_grip, TRUE))
+ set_default_appearance(theme->a_focused_grip);
+ if (!FIND(appearance, L("window","inactive","grip"),
+ theme->a_unfocused_grip, TRUE))
+ set_default_appearance(theme->a_unfocused_grip);
+ if (!FIND(appearance, L("menu","entries"), theme->a_menu, FALSE))
+ set_default_appearance(theme->a_menu);
+ if (!FIND(appearance, L("menu","title"), theme->a_menu_title, FALSE))
+ set_default_appearance(theme->a_menu_title);
+ if (!FIND(appearance, L("menu", "active"), theme->a_menu_selected, TRUE))
+ 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))
- set_default_appearance(theme->app_hilite_bg);
- if (!read_appearance(db, inst,
- "window.label.focus", theme->app_hilite_label))
- set_default_appearance(theme->app_hilite_label);
- if (!read_appearance(db, inst,
- "window.title.unfocus", theme->app_unhilite_bg))
- set_default_appearance(theme->app_unhilite_bg);
- if (!read_appearance(db, inst,
- "window.label.unfocus", theme->app_unhilite_label))
- set_default_appearance(theme->app_unhilite_label);
+ theme->osd_hilite_bg = RrAppearanceCopy(theme->a_focused_title);
+ theme->osd_hilite_label = RrAppearanceCopy(theme->a_focused_label);
+ if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL)
+ theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_label);
+ else
+ theme->osd_hilite_fg = RrAppearanceCopy(theme->a_focused_title);
+ if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL)
+ theme->osd_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_label);
+ else
+ theme->osd_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_title);
/* read buttons textures */
- if (!read_appearance(db, inst,
- "window.button.pressed.focus",
- theme->a_focused_pressed_max))
- if (!read_appearance(db, inst,
- "window.button.pressed",
- theme->a_focused_pressed_max))
- set_default_appearance(theme->a_focused_pressed_max);
- if (!read_appearance(db, inst,
- "window.button.pressed.unfocus",
- theme->a_unfocused_pressed_max))
- if (!read_appearance(db, inst,
- "window.button.pressed",
- theme->a_unfocused_pressed_max))
- set_default_appearance(theme->a_unfocused_pressed_max);
- if (!read_appearance(db, inst,
- "window.button.focus",
- 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))
- set_default_appearance(theme->a_unfocused_unpressed_max);
+ if (!FIND(appearance, L("window","active","buttons","disabled"),
+ theme->a_disabled_focused_max, TRUE))
+ set_default_appearance(theme->a_disabled_focused_max);
+ if (!FIND(appearance, L("window","inactive","buttons","disabled"),
+ theme->a_disabled_unfocused_max, TRUE))
+ set_default_appearance(theme->a_disabled_unfocused_max);
+ if (!FIND(appearance, L("window","active","buttons","pressed"),
+ theme->a_focused_pressed_max, TRUE))
+ set_default_appearance(theme->a_focused_pressed_max);
+ if (!FIND(appearance, L("window","inactive","buttons","pressed"),
+ theme->a_unfocused_pressed_max, TRUE))
+ set_default_appearance(theme->a_unfocused_pressed_max);
+ if (!FIND(appearance, L("window","active","buttons","unpressed"),
+ theme->a_focused_unpressed_max, TRUE))
+ set_default_appearance(theme->a_focused_unpressed_max);
+ if (!FIND(appearance, L("window","inactive","buttons","unpressed"),
+ theme->a_unfocused_unpressed_max, TRUE))
+ set_default_appearance(theme->a_unfocused_unpressed_max);
+ if (!FIND(appearance, L("window","active","buttons","hover"),
+ theme->a_hover_focused_max, TRUE))
+ {
+ RrAppearanceFree(theme->a_hover_focused_max);
+ theme->a_hover_focused_max =
+ RrAppearanceCopy(theme->a_focused_unpressed_max);
+ }
+ if (!FIND(appearance, L("window","inactive","buttons","hover"),
+ theme->a_hover_unfocused_max, TRUE))
+ {
+ RrAppearanceFree(theme->a_hover_unfocused_max);
+ theme->a_hover_unfocused_max =
+ RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+ }
+ if (!FIND(appearance, L("window","active","buttons","toggled-pressed"),
+ theme->a_toggled_focused_pressed_max, TRUE))
+ {
+ RrAppearanceFree(theme->a_toggled_focused_pressed_max);
+ theme->a_toggled_focused_pressed_max =
+ RrAppearanceCopy(theme->a_focused_pressed_max);
+ }
+ if (!FIND(appearance, L("window","inactive","buttons","toggled-pressed"),
+ theme->a_toggled_unfocused_pressed_max, TRUE))
+ {
+ RrAppearanceFree(theme->a_toggled_unfocused_pressed_max);
+ theme->a_toggled_unfocused_pressed_max =
+ RrAppearanceCopy(theme->a_unfocused_pressed_max);
+ }
+ if (!FIND(appearance, L("window","active","buttons","toggled-unpressed"),
+ theme->a_toggled_focused_unpressed_max, TRUE))
+ {
+ RrAppearanceFree(theme->a_toggled_focused_unpressed_max);
+ theme->a_toggled_focused_unpressed_max =
+ RrAppearanceCopy(theme->a_focused_unpressed_max);
+ }
+ if (!FIND(appearance, L("window","inactive","buttons","toggled-unpressed"),
+ theme->a_toggled_unfocused_unpressed_max, TRUE))
+ {
+ RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max);
+ theme->a_toggled_unfocused_unpressed_max =
+ RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+ }
+ if (!FIND(appearance, L("window","active","buttons","toggled-hover"),
+ theme->a_toggled_hover_focused_max, TRUE))
+ {
+ RrAppearanceFree(theme->a_toggled_hover_focused_max);
+ theme->a_toggled_hover_focused_max =
+ RrAppearanceCopy(theme->a_toggled_focused_unpressed_max);
+ }
+ if (!FIND(appearance, L("window","inactive","buttons","toggled-hover"),
+ theme->a_toggled_hover_unfocused_max, TRUE))
+ {
+ RrAppearanceFree(theme->a_toggled_hover_unfocused_max);
+ theme->a_toggled_hover_unfocused_max =
+ RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max);
+ }
+ theme->a_disabled_focused_close =
+ RrAppearanceCopy(theme->a_disabled_focused_max);
+ theme->a_disabled_unfocused_close =
+ RrAppearanceCopy(theme->a_disabled_unfocused_max);
+ theme->a_hover_focused_close =
+ RrAppearanceCopy(theme->a_hover_focused_max);
+ theme->a_hover_unfocused_close =
+ RrAppearanceCopy(theme->a_hover_unfocused_max);
theme->a_unfocused_unpressed_close =
RrAppearanceCopy(theme->a_unfocused_unpressed_max);
theme->a_unfocused_pressed_close =
RrAppearanceCopy(theme->a_focused_unpressed_max);
theme->a_focused_pressed_close =
RrAppearanceCopy(theme->a_focused_pressed_max);
+ theme->a_disabled_focused_desk =
+ RrAppearanceCopy(theme->a_disabled_focused_max);
+ theme->a_disabled_unfocused_desk =
+ RrAppearanceCopy(theme->a_disabled_unfocused_max);
+ theme->a_hover_focused_desk =
+ RrAppearanceCopy(theme->a_hover_focused_max);
+ theme->a_hover_unfocused_desk =
+ RrAppearanceCopy(theme->a_hover_unfocused_max);
+ theme->a_toggled_focused_pressed_desk =
+ RrAppearanceCopy(theme->a_toggled_focused_pressed_max);
+ theme->a_toggled_unfocused_pressed_desk =
+ RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max);
+ theme->a_toggled_focused_unpressed_desk =
+ RrAppearanceCopy(theme->a_toggled_focused_unpressed_max);
+ theme->a_toggled_unfocused_unpressed_desk =
+ RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max);
+ theme->a_toggled_hover_focused_desk =
+ RrAppearanceCopy(theme->a_toggled_hover_focused_max);
+ theme->a_toggled_hover_unfocused_desk =
+ RrAppearanceCopy(theme->a_toggled_hover_unfocused_max);
theme->a_unfocused_unpressed_desk =
RrAppearanceCopy(theme->a_unfocused_unpressed_max);
theme->a_unfocused_pressed_desk =
RrAppearanceCopy(theme->a_unfocused_pressed_max);
- theme->a_unfocused_pressed_set_desk =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
theme->a_focused_unpressed_desk =
RrAppearanceCopy(theme->a_focused_unpressed_max);
theme->a_focused_pressed_desk =
RrAppearanceCopy(theme->a_focused_pressed_max);
- theme->a_focused_pressed_set_desk =
- RrAppearanceCopy(theme->a_focused_pressed_max);
+ theme->a_disabled_focused_shade =
+ RrAppearanceCopy(theme->a_disabled_focused_max);
+ theme->a_disabled_unfocused_shade =
+ RrAppearanceCopy(theme->a_disabled_unfocused_max);
+ theme->a_hover_focused_shade =
+ RrAppearanceCopy(theme->a_hover_focused_max);
+ theme->a_hover_unfocused_shade =
+ RrAppearanceCopy(theme->a_hover_unfocused_max);
+ theme->a_toggled_focused_pressed_shade =
+ RrAppearanceCopy(theme->a_toggled_focused_pressed_max);
+ theme->a_toggled_unfocused_pressed_shade =
+ RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max);
+ theme->a_toggled_focused_unpressed_shade =
+ RrAppearanceCopy(theme->a_toggled_focused_unpressed_max);
+ theme->a_toggled_unfocused_unpressed_shade =
+ RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max);
+ theme->a_toggled_hover_focused_shade =
+ RrAppearanceCopy(theme->a_toggled_hover_focused_max);
+ theme->a_toggled_hover_unfocused_shade =
+ RrAppearanceCopy(theme->a_toggled_hover_unfocused_max);
theme->a_unfocused_unpressed_shade =
RrAppearanceCopy(theme->a_unfocused_unpressed_max);
theme->a_unfocused_pressed_shade =
RrAppearanceCopy(theme->a_unfocused_pressed_max);
- theme->a_unfocused_pressed_set_shade =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
theme->a_focused_unpressed_shade =
RrAppearanceCopy(theme->a_focused_unpressed_max);
theme->a_focused_pressed_shade =
RrAppearanceCopy(theme->a_focused_pressed_max);
- theme->a_focused_pressed_set_shade =
- RrAppearanceCopy(theme->a_focused_pressed_max);
+ theme->a_disabled_focused_iconify =
+ RrAppearanceCopy(theme->a_disabled_focused_max);
+ theme->a_disabled_unfocused_iconify =
+ RrAppearanceCopy(theme->a_disabled_focused_max);
+ theme->a_hover_focused_iconify =
+ RrAppearanceCopy(theme->a_hover_focused_max);
+ theme->a_hover_unfocused_iconify =
+ RrAppearanceCopy(theme->a_hover_unfocused_max);
theme->a_unfocused_unpressed_iconify =
RrAppearanceCopy(theme->a_unfocused_unpressed_max);
theme->a_unfocused_pressed_iconify =
RrAppearanceCopy(theme->a_focused_unpressed_max);
theme->a_focused_pressed_iconify =
RrAppearanceCopy(theme->a_focused_pressed_max);
- theme->a_unfocused_pressed_set_max =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
- theme->a_focused_pressed_set_max =
- RrAppearanceCopy(theme->a_focused_pressed_max);
- theme->a_icon->surface.grad = RR_SURFACE_PARENTREL;
+ theme->a_icon->surface.grad =
+ theme->a_clear->surface.grad =
+ theme->a_clear_tex->surface.grad =
+ theme->a_menu_normal->surface.grad =
+ theme->a_menu_disabled->surface.grad =
+ theme->a_menu_text_normal->surface.grad =
+ theme->a_menu_text_disabled->surface.grad =
+ 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 =
- theme->app_hilite_label->texture[0].type = RR_TEXTURE_TEXT;
+ theme->osd_hilite_label->texture[0].type = RR_TEXTURE_TEXT;
theme->a_focused_label->texture[0].data.text.justify = winjust;
- theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
+ theme->osd_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->osd_hilite_label->texture[0].data.text.font =
+ 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;
+ theme->osd_hilite_label->texture[0].data.text.color =
+ theme->osd_color;
+
+ if (!FIND(shadow, L("window","active","label","text","shadow","offset"),
+ theme->a_focused_label))
+ theme->a_focused_label->texture[0].data.text.shadow_offset_x =
+ theme->a_focused_label->texture[0].data.text.shadow_offset_y = 0;
+ theme->a_focused_label->texture[0].data.text.shadow_color =
+ theme->title_focused_shadow_color;
+ theme->a_focused_label->texture[0].data.text.shadow_alpha =
+ theme->title_focused_shadow_alpha;
+
+ if (!FIND(shadow, L("osd","text","shadow","offset"),
+ theme->osd_hilite_label))
+ {
+ theme->osd_hilite_label->texture[0].data.text.shadow_offset_x =
+ theme->a_focused_label->texture[0].data.text.shadow_offset_x;
+ theme->osd_hilite_label->texture[0].data.text.shadow_offset_y =
+ theme->a_focused_label->texture[0].data.text.shadow_offset_y;
+ }
+ theme->osd_hilite_label->texture[0].data.text.shadow_color =
+ theme->osd_shadow_color;
+ theme->osd_hilite_label->texture[0].data.text.shadow_alpha =
+ theme->osd_shadow_alpha;
- theme->a_unfocused_label->texture[0].type =
- theme->app_unhilite_label->texture[0].type = RR_TEXTURE_TEXT;
+ theme->a_unfocused_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->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->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;
+ if (!FIND(shadow, L("window","inactive","label","text","shadow","offset"),
+ theme->a_unfocused_label))
+ theme->a_unfocused_label->texture[0].data.text.shadow_offset_x =
+ theme->a_unfocused_label->texture[0].data.text.shadow_offset_y = 0;
+ theme->a_unfocused_label->texture[0].data.text.shadow_color =
+ theme->title_unfocused_shadow_color;
+ theme->a_unfocused_label->texture[0].data.text.shadow_alpha =
+ theme->title_unfocused_shadow_alpha;
+
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.font = theme->menu_title_font;
theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color;
- theme->a_menu_item->surface.grad =
- theme->a_menu_disabled->surface.grad =
- theme->app_icon->surface.grad = RR_SURFACE_PARENTREL;
-
- theme->a_menu_item->texture[0].type =
- theme->a_menu_disabled->texture[0].type =
- theme->a_menu_hilite->texture[0].type = RR_TEXTURE_TEXT;
- theme->a_menu_item->texture[0].data.text.justify =
- theme->a_menu_disabled->texture[0].data.text.justify =
- theme->a_menu_hilite->texture[0].data.text.justify = mjust;
- 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 =
+ if (!FIND(shadow, L("menu","title","text","shadow","offset"),
+ theme->a_menu_title))
+ theme->a_menu_title->texture[0].data.text.shadow_offset_x =
+ theme->a_menu_title->texture[0].data.text.shadow_offset_y = 0;
+ theme->a_menu_title->texture[0].data.text.shadow_color =
+ theme->menu_title_shadow_color;
+ theme->a_menu_title->texture[0].data.text.shadow_alpha =
+ theme->menu_title_shadow_alpha;
+
+ theme->a_menu_text_normal->texture[0].type =
+ theme->a_menu_text_disabled->texture[0].type =
+ 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_selected->texture[0].data.text.justify =
+ 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->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_hilite->texture[0].data.text.color =
- theme->menu_hilite_color;
-
- theme->a_focused_unpressed_max->texture[0].type =
+ theme->a_menu_text_selected->texture[0].data.text.color =
+ theme->menu_selected_color;
+
+ if (!FIND(shadow, L("menu","inactive","shadow","offset"),
+ theme->a_menu_text_normal))
+ theme->a_menu_text_normal->texture[0].data.text.shadow_offset_x =
+ theme->a_menu_text_normal->texture[0].data.text.shadow_offset_y =
+ 0;
+ if (!FIND(shadow, L("menu","active","text","shadow","offset"),
+ theme->a_menu_text_selected))
+ theme->a_menu_text_selected->texture[0].data.text.shadow_offset_x =
+ theme->a_menu_text_selected->texture[0].data.text.shadow_offset_y =
+ 0;
+ if (!FIND(shadow, L("menu","disabled","shadow","offset"),
+ theme->a_menu_text_disabled))
+ theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_x =
+ theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_y =
+ 0;
+ theme->a_menu_text_normal->texture[0].data.text.shadow_color =
+ theme->menu_text_normal_shadow_color;
+ theme->a_menu_text_normal->texture[0].data.text.shadow_alpha =
+ theme->menu_text_normal_shadow_alpha;
+ theme->a_menu_text_selected->texture[0].data.text.shadow_color =
+ theme->menu_text_selected_shadow_color;
+ theme->a_menu_text_selected->texture[0].data.text.shadow_alpha =
+ theme->menu_text_selected_shadow_alpha;
+ theme->a_menu_text_disabled->texture[0].data.text.shadow_color =
+ theme->menu_text_disabled_shadow_color;
+ theme->a_menu_text_disabled->texture[0].data.text.shadow_alpha =
+ theme->menu_text_disabled_shadow_alpha;
+
+ theme->a_disabled_focused_max->texture[0].type =
+ theme->a_disabled_unfocused_max->texture[0].type =
+ theme->a_hover_focused_max->texture[0].type =
+ theme->a_hover_unfocused_max->texture[0].type =
+ theme->a_toggled_focused_pressed_max->texture[0].type =
+ theme->a_toggled_unfocused_pressed_max->texture[0].type =
+ theme->a_toggled_focused_unpressed_max->texture[0].type =
+ theme->a_toggled_unfocused_unpressed_max->texture[0].type =
+ theme->a_toggled_hover_focused_max->texture[0].type =
+ theme->a_toggled_hover_unfocused_max->texture[0].type =
+ theme->a_focused_unpressed_max->texture[0].type =
theme->a_focused_pressed_max->texture[0].type =
- theme->a_focused_pressed_set_max->texture[0].type =
theme->a_unfocused_unpressed_max->texture[0].type =
theme->a_unfocused_pressed_max->texture[0].type =
- theme->a_unfocused_pressed_set_max->texture[0].type =
+ theme->a_disabled_focused_close->texture[0].type =
+ theme->a_disabled_unfocused_close->texture[0].type =
+ theme->a_hover_focused_close->texture[0].type =
+ theme->a_hover_unfocused_close->texture[0].type =
theme->a_focused_unpressed_close->texture[0].type =
theme->a_focused_pressed_close->texture[0].type =
theme->a_unfocused_unpressed_close->texture[0].type =
theme->a_unfocused_pressed_close->texture[0].type =
+ theme->a_disabled_focused_desk->texture[0].type =
+ theme->a_disabled_unfocused_desk->texture[0].type =
+ theme->a_hover_focused_desk->texture[0].type =
+ theme->a_hover_unfocused_desk->texture[0].type =
+ theme->a_toggled_focused_pressed_desk->texture[0].type =
+ theme->a_toggled_unfocused_pressed_desk->texture[0].type =
+ theme->a_toggled_focused_unpressed_desk->texture[0].type =
+ theme->a_toggled_unfocused_unpressed_desk->texture[0].type =
+ theme->a_toggled_hover_focused_desk->texture[0].type =
+ theme->a_toggled_hover_unfocused_desk->texture[0].type =
theme->a_focused_unpressed_desk->texture[0].type =
theme->a_focused_pressed_desk->texture[0].type =
- theme->a_focused_pressed_set_desk->texture[0].type =
theme->a_unfocused_unpressed_desk->texture[0].type =
theme->a_unfocused_pressed_desk->texture[0].type =
- theme->a_unfocused_pressed_set_desk->texture[0].type =
+ theme->a_disabled_focused_shade->texture[0].type =
+ theme->a_disabled_unfocused_shade->texture[0].type =
+ theme->a_hover_focused_shade->texture[0].type =
+ theme->a_hover_unfocused_shade->texture[0].type =
+ theme->a_toggled_focused_pressed_shade->texture[0].type =
+ theme->a_toggled_unfocused_pressed_shade->texture[0].type =
+ theme->a_toggled_focused_unpressed_shade->texture[0].type =
+ theme->a_toggled_unfocused_unpressed_shade->texture[0].type =
+ theme->a_toggled_hover_focused_shade->texture[0].type =
+ theme->a_toggled_hover_unfocused_shade->texture[0].type =
theme->a_focused_unpressed_shade->texture[0].type =
theme->a_focused_pressed_shade->texture[0].type =
- theme->a_focused_pressed_set_shade->texture[0].type =
theme->a_unfocused_unpressed_shade->texture[0].type =
theme->a_unfocused_pressed_shade->texture[0].type =
- theme->a_unfocused_pressed_set_shade->texture[0].type =
+ theme->a_disabled_focused_iconify->texture[0].type =
+ theme->a_disabled_unfocused_iconify->texture[0].type =
+ theme->a_hover_focused_iconify->texture[0].type =
+ theme->a_hover_unfocused_iconify->texture[0].type =
theme->a_focused_unpressed_iconify->texture[0].type =
theme->a_focused_pressed_iconify->texture[0].type =
theme->a_unfocused_unpressed_iconify->texture[0].type =
- theme->a_unfocused_pressed_iconify->texture[0].type = RR_TEXTURE_MASK;
+ theme->a_unfocused_pressed_iconify->texture[0].type =
+ 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 =
+ theme->max_disabled_mask;
+ theme->a_hover_focused_max->texture[0].data.mask.mask =
+ theme->a_hover_unfocused_max->texture[0].data.mask.mask =
+ theme->max_hover_mask;
+ theme->a_focused_pressed_max->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_max->texture[0].data.mask.mask =
+ theme->max_pressed_mask;
theme->a_focused_unpressed_max->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_max->texture[0].data.mask.mask =
- theme->a_focused_pressed_max->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_max->texture[0].data.mask.mask =
- theme->max_unset_mask;
- theme->a_focused_pressed_set_max->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_set_max->texture[0].data.mask.mask =
- theme->max_set_mask;
+ theme->max_mask;
+ theme->a_toggled_focused_pressed_max->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.mask =
+ theme->max_toggled_pressed_mask;
+ theme->a_toggled_focused_unpressed_max->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.mask =
+ theme->max_toggled_mask;
+ theme->a_toggled_hover_focused_max->texture[0].data.mask.mask =
+ theme->a_toggled_hover_unfocused_max->texture[0].data.mask.mask =
+ theme->max_toggled_hover_mask;
+ theme->a_disabled_focused_close->texture[0].data.mask.mask =
+ theme->a_disabled_unfocused_close->texture[0].data.mask.mask =
+ theme->close_disabled_mask;
+ theme->a_hover_focused_close->texture[0].data.mask.mask =
+ theme->a_hover_unfocused_close->texture[0].data.mask.mask =
+ theme->close_hover_mask;
theme->a_focused_pressed_close->texture[0].data.mask.mask =
theme->a_unfocused_pressed_close->texture[0].data.mask.mask =
- theme->a_focused_unpressed_close->texture[0].data.mask.mask =
+ theme->close_pressed_mask;
+ theme->a_focused_unpressed_close->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_close->texture[0].data.mask.mask =
theme->close_mask;
+ theme->a_disabled_focused_desk->texture[0].data.mask.mask =
+ theme->a_disabled_unfocused_desk->texture[0].data.mask.mask =
+ theme->desk_disabled_mask;
+ theme->a_hover_focused_desk->texture[0].data.mask.mask =
+ theme->a_hover_unfocused_desk->texture[0].data.mask.mask =
+ theme->desk_hover_mask;
+ theme->a_focused_pressed_desk->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_desk->texture[0].data.mask.mask =
+ theme->desk_pressed_mask;
theme->a_focused_unpressed_desk->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask =
- theme->a_focused_pressed_desk->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_desk->texture[0].data.mask.mask =
- theme->desk_unset_mask;
- theme->a_focused_pressed_set_desk->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_set_desk->texture[0].data.mask.mask =
- theme->desk_set_mask;
+ theme->desk_mask;
+ theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.mask =
+ theme->desk_toggled_pressed_mask;
+ theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_unpressed_desk->texture[0].data.mask.mask =
+ theme->desk_toggled_mask;
+ theme->a_toggled_hover_focused_desk->texture[0].data.mask.mask =
+ theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.mask =
+ theme->desk_toggled_hover_mask;
+ theme->a_disabled_focused_shade->texture[0].data.mask.mask =
+ theme->a_disabled_unfocused_shade->texture[0].data.mask.mask =
+ theme->shade_disabled_mask;
+ theme->a_hover_focused_shade->texture[0].data.mask.mask =
+ theme->a_hover_unfocused_shade->texture[0].data.mask.mask =
+ theme->shade_hover_mask;
+ theme->a_focused_pressed_shade->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_shade->texture[0].data.mask.mask =
+ theme->shade_pressed_mask;
theme->a_focused_unpressed_shade->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask =
- theme->a_focused_pressed_shade->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_shade->texture[0].data.mask.mask =
- theme->shade_unset_mask;
- theme->a_focused_pressed_set_shade->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_set_shade->texture[0].data.mask.mask =
- theme->shade_set_mask;
+ theme->shade_mask;
+ theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.mask =
+ theme->shade_toggled_pressed_mask;
+ theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_unpressed_shade->texture[0].data.mask.mask =
+ theme->shade_toggled_mask;
+ theme->a_toggled_hover_focused_shade->texture[0].data.mask.mask =
+ theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.mask =
+ theme->shade_toggled_hover_mask;
+ theme->a_disabled_focused_iconify->texture[0].data.mask.mask =
+ theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask =
+ theme->iconify_disabled_mask;
+ theme->a_hover_focused_iconify->texture[0].data.mask.mask =
+ theme->a_hover_unfocused_iconify->texture[0].data.mask.mask =
+ theme->iconify_hover_mask;
+ theme->a_focused_pressed_iconify->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask =
+ theme->iconify_pressed_mask;
theme->a_focused_unpressed_iconify->texture[0].data.mask.mask =
theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask =
- theme->a_focused_pressed_iconify->texture[0].data.mask.mask =
- theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask =
theme->iconify_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 =
+ theme->a_disabled_focused_desk->texture[0].data.mask.color =
+ theme->a_disabled_focused_shade->texture[0].data.mask.color =
+ theme->a_disabled_focused_iconify->texture[0].data.mask.color =
+ theme->titlebut_disabled_focused_color;
+ theme->a_disabled_unfocused_max->texture[0].data.mask.color =
+ theme->a_disabled_unfocused_close->texture[0].data.mask.color =
+ theme->a_disabled_unfocused_desk->texture[0].data.mask.color =
+ theme->a_disabled_unfocused_shade->texture[0].data.mask.color =
+ theme->a_disabled_unfocused_iconify->texture[0].data.mask.color =
+ theme->titlebut_disabled_unfocused_color;
+ theme->a_hover_focused_max->texture[0].data.mask.color =
+ theme->a_hover_focused_close->texture[0].data.mask.color =
+ theme->a_hover_focused_desk->texture[0].data.mask.color =
+ theme->a_hover_focused_shade->texture[0].data.mask.color =
+ theme->a_hover_focused_iconify->texture[0].data.mask.color =
+ theme->titlebut_hover_focused_color;
+ theme->a_hover_unfocused_max->texture[0].data.mask.color =
+ theme->a_hover_unfocused_close->texture[0].data.mask.color =
+ theme->a_hover_unfocused_desk->texture[0].data.mask.color =
+ theme->a_hover_unfocused_shade->texture[0].data.mask.color =
+ theme->a_hover_unfocused_iconify->texture[0].data.mask.color =
+ theme->titlebut_hover_unfocused_color;
+ theme->a_toggled_hover_focused_max->texture[0].data.mask.color =
+ theme->a_toggled_hover_focused_desk->texture[0].data.mask.color =
+ theme->a_toggled_hover_focused_shade->texture[0].data.mask.color =
+ theme->titlebut_toggled_hover_focused_color;
+ theme->a_toggled_hover_unfocused_max->texture[0].data.mask.color =
+ theme->a_toggled_hover_unfocused_desk->texture[0].data.mask.color =
+ theme->a_toggled_hover_unfocused_shade->texture[0].data.mask.color =
+ theme->titlebut_toggled_hover_unfocused_color;
+ theme->a_toggled_focused_pressed_max->texture[0].data.mask.color =
+ theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color =
+ theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color =
+ theme->titlebut_toggled_focused_pressed_color;
+ theme->a_toggled_unfocused_pressed_max->texture[0].data.mask.color =
+ theme->a_toggled_unfocused_pressed_desk->texture[0].data.mask.color =
+ theme->a_toggled_unfocused_pressed_shade->texture[0].data.mask.color =
+ theme->titlebut_toggled_unfocused_pressed_color;
+ theme->a_toggled_focused_unpressed_max->texture[0].data.mask.color =
+ theme->a_toggled_focused_unpressed_desk->texture[0].data.mask.color =
+ theme->a_toggled_focused_unpressed_shade->texture[0].data.mask.color =
+ theme->titlebut_toggled_focused_unpressed_color;
+ theme->a_toggled_unfocused_unpressed_max->texture[0].data.mask.color =
+ theme->a_toggled_unfocused_unpressed_desk->
+ texture[0].data.mask.color =
+ theme->a_toggled_unfocused_unpressed_shade->
+ texture[0].data.mask.color =
+ theme->titlebut_toggled_unfocused_unpressed_color;
theme->a_focused_unpressed_max->texture[0].data.mask.color =
- theme->a_focused_pressed_max->texture[0].data.mask.color =
- theme->a_focused_pressed_set_max->texture[0].data.mask.color =
theme->a_focused_unpressed_close->texture[0].data.mask.color =
- theme->a_focused_pressed_close->texture[0].data.mask.color =
theme->a_focused_unpressed_desk->texture[0].data.mask.color =
- theme->a_focused_pressed_desk->texture[0].data.mask.color =
- theme->a_focused_pressed_set_desk->texture[0].data.mask.color =
theme->a_focused_unpressed_shade->texture[0].data.mask.color =
- theme->a_focused_pressed_shade->texture[0].data.mask.color =
- theme->a_focused_pressed_set_shade->texture[0].data.mask.color =
theme->a_focused_unpressed_iconify->texture[0].data.mask.color =
+ theme->titlebut_focused_unpressed_color;
+ theme->a_focused_pressed_max->texture[0].data.mask.color =
+ theme->a_focused_pressed_close->texture[0].data.mask.color =
+ theme->a_focused_pressed_desk->texture[0].data.mask.color =
+ theme->a_focused_pressed_shade->texture[0].data.mask.color =
theme->a_focused_pressed_iconify->texture[0].data.mask.color =
- theme->titlebut_focused_color;
+ theme->titlebut_focused_pressed_color;
theme->a_unfocused_unpressed_max->texture[0].data.mask.color =
- theme->a_unfocused_pressed_max->texture[0].data.mask.color =
- theme->a_unfocused_pressed_set_max->texture[0].data.mask.color =
theme->a_unfocused_unpressed_close->texture[0].data.mask.color =
- theme->a_unfocused_pressed_close->texture[0].data.mask.color =
theme->a_unfocused_unpressed_desk->texture[0].data.mask.color =
- theme->a_unfocused_pressed_desk->texture[0].data.mask.color =
- theme->a_unfocused_pressed_set_desk->texture[0].data.mask.color =
theme->a_unfocused_unpressed_shade->texture[0].data.mask.color =
- theme->a_unfocused_pressed_shade->texture[0].data.mask.color =
- theme->a_unfocused_pressed_set_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_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_color;
-
- XrmDestroyDatabase(db);
-
- theme->label_height = theme->winfont_height;
- theme->title_height = theme->label_height + theme->bevel * 2;
+ theme->titlebut_unfocused_pressed_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;
+
+ g_free(ps.path);
+ parse_close(ps.doc);
+
+ {
+ gint ft, fb, fl, fr, ut, ub, ul, ur;
+ RrAppearance *a, *b, *c;
+
+ /* caluclate the font heights*/
+ a = theme->a_focused_label;
+ theme->win_font_height =
+ RrFontHeight(theme->win_font_focused,
+ a->texture[0].data.text.shadow_offset_y);
+ a = theme->a_unfocused_label;
+ theme->win_font_height =
+ MAX(theme->win_font_height,
+ RrFontHeight(theme->win_font_unfocused,
+ a->texture[0].data.text.shadow_offset_y));
+ a = theme->a_menu_title;
+ theme->menu_title_font_height =
+ RrFontHeight(theme->menu_title_font,
+ a->texture[0].data.text.shadow_offset_y);
+ a = theme->a_menu_text_normal;
+ b = theme->a_menu_text_selected;
+ c = theme->a_menu_text_disabled;
+ theme->menu_font_height =
+ RrFontHeight(theme->menu_font,
+ MAX(a->texture[0].data.text.shadow_offset_y,
+ MAX(b->texture[0].data.text.shadow_offset_y,
+ c->texture[0].data.text.shadow_offset_y)));
+
+ 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->paddingy * 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->paddingy * 2;
+ }
theme->button_size = theme->label_height - 2;
- theme->grip_width = theme->button_size * 2;
+ theme->grip_width = 25;
return theme;
}
void RrThemeFree(RrTheme *theme)
{
if (theme) {
- g_free(theme->name);
-
- RrColorFree(theme->b_color);
+ RrColorFree(theme->menu_b_color);
+ RrColorFree(theme->frame_b_color);
RrColorFree(theme->cb_unfocused_color);
RrColorFree(theme->cb_focused_color);
- RrColorFree(theme->title_unfocused_color);
RrColorFree(theme->title_focused_color);
- RrColorFree(theme->titlebut_unfocused_color);
- RrColorFree(theme->titlebut_focused_color);
- RrColorFree(theme->menu_color);
+ RrColorFree(theme->title_unfocused_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_focused_pressed_color);
+ RrColorFree(theme->titlebut_unfocused_pressed_color);
+ RrColorFree(theme->titlebut_focused_unpressed_color);
+ RrColorFree(theme->titlebut_unfocused_unpressed_color);
+ RrColorFree(theme->titlebut_toggled_hover_focused_color);
+ RrColorFree(theme->titlebut_toggled_hover_unfocused_color);
+ RrColorFree(theme->titlebut_toggled_focused_pressed_color);
+ RrColorFree(theme->titlebut_toggled_unfocused_pressed_color);
+ RrColorFree(theme->titlebut_toggled_focused_unpressed_color);
+ RrColorFree(theme->titlebut_toggled_unfocused_unpressed_color);
RrColorFree(theme->menu_title_color);
+ RrColorFree(theme->menu_color);
RrColorFree(theme->menu_disabled_color);
- RrColorFree(theme->menu_hilite_color);
-
- RrPixmapMaskFree(theme->max_set_mask);
- RrPixmapMaskFree(theme->max_unset_mask);
- RrPixmapMaskFree(theme->desk_set_mask);
- RrPixmapMaskFree(theme->desk_unset_mask);
- RrPixmapMaskFree(theme->shade_set_mask);
- RrPixmapMaskFree(theme->shade_unset_mask);
+ RrColorFree(theme->menu_selected_color);
+ RrColorFree(theme->title_focused_shadow_color);
+ RrColorFree(theme->title_unfocused_shadow_color);
+ RrColorFree(theme->osd_color);
+ RrColorFree(theme->osd_shadow_color);
+ RrColorFree(theme->menu_title_shadow_color);
+ RrColorFree(theme->menu_text_normal_shadow_color);
+ RrColorFree(theme->menu_text_selected_shadow_color);
+ RrColorFree(theme->menu_text_disabled_shadow_color);
+
+ g_free(theme->def_win_icon);
+
+ RrPixmapMaskFree(theme->max_mask);
+ RrPixmapMaskFree(theme->max_toggled_mask);
+ RrPixmapMaskFree(theme->max_disabled_mask);
+ RrPixmapMaskFree(theme->max_hover_mask);
+ RrPixmapMaskFree(theme->max_pressed_mask);
+ RrPixmapMaskFree(theme->desk_mask);
+ RrPixmapMaskFree(theme->desk_toggled_mask);
+ RrPixmapMaskFree(theme->desk_disabled_mask);
+ RrPixmapMaskFree(theme->desk_hover_mask);
+ RrPixmapMaskFree(theme->desk_pressed_mask);
+ RrPixmapMaskFree(theme->shade_mask);
+ RrPixmapMaskFree(theme->shade_toggled_mask);
+ RrPixmapMaskFree(theme->shade_disabled_mask);
+ RrPixmapMaskFree(theme->shade_hover_mask);
+ RrPixmapMaskFree(theme->shade_pressed_mask);
RrPixmapMaskFree(theme->iconify_mask);
+ RrPixmapMaskFree(theme->iconify_disabled_mask);
+ RrPixmapMaskFree(theme->iconify_hover_mask);
+ RrPixmapMaskFree(theme->iconify_pressed_mask);
RrPixmapMaskFree(theme->close_mask);
-
- font_close(theme->winfont);
- font_close(theme->mtitlefont);
- font_close(theme->mfont);
-
- g_free(theme->title_layout);
-
+ RrPixmapMaskFree(theme->close_disabled_mask);
+ RrPixmapMaskFree(theme->close_hover_mask);
+ RrPixmapMaskFree(theme->close_pressed_mask);
+ RrPixmapMaskFree(theme->menu_bullet_mask);
+
+ 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_hover_focused_max);
+ RrAppearanceFree(theme->a_hover_unfocused_max);
RrAppearanceFree(theme->a_focused_unpressed_max);
RrAppearanceFree(theme->a_focused_pressed_max);
- RrAppearanceFree(theme->a_focused_pressed_set_max);
RrAppearanceFree(theme->a_unfocused_unpressed_max);
RrAppearanceFree(theme->a_unfocused_pressed_max);
- RrAppearanceFree(theme->a_unfocused_pressed_set_max);
+ RrAppearanceFree(theme->a_toggled_hover_focused_max);
+ RrAppearanceFree(theme->a_toggled_hover_unfocused_max);
+ RrAppearanceFree(theme->a_toggled_focused_unpressed_max);
+ RrAppearanceFree(theme->a_toggled_focused_pressed_max);
+ RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max);
+ RrAppearanceFree(theme->a_toggled_unfocused_pressed_max);
+ RrAppearanceFree(theme->a_disabled_focused_close);
+ RrAppearanceFree(theme->a_disabled_unfocused_close);
+ RrAppearanceFree(theme->a_hover_focused_close);
+ RrAppearanceFree(theme->a_hover_unfocused_close);
RrAppearanceFree(theme->a_focused_unpressed_close);
RrAppearanceFree(theme->a_focused_pressed_close);
RrAppearanceFree(theme->a_unfocused_unpressed_close);
RrAppearanceFree(theme->a_unfocused_pressed_close);
+ RrAppearanceFree(theme->a_disabled_focused_desk);
+ RrAppearanceFree(theme->a_disabled_unfocused_desk);
+ RrAppearanceFree(theme->a_hover_focused_desk);
+ RrAppearanceFree(theme->a_hover_unfocused_desk);
RrAppearanceFree(theme->a_focused_unpressed_desk);
RrAppearanceFree(theme->a_focused_pressed_desk);
RrAppearanceFree(theme->a_unfocused_unpressed_desk);
RrAppearanceFree(theme->a_unfocused_pressed_desk);
+ RrAppearanceFree(theme->a_toggled_hover_focused_desk);
+ RrAppearanceFree(theme->a_toggled_hover_unfocused_desk);
+ RrAppearanceFree(theme->a_toggled_focused_unpressed_desk);
+ RrAppearanceFree(theme->a_toggled_focused_pressed_desk);
+ RrAppearanceFree(theme->a_toggled_unfocused_unpressed_desk);
+ RrAppearanceFree(theme->a_toggled_unfocused_pressed_desk);
+ RrAppearanceFree(theme->a_disabled_focused_shade);
+ RrAppearanceFree(theme->a_disabled_unfocused_shade);
+ RrAppearanceFree(theme->a_hover_focused_shade);
+ RrAppearanceFree(theme->a_hover_unfocused_shade);
RrAppearanceFree(theme->a_focused_unpressed_shade);
RrAppearanceFree(theme->a_focused_pressed_shade);
RrAppearanceFree(theme->a_unfocused_unpressed_shade);
RrAppearanceFree(theme->a_unfocused_pressed_shade);
+ RrAppearanceFree(theme->a_toggled_hover_focused_shade);
+ RrAppearanceFree(theme->a_toggled_hover_unfocused_shade);
+ RrAppearanceFree(theme->a_toggled_focused_unpressed_shade);
+ RrAppearanceFree(theme->a_toggled_focused_pressed_shade);
+ RrAppearanceFree(theme->a_toggled_unfocused_unpressed_shade);
+ RrAppearanceFree(theme->a_toggled_unfocused_pressed_shade);
+ RrAppearanceFree(theme->a_disabled_focused_iconify);
+ RrAppearanceFree(theme->a_disabled_unfocused_iconify);
+ RrAppearanceFree(theme->a_hover_focused_iconify);
+ RrAppearanceFree(theme->a_hover_unfocused_iconify);
RrAppearanceFree(theme->a_focused_unpressed_iconify);
RrAppearanceFree(theme->a_focused_pressed_iconify);
RrAppearanceFree(theme->a_unfocused_unpressed_iconify);
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->app_hilite_bg);
- RrAppearanceFree(theme->app_unhilite_bg);
- RrAppearanceFree(theme->app_hilite_label);
- RrAppearanceFree(theme->app_unhilite_label);
- RrAppearanceFree(theme->app_icon);
+ RrAppearanceFree(theme->a_menu_selected);
+ RrAppearanceFree(theme->a_menu_text_normal);
+ RrAppearanceFree(theme->a_menu_text_disabled);
+ 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->osd_hilite_bg);
+ RrAppearanceFree(theme->osd_hilite_fg);
+ RrAppearanceFree(theme->osd_hilite_label);
+ RrAppearanceFree(theme->osd_unhilite_fg);
+
+ g_free(theme);
}
}
-static XrmDatabase loaddb(char *theme)
+static gboolean read_mask(ParseState *ps, const gchar *maskname,
+ RrPixmapMask **value)
{
- XrmDatabase db;
-
- db = XrmGetFileDatabase(theme);
- if (db == NULL) {
- char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- theme, NULL);
- db = XrmGetFileDatabase(s);
- g_free(s);
- }
- if (db == NULL) {
- char *s = g_build_filename(THEMEDIR, theme, NULL);
- db = XrmGetFileDatabase(s);
- g_free(s);
+ gboolean ret = FALSE;
+ gchar *s;
+ gint hx, hy; /* ignored */
+ guint w, h;
+ guchar *b;
+
+ s = g_build_filename(ps->path, maskname, NULL);
+ if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) {
+ ret = TRUE;
+ *value = RrPixmapMaskNew(ps->inst, w, h, (gchar*)b);
+ XFree(b);
}
- return db;
-}
+ g_free(s);
-static char *create_class_name(char *rname)
-{
- char *rclass = g_strdup(rname);
- char *p = rclass;
-
- while (TRUE) {
- *p = toupper(*p);
- p = strchr(p+1, '.');
- if (p == NULL) break;
- ++p;
- if (*p == '\0') break;
- }
- return rclass;
+ return ret;
}
-static gboolean read_int(XrmDatabase db, char *rname, int *value)
+static void set_default_appearance(RrAppearance *a)
{
- gboolean ret = FALSE;
- char *rclass = create_class_name(rname);
- char *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;
- }
-
- g_free(rclass);
- return ret;
+ a->surface.grad = RR_SURFACE_SOLID;
+ a->surface.relief = RR_RELIEF_FLAT;
+ a->surface.bevel = RR_BEVEL_1;
+ a->surface.interlaced = FALSE;
+ a->surface.border = FALSE;
+ a->surface.primary = RrColorNew(a->inst, 0, 0, 0);
+ a->surface.secondary = RrColorNew(a->inst, 0, 0, 0);
}
-static gboolean read_string(XrmDatabase db, char *rname, char **value)
+/* 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)
{
- gboolean ret = FALSE;
- char *rclass = create_class_name(rname);
- char *rettype;
- XrmValue retvalue;
-
- if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
- retvalue.addr != NULL) {
- *value = g_strdup(retvalue.addr);
- ret = TRUE;
+ 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++;
}
- g_free(rclass);
- return ret;
+ return im;
}
-static gboolean read_color(XrmDatabase db, const RrInstance *inst,
- gchar *rname, RrColor **value)
+static void parse_style(gchar *tex, RrSurfaceColorType *grad,
+ RrReliefType *relief, RrBevelType *bevel,
+ gboolean *interlaced, gboolean *border,
+ gboolean allow_trans)
{
- gboolean ret = FALSE;
- char *rclass = create_class_name(rname);
- char *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;
- }
- }
-
- g_free(rclass);
- return ret;
-}
+ gchar *t;
-static gboolean read_mask(XrmDatabase db, const RrInstance *inst,
- gchar *rname, gchar *theme,
- RrPixmapMask **value)
-{
- gboolean ret = FALSE;
- char *rclass = create_class_name(rname);
- char *rettype;
- char *s;
- char *button_dir;
- XrmValue retvalue;
- int hx, hy; /* ignored */
- unsigned int w, h;
- unsigned char *b;
-
- if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
- retvalue.addr != NULL) {
-
- button_dir = g_strdup_printf("%s_data", theme);
-
- s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- button_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);
-
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
- ret = TRUE;
- else {
- char *themename;
-
- g_free(s);
- themename = g_path_get_basename(theme);
- s = g_strdup_printf("%s/%s_data/%s", theme,
- themename, retvalue.addr);
- g_free(themename);
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) ==
- BitmapSuccess)
- ret = TRUE;
- else
- g_message("Unable to find bitmap '%s'", retvalue.addr);
- }
+ /* convert to all lowercase */
+ for (t = tex; *t != '\0'; ++t)
+ *t = g_ascii_tolower(*t);
+
+ if (allow_trans && strstr(tex, "parentrelative") != NULL) {
+ *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, "mirrorhorizontal") != NULL)
+ *grad = RR_SURFACE_MIRROR_HORIZONTAL;
+ else if (strstr(tex, "horizontal") != NULL)
+ *grad = RR_SURFACE_HORIZONTAL;
+ else if (strstr(tex, "splitvertical") != NULL)
+ *grad = RR_SURFACE_SPLIT_VERTICAL;
+ else if (strstr(tex, "vertical") != NULL)
+ *grad = RR_SURFACE_VERTICAL;
+ else
+ *grad = RR_SURFACE_DIAGONAL;
+ } else {
+ *grad = RR_SURFACE_SOLID;
}
- if (ret) {
- *value = RrPixmapMaskNew(inst, w, h, (char*)b);
- XFree(b);
+ 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;
}
-
- g_free(s);
- g_free(button_dir);
+
+ if (strstr(tex, "interlaced") != NULL)
+ *interlaced = TRUE;
+ else
+ *interlaced = FALSE;
}
+}
- g_free(rclass);
- return ret;
+static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[])
+{
+ gint i;
+
+ for (i = 0; names[i] && n; ++i)
+ n = parse_find_node(names[i], n->children);
+ return n;
}
-static void parse_appearance(gchar *tex, RrSurfaceColorType *grad,
- RrReliefType *relief, RrBevelType *bevel,
- gboolean *interlaced, gboolean *border)
+static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ gint *integer, gint lower, gint upper)
{
- char *t;
+ gint i;
- /* convert to all lowercase */
- for (t = tex; *t != '\0'; ++t)
- *t = g_ascii_tolower(*t);
+ if ((n = find_node(n, names))) {
+ i = parse_int(ps->doc, n);
+ if (i >= lower && i <= upper) {
+ *integer = i;
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
- if (strstr(tex, "parentrelative") != NULL) {
- *grad = RR_SURFACE_PARENTREL;
- } else {
- 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)
- *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;
+static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ const gchar **string)
+{
+ if ((n = find_node(n, names))) {
+ *string = parse_string(ps->doc, n);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ RrColor **color, gchar *alpha)
+{
+ if ((n = find_node(n, names))) {
+ int r,g,b,a;
+ if (parse_attr_int("r", n, &r) &&
+ parse_attr_int("g", n, &g) &&
+ parse_attr_int("b", n, &b) &&
+ parse_attr_int("a", n, &a) &&
+ r >= 0 && g >= 0 && b >= 0 && a >= 0 &&
+ r < 256 && g < 256 && b < 256 && a < 256)
+ {
+ *color = RrColorNew(ps->inst, r, g, b);
+ if (alpha) *alpha = a;
+ return TRUE;
+ }
}
+ return FALSE;
}
+static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ gint *x, gint *y,
+ gint lowx, gint upx, gint lowy, gint upy)
+{
+ if ((n = find_node(n, names))) {
+ gint a, b;
+ if (parse_attr_int("x", n, &a) &&
+ parse_attr_int("y", n, &b) &&
+ a >= lowx && a <= upx && b >= lowy && b <= upy)
+ {
+ *x = a; *y = b;
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
-static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
- gchar *rname, RrAppearance *value)
+static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ RrAppearance *a)
{
- gboolean ret = FALSE;
- char *rclass = create_class_name(rname), *cname, *ctoname, *bcname;
- char *rettype;
- XrmValue retvalue;
-
- cname = g_strconcat(rname, ".color", NULL);
- ctoname = g_strconcat(rname, ".colorTo", NULL);
- bcname = g_strconcat(rname, ".borderColor", 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);
- 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);
- ret = TRUE;
- }
-
- g_free(bcname);
- g_free(ctoname);
- g_free(cname);
- g_free(rclass);
- return ret;
+ return find_point(ps, n, names,
+ &a->texture[0].data.text.shadow_offset_x,
+ &a->texture[0].data.text.shadow_offset_y,
+ -20, 20, -20, 20);
}
-static void set_default_appearance(RrAppearance *a)
+static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[],
+ RrAppearance *a, gboolean allow_trans)
{
- a->surface.grad = RR_SURFACE_SOLID;
- a->surface.relief = RR_RELIEF_FLAT;
- a->surface.bevel = RR_BEVEL_1;
- a->surface.interlaced = FALSE;
- a->surface.border = FALSE;
- a->surface.primary = RrColorNew(a->inst, 0, 0, 0);
- a->surface.secondary = RrColorNew(a->inst, 0, 0, 0);
+ xmlNodePtr n2;
+
+ if (!(n = find_node(n, names)))
+ return FALSE;
+
+ if ((n2 = find_node(n, L("style")))) {
+ gchar *s = parse_string(ps->doc, n2);
+ parse_style(s, &a->surface.grad, &a->surface.relief,
+ &a->surface.bevel, &a->surface.interlaced,
+ &a->surface.border, allow_trans);
+ g_free(s);
+ } else
+ return FALSE;
+
+ if (!find_color(ps, n, L("primary"), &a->surface.primary, NULL))
+ a->surface.primary = RrColorNew(ps->inst, 0, 0, 0);
+ if (!find_color(ps, n, L("secondary"), &a->surface.secondary, NULL))
+ a->surface.secondary = RrColorNew(ps->inst, 0, 0, 0);
+ if (a->surface.border)
+ if (!find_color(ps, n, L("border"),
+ &a->surface.border_color, NULL))
+ a->surface.border_color = RrColorNew(ps->inst, 0, 0, 0);
+ if (a->surface.interlaced)
+ if (!find_color(ps, n, L("interlace"),
+ &a->surface.interlace_color, NULL))
+ a->surface.interlace_color = RrColorNew(ps->inst, 0, 0, 0);
+
+ return TRUE;
}
projects / mikachu / openbox.git / blobdiff