diff options
| -rw-r--r-- | engines/openbox/openbox.c | 29 | ||||
| -rw-r--r-- | engines/openbox/openbox.h | 8 | ||||
| -rw-r--r-- | engines/openbox/theme.c | 91 | ||||
| -rw-r--r-- | openbox/themerc.c | 2 | ||||
| -rw-r--r-- | otk/renderstyle.cc | 2 |
5 files changed, 123 insertions, 9 deletions
diff --git a/engines/openbox/openbox.c b/engines/openbox/openbox.c index 75dc3267..184262ec 100644 --- a/engines/openbox/openbox.c +++ b/engines/openbox/openbox.c @@ -7,6 +7,7 @@ #include "../../render/render.h" #include "../../render/color.h" #include "../../render/font.h" +#include "../../render/mask.h" #include <X11/Xlib.h> #include <glib.h> @@ -33,11 +34,18 @@ color_rgb *s_cb_focused_color; color_rgb *s_cb_unfocused_color; color_rgb *s_title_focused_color; color_rgb *s_title_unfocused_color; +color_rgb *s_titlebut_focused_color; +color_rgb *s_titlebut_unfocused_color; /* style settings - fonts */ int s_winfont_height; int s_winfont_shadow; int s_winfont_shadow_offset; ObFont *s_winfont; +/* style settings - masks */ +pixmap_mask *s_max_mask; +pixmap_mask *s_icon_mask; +pixmap_mask *s_desk_mask; +pixmap_mask *s_close_mask; /* global appearances */ Appearance *a_focused_unpressed_max; @@ -135,13 +143,15 @@ gboolean startup() g_quark_from_string("close"); s_b_color = s_cb_unfocused_color = s_cb_focused_color = - s_title_unfocused_color = s_title_focused_color = NULL; + s_title_unfocused_color = s_title_focused_color = + s_titlebut_unfocused_color = s_titlebut_focused_color = NULL; s_winfont = NULL; + s_max_mask = s_icon_mask = s_desk_mask = s_close_mask = NULL; - a_focused_unpressed_max = appearance_new(Surface_Planar, 0);//1); - a_focused_pressed_max = appearance_new(Surface_Planar, 0);//1); - a_unfocused_unpressed_max = appearance_new(Surface_Planar, 0);//1); - a_unfocused_pressed_max = appearance_new(Surface_Planar, 0);//1); + a_focused_unpressed_max = appearance_new(Surface_Planar, 1); + a_focused_pressed_max = appearance_new(Surface_Planar, 1); + a_unfocused_unpressed_max = appearance_new(Surface_Planar, 1); + a_unfocused_pressed_max = appearance_new(Surface_Planar, 1); a_focused_unpressed_close = NULL; a_focused_pressed_close = NULL; a_unfocused_unpressed_close = NULL; @@ -174,6 +184,15 @@ void shutdown() if (s_cb_focused_color != NULL) color_free(s_cb_focused_color); if (s_title_unfocused_color != NULL) color_free(s_title_unfocused_color); if (s_title_focused_color != NULL) color_free(s_title_focused_color); + if (s_titlebut_unfocused_color != NULL) + color_free(s_titlebut_unfocused_color); + if (s_titlebut_focused_color != NULL) + color_free(s_titlebut_focused_color); + + if (s_max_mask != NULL) pixmap_mask_free(s_max_mask); + if (s_desk_mask != NULL) pixmap_mask_free(s_desk_mask); + if (s_icon_mask != NULL) pixmap_mask_free(s_icon_mask); + if (s_close_mask != NULL) pixmap_mask_free(s_close_mask); if (s_winfont != NULL) font_close(s_winfont); diff --git a/engines/openbox/openbox.h b/engines/openbox/openbox.h index 3a3b1904..5e9b9818 100644 --- a/engines/openbox/openbox.h +++ b/engines/openbox/openbox.h @@ -4,6 +4,7 @@ #include "../../render/render.h" #include "../../render/color.h" #include "../../render/font.h" +#include "../../render/mask.h" extern int s_bevel; extern int s_handle_height; @@ -15,12 +16,19 @@ extern color_rgb *s_cb_focused_color; extern color_rgb *s_cb_unfocused_color; extern color_rgb *s_title_focused_color; extern color_rgb *s_title_unfocused_color; +extern color_rgb *s_titlebut_focused_color; +extern color_rgb *s_titlebut_unfocused_color; extern int s_winfont_height; extern int s_winfont_shadow; extern int s_winfont_shadow_offset; extern ObFont *s_winfont; +extern pixmap_mask *s_max_mask; +extern pixmap_mask *s_icon_mask; +extern pixmap_mask *s_desk_mask; +extern pixmap_mask *s_close_mask; + extern Appearance *a_focused_unpressed_max; extern Appearance *a_focused_pressed_max; extern Appearance *a_unfocused_unpressed_max; diff --git a/engines/openbox/theme.c b/engines/openbox/theme.c index 18a04e8f..2165ccca 100644 --- a/engines/openbox/theme.c +++ b/engines/openbox/theme.c @@ -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) @@ -278,6 +293,29 @@ gboolean load() 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); @@ -328,8 +366,6 @@ 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.font = s_winfont; @@ -343,6 +379,57 @@ gboolean load() 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; } diff --git a/openbox/themerc.c b/openbox/themerc.c index 7f587afe..b79fc6e1 100644 --- a/openbox/themerc.c +++ b/openbox/themerc.c @@ -144,7 +144,7 @@ void themerc_startup() if (themerc_titlebar_layout == NULL) themerc_titlebar_layout = g_strdup("NDLIMC"); if (themerc_font == NULL) - themerc_font = g_strdup("sans-8"); + themerc_font = g_strdup("sans-7"); } void themerc_shutdown() diff --git a/otk/renderstyle.cc b/otk/renderstyle.cc index 4b3bc1bd..482f3303 100644 --- a/otk/renderstyle.cc +++ b/otk/renderstyle.cc @@ -455,7 +455,7 @@ bool RenderStyle::loadStyle(RenderStyle *s, int screen, s->_icon_mask = new PixmapMask(); s->_icon_mask->w = s->_icon_mask->h = 7; { - char data[] = {0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e }; + char data[] = { 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e }; s->_icon_mask->mask = XCreateBitmapFromData(**display, display->screenInfo(screen)->rootWindow(), |