}
}
+#define READ_INT(x_resstr, x_var, x_min, x_max, x_def) \
+ if (!read_int(db, x_resstr, & x_var) || \
+ x_var < x_min || x_var > x_max) \
+ x_var = x_def;
+
+#define READ_COLOR(x_resstr, x_var, x_def) \
+ if (!read_color(db, inst, x_resstr, & x_var)) \
+ x_var = x_def;
+
+#define READ_COLOR_(x_res1, x_res2, x_var, x_def) \
+ if (!read_color(db, inst, x_res1, & x_var) && \
+ !read_color(db, inst, x_res2, & x_var)) \
+ x_var = x_def;
+
+#define READ_MASK_COPY(x_file, x_var, x_copysrc) \
+ if (!read_mask(inst, path, theme, x_file, & x_var)) \
+ x_var = RrPixmapMaskCopy(x_copysrc);
+
+#define READ_APPEARANCE(x_resstr, x_var, x_parrel) \
+ if (!read_appearance(db, inst, x_resstr, x_var, x_parrel)) \
+ set_default_appearance(x_var);
+
+#define READ_APPEARANCE_COPY(x_resstr, x_var, x_parrel, x_defval) \
+ if (!read_appearance(db, inst, x_resstr, x_var, x_parrel)) {\
+ RrAppearanceFree(x_var); \
+ x_var = RrAppearanceCopy(x_defval); }
+
+#define READ_APPEARANCE_(x_res1, x_res2, x_var, x_parrel, x_defval) \
+ if (!read_appearance(db, inst, x_res1, x_var, x_parrel) && \
+ !read_appearance(db, inst, x_res2, x_var, x_parrel)) {\
+ RrAppearanceFree(x_var); \
+ x_var = RrAppearanceCopy(x_defval); }
+
RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
gboolean allow_fallback,
RrFont *active_window_font, RrFont *inactive_window_font,
RrFont *default_font = NULL;
gchar *path;
gboolean userdef;
+ gint menu_overlap = 0;
+ RrAppearance *a_disabled_focused_tmp;
+ RrAppearance *a_disabled_unfocused_tmp;
+ RrAppearance *a_hover_focused_tmp;
+ RrAppearance *a_hover_unfocused_tmp;
+ RrAppearance *a_focused_unpressed_tmp;
+ RrAppearance *a_focused_pressed_tmp;
+ RrAppearance *a_unfocused_unpressed_tmp;
+ RrAppearance *a_unfocused_pressed_tmp;
+ RrAppearance *a_toggled_hover_focused_tmp;
+ RrAppearance *a_toggled_hover_unfocused_tmp;
+ RrAppearance *a_toggled_focused_unpressed_tmp;
+ RrAppearance *a_toggled_focused_pressed_tmp;
+ RrAppearance *a_toggled_unfocused_unpressed_tmp;
+ RrAppearance *a_toggled_unfocused_pressed_tmp;
if (name) {
db = loaddb(name, &path);
return NULL;
}
- theme = g_new0(RrTheme, 1);
+ /* initialize temp reading textures */
+ a_disabled_focused_tmp = RrAppearanceNew(inst, 1);
+ a_disabled_unfocused_tmp = RrAppearanceNew(inst, 1);
+ a_hover_focused_tmp = RrAppearanceNew(inst, 1);
+ a_hover_unfocused_tmp = RrAppearanceNew(inst, 1);
+ a_toggled_focused_unpressed_tmp = RrAppearanceNew(inst, 1);
+ a_toggled_unfocused_unpressed_tmp = RrAppearanceNew(inst, 1);
+ a_toggled_hover_focused_tmp = RrAppearanceNew(inst, 1);
+ a_toggled_hover_unfocused_tmp = RrAppearanceNew(inst, 1);
+ a_toggled_focused_pressed_tmp = RrAppearanceNew(inst, 1);
+ a_toggled_unfocused_pressed_tmp = RrAppearanceNew(inst, 1);
+ a_focused_unpressed_tmp = RrAppearanceNew(inst, 1);
+ a_focused_pressed_tmp = RrAppearanceNew(inst, 1);
+ a_unfocused_unpressed_tmp = RrAppearanceNew(inst, 1);
+ a_unfocused_pressed_tmp = RrAppearanceNew(inst, 1);
+
+ /* initialize theme */
+ theme = g_slice_new0(RrTheme, 1);
theme->inst = inst;
theme->name = g_strdup(name ? name : DEFAULT_THEME);
theme->osd_font_unhilite = get_font(inactive_osd_font, &default_font,inst);
/* load direct dimensions */
- if ((!read_int(db, "menu.overlap.x", &theme->menu_overlap_x) &&
- !read_int(db, "menu.overlap", &theme->menu_overlap_x)) ||
- theme->menu_overlap_x < -100 || theme->menu_overlap_x > 100)
- theme->menu_overlap_x = 0;
- if ((!read_int(db, "menu.overlap.y", &theme->menu_overlap_y) &&
- !read_int(db, "menu.overlap", &theme->menu_overlap_y)) ||
- theme->menu_overlap_y < -100 || theme->menu_overlap_y > 100)
- theme->menu_overlap_y = 0;
- if (!read_int(db, "window.handle.width", &theme->handle_height) ||
- theme->handle_height < 0 || theme->handle_height > 100)
- theme->handle_height = 6;
- if (!read_int(db, "padding.width", &theme->paddingx) ||
- theme->paddingx < 0 || theme->paddingx > 100)
- theme->paddingx = 3;
- if (!read_int(db, "padding.height", &theme->paddingy) ||
- theme->paddingy < 0 || theme->paddingy > 100)
- theme->paddingy = theme->paddingx;
- if (!read_int(db, "border.width", &theme->fbwidth) ||
- theme->fbwidth < 0 || theme->fbwidth > 100)
- theme->fbwidth = 1;
- /* menu border width inherits from the frame border width */
- if (!read_int(db, "menu.border.width", &theme->mbwidth) ||
- theme->mbwidth < 0 || theme->mbwidth > 100)
- theme->mbwidth = theme->fbwidth;
- /* osd border width inherits from the frame border width */
- if (!read_int(db, "osd.border.width", &theme->obwidth) ||
- theme->obwidth < 0 || theme->obwidth > 100)
- theme->obwidth = theme->fbwidth;
- if (!read_int(db, "window.client.padding.width", &theme->cbwidthx) ||
- theme->cbwidthx < 0 || theme->cbwidthx > 100)
- theme->cbwidthx = theme->paddingx;
- if (!read_int(db, "window.client.padding.height", &theme->cbwidthy) ||
- theme->cbwidthy < 0 || theme->cbwidthy > 100)
- theme->cbwidthy = theme->cbwidthx;
- if (!read_int(db, "menu.separator.width", &theme->menu_sep_width) ||
- theme->menu_sep_width < 1 || theme->menu_sep_width > 100)
- theme->menu_sep_width = 1;
- if (!read_int(db, "menu.separator.padding.width",
- &theme->menu_sep_paddingx) ||
- theme->menu_sep_paddingx < 0 || theme->menu_sep_paddingx > 100)
- theme->menu_sep_paddingx = 6;
- if (!read_int(db, "menu.separator.padding.height",
- &theme->menu_sep_paddingy) ||
- theme->menu_sep_paddingy < 0 || theme->menu_sep_paddingy > 100)
- theme->menu_sep_paddingy = 3;
+ READ_INT("menu.overlap", menu_overlap, -100, 100, 0);
+ READ_INT("menu.overlap.x", theme->menu_overlap_x, -100, 100, menu_overlap);
+ READ_INT("menu.overlap.y", theme->menu_overlap_y, -100, 100, menu_overlap);
+ READ_INT("window.handle.width", theme->handle_height, 0, 100, 6);
+ READ_INT("padding.width", theme->paddingx, 0, 100, 3);
+ READ_INT("padding.height", theme->paddingy, 0, 100, theme->paddingx);
+ READ_INT("border.width", theme->fbwidth, 0, 100, 1);
+ READ_INT("menu.border.width", theme->mbwidth, 0, 100, theme->fbwidth);
+ READ_INT("osd.border.width", theme->obwidth, 0, 100, theme->fbwidth);
+ READ_INT("menu.separator.width", theme->menu_sep_width, 1, 100, 1);
+ READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx, 0, 100, 6);
+ READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy, 0, 100, 3);
+ READ_INT("window.client.padding.width", theme->cbwidthx, 0, 100,
+ theme->paddingx);
+ READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100,
+ theme->cbwidthx);
/* load colors */
- if (!read_color(db, inst,
- "window.active.border.color",
- &theme->frame_focused_border_color) &&
- !read_color(db, inst,
- "border.color",
- &theme->frame_focused_border_color))
- theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0);
+ READ_COLOR_("window.active.border.color", "border.color",
+ theme->frame_focused_border_color, RrColorNew(inst, 0, 0, 0));
+
/* title separator focused color inherits from focused border color */
- if (!read_color(db, inst,
- "window.active.title.separator.color",
- &theme->title_separator_focused_color))
- theme->title_separator_focused_color =
- RrColorNew(inst,
- theme->frame_focused_border_color->r,
- theme->frame_focused_border_color->g,
- theme->frame_focused_border_color->b);
+ READ_COLOR("window.active.title.separator.color",
+ theme->title_separator_focused_color,
+ RrColorCopy(theme->frame_focused_border_color));
+
/* unfocused border color inherits from frame focused border color */
- if (!read_color(db, inst,
- "window.inactive.border.color",
- &theme->frame_unfocused_border_color))
- theme->frame_unfocused_border_color =
- RrColorNew(inst, theme->frame_focused_border_color->r,
- theme->frame_focused_border_color->g,
- theme->frame_focused_border_color->b);
+ READ_COLOR("window.inactive.border.color",
+ theme->frame_unfocused_border_color,
+ RrColorCopy(theme->frame_focused_border_color));
+
/* title separator unfocused color inherits from unfocused border color */
- if (!read_color(db, inst,
- "window.inactive.title.separator.color",
- &theme->title_separator_unfocused_color))
- theme->title_separator_unfocused_color =
- RrColorNew(inst,
- theme->frame_unfocused_border_color->r,
- theme->frame_unfocused_border_color->g,
- theme->frame_unfocused_border_color->b);
+ READ_COLOR("window.inactive.title.separator.color",
+ theme->title_separator_unfocused_color,
+ RrColorCopy(theme->frame_unfocused_border_color));
/* menu border color inherits from frame focused border color */
- if (!read_color(db, inst, "menu.border.color", &theme->menu_border_color))
- theme->menu_border_color =
- RrColorNew(inst,
- theme->frame_focused_border_color->r,
- theme->frame_focused_border_color->g,
- theme->frame_focused_border_color->b);
+ READ_COLOR("menu.border.color", theme->menu_border_color,
+ RrColorCopy(theme->frame_focused_border_color));
+
/* osd border color inherits from frame focused border color */
- if (!read_color(db, inst, "osd.border.color", &theme->osd_border_color))
- theme->osd_border_color =
- RrColorNew(inst,
- theme->frame_focused_border_color->r,
- theme->frame_focused_border_color->g,
- theme->frame_focused_border_color->b);
- if (!read_color(db, inst,
- "window.active.client.color",
- &theme->cb_focused_color))
- theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
- if (!read_color(db, inst,
- "window.inactive.client.color",
- &theme->cb_unfocused_color))
- theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
- if (!read_color(db, inst,
- "window.active.label.text.color",
- &theme->title_focused_color))
- theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0);
- if (!read_color(db, inst, "osd.active.label.text.color",
- &theme->osd_text_active_color) &&
- !read_color(db, inst, "osd.label.text.color",
- &theme->osd_text_active_color))
- theme->osd_text_active_color =
- RrColorNew(inst,
- theme->title_focused_color->r,
- theme->title_focused_color->g,
- theme->title_focused_color->b);
- if (!read_color(db, inst,
- "window.inactive.label.text.color",
- &theme->title_unfocused_color))
- theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
- if (!read_color(db, inst, "osd.inactive.label.text.color",
- &theme->osd_text_inactive_color))
- theme->osd_text_inactive_color =
- RrColorNew(inst,
- theme->title_unfocused_color->r,
- theme->title_unfocused_color->g,
- theme->title_unfocused_color->b);
- if (!read_color(db, inst,
- "window.active.button.unpressed.image.color",
- &theme->titlebut_focused_unpressed_color))
- theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0);
- if (!read_color(db, inst,
- "window.inactive.button.unpressed.image.color",
- &theme->titlebut_unfocused_unpressed_color))
- theme->titlebut_unfocused_unpressed_color =
- RrColorNew(inst, 0xff, 0xff, 0xff);
- if (!read_color(db, inst,
- "window.active.button.pressed.image.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.inactive.button.pressed.image.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.active.button.disabled.image.color",
- &theme->titlebut_disabled_focused_color))
- theme->titlebut_disabled_focused_color =
- RrColorNew(inst, 0xff, 0xff, 0xff);
- if (!read_color(db, inst,
- "window.inactive.button.disabled.image.color",
- &theme->titlebut_disabled_unfocused_color))
- theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0);
- if (!read_color(db, inst,
- "window.active.button.hover.image.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.inactive.button.hover.image.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.active.button.toggled.unpressed.image.color",
- &theme->titlebut_toggled_focused_unpressed_color) &&
- !read_color(db, inst,
- "window.active.button.toggled.image.color",
- &theme->titlebut_toggled_focused_unpressed_color))
- theme->titlebut_toggled_focused_unpressed_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.inactive.button.toggled.unpressed.image.color",
- &theme->titlebut_toggled_unfocused_unpressed_color) &&
- !read_color(db, inst,
- "window.inactive.button.toggled.image.color",
- &theme->titlebut_toggled_unfocused_unpressed_color))
- theme->titlebut_toggled_unfocused_unpressed_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,
- "window.active.button.toggled.hover.image.color",
- &theme->titlebut_toggled_hover_focused_color))
- 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 (!read_color(db, inst,
- "window.inactive.button.toggled.hover.image.color",
- &theme->titlebut_toggled_hover_unfocused_color))
- 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 (!read_color(db, inst,
- "window.active.button.toggled.pressed.image.color",
- &theme->titlebut_toggled_focused_pressed_color))
- 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 (!read_color(db, inst,
- "window.inactive.button.toggled.pressed.image.color",
- &theme->titlebut_toggled_unfocused_pressed_color))
- 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 (!read_color(db, inst,
- "menu.title.text.color", &theme->menu_title_color))
- theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
- if (!read_color(db, inst,
- "menu.items.text.color", &theme->menu_color))
- theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
- if (!read_color(db, inst,
- "menu.items.disabled.text.color",
- &theme->menu_disabled_color))
- theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0);
- if (!read_color(db, inst,
- "menu.items.active.disabled.text.color",
- &theme->menu_disabled_selected_color))
- theme->menu_disabled_selected_color =
- RrColorNew(inst,
- theme->menu_disabled_color->r,
- theme->menu_disabled_color->g,
- theme->menu_disabled_color->b);
- if (!read_color(db, inst,
- "menu.items.active.text.color",
- &theme->menu_selected_color))
- theme->menu_selected_color = RrColorNew(inst, 0, 0, 0);
- if (!read_color(db, inst,
- "menu.separator.color", &theme->menu_sep_color))
- theme->menu_sep_color = RrColorNew(inst,
- theme->menu_color->r,
- theme->menu_color->g,
- theme->menu_color->b);
+ READ_COLOR("osd.border.color", theme->osd_border_color,
+ RrColorCopy(theme->frame_focused_border_color));
+
+ READ_COLOR("window.active.client.color", theme->cb_focused_color,
+ RrColorNew(inst, 0xff, 0xff, 0xff));
+
+ READ_COLOR("window.inactive.client.color", theme->cb_unfocused_color,
+ RrColorNew(inst, 0xff, 0xff, 0xff));
+
+ READ_COLOR("window.active.label.text.color", theme->title_focused_color,
+ RrColorNew(inst, 0x0, 0x0, 0x0));
+
+ READ_COLOR_("osd.active.label.text.color",
+ "osd.label.text.color",
+ theme->osd_color, RrColorCopy(theme->title_focused_color));
+
+ READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color,
+ RrColorCopy(theme->title_unfocused_color));
+
+ READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color,
+ RrColorNew(inst, 0xff, 0xff, 0xff));
+
+ READ_COLOR("window.inactive.label.text.color",
+ theme->title_unfocused_color,
+ RrColorNew(inst, 0xff, 0xff, 0xff));
+
+ READ_COLOR("window.active.button.unpressed.image.color",
+ theme->titlebut_focused_unpressed_color,
+ RrColorNew(inst, 0, 0, 0));
+
+ READ_COLOR("window.inactive.button.unpressed.image.color",
+ theme->titlebut_unfocused_unpressed_color,
+ RrColorNew(inst, 0xff, 0xff, 0xff));
+
+ READ_COLOR("window.active.button.pressed.image.color",
+ theme->titlebut_focused_pressed_color,
+ RrColorCopy(theme->titlebut_focused_unpressed_color));
+
+ READ_COLOR("window.inactive.button.pressed.image.color",
+ theme->titlebut_unfocused_pressed_color,
+ RrColorCopy(theme->titlebut_unfocused_unpressed_color));
+
+ READ_COLOR("window.active.button.disabled.image.color",
+ theme->titlebut_disabled_focused_color,
+ RrColorNew(inst, 0xff, 0xff, 0xff));
+
+ READ_COLOR("window.inactive.button.disabled.image.color",
+ theme->titlebut_disabled_unfocused_color,
+ RrColorNew(inst, 0, 0, 0));
+
+ READ_COLOR("window.active.button.hover.image.color",
+ theme->titlebut_hover_focused_color,
+ RrColorCopy(theme->titlebut_focused_unpressed_color));
+
+ READ_COLOR("window.inactive.button.hover.image.color",
+ theme->titlebut_hover_unfocused_color,
+ RrColorCopy(theme->titlebut_unfocused_unpressed_color));
+
+ READ_COLOR_("window.active.button.toggled.unpressed.image.color",
+ "window.active.button.toggled.image.color",
+ theme->titlebut_toggled_focused_unpressed_color,
+ RrColorCopy(theme->titlebut_focused_pressed_color));
+
+ READ_COLOR_("window.inactive.button.toggled.unpressed.image.color",
+ "window.inactive.button.toggled.image.color",
+ theme->titlebut_toggled_unfocused_unpressed_color,
+ RrColorCopy(theme->titlebut_unfocused_pressed_color));
+
+ READ_COLOR("window.active.button.toggled.hover.image.color",
+ theme->titlebut_toggled_hover_focused_color,
+ RrColorCopy(theme->titlebut_toggled_focused_unpressed_color));
+
+ READ_COLOR("window.inactive.button.toggled.hover.image.color",
+ theme->titlebut_toggled_hover_unfocused_color,
+ RrColorCopy(theme->titlebut_toggled_unfocused_unpressed_color));
+
+ READ_COLOR("window.active.button.toggled.pressed.image.color",
+ theme->titlebut_toggled_focused_pressed_color,
+ RrColorCopy(theme->titlebut_focused_pressed_color));
+
+ READ_COLOR("window.inactive.button.toggled.pressed.image.color",
+ theme->titlebut_toggled_unfocused_pressed_color,
+ RrColorCopy(theme->titlebut_unfocused_pressed_color));
+
+ READ_COLOR("menu.title.text.color", theme->menu_title_color,
+ RrColorNew(inst, 0, 0, 0));
+
+ READ_COLOR("menu.items.text.color", theme->menu_color,
+ RrColorNew(inst, 0xff, 0xff, 0xff));
+
+ READ_COLOR("menu.items.disabled.text.color", theme->menu_disabled_color,
+ RrColorNew(inst, 0, 0, 0));
+
+ READ_COLOR("menu.items.active.disabled.text.color",
+ theme->menu_disabled_selected_color,
+ RrColorCopy(theme->menu_disabled_color));
+
+ READ_COLOR("menu.items.active.text.color", theme->menu_selected_color,
+ RrColorNew(inst, 0, 0, 0));
+
+ READ_COLOR("menu.separator.color", theme->menu_sep_color,
+ RrColorCopy(theme->menu_color));
/* load the image masks */
theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data);
}
}
- if (!read_mask(inst, path, theme, "max_pressed.xbm",
- &theme->max_pressed_mask))
- theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
- if (!read_mask(inst,path,theme,"max_disabled.xbm",
- &theme->max_disabled_mask))
- theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
- if (!read_mask(inst, path, theme, "max_hover.xbm", &theme->max_hover_mask))
- theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
- if (!read_mask(inst, path, theme, "max_toggled_pressed.xbm",
- &theme->max_toggled_pressed_mask))
- theme->max_toggled_pressed_mask =
- RrPixmapMaskCopy(theme->max_toggled_mask);
- if (!read_mask(inst, path, theme, "max_toggled_hover.xbm",
- &theme->max_toggled_hover_mask))
- theme->max_toggled_hover_mask =
- RrPixmapMaskCopy(theme->max_toggled_mask);
+ READ_MASK_COPY("max_pressed.xbm", theme->max_pressed_mask,
+ theme->max_mask);
+ READ_MASK_COPY("max_disabled.xbm", theme->max_disabled_mask,
+ theme->max_mask);
+ READ_MASK_COPY("max_hover.xbm", theme->max_hover_mask, theme->max_mask);
+ READ_MASK_COPY("max_toggled_pressed.xbm", theme->max_toggled_pressed_mask,
+ theme->max_toggled_mask);
+ READ_MASK_COPY("max_toggled_hover.xbm", theme->max_toggled_hover_mask,
+ theme->max_toggled_mask);
/* iconify button masks */
if (!read_mask(inst, path, theme, "iconify.xbm", &theme->iconify_mask)) {
guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f };
theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
}
- if (!read_mask(inst, path, theme, "iconify_pressed.xbm",
- &theme->iconify_pressed_mask))
- theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask);
- if (!read_mask(inst, path, theme, "iconify_disabled.xbm",
- &theme->iconify_disabled_mask))
- theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask);
- if (!read_mask(inst, path, theme, "iconify_hover.xbm",
- &theme->iconify_hover_mask))
- theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
+ READ_MASK_COPY("iconify_pressed.xbm", theme->iconify_pressed_mask,
+ theme->iconify_mask);
+ READ_MASK_COPY("iconify_disabled.xbm", theme->iconify_disabled_mask,
+ theme->iconify_mask);
+ READ_MASK_COPY("iconify_hover.xbm", theme->iconify_hover_mask,
+ theme->iconify_mask);
/* all desktops button masks */
userdef = TRUE;
RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
}
}
- if (!read_mask(inst, path, theme, "desk_pressed.xbm",
- &theme->desk_pressed_mask))
- theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
- if (!read_mask(inst, path, theme, "desk_disabled.xbm",
- &theme->desk_disabled_mask))
- theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
- if (!read_mask(inst, path, theme, "desk_hover.xbm",
- &theme->desk_hover_mask))
- theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
- if (!read_mask(inst, path, theme, "desk_toggled_pressed.xbm",
- &theme->desk_toggled_pressed_mask))
- theme->desk_toggled_pressed_mask =
- RrPixmapMaskCopy(theme->desk_toggled_mask);
- if (!read_mask(inst, path, theme, "desk_toggled_hover.xbm",
- &theme->desk_toggled_hover_mask))
- theme->desk_toggled_hover_mask =
- RrPixmapMaskCopy(theme->desk_toggled_mask);
+ READ_MASK_COPY("desk_pressed.xbm", theme->desk_pressed_mask,
+ theme->desk_mask);
+ READ_MASK_COPY("desk_disabled.xbm", theme->desk_disabled_mask,
+ theme->desk_mask);
+ READ_MASK_COPY("desk_hover.xbm", theme->desk_hover_mask, theme->desk_mask);
+ READ_MASK_COPY("desk_toggled_pressed.xbm",
+ theme->desk_toggled_pressed_mask, theme->desk_toggled_mask);
+ READ_MASK_COPY("desk_toggled_hover.xbm", theme->desk_toggled_hover_mask,
+ theme->desk_toggled_mask);
/* shade button masks */
if (!read_mask(inst, path, theme, "shade.xbm", &theme->shade_mask)) {
guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 };
theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
}
- if (!read_mask(inst, path, theme, "shade_toggled.xbm",
- &theme->shade_toggled_mask))
- theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_mask);
- if (!read_mask(inst, path, theme, "shade_pressed.xbm",
- &theme->shade_pressed_mask))
- theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
- if (!read_mask(inst, path, theme, "shade_disabled.xbm",
- &theme->shade_disabled_mask))
- theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
- if (!read_mask(inst, path, theme, "shade_hover.xbm",
- &theme->shade_hover_mask))
- theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
- if (!read_mask(inst, path, theme, "shade_toggled_pressed.xbm",
- &theme->shade_toggled_pressed_mask))
- theme->shade_toggled_pressed_mask =
- RrPixmapMaskCopy(theme->shade_toggled_mask);
- if (!read_mask(inst, path, theme, "shade_toggled_hover.xbm",
- &theme->shade_toggled_hover_mask))
- theme->shade_toggled_hover_mask =
- RrPixmapMaskCopy(theme->shade_toggled_mask);
+ READ_MASK_COPY("shade_toggled.xbm", theme->shade_toggled_mask,
+ theme->shade_mask);
+ READ_MASK_COPY("shade_pressed.xbm", theme->shade_pressed_mask,
+ theme->shade_mask);
+ READ_MASK_COPY("shade_disabled.xbm", theme->shade_disabled_mask,
+ theme->shade_mask);
+ READ_MASK_COPY("shade_hover.xbm", theme->shade_hover_mask,
+ theme->shade_mask);
+ READ_MASK_COPY("shade_toggled_pressed.xbm",
+ theme->shade_toggled_pressed_mask,
+ theme->shade_toggled_mask);
+ READ_MASK_COPY("shade_toggled_hover.xbm",
+ theme->shade_toggled_hover_mask, theme->shade_toggled_mask);
/* close button masks */
if (!read_mask(inst, path, theme, "close.xbm", &theme->close_mask)) {
guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 };
theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
}
- if (!read_mask(inst, path, theme, "close_pressed.xbm",
- &theme->close_pressed_mask))
- theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
- if (!read_mask(inst, path, theme, "close_disabled.xbm",
- &theme->close_disabled_mask))
- theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
- if (!read_mask(inst, path, theme, "close_hover.xbm",
- &theme->close_hover_mask))
- theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
+ READ_MASK_COPY("close_pressed.xbm", theme->close_pressed_mask,
+ theme->close_mask);
+ READ_MASK_COPY("close_disabled.xbm", theme->close_disabled_mask,
+ theme->close_mask);
+ READ_MASK_COPY("close_hover.xbm", theme->close_hover_mask,
+ theme->close_mask);
/* submenu bullet mask */
if (!read_mask(inst, path, theme, "bullet.xbm", &theme->menu_bullet_mask))
theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT;
/* read the decoration textures */
- if (!read_appearance(db, inst,
- "window.active.title.bg", theme->a_focused_title,
- FALSE))
- set_default_appearance(theme->a_focused_title);
- if (!read_appearance(db, inst,
- "window.inactive.title.bg", theme->a_unfocused_title,
- FALSE))
- set_default_appearance(theme->a_unfocused_title);
- if (!read_appearance(db, inst,
- "window.active.label.bg", theme->a_focused_label,
- TRUE))
- set_default_appearance(theme->a_focused_label);
- if (!read_appearance(db, inst,
- "window.inactive.label.bg", theme->a_unfocused_label,
- TRUE))
- set_default_appearance(theme->a_unfocused_label);
- if (!read_appearance(db, inst,
- "window.active.handle.bg", theme->a_focused_handle,
- FALSE))
- set_default_appearance(theme->a_focused_handle);
- if (!read_appearance(db, inst,
- "window.inactive.handle.bg",theme->a_unfocused_handle,
- FALSE))
- set_default_appearance(theme->a_unfocused_handle);
- if (!read_appearance(db, inst,
- "window.active.grip.bg", theme->a_focused_grip,
- TRUE))
- set_default_appearance(theme->a_focused_grip);
- if (!read_appearance(db, inst,
- "window.inactive.grip.bg", theme->a_unfocused_grip,
- TRUE))
- set_default_appearance(theme->a_unfocused_grip);
- if (!read_appearance(db, inst,
- "menu.items.bg", theme->a_menu,
- FALSE))
- set_default_appearance(theme->a_menu);
- if (!read_appearance(db, inst,
- "menu.title.bg", theme->a_menu_title,
- TRUE))
- set_default_appearance(theme->a_menu_title);
- if (!read_appearance(db, inst,
- "menu.items.active.bg", theme->a_menu_selected,
- TRUE))
- set_default_appearance(theme->a_menu_selected);
+ READ_APPEARANCE("window.active.title.bg", theme->a_focused_title, FALSE);
+ READ_APPEARANCE("window.inactive.title.bg", theme->a_unfocused_title,
+ FALSE);
+ READ_APPEARANCE("window.active.label.bg", theme->a_focused_label, TRUE);
+ READ_APPEARANCE("window.inactive.label.bg", theme->a_unfocused_label,
+ TRUE);
+ READ_APPEARANCE("window.active.handle.bg", theme->a_focused_handle, FALSE);
+ READ_APPEARANCE("window.inactive.handle.bg",theme->a_unfocused_handle,
+ FALSE);
+ READ_APPEARANCE("window.active.grip.bg", theme->a_focused_grip, TRUE);
+ READ_APPEARANCE("window.inactive.grip.bg", theme->a_unfocused_grip, TRUE);
+ READ_APPEARANCE("menu.items.bg", theme->a_menu, FALSE);
+ READ_APPEARANCE("menu.title.bg", theme->a_menu_title, TRUE);
+ READ_APPEARANCE("menu.items.active.bg", theme->a_menu_selected, TRUE);
+
theme->a_menu_disabled_selected =
RrAppearanceCopy(theme->a_menu_selected);
}
/* read buttons textures */
- if (!read_appearance(db, inst,
- "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.inactive.button.disabled.bg",
- theme->a_disabled_unfocused_max,
- TRUE))
- set_default_appearance(theme->a_disabled_unfocused_max);
- if (!read_appearance(db, inst,
- "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.inactive.button.pressed.bg",
- theme->a_unfocused_pressed_max,
- TRUE))
- set_default_appearance(theme->a_unfocused_pressed_max);
- if (!read_appearance(db, inst,
- "window.active.button.toggled.unpressed.bg",
- theme->a_toggled_focused_unpressed_max,
- TRUE) &&
- !read_appearance(db, inst,
- "window.active.button.toggled.bg",
- theme->a_toggled_focused_unpressed_max,
- TRUE))
- {
- RrAppearanceFree(theme->a_toggled_focused_unpressed_max);
- theme->a_toggled_focused_unpressed_max =
- RrAppearanceCopy(theme->a_focused_pressed_max);
- }
- if (!read_appearance(db, inst,
- "window.inactive.button.toggled.unpressed.bg",
- theme->a_toggled_unfocused_unpressed_max,
- TRUE) &&
- !read_appearance(db, inst,
- "window.inactive.button.toggled.bg",
- theme->a_toggled_unfocused_unpressed_max,
- TRUE))
- {
- RrAppearanceFree(theme->a_toggled_unfocused_unpressed_max);
- theme->a_toggled_unfocused_unpressed_max =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
- }
- if (!read_appearance(db, inst,
- "window.active.button.toggled.hover.bg",
- 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 (!read_appearance(db, inst,
- "window.inactive.button.toggled.hover.bg",
- 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);
- }
- if (!read_appearance(db, inst,
- "window.active.button.toggled.pressed.bg",
- 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 (!read_appearance(db, inst,
- "window.inactive.button.toggled.pressed.bg",
- 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 (!read_appearance(db, inst,
- "window.active.button.unpressed.bg",
- theme->a_focused_unpressed_max,
- TRUE))
- set_default_appearance(theme->a_focused_unpressed_max);
- if (!read_appearance(db, inst,
- "window.inactive.button.unpressed.bg",
- theme->a_unfocused_unpressed_max,
- TRUE))
- set_default_appearance(theme->a_unfocused_unpressed_max);
- if (!read_appearance(db, inst,
- "window.active.button.hover.bg",
- theme->a_hover_focused_max,
- TRUE))
- {
- RrAppearanceFree(theme->a_hover_focused_max);
- theme->a_hover_focused_max =
- RrAppearanceCopy(theme->a_focused_unpressed_max);
- }
- if (!read_appearance(db, inst,
- "window.inactive.button.hover.bg",
- theme->a_hover_unfocused_max,
- TRUE))
- {
- RrAppearanceFree(theme->a_hover_unfocused_max);
- theme->a_hover_unfocused_max =
- RrAppearanceCopy(theme->a_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_unfocused_pressed_max);
- theme->a_focused_unpressed_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_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_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_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_unfocused_unpressed_desk =
- RrAppearanceCopy(theme->a_unfocused_unpressed_max);
- theme->a_unfocused_pressed_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_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_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_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_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_unfocused_unpressed_shade =
- RrAppearanceCopy(theme->a_unfocused_unpressed_max);
- theme->a_unfocused_pressed_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_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_unfocused_pressed_max);
- theme->a_focused_unpressed_iconify =
- RrAppearanceCopy(theme->a_focused_unpressed_max);
- theme->a_focused_pressed_iconify =
- RrAppearanceCopy(theme->a_focused_pressed_max);
+ READ_APPEARANCE("window.active.button.disabled.bg",
+ a_disabled_focused_tmp, TRUE);
+ READ_APPEARANCE("window.inactive.button.disabled.bg",
+ a_disabled_unfocused_tmp, TRUE);
+ READ_APPEARANCE("window.active.button.pressed.bg",
+ a_focused_pressed_tmp, TRUE);
+ READ_APPEARANCE("window.inactive.button.pressed.bg",
+ a_unfocused_pressed_tmp, TRUE);
+
+ READ_APPEARANCE_("window.active.button.toggled.unpressed.bg",
+ "window.active.button.toggled.bg",
+ a_toggled_focused_unpressed_tmp, TRUE,
+ a_focused_pressed_tmp);
+ READ_APPEARANCE_("window.inactive.button.toggled.unpressed.bg",
+ "window.inactive.button.toggled.bg",
+ a_toggled_unfocused_unpressed_tmp, TRUE,
+ a_unfocused_pressed_tmp);
+
+ READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg",
+ a_toggled_hover_focused_tmp, TRUE,
+ a_toggled_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg",
+ a_toggled_hover_unfocused_tmp, TRUE,
+ a_toggled_unfocused_unpressed_tmp);
+
+ READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg",
+ a_toggled_focused_pressed_tmp, TRUE,
+ a_focused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.toggled.pressed.bg",
+ a_toggled_unfocused_pressed_tmp, TRUE,
+ a_unfocused_pressed_tmp);
+
+ READ_APPEARANCE("window.active.button.unpressed.bg",
+ a_focused_unpressed_tmp, TRUE);
+ READ_APPEARANCE("window.inactive.button.unpressed.bg",
+ a_unfocused_unpressed_tmp, TRUE);
+
+ READ_APPEARANCE_COPY("window.active.button.hover.bg",
+ a_hover_focused_tmp, TRUE,
+ a_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.hover.bg",
+ a_hover_unfocused_tmp, TRUE,
+ a_unfocused_unpressed_tmp);
+
+ /* now do individual buttons, if specified */
+
+ /* max button */
+ READ_APPEARANCE_COPY("window.active.button.max.disabled.bg",
+ theme->a_disabled_focused_max, TRUE,
+ a_disabled_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.max.disabled.bg",
+ theme->a_disabled_unfocused_max, TRUE,
+ a_disabled_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.max.pressed.bg",
+ theme->a_hover_focused_max, TRUE,
+ a_hover_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg",
+ theme->a_hover_unfocused_max, TRUE,
+ a_hover_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.max.unpressed.bg",
+ theme->a_focused_unpressed_max, TRUE,
+ a_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.max.pressed.bg",
+ theme->a_focused_pressed_max, TRUE,
+ a_focused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.max.unpressed.bg",
+ theme->a_unfocused_unpressed_max, TRUE,
+ a_unfocused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg",
+ theme->a_unfocused_pressed_max, TRUE,
+ a_unfocused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.max.toggled.hover.bg",
+ theme->a_toggled_hover_focused_max, TRUE,
+ a_toggled_hover_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.max.toggled.hover.bg",
+ theme->a_toggled_hover_unfocused_max, TRUE,
+ a_toggled_hover_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.max.toggled.unpressed.bg",
+ theme->a_toggled_focused_unpressed_max, TRUE,
+ a_toggled_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.max.toggled.pressed.bg",
+ theme->a_toggled_focused_pressed_max, TRUE,
+ a_toggled_focused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.max.toggled.unpressed.bg",
+ theme->a_toggled_unfocused_unpressed_max, TRUE,
+ a_toggled_unfocused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.max.toggled.pressed.bg",
+ theme->a_toggled_unfocused_pressed_max, TRUE,
+ a_toggled_unfocused_pressed_tmp);
+
+ /* close button */
+ READ_APPEARANCE_COPY("window.active.button.close.disabled.bg",
+ theme->a_disabled_focused_close, TRUE,
+ a_disabled_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.close.disabled.bg",
+ theme->a_disabled_unfocused_close, TRUE,
+ a_disabled_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.close.hover.bg",
+ theme->a_hover_focused_close, TRUE,
+ a_hover_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.close.hover.bg",
+ theme->a_hover_unfocused_close, TRUE,
+ a_hover_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.close.unpressed.bg",
+ theme->a_focused_unpressed_close, TRUE,
+ a_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.close.pressed.bg",
+ theme->a_focused_pressed_close, TRUE,
+ a_focused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.close.unpressed.bg",
+ theme->a_unfocused_unpressed_close, TRUE,
+ a_unfocused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.close.pressed.bg",
+ theme->a_unfocused_pressed_close, TRUE,
+ a_unfocused_pressed_tmp);
+
+ /* desk button */
+ READ_APPEARANCE_COPY("window.active.button.desk.disabled.bg",
+ theme->a_disabled_focused_desk, TRUE,
+ a_disabled_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.desk.disabled.bg",
+ theme->a_disabled_unfocused_desk, TRUE,
+ a_disabled_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg",
+ theme->a_hover_focused_desk, TRUE,
+ a_hover_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg",
+ theme->a_hover_unfocused_desk, TRUE,
+ a_hover_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.desk.unpressed.bg",
+ theme->a_focused_unpressed_desk, TRUE,
+ a_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg",
+ theme->a_focused_pressed_desk, TRUE,
+ a_focused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.desk.unpressed.bg",
+ theme->a_unfocused_unpressed_desk, TRUE,
+ a_unfocused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg",
+ theme->a_unfocused_pressed_desk, TRUE,
+ a_unfocused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.desk.toggled.hover.bg",
+ theme->a_toggled_hover_focused_desk, TRUE,
+ a_toggled_hover_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.hover.bg",
+ theme->a_toggled_hover_unfocused_desk, TRUE,
+ a_toggled_hover_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.desk.toggled.unpressed.bg",
+ theme->a_toggled_focused_unpressed_desk, TRUE,
+ a_toggled_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.desk.toggled.pressed.bg",
+ theme->a_toggled_focused_pressed_desk, TRUE,
+ a_toggled_focused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.unpressed.bg",
+ theme->a_toggled_unfocused_unpressed_desk, TRUE,
+ a_toggled_unfocused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.pressed.bg",
+ theme->a_toggled_unfocused_pressed_desk, TRUE,
+ a_toggled_unfocused_pressed_tmp);
+
+ /* shade button */
+ READ_APPEARANCE_COPY("window.active.button.shade.disabled.bg",
+ theme->a_disabled_focused_shade, TRUE,
+ a_disabled_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.shade.disabled.bg",
+ theme->a_disabled_unfocused_shade, TRUE,
+ a_disabled_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg",
+ theme->a_hover_focused_shade, TRUE,
+ a_hover_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg",
+ theme->a_hover_unfocused_shade, TRUE,
+ a_hover_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.shade.unpressed.bg",
+ theme->a_focused_unpressed_shade, TRUE,
+ a_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg",
+ theme->a_focused_pressed_shade, TRUE,
+ a_focused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.shade.unpressed.bg",
+ theme->a_unfocused_unpressed_shade, TRUE,
+ a_unfocused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg",
+ theme->a_unfocused_pressed_shade, TRUE,
+ a_unfocused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.shade.toggled.hover.bg",
+ theme->a_toggled_hover_focused_shade, TRUE,
+ a_toggled_hover_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.hover.bg",
+ theme->a_toggled_hover_unfocused_shade, TRUE,
+ a_toggled_hover_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.shade.toggled.unpressed.bg",
+ theme->a_toggled_focused_unpressed_shade, TRUE,
+ a_toggled_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.shade.toggled.pressed.bg",
+ theme->a_toggled_focused_pressed_shade, TRUE,
+ a_toggled_focused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.unpressed.bg",
+ theme->a_toggled_unfocused_unpressed_shade, TRUE,
+ a_toggled_unfocused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.pressed.bg",
+ theme->a_toggled_unfocused_pressed_shade, TRUE,
+ a_toggled_unfocused_pressed_tmp);
+
+ /* iconify button */
+ READ_APPEARANCE_COPY("window.active.button.iconify.disabled.bg",
+ theme->a_disabled_focused_iconify, TRUE,
+ a_disabled_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.iconify.disabled.bg",
+ theme->a_disabled_unfocused_iconify, TRUE,
+ a_disabled_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.iconify.hover.bg",
+ theme->a_hover_focused_iconify, TRUE,
+ a_hover_focused_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.iconify.hover.bg",
+ theme->a_hover_unfocused_iconify, TRUE,
+ a_hover_unfocused_tmp);
+ READ_APPEARANCE_COPY("window.active.button.iconify.unpressed.bg",
+ theme->a_focused_unpressed_iconify, TRUE,
+ a_focused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.active.button.iconify.pressed.bg",
+ theme->a_focused_pressed_iconify, TRUE,
+ a_focused_pressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.iconify.unpressed.bg",
+ theme->a_unfocused_unpressed_iconify, TRUE,
+ a_unfocused_unpressed_tmp);
+ READ_APPEARANCE_COPY("window.inactive.button.iconify.pressed.bg",
+ theme->a_unfocused_pressed_iconify, TRUE,
+ a_unfocused_pressed_tmp);
theme->a_icon->surface.grad =
theme->a_clear->surface.grad =
theme->button_size = theme->label_height - 2;
theme->grip_width = 25;
+ RrAppearanceFree(a_disabled_focused_tmp);
+ RrAppearanceFree(a_disabled_unfocused_tmp);
+ RrAppearanceFree(a_hover_focused_tmp);
+ RrAppearanceFree(a_hover_unfocused_tmp);
+ RrAppearanceFree(a_focused_unpressed_tmp);
+ RrAppearanceFree(a_focused_pressed_tmp);
+ RrAppearanceFree(a_unfocused_unpressed_tmp);
+ RrAppearanceFree(a_unfocused_pressed_tmp);
+ RrAppearanceFree(a_toggled_hover_focused_tmp);
+ RrAppearanceFree(a_toggled_hover_unfocused_tmp);
+ RrAppearanceFree(a_toggled_focused_unpressed_tmp);
+ RrAppearanceFree(a_toggled_focused_pressed_tmp);
+ RrAppearanceFree(a_toggled_unfocused_unpressed_tmp);
+ RrAppearanceFree(a_toggled_unfocused_pressed_tmp);
+
return theme;
}
RrAppearanceFree(theme->osd_unhilite_bg);
RrAppearanceFree(theme->osd_unhilite_label);
- g_free(theme);
+ g_slice_free(RrTheme, theme);
}
}
projects / dana / openbox.git / blobdiff