X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=engines%2Fopenbox%2Ftheme.c;h=4fc859dacbc109412e6b97502f04103479301c2a;hb=327a0b3de75187a23bb01ce5e8e6992fd1106a81;hp=2c96224f34821e4606da5dc0f96837a4202ad73e;hpb=f8a47de5ec444c452093371e3db16857eb39a490;p=chaz%2Fopenbox diff --git a/engines/openbox/theme.c b/engines/openbox/theme.c index 2c96224f..4fc859da 100644 --- a/engines/openbox/theme.c +++ b/engines/openbox/theme.c @@ -95,7 +95,7 @@ gboolean read_string(XrmDatabase db, char *rname, char **value) if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - *value = retvalue.addr; + *value = g_strdup(retvalue.addr); ret = TRUE; } @@ -123,6 +123,21 @@ gboolean read_color(XrmDatabase db, char *rname, color_rgb **value) return ret; } +gboolean read_mask(XrmDatabase db, char *rname, pixmap_mask **value) +{ + gboolean ret = FALSE; + char *rclass = create_class_name(rname); + char *rettype; + XrmValue retvalue; + + if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && + retvalue.addr != NULL) { + } + + g_free(rclass); + return ret; +} + static void parse_appearance(char *tex, SurfaceColorType *grad, ReliefType *relief, BevelType *bevel, gboolean *interlaced, gboolean *border) @@ -234,6 +249,8 @@ void set_default_appearance(Appearance *a) gboolean load() { XrmDatabase db = NULL; + Justify winjust; + char *winjuststr; if (themerc_theme != NULL) { db = loaddb(themerc_theme); @@ -250,8 +267,21 @@ gboolean load() } } - /* XXX load the font, not from the theme file tho, its in themerc_font */ - s_font_height = 10; + /* load the font, not from the theme file tho, its in themerc_font */ + s_winfont_shadow = 1; /* XXX read from themrc */ + s_winfont_shadow_offset = 2; /* XXX read from themerc */ + s_winfont = font_open(themerc_font); + s_winfont_height = font_height(s_winfont, s_winfont_shadow, + s_winfont_shadow_offset); + + winjust = Justify_Left; + if (read_string(db, "window.justify", &winjuststr)) { + if (!g_ascii_strcasecmp(winjuststr, "right")) + winjust = Justify_Right; + else if (!g_ascii_strcasecmp(winjuststr, "center")) + winjust = Justify_Center; + g_free(winjuststr); + } if (!read_int(db, "handleWidth", &s_handle_height) || s_handle_height < 0 || s_handle_height > 100) s_handle_height = 6; @@ -268,6 +298,35 @@ gboolean load() s_cb_focused_color = color_new(0xff, 0xff, 0xff); if (!read_color(db, "window.frame.unfocusColor", &s_cb_unfocused_color)) s_cb_unfocused_color = color_new(0xff, 0xff, 0xff); + if (!read_color(db, "window.label.focus.textColor", + &s_title_focused_color)) + s_title_focused_color = color_new(0xff, 0xff, 0xff); + if (!read_color(db, "window.label.unfocus.textColor", + &s_title_unfocused_color)) + s_title_unfocused_color = color_new(0xff, 0xff, 0xff); + if (!read_color(db, "window.button.focus.picColor", + &s_titlebut_focused_color)) + s_titlebut_focused_color = color_new(0, 0, 0); + if (!read_color(db, "window.button.unfocus.picColor", + &s_titlebut_unfocused_color)) + s_titlebut_unfocused_color = color_new(0xff, 0xff, 0xff); + + if (!read_mask(db, "window.button.max.mask", &s_max_mask)) { + char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; + s_max_mask = pixmap_mask_new(7, 7, data); + } + if (!read_mask(db, "window.button.icon.mask", &s_icon_mask)) { + char data[] = { 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e }; + s_icon_mask = pixmap_mask_new(7, 7, data); + } + if (!read_mask(db, "window.button.stick.mask", &s_desk_mask)) { + char data[] = { 0x00, 0x36, 0x36, 0x00, 0x36, 0x36, 0x00 }; + s_desk_mask = pixmap_mask_new(7, 7, data); + } + if (!read_mask(db, "window.button.close.mask", &s_close_mask)) { + char data[] = { 0x22, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x22 }; + s_close_mask = pixmap_mask_new(7, 7, data); + } if (!read_appearance(db, "window.title.focus", a_focused_title)) set_default_appearance(a_focused_title); @@ -318,7 +377,71 @@ gboolean load() a_icon->surface.data.planar.grad = Background_ParentRelative; - /* XXX load the button masks */ + /* set up the textures */ + a_focused_label->texture[0].type = Text; + a_focused_label->texture[0].data.text.justify = winjust; + a_focused_label->texture[0].data.text.font = s_winfont; + a_focused_label->texture[0].data.text.shadow = s_winfont_shadow; + a_focused_label->texture[0].data.text.offset = s_winfont_shadow_offset; + a_focused_label->texture[0].data.text.color = s_title_focused_color; + + a_unfocused_label->texture[0].type = Text; + a_unfocused_label->texture[0].data.text.justify = winjust; + a_unfocused_label->texture[0].data.text.font = s_winfont; + a_unfocused_label->texture[0].data.text.shadow = s_winfont_shadow; + a_unfocused_label->texture[0].data.text.offset = s_winfont_shadow_offset; + a_unfocused_label->texture[0].data.text.color = s_title_unfocused_color; + + a_focused_unpressed_max->texture[0].type = + a_focused_pressed_max->texture[0].type = + a_unfocused_unpressed_max->texture[0].type = + a_unfocused_pressed_max->texture[0].type = + a_focused_unpressed_close->texture[0].type = + a_focused_pressed_close->texture[0].type = + a_unfocused_unpressed_close->texture[0].type = + a_unfocused_pressed_close->texture[0].type = + a_focused_unpressed_desk->texture[0].type = + a_focused_pressed_desk->texture[0].type = + a_unfocused_unpressed_desk->texture[0].type = + a_unfocused_pressed_desk->texture[0].type = + a_focused_unpressed_iconify->texture[0].type = + a_focused_pressed_iconify->texture[0].type = + a_unfocused_unpressed_iconify->texture[0].type = + a_unfocused_pressed_iconify->texture[0].type = Bitmask; + a_focused_unpressed_max->texture[0].data.mask.mask = + a_focused_pressed_max->texture[0].data.mask.mask = + a_unfocused_unpressed_max->texture[0].data.mask.mask = + a_unfocused_pressed_max->texture[0].data.mask.mask = s_max_mask; + a_focused_unpressed_close->texture[0].data.mask.mask = + a_focused_pressed_close->texture[0].data.mask.mask = + a_unfocused_unpressed_close->texture[0].data.mask.mask = + a_unfocused_pressed_close->texture[0].data.mask.mask = s_close_mask; + a_focused_unpressed_desk->texture[0].data.mask.mask = + a_focused_pressed_desk->texture[0].data.mask.mask = + a_unfocused_unpressed_desk->texture[0].data.mask.mask = + a_unfocused_pressed_desk->texture[0].data.mask.mask = s_desk_mask; + a_focused_unpressed_iconify->texture[0].data.mask.mask = + a_focused_pressed_iconify->texture[0].data.mask.mask = + a_unfocused_unpressed_iconify->texture[0].data.mask.mask = + a_unfocused_pressed_iconify->texture[0].data.mask.mask = s_icon_mask; + a_focused_unpressed_max->texture[0].data.mask.color = + a_focused_pressed_max->texture[0].data.mask.color = + a_focused_unpressed_close->texture[0].data.mask.color = + a_focused_pressed_close->texture[0].data.mask.color = + a_focused_unpressed_desk->texture[0].data.mask.color = + a_focused_pressed_desk->texture[0].data.mask.color = + a_focused_unpressed_iconify->texture[0].data.mask.color = + a_focused_pressed_iconify->texture[0].data.mask.color = + s_titlebut_focused_color; + a_unfocused_unpressed_max->texture[0].data.mask.color = + a_unfocused_pressed_max->texture[0].data.mask.color = + a_unfocused_unpressed_close->texture[0].data.mask.color = + a_unfocused_pressed_close->texture[0].data.mask.color = + a_unfocused_unpressed_desk->texture[0].data.mask.color = + a_unfocused_pressed_desk->texture[0].data.mask.color = + a_unfocused_unpressed_iconify->texture[0].data.mask.color = + a_unfocused_pressed_iconify->texture[0].data.mask.color = + s_titlebut_unfocused_color; XrmDestroyDatabase(db); return TRUE;