XrmDatabase db = NULL;
Justify winjust;
char *winjuststr;
- ConfigValue theme, shadow, offset, font;
+ ConfigValue theme, shadow, offset, font, tint;
if (config_get("theme", Config_String, &theme)) {
db = loaddb(theme.string);
/* load the font, not from the theme file tho, its in the config */
- if (!config_get("font.shadow", Config_Bool, &shadow)) {
- shadow.bool = TRUE; /* default */
- config_set("font.shadow", Config_Bool, shadow);
- }
+ if (!config_get("font.shadow", Config_Bool, &shadow))
+ g_assert_not_reached();
ob_s_winfont_shadow = shadow.bool;
- if (!config_get("font.shadow.offset", Config_Integer, &offset) ||
- offset.integer < 0 || offset.integer >= 10) {
- offset.integer = 1; /* default */
- config_set("font.shadow.offset", Config_Integer, offset);
- }
+ if (!config_get("font.shadow.offset", Config_Integer, &offset))
+ g_assert_not_reached();
ob_s_winfont_shadow_offset = offset.integer;
- if (!config_get("font", Config_String, &font)) {
- font.string = DEFAULT_FONT;
- config_set("font", Config_String, font);
- }
+ if (!config_get("font.shadow.tint", Config_Integer, &tint))
+ g_assert_not_reached();
+ /* XXX put these checks into the config system somehow!!! */
+ if (tint.integer < -100) tint.integer = -100;
+ if (tint.integer > 100) tint.integer = 100;
+ config_set("font.shadow.tint", Config_Integer, tint);
+ ob_s_winfont_shadow_tint = tint.integer;
+ if (!config_get("font", Config_String, &font))
+ g_assert_not_reached();
ob_s_winfont = font_open(font.string);
ob_s_winfont_height = font_height(ob_s_winfont, ob_s_winfont_shadow,
ob_s_winfont_shadow_offset);
}
if (!read_int(db, "handleWidth", &ob_s_handle_height) ||
- ob_s_handle_height < 0 || ob_s_handle_height > 100) ob_s_handle_height = 6;
+ ob_s_handle_height < 0 || ob_s_handle_height > 100)
+ ob_s_handle_height = 6;
if (!read_int(db, "bevelWidth", &ob_s_bevel) ||
ob_s_bevel <= 0 || ob_s_bevel > 100) ob_s_bevel = 3;
if (!read_int(db, "borderWidth", &ob_s_bwidth) ||
ob_s_cb_unfocused_color = color_new(0xff, 0xff, 0xff);
if (!read_color(db, "window.label.focus.textColor",
&ob_s_title_focused_color))
- ob_s_title_focused_color = color_new(0xff, 0xff, 0xff);
+ ob_s_title_focused_color = color_new(0x0, 0x0, 0x0);
if (!read_color(db, "window.label.unfocus.textColor",
&ob_s_title_unfocused_color))
ob_s_title_unfocused_color = color_new(0xff, 0xff, 0xff);
&ob_s_titlebut_unfocused_color))
ob_s_titlebut_unfocused_color = color_new(0xff, 0xff, 0xff);
- if (!read_mask(db, "window.button.max.mask", &ob_s_max_unpressed_mask)) {
- char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
- ob_s_max_unpressed_mask = pixmap_mask_new(7, 7, data);
- }
- if (!read_mask(db, "window.button.max.pressed.mask",
- &ob_s_max_pressed_mask)) {
- ob_s_max_pressed_mask = pixmap_mask_copy(ob_s_max_unpressed_mask);
+ if (read_mask(db, "window.button.max.mask", &ob_s_max_unset_mask)) {
+ if (!read_mask(db, "window.button.max.toggled.mask",
+ &ob_s_max_set_mask)) {
+ ob_s_max_set_mask = pixmap_mask_copy(ob_s_max_unset_mask);
+ }
+ } else {
+ {
+ char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
+ ob_s_max_unset_mask = pixmap_mask_new(7, 7, data);
+ }
+ {
+ char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
+ ob_s_max_set_mask = pixmap_mask_new(7, 7, data);
+ }
}
if (!read_mask(db, "window.button.icon.mask",
- &ob_s_iconify_unpressed_mask)) {
- char data[] = { 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e };
- ob_s_iconify_unpressed_mask = pixmap_mask_new(7, 7, data);
- }
- if (!read_mask(db, "window.button.icon.pressed.mask",
- &ob_s_iconify_pressed_mask)) {
- ob_s_iconify_pressed_mask =
- pixmap_mask_copy(ob_s_iconify_unpressed_mask);
+ &ob_s_iconify_mask)) {
+ char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
+ ob_s_iconify_mask = pixmap_mask_new(7, 7, data);
}
- if (!read_mask(db, "window.button.stick.mask",
- &ob_s_desk_unpressed_mask)) {
- char data[] = { 0x00, 0x36, 0x36, 0x00, 0x36, 0x36, 0x00 };
- ob_s_desk_unpressed_mask = pixmap_mask_new(7, 7, data);
+ if (read_mask(db, "window.button.stick.mask",
+ &ob_s_desk_unset_mask)) {
+ if (!read_mask(db, "window.button.stick.toggled.mask",
+ &ob_s_desk_set_mask)) {
+ ob_s_desk_set_mask =
+ pixmap_mask_copy(ob_s_desk_unset_mask);
+ }
+ } else {
+ {
+ char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
+ ob_s_desk_unset_mask = pixmap_mask_new(7, 7, data);
+ }
+ {
+ char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
+ ob_s_desk_set_mask = pixmap_mask_new(7, 7, data);
+ }
}
- if (!read_mask(db, "window.button.stick.pressed.mask",
- &ob_s_desk_pressed_mask)) {
- ob_s_desk_pressed_mask = pixmap_mask_copy(ob_s_desk_unpressed_mask);
+
+ if (read_mask(db, "window.button.shade.mask",
+ &ob_s_shade_unset_mask)) {
+ if (!read_mask(db, "window.button.shade.toggled.mask",
+ &ob_s_shade_set_mask)) {
+ ob_s_shade_set_mask =
+ pixmap_mask_copy(ob_s_shade_unset_mask);
+ }
+ } else {
+ {
+ char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
+ ob_s_shade_unset_mask = pixmap_mask_new(7, 7, data);
+ }
+ {
+ char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
+ ob_s_shade_set_mask = pixmap_mask_new(7, 7, data);
+ }
}
if (!read_mask(db, "window.button.close.mask",
- &ob_s_close_unpressed_mask)) {
- char data[] = { 0x22, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x22 };
- ob_s_close_unpressed_mask = pixmap_mask_new(7, 7, data);
- }
- if (!read_mask(db, "window.button.close.pressed.mask",
- &ob_s_close_pressed_mask)) {
- ob_s_close_pressed_mask = pixmap_mask_copy(ob_s_close_unpressed_mask);
+ &ob_s_close_mask)) {
+ char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
+ ob_s_close_mask = pixmap_mask_new(7, 7, data);
}
if (!read_appearance(db, "window.title.focus", ob_a_focused_title))
ob_a_unfocused_unpressed_desk =
appearance_copy(ob_a_unfocused_unpressed_max);
ob_a_unfocused_pressed_desk = appearance_copy(ob_a_unfocused_pressed_max);
+ ob_a_unfocused_pressed_set_desk =
+ appearance_copy(ob_a_unfocused_pressed_max);
ob_a_focused_unpressed_desk = appearance_copy(ob_a_focused_unpressed_max);
ob_a_focused_pressed_desk = appearance_copy(ob_a_focused_pressed_max);
+ ob_a_focused_pressed_set_desk = appearance_copy(ob_a_focused_pressed_max);
+ ob_a_unfocused_unpressed_shade =
+ appearance_copy(ob_a_unfocused_unpressed_max);
+ ob_a_unfocused_pressed_shade = appearance_copy(ob_a_unfocused_pressed_max);
+ ob_a_unfocused_pressed_set_shade =
+ appearance_copy(ob_a_unfocused_pressed_max);
+ ob_a_focused_unpressed_shade = appearance_copy(ob_a_focused_unpressed_max);
+ ob_a_focused_pressed_shade = appearance_copy(ob_a_focused_pressed_max);
+ ob_a_focused_pressed_set_shade = appearance_copy(ob_a_focused_pressed_max);
ob_a_unfocused_unpressed_iconify =
appearance_copy(ob_a_unfocused_unpressed_max);
ob_a_unfocused_pressed_iconify =
ob_a_focused_unpressed_iconify =
appearance_copy(ob_a_focused_unpressed_max);
ob_a_focused_pressed_iconify = appearance_copy(ob_a_focused_pressed_max);
+ ob_a_unfocused_pressed_set_max =
+ appearance_copy(ob_a_unfocused_pressed_max);
+ ob_a_focused_pressed_set_max = appearance_copy(ob_a_focused_pressed_max);
ob_a_icon->surface.data.planar.grad = Background_ParentRelative;
ob_a_focused_label->texture[0].data.text.shadow = ob_s_winfont_shadow;
ob_a_focused_label->texture[0].data.text.offset =
ob_s_winfont_shadow_offset;
+ ob_a_focused_label->texture[0].data.text.tint = ob_s_winfont_shadow_tint;
ob_a_focused_label->texture[0].data.text.color = ob_s_title_focused_color;
ob_a_unfocused_label->texture[0].type = Text;
ob_a_unfocused_label->texture[0].data.text.shadow = ob_s_winfont_shadow;
ob_a_unfocused_label->texture[0].data.text.offset =
ob_s_winfont_shadow_offset;
+ ob_a_unfocused_label->texture[0].data.text.tint = ob_s_winfont_shadow_tint;
ob_a_unfocused_label->texture[0].data.text.color =
ob_s_title_unfocused_color;
ob_a_focused_unpressed_max->texture[0].type =
ob_a_focused_pressed_max->texture[0].type =
+ ob_a_focused_pressed_set_max->texture[0].type =
ob_a_unfocused_unpressed_max->texture[0].type =
ob_a_unfocused_pressed_max->texture[0].type =
+ ob_a_unfocused_pressed_set_max->texture[0].type =
ob_a_focused_unpressed_close->texture[0].type =
ob_a_focused_pressed_close->texture[0].type =
ob_a_unfocused_unpressed_close->texture[0].type =
ob_a_unfocused_pressed_close->texture[0].type =
ob_a_focused_unpressed_desk->texture[0].type =
ob_a_focused_pressed_desk->texture[0].type =
+ ob_a_focused_pressed_set_desk->texture[0].type =
ob_a_unfocused_unpressed_desk->texture[0].type =
ob_a_unfocused_pressed_desk->texture[0].type =
+ ob_a_unfocused_pressed_set_desk->texture[0].type =
+ ob_a_focused_unpressed_shade->texture[0].type =
+ ob_a_focused_pressed_shade->texture[0].type =
+ ob_a_focused_pressed_set_shade->texture[0].type =
+ ob_a_unfocused_unpressed_shade->texture[0].type =
+ ob_a_unfocused_pressed_shade->texture[0].type =
+ ob_a_unfocused_pressed_set_shade->texture[0].type =
ob_a_focused_unpressed_iconify->texture[0].type =
ob_a_focused_pressed_iconify->texture[0].type =
ob_a_unfocused_unpressed_iconify->texture[0].type =
ob_a_unfocused_pressed_iconify->texture[0].type = Bitmask;
ob_a_focused_unpressed_max->texture[0].data.mask.mask =
ob_a_unfocused_unpressed_max->texture[0].data.mask.mask =
- ob_s_max_unpressed_mask;
- ob_a_focused_pressed_max->texture[0].data.mask.mask =
+ ob_a_focused_pressed_max->texture[0].data.mask.mask =
ob_a_unfocused_pressed_max->texture[0].data.mask.mask =
- ob_s_max_pressed_mask;
- ob_a_focused_unpressed_close->texture[0].data.mask.mask =
- ob_a_unfocused_unpressed_close->texture[0].data.mask.mask =
- ob_s_close_unpressed_mask;
+ ob_s_max_unset_mask;
+ ob_a_focused_pressed_set_max->texture[0].data.mask.mask =
+ ob_a_unfocused_pressed_set_max->texture[0].data.mask.mask =
+ ob_s_max_set_mask;
ob_a_focused_pressed_close->texture[0].data.mask.mask =
ob_a_unfocused_pressed_close->texture[0].data.mask.mask =
- ob_s_close_pressed_mask;
+ ob_a_focused_unpressed_close->texture[0].data.mask.mask =
+ ob_a_unfocused_unpressed_close->texture[0].data.mask.mask =
+ ob_s_close_mask;
ob_a_focused_unpressed_desk->texture[0].data.mask.mask =
ob_a_unfocused_unpressed_desk->texture[0].data.mask.mask =
- ob_s_desk_unpressed_mask;
- ob_a_focused_pressed_desk->texture[0].data.mask.mask =
+ ob_a_focused_pressed_desk->texture[0].data.mask.mask =
ob_a_unfocused_pressed_desk->texture[0].data.mask.mask =
- ob_s_desk_pressed_mask;
+ ob_s_desk_unset_mask;
+ ob_a_focused_pressed_set_desk->texture[0].data.mask.mask =
+ ob_a_unfocused_pressed_set_desk->texture[0].data.mask.mask =
+ ob_s_desk_set_mask;
+ ob_a_focused_unpressed_shade->texture[0].data.mask.mask =
+ ob_a_unfocused_unpressed_shade->texture[0].data.mask.mask =
+ ob_a_focused_pressed_shade->texture[0].data.mask.mask =
+ ob_a_unfocused_pressed_shade->texture[0].data.mask.mask =
+ ob_s_shade_unset_mask;
+ ob_a_focused_pressed_set_shade->texture[0].data.mask.mask =
+ ob_a_unfocused_pressed_set_shade->texture[0].data.mask.mask =
+ ob_s_shade_set_mask;
ob_a_focused_unpressed_iconify->texture[0].data.mask.mask =
ob_a_unfocused_unpressed_iconify->texture[0].data.mask.mask =
- ob_s_iconify_unpressed_mask;
- ob_a_focused_pressed_iconify->texture[0].data.mask.mask =
+ ob_a_focused_pressed_iconify->texture[0].data.mask.mask =
ob_a_unfocused_pressed_iconify->texture[0].data.mask.mask =
- ob_s_iconify_pressed_mask;
+ ob_s_iconify_mask;
ob_a_focused_unpressed_max->texture[0].data.mask.color =
ob_a_focused_pressed_max->texture[0].data.mask.color =
+ ob_a_focused_pressed_set_max->texture[0].data.mask.color =
ob_a_focused_unpressed_close->texture[0].data.mask.color =
ob_a_focused_pressed_close->texture[0].data.mask.color =
ob_a_focused_unpressed_desk->texture[0].data.mask.color =
ob_a_focused_pressed_desk->texture[0].data.mask.color =
+ ob_a_focused_pressed_set_desk->texture[0].data.mask.color =
+ ob_a_focused_unpressed_shade->texture[0].data.mask.color =
+ ob_a_focused_pressed_shade->texture[0].data.mask.color =
+ ob_a_focused_pressed_set_shade->texture[0].data.mask.color =
ob_a_focused_unpressed_iconify->texture[0].data.mask.color =
ob_a_focused_pressed_iconify->texture[0].data.mask.color =
ob_s_titlebut_focused_color;
ob_a_unfocused_unpressed_max->texture[0].data.mask.color =
ob_a_unfocused_pressed_max->texture[0].data.mask.color =
+ ob_a_unfocused_pressed_set_max->texture[0].data.mask.color =
ob_a_unfocused_unpressed_close->texture[0].data.mask.color =
ob_a_unfocused_pressed_close->texture[0].data.mask.color =
ob_a_unfocused_unpressed_desk->texture[0].data.mask.color =
ob_a_unfocused_pressed_desk->texture[0].data.mask.color =
+ ob_a_unfocused_pressed_set_desk->texture[0].data.mask.color =
+ ob_a_unfocused_unpressed_shade->texture[0].data.mask.color =
+ ob_a_unfocused_pressed_shade->texture[0].data.mask.color =
+ ob_a_unfocused_pressed_set_shade->texture[0].data.mask.color =
ob_a_unfocused_unpressed_iconify->texture[0].data.mask.color =
ob_a_unfocused_pressed_iconify->texture[0].data.mask.color =
ob_s_titlebut_unfocused_color;
projects / chaz / openbox / blobdiff