#include <X11/Xlib.h>
#include <X11/Xresource.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
static XrmDatabase loaddb(RrTheme *theme, char *name);
static gboolean read_int(XrmDatabase db, char *rname, int *value);
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_max = RrAppearanceNew(inst, 1);
+ theme->a_toggled_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_grip = RrAppearanceNew(inst, 0);
theme->a_unfocused_grip = RrAppearanceNew(inst, 0);
theme->a_focused_title = RrAppearanceNew(inst, 0);
theme->a_menu_item = RrAppearanceNew(inst, 1);
theme->a_menu_disabled = RrAppearanceNew(inst, 1);
theme->a_menu_hilite = RrAppearanceNew(inst, 1);
+ theme->a_clear = RrAppearanceNew(inst, 0);
theme->app_hilite_bg = RrAppearanceNew(inst, 0);
theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
mjust = RR_JUSTIFY_CENTER;
}
- /* load the title layout */
- if (!read_string(db, "window.title.layout", &font_str))
- font_str = "NLIMC";
- theme->title_layout = g_strdup(font_str);
-
/* load direct dimensions */
if (!read_int(db, "menuOverlap", &theme->menu_overlap) ||
theme->menu_overlap < 0 || theme->menu_overlap > 20)
theme->titlebut_unfocused_unpressed_color->r,
theme->titlebut_unfocused_unpressed_color->g,
theme->titlebut_unfocused_unpressed_color->b);
+ if (!read_color(db, inst,
+ "window.button.toggled.focus.picColor",
+ &theme->titlebut_toggled_focused_color))
+ theme->titlebut_toggled_focused_color =
+ RrColorNew(inst,
+ theme->titlebut_focused_pressed_color->r,
+ theme->titlebut_focused_pressed_color->g,
+ theme->titlebut_focused_pressed_color->b);
+ if (!read_color(db, inst,
+ "window.button.toggled.unfocus.picColor",
+ &theme->titlebut_toggled_unfocused_color))
+ theme->titlebut_toggled_unfocused_color =
+ RrColorNew(inst,
+ theme->titlebut_unfocused_pressed_color->r,
+ theme->titlebut_unfocused_pressed_color->g,
+ theme->titlebut_unfocused_pressed_color->b);
if (!read_color(db, inst,
"menu.title.textColor", &theme->menu_title_color))
theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
"menu.hilite.textColor", &theme->menu_hilite_color))
theme->menu_hilite_color = RrColorNew(inst, 0, 0, 0);
- if (read_mask(inst, "max.xbm", theme, &theme->max_unset_mask)){
- if (!read_mask(inst, "max_t.xbm", theme, &theme->max_set_mask)) {
- theme->max_set_mask = RrPixmapMaskCopy(theme->max_unset_mask);
+ if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) {
+ if (!read_mask(inst, "max_pressed.xbm", theme,
+ &theme->max_pressed_mask)) {
+ theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
+ }
+ if (!read_mask(inst, "max_toggled.xbm", theme,
+ &theme->max_toggled_mask)) {
+ theme->max_toggled_mask =
+ RrPixmapMaskCopy(theme->max_pressed_mask);
}
- } else {
+ if (!read_mask(inst, "max_disabled.xbm", theme,
+ &theme->max_disabled_mask)) {
+ theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
+ }
+ if (!read_mask(inst, "max_hover.xbm", theme, &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);
+ theme->max_mask = RrPixmapMaskNew(inst, 7, 7, data);
}
{
char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
- theme->max_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, 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);
}
- if (!read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) {
- char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
- theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ if (read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) {
+ if (!read_mask(inst, "iconify_pressed.xbm", theme,
+ &theme->iconify_pressed_mask)) {
+ theme->iconify_pressed_mask =
+ RrPixmapMaskCopy(theme->iconify_mask);
+ }
+ if (!read_mask(inst, "iconify_disabled.xbm", theme,
+ &theme->iconify_disabled_mask)) {
+ theme->iconify_disabled_mask =
+ RrPixmapMaskCopy(theme->iconify_mask);
+ }
+ if (!read_mask(inst, "iconify_hover.xbm", theme,
+ &theme->iconify_hover_mask)) {
+ theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
+ }
+ } else {
+ {
+ char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
+ theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, 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(inst, "stick.xbm", theme, &theme->desk_unset_mask)) {
- if (!read_mask(inst, "stick_t.xbm", theme, &theme->desk_set_mask)) {
- theme->desk_set_mask =
- RrPixmapMaskCopy(theme->desk_unset_mask);
+ if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) {
+ if (!read_mask(inst, "desk_pressed.xbm", theme,
+ &theme->desk_pressed_mask)) {
+ theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+ }
+ if (!read_mask(inst, "desk_toggled.xbm", theme,
+ &theme->desk_toggled_mask)) {
+ theme->desk_toggled_mask =
+ RrPixmapMaskCopy(theme->desk_pressed_mask);
+ }
+ if (!read_mask(inst, "desk_disabled.xbm", theme,
+ &theme->desk_disabled_mask)) {
+ theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+ }
+ if (!read_mask(inst, "desk_hover.xbm", theme,
+ &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);
+ theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, data);
}
{
char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
- theme->desk_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7, 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);
}
- if (read_mask(inst, "shade.xbm", theme, &theme->shade_unset_mask)) {
- if (!read_mask(inst, "shade_t.xbm", theme, &theme->shade_set_mask)) {
- theme->shade_set_mask =
- RrPixmapMaskCopy(theme->shade_unset_mask);
+ if (read_mask(inst, "shade.xbm", theme, &theme->shade_mask)) {
+ if (!read_mask(inst, "shade_pressed.xbm", theme,
+ &theme->shade_pressed_mask)) {
+ theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
+ }
+ if (!read_mask(inst, "shade_toggled.xbm", theme,
+ &theme->shade_toggled_mask)) {
+ theme->shade_toggled_mask =
+ RrPixmapMaskCopy(theme->shade_pressed_mask);
+ }
+ if (!read_mask(inst, "shade_disabled.xbm", theme,
+ &theme->shade_disabled_mask)) {
+ theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
+ }
+ if (!read_mask(inst, "shade_hover.xbm", theme,
+ &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);
+ theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, data);
}
{
char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
- theme->shade_set_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7, 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);
}
- if (!read_mask(inst, "close.xbm", theme, &theme->close_mask)) {
- char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
- theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ if (read_mask(inst, "close.xbm", theme, &theme->close_mask)) {
+ if (!read_mask(inst, "close_pressed.xbm", theme,
+ &theme->close_pressed_mask)) {
+ theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
+ }
+ if (!read_mask(inst, "close_disabled.xbm", theme,
+ &theme->close_disabled_mask)) {
+ theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
+ }
+ if (!read_mask(inst, "close_hover.xbm", theme,
+ &theme->close_hover_mask)) {
+ theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
+ }
+ } else {
+ {
+ char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
+ theme->close_mask = RrPixmapMaskNew(inst, 7, 7, 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);
}
/* read the decoration textures */
"window.button.pressed.focus",
theme->a_focused_pressed_max,
TRUE))
- if (!read_appearance(db, inst,
- "window.button.pressed",
- theme->a_focused_pressed_max,
- TRUE))
- set_default_appearance(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,
TRUE))
- if (!read_appearance(db, inst,
- "window.button.pressed",
- theme->a_unfocused_pressed_max,
- TRUE))
- set_default_appearance(theme->a_unfocused_pressed_max);
+ set_default_appearance(theme->a_unfocused_pressed_max);
+ if (!read_appearance(db, inst,
+ "window.button.toggled.focus",
+ theme->a_toggled_focused_max,
+ TRUE))
+ theme->a_toggled_focused_max =
+ RrAppearanceCopy(theme->a_focused_pressed_max);
+ if (!read_appearance(db, inst,
+ "window.button.toggled.unfocus",
+ theme->a_toggled_unfocused_max,
+ TRUE))
+ theme->a_toggled_unfocused_max =
+ RrAppearanceCopy(theme->a_unfocused_pressed_max);
if (!read_appearance(db, inst,
"window.button.focus",
theme->a_focused_unpressed_max,
theme->a_hover_focused_desk =
RrAppearanceCopy(theme->a_hover_focused_max);
theme->a_hover_unfocused_desk =
- RrAppearanceCopy(theme->a_hover_unfocused_max);
+ RrAppearanceCopy(theme->a_hover_unfocused_max);
+ theme->a_toggled_focused_desk =
+ RrAppearanceCopy(theme->a_toggled_focused_max);
+ theme->a_toggled_unfocused_desk =
+ RrAppearanceCopy(theme->a_toggled_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_hover_focused_max);
theme->a_hover_unfocused_shade =
RrAppearanceCopy(theme->a_hover_unfocused_max);
+ theme->a_toggled_focused_shade =
+ RrAppearanceCopy(theme->a_toggled_focused_max);
+ theme->a_toggled_unfocused_shade =
+ RrAppearanceCopy(theme->a_toggled_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 =
theme->a_hover_focused_iconify =
RrAppearanceCopy(theme->a_hover_focused_max);
theme->a_hover_unfocused_iconify =
- RrAppearanceCopy(theme->a_hover_focused_max);
+ 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_clear->surface.grad = RR_SURFACE_PARENTREL;
/* set up the textures */
theme->a_focused_label->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_max->texture[0].type =
+ theme->a_toggled_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_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_desk->texture[0].type =
+ theme->a_toggled_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_shade->texture[0].type =
+ theme->a_toggled_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_unfocused_pressed_iconify->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->a_hover_focused_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->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->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_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_pressed_mask;
+ theme->a_focused_unpressed_max->texture[0].data.mask.mask =
+ theme->a_unfocused_unpressed_max->texture[0].data.mask.mask =
+ theme->max_mask;
+ theme->a_toggled_focused_max->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_max->texture[0].data.mask.mask =
+ theme->max_toggled_mask;
theme->a_disabled_focused_close->texture[0].data.mask.mask =
theme->a_disabled_unfocused_close->texture[0].data.mask.mask =
- theme->a_hover_focused_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->a_focused_pressed_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->a_hover_focused_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->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->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_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_pressed_mask;
+ theme->a_focused_unpressed_desk->texture[0].data.mask.mask =
+ theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask =
+ theme->desk_mask;
+ theme->a_toggled_focused_desk->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_desk->texture[0].data.mask.mask =
+ theme->desk_toggled_mask;
theme->a_disabled_focused_shade->texture[0].data.mask.mask =
theme->a_disabled_unfocused_shade->texture[0].data.mask.mask =
- theme->a_hover_focused_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->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->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_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_pressed_mask;
+ theme->a_focused_unpressed_shade->texture[0].data.mask.mask =
+ theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask =
+ theme->shade_mask;
+ theme->a_toggled_focused_shade->texture[0].data.mask.mask =
+ theme->a_toggled_unfocused_shade->texture[0].data.mask.mask =
+ theme->shade_toggled_mask;
theme->a_disabled_focused_iconify->texture[0].data.mask.mask =
theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask =
- theme->a_hover_focused_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->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->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->iconify_mask;
theme->a_disabled_focused_max->texture[0].data.mask.color =
theme->a_disabled_focused_close->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_focused_max->texture[0].data.mask.color =
+ theme->a_toggled_focused_desk->texture[0].data.mask.color =
+ theme->a_toggled_focused_shade->texture[0].data.mask.color =
+ theme->titlebut_toggled_focused_color;
+ theme->a_toggled_unfocused_max->texture[0].data.mask.color =
+ theme->a_toggled_unfocused_desk->texture[0].data.mask.color =
+ theme->a_toggled_unfocused_shade->texture[0].data.mask.color =
+ theme->titlebut_toggled_unfocused_color;
theme->a_focused_unpressed_max->texture[0].data.mask.color =
theme->a_focused_unpressed_close->texture[0].data.mask.color =
theme->a_focused_unpressed_desk->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_set_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_set_desk->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_pressed_iconify->texture[0].data.mask.color =
theme->titlebut_focused_pressed_color;
theme->a_unfocused_unpressed_max->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_set_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_set_desk->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_pressed_iconify->texture[0].data.mask.color =
theme->titlebut_unfocused_pressed_color;
RrColorFree(theme->titlebut_disabled_unfocused_color);
RrColorFree(theme->titlebut_hover_focused_color);
RrColorFree(theme->titlebut_hover_unfocused_color);
+ RrColorFree(theme->titlebut_toggled_focused_color);
+ RrColorFree(theme->titlebut_toggled_unfocused_color);
RrColorFree(theme->titlebut_unfocused_pressed_color);
RrColorFree(theme->titlebut_focused_pressed_color);
RrColorFree(theme->titlebut_unfocused_unpressed_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);
+ 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);
+ RrPixmapMaskFree(theme->close_disabled_mask);
+ RrPixmapMaskFree(theme->close_hover_mask);
+ RrPixmapMaskFree(theme->close_pressed_mask);
RrFontClose(theme->winfont);
RrFontClose(theme->mtitlefont);
RrFontClose(theme->mfont);
- g_free(theme->title_layout);
-
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_toggled_focused_max);
+ RrAppearanceFree(theme->a_toggled_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_disabled_focused_close);
RrAppearanceFree(theme->a_disabled_unfocused_close);
RrAppearanceFree(theme->a_hover_focused_close);
RrAppearanceFree(theme->a_disabled_unfocused_desk);
RrAppearanceFree(theme->a_hover_focused_desk);
RrAppearanceFree(theme->a_hover_unfocused_desk);
+ RrAppearanceFree(theme->a_toggled_focused_desk);
+ RrAppearanceFree(theme->a_toggled_unfocused_desk);
RrAppearanceFree(theme->a_focused_unpressed_desk);
RrAppearanceFree(theme->a_focused_pressed_desk);
RrAppearanceFree(theme->a_unfocused_unpressed_desk);
RrAppearanceFree(theme->a_disabled_unfocused_shade);
RrAppearanceFree(theme->a_hover_focused_shade);
RrAppearanceFree(theme->a_hover_unfocused_shade);
+ RrAppearanceFree(theme->a_toggled_focused_shade);
+ RrAppearanceFree(theme->a_toggled_unfocused_shade);
RrAppearanceFree(theme->a_focused_unpressed_shade);
RrAppearanceFree(theme->a_focused_pressed_shade);
RrAppearanceFree(theme->a_unfocused_unpressed_shade);
RrAppearanceFree(theme->a_menu_item);
RrAppearanceFree(theme->a_menu_disabled);
RrAppearanceFree(theme->a_menu_hilite);
+ RrAppearanceFree(theme->a_clear);
RrAppearanceFree(theme->app_hilite_bg);
RrAppearanceFree(theme->app_unhilite_bg);
RrAppearanceFree(theme->app_hilite_label);
{
XrmDatabase db;
- if ((db = XrmGetFileDatabase(name)))
- theme->path = g_path_get_dirname(name);
+ char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
+ name, "themerc", NULL);
+ if ((db = XrmGetFileDatabase(s)))
+ theme->path = g_path_get_dirname(s);
+ g_free(s);
if (db == NULL) {
- char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- name, NULL);
+ char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
}
if (db == NULL) {
- char *s = g_build_filename(THEMEDIR, name, NULL);
+ char *s = g_build_filename(name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
{
gboolean ret = FALSE;
char *s;
- char *data_dir;
int hx, hy; /* ignored */
unsigned int w, h;
unsigned char *b;
- data_dir = g_strdup_printf("%s_data", theme->name);
-
- s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- data_dir, maskname, NULL);
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
+ s = g_build_filename(theme->path, maskname, NULL);
+ if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) {
ret = TRUE;
- else {
- g_free(s);
- s = g_build_filename(THEMEDIR, data_dir, maskname, NULL);
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
- ret = TRUE;
- else {
- g_free(s);
- s = g_build_filename(theme->path, data_dir, maskname, NULL);
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
- ret = TRUE;
- }
- }
-
- if (ret) {
*value = RrPixmapMaskNew(inst, w, h, (char*)b);
XFree(b);
}
-
g_free(s);
- g_free(data_dir);
return ret;
}
projects / chaz / openbox / blobdiff