X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=engines%2Fopenbox%2Fobtheme.c;h=3f45c20949ec24e503fc2ee0b8a9571dfe030b47;hb=71c8b0b7b2cf2fa79ac4c81b7756f2b230f2de7a;hp=c4ec31fb5bca9b7a3aafb9b5ff170eea4d82eb63;hpb=2881ed1ed3c79a6357fb68b92f2a44ad9c2c861d;p=chaz%2Fopenbox diff --git a/engines/openbox/obtheme.c b/engines/openbox/obtheme.c index c4ec31fb..3f45c209 100644 --- a/engines/openbox/obtheme.c +++ b/engines/openbox/obtheme.c @@ -277,7 +277,7 @@ gboolean obtheme_load() 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); @@ -299,21 +299,21 @@ gboolean obtheme_load() /* 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); @@ -328,7 +328,8 @@ gboolean obtheme_load() } 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) || @@ -344,7 +345,7 @@ gboolean obtheme_load() 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); @@ -362,19 +363,19 @@ gboolean obtheme_load() } } else { { - char data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; - ob_s_max_unset_mask = pixmap_mask_new(6, 6, data); + char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f }; + ob_s_max_unset_mask = pixmap_mask_new(7, 7, data); } { - char data[] = { 0x3c, 0x24, 0x27, 0x3f, 0x0f, 0x0f }; - ob_s_max_set_mask = pixmap_mask_new(6, 6, 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_mask)) { - char data[] = { 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f }; - ob_s_iconify_mask = pixmap_mask_new(6, 6, data); + 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", @@ -386,19 +387,37 @@ gboolean obtheme_load() } } else { { - char data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; - ob_s_desk_unset_mask = pixmap_mask_new(6, 6, data); + char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 }; + ob_s_desk_unset_mask = pixmap_mask_new(7, 7, data); } { - char data[] = { 0x0c, 0x0c, 0x3f, 0x3f, 0x0c, 0x0c }; - ob_s_desk_set_mask = pixmap_mask_new(6, 6, 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.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_mask)) { - char data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; - ob_s_close_mask = pixmap_mask_new(6, 6, data); + 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)) @@ -448,6 +467,14 @@ gboolean obtheme_load() 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 = @@ -468,6 +495,7 @@ gboolean obtheme_load() 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; @@ -476,6 +504,7 @@ gboolean obtheme_load() 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; @@ -495,6 +524,12 @@ gboolean obtheme_load() 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 = @@ -520,6 +555,14 @@ gboolean obtheme_load() 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_a_focused_pressed_iconify->texture[0].data.mask.mask = @@ -533,6 +576,9 @@ gboolean obtheme_load() 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; @@ -544,6 +590,9 @@ gboolean obtheme_load() 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;