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_slice_new0(RrTheme);
+ /* 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);
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("window.client.padding.width", theme->cbwidthx, 0, 100, theme->paddingx);
- READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100, theme->cbwidthx);
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_COLOR("menu.separator.color", theme->menu_sep_color,
RrColorCopy(theme->menu_color));
-
+
/* load the image masks */
/* maximize button masks */
/* read buttons textures */
READ_APPEARANCE("window.active.button.disabled.bg",
- theme->a_disabled_focused_max, TRUE);
+ a_disabled_focused_tmp, TRUE);
READ_APPEARANCE("window.inactive.button.disabled.bg",
- theme->a_disabled_unfocused_max, TRUE);
+ a_disabled_unfocused_tmp, TRUE);
READ_APPEARANCE("window.active.button.pressed.bg",
- theme->a_focused_pressed_max, TRUE);
+ a_focused_pressed_tmp, TRUE);
READ_APPEARANCE("window.inactive.button.pressed.bg",
- theme->a_unfocused_pressed_max, TRUE);
+ a_unfocused_pressed_tmp, TRUE);
READ_APPEARANCE_("window.active.button.toggled.unpressed.bg",
"window.active.button.toggled.bg",
- theme->a_toggled_focused_unpressed_max, TRUE,
- theme->a_focused_pressed_max);
+ a_toggled_focused_unpressed_tmp, TRUE,
+ a_focused_pressed_tmp);
READ_APPEARANCE_("window.inactive.button.toggled.unpressed.bg",
"window.inactive.button.toggled.bg",
- theme->a_toggled_unfocused_unpressed_max, TRUE,
- theme->a_unfocused_pressed_max);
+ a_toggled_unfocused_unpressed_tmp, TRUE,
+ a_unfocused_pressed_tmp);
READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg",
- theme->a_toggled_hover_focused_max, TRUE,
- theme->a_toggled_focused_unpressed_max);
+ a_toggled_hover_focused_tmp, TRUE,
+ a_toggled_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg",
- theme->a_toggled_hover_unfocused_max, TRUE,
- theme->a_toggled_unfocused_unpressed_max);
+ a_toggled_hover_unfocused_tmp, TRUE,
+ a_toggled_unfocused_unpressed_tmp);
READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg",
- theme->a_toggled_focused_pressed_max, TRUE,
- theme->a_focused_pressed_max);
+ a_toggled_focused_pressed_tmp, TRUE,
+ a_focused_pressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button.toggled.pressed.bg",
- theme->a_toggled_unfocused_pressed_max, TRUE,
- theme->a_unfocused_pressed_max);
+ a_toggled_unfocused_pressed_tmp, TRUE,
+ a_unfocused_pressed_tmp);
READ_APPEARANCE("window.active.button.unpressed.bg",
- theme->a_focused_unpressed_max, TRUE);
+ a_focused_unpressed_tmp, TRUE);
READ_APPEARANCE("window.inactive.button.unpressed.bg",
- theme->a_unfocused_unpressed_max, TRUE);
+ a_unfocused_unpressed_tmp, TRUE);
READ_APPEARANCE_COPY("window.active.button.hover.bg",
- theme->a_hover_focused_max, TRUE,
- theme->a_focused_unpressed_max);
+ a_hover_focused_tmp, TRUE,
+ a_focused_unpressed_tmp);
READ_APPEARANCE_COPY("window.inactive.button.hover.bg",
- theme->a_hover_unfocused_max, TRUE,
- theme->a_unfocused_unpressed_max);
-
+ a_hover_unfocused_tmp, TRUE,
+ a_unfocused_unpressed_tmp);
+
+ theme->a_disabled_focused_max =
+ RrAppearanceCopy(a_disabled_focused_tmp);
+ theme->a_disabled_unfocused_max =
+ RrAppearanceCopy(a_disabled_unfocused_tmp);
+ theme->a_hover_focused_max =
+ RrAppearanceCopy(a_hover_focused_tmp);
+ theme->a_hover_unfocused_max =
+ RrAppearanceCopy(a_hover_unfocused_tmp);
+ theme->a_unfocused_unpressed_max =
+ RrAppearanceCopy(a_unfocused_unpressed_tmp);
+ theme->a_unfocused_pressed_max =
+ RrAppearanceCopy(a_unfocused_pressed_tmp);
+ theme->a_focused_unpressed_max =
+ RrAppearanceCopy(a_focused_unpressed_tmp);
+ theme->a_focused_pressed_max =
+ RrAppearanceCopy(a_focused_pressed_tmp);
theme->a_disabled_focused_close =
- RrAppearanceCopy(theme->a_disabled_focused_max);
+ RrAppearanceCopy(a_disabled_focused_tmp);
theme->a_disabled_unfocused_close =
- RrAppearanceCopy(theme->a_disabled_unfocused_max);
+ RrAppearanceCopy(a_disabled_unfocused_tmp);
theme->a_hover_focused_close =
- RrAppearanceCopy(theme->a_hover_focused_max);
+ RrAppearanceCopy(a_hover_focused_tmp);
theme->a_hover_unfocused_close =
- RrAppearanceCopy(theme->a_hover_unfocused_max);
+ RrAppearanceCopy(a_hover_unfocused_tmp);
theme->a_unfocused_unpressed_close =
- RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+ RrAppearanceCopy(a_unfocused_unpressed_tmp);
theme->a_unfocused_pressed_close =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
+ RrAppearanceCopy(a_unfocused_pressed_tmp);
theme->a_focused_unpressed_close =
- RrAppearanceCopy(theme->a_focused_unpressed_max);
+ RrAppearanceCopy(a_focused_unpressed_tmp);
theme->a_focused_pressed_close =
- RrAppearanceCopy(theme->a_focused_pressed_max);
+ RrAppearanceCopy(a_focused_pressed_tmp);
theme->a_disabled_focused_desk =
- RrAppearanceCopy(theme->a_disabled_focused_max);
+ RrAppearanceCopy(a_disabled_focused_tmp);
theme->a_disabled_unfocused_desk =
- RrAppearanceCopy(theme->a_disabled_unfocused_max);
+ RrAppearanceCopy(a_disabled_unfocused_tmp);
theme->a_hover_focused_desk =
- RrAppearanceCopy(theme->a_hover_focused_max);
+ RrAppearanceCopy(a_hover_focused_tmp);
theme->a_hover_unfocused_desk =
- RrAppearanceCopy(theme->a_hover_unfocused_max);
+ RrAppearanceCopy(a_hover_unfocused_tmp);
theme->a_toggled_hover_focused_desk =
- RrAppearanceCopy(theme->a_toggled_hover_focused_max);
+ RrAppearanceCopy(a_toggled_hover_focused_tmp);
theme->a_toggled_hover_unfocused_desk =
- RrAppearanceCopy(theme->a_toggled_hover_unfocused_max);
+ RrAppearanceCopy(a_toggled_hover_unfocused_tmp);
theme->a_toggled_focused_unpressed_desk =
- RrAppearanceCopy(theme->a_toggled_focused_unpressed_max);
+ RrAppearanceCopy(a_toggled_focused_unpressed_tmp);
theme->a_toggled_unfocused_unpressed_desk =
- RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max);
+ RrAppearanceCopy(a_toggled_unfocused_unpressed_tmp);
theme->a_toggled_focused_pressed_desk =
- RrAppearanceCopy(theme->a_toggled_focused_pressed_max);
+ RrAppearanceCopy(a_toggled_focused_pressed_tmp);
theme->a_toggled_unfocused_pressed_desk =
- RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max);
+ RrAppearanceCopy(a_toggled_unfocused_pressed_tmp);
theme->a_unfocused_unpressed_desk =
- RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+ RrAppearanceCopy(a_unfocused_unpressed_tmp);
theme->a_unfocused_pressed_desk =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
+ RrAppearanceCopy(a_unfocused_pressed_tmp);
theme->a_focused_unpressed_desk =
- RrAppearanceCopy(theme->a_focused_unpressed_max);
+ RrAppearanceCopy(a_focused_unpressed_tmp);
theme->a_focused_pressed_desk =
- RrAppearanceCopy(theme->a_focused_pressed_max);
+ RrAppearanceCopy(a_focused_pressed_tmp);
theme->a_disabled_focused_shade =
- RrAppearanceCopy(theme->a_disabled_focused_max);
+ RrAppearanceCopy(a_disabled_focused_tmp);
theme->a_disabled_unfocused_shade =
- RrAppearanceCopy(theme->a_disabled_unfocused_max);
+ RrAppearanceCopy(a_disabled_unfocused_tmp);
theme->a_hover_focused_shade =
- RrAppearanceCopy(theme->a_hover_focused_max);
+ RrAppearanceCopy(a_hover_focused_tmp);
theme->a_hover_unfocused_shade =
- RrAppearanceCopy(theme->a_hover_unfocused_max);
+ RrAppearanceCopy(a_hover_unfocused_tmp);
theme->a_toggled_hover_focused_shade =
- RrAppearanceCopy(theme->a_toggled_hover_focused_max);
+ RrAppearanceCopy(a_toggled_hover_focused_tmp);
theme->a_toggled_hover_unfocused_shade =
- RrAppearanceCopy(theme->a_toggled_hover_unfocused_max);
+ RrAppearanceCopy(a_toggled_hover_unfocused_tmp);
theme->a_toggled_focused_unpressed_shade =
- RrAppearanceCopy(theme->a_toggled_focused_unpressed_max);
+ RrAppearanceCopy(a_toggled_focused_unpressed_tmp);
theme->a_toggled_unfocused_unpressed_shade =
- RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max);
+ RrAppearanceCopy(a_toggled_unfocused_unpressed_tmp);
theme->a_toggled_focused_pressed_shade =
- RrAppearanceCopy(theme->a_toggled_focused_pressed_max);
+ RrAppearanceCopy(a_toggled_focused_pressed_tmp);
theme->a_toggled_unfocused_pressed_shade =
- RrAppearanceCopy(theme->a_toggled_unfocused_pressed_max);
+ RrAppearanceCopy(a_toggled_unfocused_pressed_tmp);
theme->a_unfocused_unpressed_shade =
- RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+ RrAppearanceCopy(a_unfocused_unpressed_tmp);
theme->a_unfocused_pressed_shade =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
+ RrAppearanceCopy(a_unfocused_pressed_tmp);
theme->a_focused_unpressed_shade =
- RrAppearanceCopy(theme->a_focused_unpressed_max);
+ RrAppearanceCopy(a_focused_unpressed_tmp);
theme->a_focused_pressed_shade =
- RrAppearanceCopy(theme->a_focused_pressed_max);
+ RrAppearanceCopy(a_focused_pressed_tmp);
theme->a_disabled_focused_iconify =
- RrAppearanceCopy(theme->a_disabled_focused_max);
+ RrAppearanceCopy(a_disabled_focused_tmp);
theme->a_disabled_unfocused_iconify =
- RrAppearanceCopy(theme->a_disabled_focused_max);
+ RrAppearanceCopy(a_disabled_focused_tmp);
theme->a_hover_focused_iconify =
- RrAppearanceCopy(theme->a_hover_focused_max);
+ RrAppearanceCopy(a_hover_focused_tmp);
theme->a_hover_unfocused_iconify =
- RrAppearanceCopy(theme->a_hover_unfocused_max);
+ RrAppearanceCopy(a_hover_unfocused_tmp);
theme->a_unfocused_unpressed_iconify =
- RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+ RrAppearanceCopy(a_unfocused_unpressed_tmp);
theme->a_unfocused_pressed_iconify =
- RrAppearanceCopy(theme->a_unfocused_pressed_max);
+ RrAppearanceCopy(a_unfocused_pressed_tmp);
theme->a_focused_unpressed_iconify =
- RrAppearanceCopy(theme->a_focused_unpressed_max);
+ RrAppearanceCopy(a_focused_unpressed_tmp);
theme->a_focused_pressed_iconify =
- RrAppearanceCopy(theme->a_focused_pressed_max);
+ RrAppearanceCopy(a_focused_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;
}
projects / dana / openbox.git / blobdiff