diff options
Diffstat (limited to 'obrender')
| -rw-r--r-- | obrender/button.c | 124 | ||||
| -rw-r--r-- | obrender/color.c | 44 | ||||
| -rw-r--r-- | obrender/font.c | 2 | ||||
| -rw-r--r-- | obrender/image.c | 5 | ||||
| -rw-r--r-- | obrender/render.h | 48 | ||||
| -rw-r--r-- | obrender/theme.c | 1303 | ||||
| -rw-r--r-- | obrender/theme.h | 30 |
7 files changed, 440 insertions, 1116 deletions
diff --git a/obrender/button.c b/obrender/button.c index 35437afd..faf83e02 100644 --- a/obrender/button.c +++ b/obrender/button.c @@ -29,49 +29,25 @@ RrButton *RrButtonNew (const RrInstance *inst) { RrButton *out = NULL; - out = g_new(RrButton, 1); + /* no need to alloc colors and masks, set them null (for freeing later) */ + out = g_new0(RrButton, 1); out->inst = inst; - /* no need to alloc colors, set them null (for freeing later) */ - out->focused_unpressed_color = NULL; - out->unfocused_unpressed_color = NULL; - out->focused_pressed_color = NULL; - out->unfocused_pressed_color = NULL; - out->disabled_focused_color = NULL; - out->disabled_unfocused_color = NULL; - out->hover_focused_color = NULL; - out->hover_unfocused_color = NULL; - out->toggled_hover_focused_color = NULL; - out->toggled_hover_unfocused_color = NULL; - out->toggled_focused_pressed_color = NULL; - out->toggled_unfocused_pressed_color = NULL; - out->toggled_focused_unpressed_color = NULL; - out->toggled_unfocused_unpressed_color = NULL; - - /* same with masks */ - out->mask = NULL; - out->pressed_mask = NULL; - out->disabled_mask = NULL; - out->hover_mask = NULL; - out->toggled_mask = NULL; - out->toggled_hover_mask = NULL; - out->toggled_pressed_mask = NULL; - /* allocate appearances */ out->a_focused_unpressed = RrAppearanceNew(inst, 1); out->a_unfocused_unpressed = RrAppearanceNew(inst, 1); out->a_focused_pressed = RrAppearanceNew(inst, 1); out->a_unfocused_pressed = RrAppearanceNew(inst, 1); - out->a_disabled_focused = RrAppearanceNew(inst, 1); - out->a_disabled_unfocused = RrAppearanceNew(inst, 1); - out->a_hover_focused = RrAppearanceNew(inst, 1); - out->a_hover_unfocused = RrAppearanceNew(inst, 1); - out->a_toggled_focused_unpressed = RrAppearanceNew(inst, 1); - out->a_toggled_unfocused_unpressed = RrAppearanceNew(inst, 1); - out->a_toggled_focused_pressed = RrAppearanceNew(inst, 1); - out->a_toggled_unfocused_pressed = RrAppearanceNew(inst, 1); - out->a_toggled_hover_focused = RrAppearanceNew(inst, 1); - out->a_toggled_hover_unfocused = RrAppearanceNew(inst, 1); + out->a_focused_disabled = RrAppearanceNew(inst, 1); + out->a_unfocused_disabled = RrAppearanceNew(inst, 1); + out->a_focused_hover = RrAppearanceNew(inst, 1); + out->a_unfocused_hover = RrAppearanceNew(inst, 1); + out->a_focused_unpressed_toggled = RrAppearanceNew(inst, 1); + out->a_unfocused_unpressed_toggled = RrAppearanceNew(inst, 1); + out->a_focused_pressed_toggled = RrAppearanceNew(inst, 1); + out->a_unfocused_pressed_toggled = RrAppearanceNew(inst, 1); + out->a_focused_hover_toggled = RrAppearanceNew(inst, 1); + out->a_unfocused_hover_toggled = RrAppearanceNew(inst, 1); return out; } @@ -79,57 +55,43 @@ RrButton *RrButtonNew (const RrInstance *inst) void RrButtonFree(RrButton *b) { /* colors */ - if (b->focused_unpressed_color) - RrColorFree(b->focused_unpressed_color); - if (b->unfocused_unpressed_color) - RrColorFree(b->unfocused_unpressed_color); - if (b->focused_pressed_color) - RrColorFree(b->focused_pressed_color); - if (b->unfocused_pressed_color) - RrColorFree(b->unfocused_pressed_color); - if (b->disabled_focused_color) - RrColorFree(b->disabled_focused_color); - if (b->disabled_unfocused_color) - RrColorFree(b->disabled_unfocused_color); - if (b->hover_focused_color) - RrColorFree(b->hover_focused_color); - if (b->hover_unfocused_color) - RrColorFree(b->hover_unfocused_color); - if (b->toggled_hover_focused_color) - RrColorFree(b->toggled_hover_focused_color); - if (b->toggled_hover_unfocused_color) - RrColorFree(b->toggled_hover_unfocused_color); - if (b->toggled_focused_pressed_color) - RrColorFree(b->toggled_focused_pressed_color); - if (b->toggled_unfocused_pressed_color) - RrColorFree(b->toggled_unfocused_pressed_color); - if (b->toggled_focused_unpressed_color) - RrColorFree(b->toggled_focused_unpressed_color); - if (b->toggled_unfocused_unpressed_color) - RrColorFree(b->toggled_unfocused_unpressed_color); + RrColorFree(b->focused_unpressed_color); + RrColorFree(b->unfocused_unpressed_color); + RrColorFree(b->focused_pressed_color); + RrColorFree(b->unfocused_pressed_color); + RrColorFree(b->focused_disabled_color); + RrColorFree(b->unfocused_disabled_color); + RrColorFree(b->focused_hover_color); + RrColorFree(b->unfocused_hover_color); + RrColorFree(b->focused_hover_toggled_color); + RrColorFree(b->unfocused_hover_toggled_color); + RrColorFree(b->focused_pressed_toggled_color); + RrColorFree(b->unfocused_pressed_toggled_color); + RrColorFree(b->focused_unpressed_toggled_color); + RrColorFree(b->unfocused_unpressed_toggled_color); /* masks */ - if (b->mask) RrPixmapMaskFree(b->mask); - if (b->pressed_mask) RrPixmapMaskFree(b->pressed_mask); - if (b->disabled_mask) RrPixmapMaskFree(b->disabled_mask); - if (b->hover_mask) RrPixmapMaskFree(b->hover_mask); - if (b->toggled_mask) RrPixmapMaskFree(b->toggled_mask); - if (b->toggled_hover_mask) RrPixmapMaskFree(b->toggled_hover_mask); - if (b->toggled_pressed_mask) RrPixmapMaskFree(b->toggled_pressed_mask); + RrPixmapMaskFree(b->unpressed_mask); + RrPixmapMaskFree(b->pressed_mask); + RrPixmapMaskFree(b->disabled_mask); + RrPixmapMaskFree(b->hover_mask); + RrPixmapMaskFree(b->unpressed_toggled_mask); + RrPixmapMaskFree(b->hover_toggled_mask); + RrPixmapMaskFree(b->pressed_toggled_mask); /* appearances */ RrAppearanceFree(b->a_focused_unpressed); RrAppearanceFree(b->a_unfocused_unpressed); RrAppearanceFree(b->a_focused_pressed); RrAppearanceFree(b->a_unfocused_pressed); - RrAppearanceFree(b->a_disabled_focused); - RrAppearanceFree(b->a_disabled_unfocused); - RrAppearanceFree(b->a_hover_focused); - RrAppearanceFree(b->a_hover_unfocused); - RrAppearanceFree(b->a_toggled_focused_unpressed); - RrAppearanceFree(b->a_toggled_unfocused_unpressed); - RrAppearanceFree(b->a_toggled_focused_pressed); - RrAppearanceFree(b->a_toggled_unfocused_pressed); - RrAppearanceFree(b->a_toggled_hover_focused); - RrAppearanceFree(b->a_toggled_hover_unfocused); + RrAppearanceFree(b->a_focused_disabled); + RrAppearanceFree(b->a_unfocused_disabled); + RrAppearanceFree(b->a_focused_hover); + RrAppearanceFree(b->a_unfocused_hover); + RrAppearanceFree(b->a_focused_unpressed_toggled); + RrAppearanceFree(b->a_unfocused_unpressed_toggled); + RrAppearanceFree(b->a_focused_pressed_toggled); + RrAppearanceFree(b->a_unfocused_pressed_toggled); + RrAppearanceFree(b->a_focused_hover_toggled); + RrAppearanceFree(b->a_unfocused_hover_toggled); } diff --git a/obrender/color.c b/obrender/color.c index 221ebc40..42953671 100644 --- a/obrender/color.c +++ b/obrender/color.c @@ -126,22 +126,26 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) { gint r, g, b; gint x,y; + gint ro = RrRedOffset(inst); + gint bo = RrBlueOffset(inst); + gint go = RrGreenOffset(inst); + gint rs = RrRedShift(inst); + gint bs = RrBlueShift(inst); + gint gs = RrGreenShift(inst); RrPixel32 *p32 = (RrPixel32 *) im->data; RrPixel16 *p16 = (RrPixel16 *) im->data; RrPixel8 *p8 = (RrPixel8 *) im->data; switch (im->bits_per_pixel) { case 32: - if ((RrRedOffset(inst) != RrDefaultRedOffset) || - (RrBlueOffset(inst) != RrDefaultBlueOffset) || - (RrGreenOffset(inst) != RrDefaultGreenOffset)) { + if ((ro != RrDefaultRedOffset) || + (bo != RrDefaultBlueOffset) || + (go != RrDefaultGreenOffset)) { for (y = 0; y < im->height; y++) { for (x = 0; x < im->width; x++) { r = (data[x] >> RrDefaultRedOffset) & 0xFF; g = (data[x] >> RrDefaultGreenOffset) & 0xFF; b = (data[x] >> RrDefaultBlueOffset) & 0xFF; - p32[x] = (r << RrRedOffset(inst)) - + (g << RrGreenOffset(inst)) - + (b << RrBlueOffset(inst)); + p32[x] = (r << ro) + (g << go) + (b << bo); } data += im->width; p32 += im->width; @@ -152,9 +156,9 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) { /* reverse the ordering, shifting left 16bit should be the first byte out of three, etc */ - const guint roff = (16 - RrRedOffset(inst)) / 8; - const guint goff = (16 - RrGreenOffset(inst)) / 8; - const guint boff = (16 - RrBlueOffset(inst)) / 8; + const guint roff = (16 - ro) / 8; + const guint goff = (16 - go) / 8; + const guint boff = (16 - bo) / 8; gint outx; for (y = 0; y < im->height; y++) { for (x = 0, outx = 0; x < im->width; x++, outx += 3) { @@ -174,14 +178,12 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) for (y = 0; y < im->height; y++) { for (x = 0; x < im->width; x++) { r = (data[x] >> RrDefaultRedOffset) & 0xFF; - r = r >> RrRedShift(inst); + r = r >> rs; g = (data[x] >> RrDefaultGreenOffset) & 0xFF; - g = g >> RrGreenShift(inst); + g = g >> gs; b = (data[x] >> RrDefaultBlueOffset) & 0xFF; - b = b >> RrBlueShift(inst); - p16[x] = (r << RrRedOffset(inst)) - + (g << RrGreenOffset(inst)) - + (b << RrBlueOffset(inst)); + b = b >> bs; + p16[x] = (r << ro) + (g << go) + (b << bo); } data += im->width; p16 += im->bytes_per_line/2; @@ -192,14 +194,12 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im) for (y = 0; y < im->height; y++) { for (x = 0; x < im->width; x++) { r = (data[x] >> RrDefaultRedOffset) & 0xFF; - r = r >> RrRedShift(inst); + r = r >> rs; g = (data[x] >> RrDefaultGreenOffset) & 0xFF; - g = g >> RrGreenShift(inst); + g = g >> gs; b = (data[x] >> RrDefaultBlueOffset) & 0xFF; - b = b >> RrBlueShift(inst); - p8[x] = (r << RrRedOffset(inst)) - + (g << RrGreenOffset(inst)) - + (b << RrBlueOffset(inst)); + b = b >> bs; + p8[x] = (r << ro) + (g << go) + (b << bo); } data += im->width; p8 += im->bytes_per_line; @@ -239,7 +239,7 @@ static void swap_byte_order(XImage *im) di = 0; for (y = 0; y < im->height; ++y) { - for (x = 0; x < im->height; ++x) { + for (x = 0; x < im->width; ++x) { gchar *c = &im->data[di + x * im->bits_per_pixel / 8]; gchar t; diff --git a/obrender/font.c b/obrender/font.c index a22e23f5..0f56a552 100644 --- a/obrender/font.c +++ b/obrender/font.c @@ -73,7 +73,7 @@ RrFont *RrFontOpen(const RrInstance *inst, const gchar *name, gint size, out->ref = 1; out->font_desc = pango_font_description_new(); out->layout = pango_layout_new(inst->pango); - out->shortcut_underline = pango_attr_underline_new(PANGO_UNDERLINE_LOW); + out->shortcut_underline = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); out->shortcut_underline->start_index = 0; out->shortcut_underline->end_index = 0; diff --git a/obrender/image.c b/obrender/image.c index 8ff9bf10..fb5f40bc 100644 --- a/obrender/image.c +++ b/obrender/image.c @@ -243,7 +243,7 @@ RrImageSet* RrImageSetMergeSets(RrImageSet *b, RrImageSet *a) gint n_original, n_resized, tmp; GSList *it; - const gint max_resized = a->cache->max_resized_saved; + gint max_resized; if (!a) return b; @@ -251,7 +251,6 @@ RrImageSet* RrImageSetMergeSets(RrImageSet *b, RrImageSet *a) return a; if (a == b) return b; - /* the original and resized picture lists in an RrImageSet are kept ordered as newest to oldest. we don't have timestamps for them, so we cannot preserve this in the merged RrImageSet exactly. a decent approximation, @@ -264,6 +263,8 @@ RrImageSet* RrImageSetMergeSets(RrImageSet *b, RrImageSet *a) g_assert(b->cache == a->cache); + max_resized = a->cache->max_resized_saved; + a_i = b_i = merged_i = 0; n_original = a->n_original + b->n_original; original = g_new(RrImagePic*, n_original); diff --git a/obrender/render.h b/obrender/render.h index 59e77660..f125847c 100644 --- a/obrender/render.h +++ b/obrender/render.h @@ -295,41 +295,41 @@ struct _RrButton { RrColor *unfocused_unpressed_color; RrColor *focused_pressed_color; RrColor *unfocused_pressed_color; - RrColor *disabled_focused_color; - RrColor *disabled_unfocused_color; - RrColor *hover_focused_color; - RrColor *hover_unfocused_color; - RrColor *toggled_hover_focused_color; - RrColor *toggled_hover_unfocused_color; - RrColor *toggled_focused_pressed_color; - RrColor *toggled_unfocused_pressed_color; - RrColor *toggled_focused_unpressed_color; - RrColor *toggled_unfocused_unpressed_color; + RrColor *focused_disabled_color; + RrColor *unfocused_disabled_color; + RrColor *focused_hover_color; + RrColor *unfocused_hover_color; + RrColor *focused_hover_toggled_color; + RrColor *unfocused_hover_toggled_color; + RrColor *focused_pressed_toggled_color; + RrColor *unfocused_pressed_toggled_color; + RrColor *focused_unpressed_toggled_color; + RrColor *unfocused_unpressed_toggled_color; /* masks */ - RrPixmapMask *mask; + RrPixmapMask *unpressed_mask; RrPixmapMask *pressed_mask; RrPixmapMask *disabled_mask; RrPixmapMask *hover_mask; - RrPixmapMask *toggled_mask; - RrPixmapMask *toggled_hover_mask; - RrPixmapMask *toggled_pressed_mask; + RrPixmapMask *unpressed_toggled_mask; + RrPixmapMask *hover_toggled_mask; + RrPixmapMask *pressed_toggled_mask; /* textures */ RrAppearance *a_focused_unpressed; RrAppearance *a_unfocused_unpressed; RrAppearance *a_focused_pressed; RrAppearance *a_unfocused_pressed; - RrAppearance *a_disabled_focused; - RrAppearance *a_disabled_unfocused; - RrAppearance *a_hover_focused; - RrAppearance *a_hover_unfocused; - RrAppearance *a_toggled_focused_unpressed; - RrAppearance *a_toggled_unfocused_unpressed; - RrAppearance *a_toggled_focused_pressed; - RrAppearance *a_toggled_unfocused_pressed; - RrAppearance *a_toggled_hover_focused; - RrAppearance *a_toggled_hover_unfocused; + RrAppearance *a_focused_disabled; + RrAppearance *a_unfocused_disabled; + RrAppearance *a_focused_hover; + RrAppearance *a_unfocused_hover; + RrAppearance *a_focused_unpressed_toggled; + RrAppearance *a_unfocused_unpressed_toggled; + RrAppearance *a_focused_pressed_toggled; + RrAppearance *a_unfocused_pressed_toggled; + RrAppearance *a_focused_hover_toggled; + RrAppearance *a_unfocused_hover_toggled; }; diff --git a/obrender/theme.c b/obrender/theme.c index 87ca5c89..2a4f6e10 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -31,23 +31,43 @@ #include <stdlib.h> #include <string.h> +struct fallbacks { + RrAppearance *focused_disabled; + RrAppearance *unfocused_disabled; + RrAppearance *focused_hover; + RrAppearance *unfocused_hover; + RrAppearance *focused_unpressed; + RrAppearance *focused_pressed; + RrAppearance *unfocused_unpressed; + RrAppearance *unfocused_pressed; + RrAppearance *focused_hover_toggled; + RrAppearance *unfocused_hover_toggled; + RrAppearance *focused_unpressed_toggled; + RrAppearance *focused_pressed_toggled; + RrAppearance *unfocused_unpressed_toggled; + RrAppearance *unfocused_pressed_toggled; +}; + static XrmDatabase loaddb(const gchar *name, gchar **path); static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value); static gboolean read_string(XrmDatabase db, const gchar *rname, gchar **value); static gboolean read_color(XrmDatabase db, const RrInstance *inst, const gchar *rname, RrColor **value); static gboolean read_mask(const RrInstance *inst, const gchar *path, - RrTheme *theme, const gchar *maskname, - RrPixmapMask **value); + const gchar *maskname, RrPixmapMask **value); static gboolean read_appearance(XrmDatabase db, const RrInstance *inst, const gchar *rname, RrAppearance *value, gboolean allow_trans); static int parse_inline_number(const char *p); static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); -static void read_button_colors(XrmDatabase db, const RrInstance *inst, +static void read_button_styles(XrmDatabase db, const RrInstance *inst, + gchar *path, const RrTheme *theme, RrButton *btn, - const gchar *btnname); + const gchar *btnname, + struct fallbacks *fbs, + guchar *normal_mask, + guchar *toggled_mask); static RrFont *get_font(RrFont *target, RrFont **default_font, const RrInstance *inst) @@ -81,7 +101,7 @@ static RrFont *get_font(RrFont *target, RrFont **default_font, x_var = x_def; #define READ_MASK_COPY(x_file, x_var, x_copysrc) \ - if (!read_mask(inst, path, theme, x_file, & x_var)) \ + if (!read_mask(inst, path, x_file, & x_var)) \ x_var = RrPixmapMaskCopy(x_copysrc); #define READ_APPEARANCE(x_resstr, x_var, x_parrel) \ @@ -118,22 +138,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrTheme *theme; RrFont *default_font = NULL; gchar *path; - gboolean userdef; gint menu_overlap = 0; - RrAppearance *a_disabled_focused_tmp; - RrAppearance *a_disabled_unfocused_tmp; - RrAppearance *a_hover_focused_tmp; - RrAppearance *a_hover_unfocused_tmp; - RrAppearance *a_focused_unpressed_tmp; - RrAppearance *a_focused_pressed_tmp; - RrAppearance *a_unfocused_unpressed_tmp; - RrAppearance *a_unfocused_pressed_tmp; - RrAppearance *a_toggled_hover_focused_tmp; - RrAppearance *a_toggled_hover_unfocused_tmp; - RrAppearance *a_toggled_focused_unpressed_tmp; - RrAppearance *a_toggled_focused_pressed_tmp; - RrAppearance *a_toggled_unfocused_unpressed_tmp; - RrAppearance *a_toggled_unfocused_pressed_tmp; + struct fallbacks fbs; if (name) { db = loaddb(name, &path); @@ -158,20 +164,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, } /* initialize temp reading textures */ - a_disabled_focused_tmp = RrAppearanceNew(inst, 1); - a_disabled_unfocused_tmp = RrAppearanceNew(inst, 1); - a_hover_focused_tmp = RrAppearanceNew(inst, 1); - a_hover_unfocused_tmp = RrAppearanceNew(inst, 1); - a_toggled_focused_unpressed_tmp = RrAppearanceNew(inst, 1); - a_toggled_unfocused_unpressed_tmp = RrAppearanceNew(inst, 1); - a_toggled_hover_focused_tmp = RrAppearanceNew(inst, 1); - a_toggled_hover_unfocused_tmp = RrAppearanceNew(inst, 1); - a_toggled_focused_pressed_tmp = RrAppearanceNew(inst, 1); - a_toggled_unfocused_pressed_tmp = RrAppearanceNew(inst, 1); - a_focused_unpressed_tmp = RrAppearanceNew(inst, 1); - a_focused_pressed_tmp = RrAppearanceNew(inst, 1); - a_unfocused_unpressed_tmp = RrAppearanceNew(inst, 1); - a_unfocused_pressed_tmp = RrAppearanceNew(inst, 1); + fbs.focused_disabled = RrAppearanceNew(inst, 1); + fbs.unfocused_disabled = RrAppearanceNew(inst, 1); + fbs.focused_hover = RrAppearanceNew(inst, 1); + fbs.unfocused_hover = RrAppearanceNew(inst, 1); + fbs.focused_unpressed_toggled = RrAppearanceNew(inst, 1); + fbs.unfocused_unpressed_toggled = RrAppearanceNew(inst, 1); + fbs.focused_hover_toggled = RrAppearanceNew(inst, 1); + fbs.unfocused_hover_toggled = RrAppearanceNew(inst, 1); + fbs.focused_pressed_toggled = RrAppearanceNew(inst, 1); + fbs.unfocused_pressed_toggled = RrAppearanceNew(inst, 1); + fbs.focused_unpressed = RrAppearanceNew(inst, 1); + fbs.focused_pressed = RrAppearanceNew(inst, 1); + fbs.unfocused_unpressed = RrAppearanceNew(inst, 1); + fbs.unfocused_pressed = RrAppearanceNew(inst, 1); /* initialize theme */ theme = g_slice_new0(RrTheme); @@ -259,74 +265,70 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_INT("border.width", theme->fbwidth, 0, 100, 1); READ_INT("menu.border.width", theme->mbwidth, 0, 100, theme->fbwidth); READ_INT("osd.border.width", theme->obwidth, 0, 100, theme->fbwidth); - READ_INT("undecorated.border.width", theme->ubwidth, 0, 100, - theme->fbwidth); + READ_INT("undecorated.border.width", theme->ubwidth, 0, 100, theme->fbwidth); READ_INT("menu.separator.width", theme->menu_sep_width, 1, 100, 1); - READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx, - 0, 100, 6); - READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy, - 0, 100, 3); - READ_INT("window.client.padding.width", theme->cbwidthx, 0, 100, - theme->paddingx); - READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100, - theme->cbwidthx); + READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx, 0, 100, 6); + READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy, 0, 100, 3); + READ_INT("window.client.padding.width", theme->cbwidthx, 0, 100, theme->paddingx); + READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100, theme->cbwidthx); /* load colors */ - READ_COLOR_("window.active.border.color", "border.color", - theme->frame_focused_border_color, RrColorNew(inst, 0, 0, 0)); - /* undecorated focused border color inherits from frame focused border - color */ + READ_COLOR_("window.active.border.color", + "border.color", + theme->frame_focused_border_color, + RrColorNew(inst, 0, 0, 0)); READ_COLOR("window.undecorated.active.border.color", theme->frame_undecorated_focused_border_color, RrColorCopy(theme->frame_focused_border_color)); - /* title separator focused color inherits from focused border color */ READ_COLOR("window.active.title.separator.color", theme->title_separator_focused_color, RrColorCopy(theme->frame_focused_border_color)); - /* unfocused border color inherits from frame focused border color */ READ_COLOR("window.inactive.border.color", theme->frame_unfocused_border_color, RrColorCopy(theme->frame_focused_border_color)); - /* undecorated unfocused border color inherits from frame unfocused border - color */ READ_COLOR("window.undecorated.inactive.border.color", theme->frame_undecorated_unfocused_border_color, RrColorCopy(theme->frame_unfocused_border_color)); - /* title separator unfocused color inherits from unfocused border color */ READ_COLOR("window.inactive.title.separator.color", theme->title_separator_unfocused_color, RrColorCopy(theme->frame_unfocused_border_color)); - /* menu border color inherits from frame focused border color */ - READ_COLOR("menu.border.color", theme->menu_border_color, + READ_COLOR("menu.border.color", + theme->menu_border_color, RrColorCopy(theme->frame_focused_border_color)); - /* osd border color inherits from frame focused border color */ - READ_COLOR("osd.border.color", theme->osd_border_color, + READ_COLOR("osd.border.color", + theme->osd_border_color, RrColorCopy(theme->frame_focused_border_color)); - READ_COLOR("window.active.client.color", theme->cb_focused_color, + READ_COLOR("window.active.client.color", + theme->cb_focused_color, RrColorNew(inst, 0xff, 0xff, 0xff)); - READ_COLOR("window.inactive.client.color", theme->cb_unfocused_color, + READ_COLOR("window.inactive.client.color", + theme->cb_unfocused_color, RrColorNew(inst, 0xff, 0xff, 0xff)); - READ_COLOR("window.active.label.text.color", theme->title_focused_color, + READ_COLOR("window.active.label.text.color", + theme->title_focused_color, RrColorNew(inst, 0x0, 0x0, 0x0)); - READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color, + READ_COLOR("window.inactive.label.text.color", + theme->title_unfocused_color, RrColorNew(inst, 0xff, 0xff, 0xff)); READ_COLOR_("osd.active.label.text.color", "osd.label.text.color", - theme->osd_text_active_color, RrColorCopy(theme->title_focused_color)); + theme->osd_text_active_color, + RrColorCopy(theme->title_focused_color)); READ_COLOR_("osd.inactive.label.text.color", "osd.label.text.color", - theme->osd_text_inactive_color, RrColorCopy(theme->title_unfocused_color)); + theme->osd_text_inactive_color, + RrColorCopy(theme->title_unfocused_color)); READ_COLOR("window.active.button.unpressed.image.color", theme->titlebut_focused_unpressed_color, @@ -345,189 +347,181 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrColorCopy(theme->titlebut_unfocused_unpressed_color)); READ_COLOR("window.active.button.disabled.image.color", - theme->titlebut_disabled_focused_color, + theme->titlebut_focused_disabled_color, RrColorNew(inst, 0xff, 0xff, 0xff)); READ_COLOR("window.inactive.button.disabled.image.color", - theme->titlebut_disabled_unfocused_color, + theme->titlebut_unfocused_disabled_color, RrColorNew(inst, 0, 0, 0)); READ_COLOR("window.active.button.hover.image.color", - theme->titlebut_hover_focused_color, + theme->titlebut_focused_hover_color, RrColorCopy(theme->titlebut_focused_unpressed_color)); READ_COLOR("window.inactive.button.hover.image.color", - theme->titlebut_hover_unfocused_color, + theme->titlebut_unfocused_hover_color, RrColorCopy(theme->titlebut_unfocused_unpressed_color)); READ_COLOR_("window.active.button.toggled.unpressed.image.color", "window.active.button.toggled.image.color", - theme->titlebut_toggled_focused_unpressed_color, + theme->titlebut_focused_unpressed_toggled_color, RrColorCopy(theme->titlebut_focused_pressed_color)); READ_COLOR_("window.inactive.button.toggled.unpressed.image.color", "window.inactive.button.toggled.image.color", - theme->titlebut_toggled_unfocused_unpressed_color, + theme->titlebut_unfocused_unpressed_toggled_color, RrColorCopy(theme->titlebut_unfocused_pressed_color)); READ_COLOR("window.active.button.toggled.hover.image.color", - theme->titlebut_toggled_hover_focused_color, - RrColorCopy(theme->titlebut_toggled_focused_unpressed_color)); + theme->titlebut_focused_hover_toggled_color, + RrColorCopy(theme->titlebut_focused_unpressed_toggled_color)); READ_COLOR("window.inactive.button.toggled.hover.image.color", - theme->titlebut_toggled_hover_unfocused_color, - RrColorCopy(theme->titlebut_toggled_unfocused_unpressed_color)); + theme->titlebut_unfocused_hover_toggled_color, + RrColorCopy(theme->titlebut_unfocused_unpressed_toggled_color)); READ_COLOR("window.active.button.toggled.pressed.image.color", - theme->titlebut_toggled_focused_pressed_color, + theme->titlebut_focused_pressed_toggled_color, RrColorCopy(theme->titlebut_focused_pressed_color)); READ_COLOR("window.inactive.button.toggled.pressed.image.color", - theme->titlebut_toggled_unfocused_pressed_color, + theme->titlebut_unfocused_pressed_toggled_color, RrColorCopy(theme->titlebut_unfocused_pressed_color)); - READ_COLOR("menu.title.text.color", theme->menu_title_color, + READ_COLOR("menu.title.text.color", + theme->menu_title_color, RrColorNew(inst, 0, 0, 0)); - READ_COLOR("menu.items.text.color", theme->menu_color, + READ_COLOR("menu.items.text.color", + theme->menu_color, RrColorNew(inst, 0xff, 0xff, 0xff)); - READ_COLOR("menu.bullet.image.color", theme->menu_bullet_color, + READ_COLOR("menu.bullet.image.color", + theme->menu_bullet_color, RrColorCopy(theme->menu_color)); - READ_COLOR("menu.items.disabled.text.color", theme->menu_disabled_color, + READ_COLOR("menu.items.disabled.text.color", + theme->menu_disabled_color, RrColorNew(inst, 0, 0, 0)); READ_COLOR("menu.items.active.disabled.text.color", theme->menu_disabled_selected_color, RrColorCopy(theme->menu_disabled_color)); - READ_COLOR("menu.items.active.text.color", theme->menu_selected_color, + READ_COLOR("menu.items.active.text.color", + theme->menu_selected_color, RrColorNew(inst, 0, 0, 0)); - READ_COLOR("menu.separator.color", theme->menu_sep_color, + READ_COLOR("menu.separator.color", + theme->menu_sep_color, RrColorCopy(theme->menu_color)); READ_COLOR("menu.bullet.selected.image.color", theme->menu_bullet_selected_color, RrColorCopy(theme->menu_selected_color)); - READ_COLOR("osd.button.unpressed.text.color", theme->osd_unpressed_color, + READ_COLOR("osd.button.unpressed.text.color", + theme->osd_unpressed_color, RrColorCopy(theme->osd_text_active_color)); - READ_COLOR("osd.button.pressed.text.color", theme->osd_pressed_color, + READ_COLOR("osd.button.pressed.text.color", + theme->osd_pressed_color, RrColorCopy(theme->osd_text_active_color)); - READ_COLOR("osd.button.focused.text.color", theme->osd_focused_color, + READ_COLOR("osd.button.focused.text.color", + theme->osd_focused_color, RrColorCopy(theme->osd_text_active_color)); - READ_COLOR("osd.button.pressed.box.color", theme->osd_pressed_lineart, + READ_COLOR("osd.button.pressed.box.color", + theme->osd_pressed_lineart, RrColorCopy(theme->titlebut_focused_pressed_color)); - READ_COLOR("osd.button.focused.box.color", theme->osd_focused_lineart, - RrColorCopy(theme->titlebut_hover_focused_color)); + READ_COLOR("osd.button.focused.box.color", + theme->osd_focused_lineart, + RrColorCopy(theme->titlebut_focused_hover_color)); - /* load the image masks */ - - /* maximize button masks */ - userdef = TRUE; - if (!read_mask(inst, path, theme, "max.xbm", &theme->btn_max->mask)) { - guchar data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; - theme->btn_max->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); - userdef = FALSE; - } - if (!read_mask(inst, path, theme, "max_toggled.xbm", - &theme->btn_max->toggled_mask)) + /* load window buttons */ + + /* bases: unpressed, pressed, disabled */ + READ_APPEARANCE("window.active.button.unpressed.bg", fbs.focused_unpressed, TRUE); + READ_APPEARANCE("window.inactive.button.unpressed.bg", fbs.unfocused_unpressed, TRUE); + READ_APPEARANCE("window.active.button.pressed.bg", fbs.focused_pressed, TRUE); + READ_APPEARANCE("window.inactive.button.pressed.bg", fbs.unfocused_pressed, TRUE); + READ_APPEARANCE("window.active.button.disabled.bg", fbs.focused_disabled, TRUE); + READ_APPEARANCE("window.inactive.button.disabled.bg", fbs.unfocused_disabled, TRUE); + + /* hover */ + READ_APPEARANCE_COPY("window.active.button.hover.bg", + fbs.focused_hover, TRUE, + fbs.focused_unpressed); + READ_APPEARANCE_COPY("window.inactive.button.hover.bg", + fbs.unfocused_hover, TRUE, + fbs.unfocused_unpressed); + + /* toggled unpressed */ + READ_APPEARANCE_("window.active.button.toggled.unpressed.bg", + "window.active.button.toggled.bg", + fbs.focused_unpressed_toggled, TRUE, + fbs.focused_pressed); + READ_APPEARANCE_("window.inactive.button.toggled.unpressed.bg", + "window.inactive.button.toggled.bg", + fbs.unfocused_unpressed_toggled, TRUE, + fbs.unfocused_pressed); + + /* toggled pressed */ + READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg", + fbs.focused_pressed_toggled, TRUE, + fbs.focused_pressed); + READ_APPEARANCE_COPY("window.inactive.button.toggled.pressed.bg", + fbs.unfocused_pressed_toggled, TRUE, + fbs.unfocused_pressed); + + /* toggled hover */ + READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", + fbs.focused_hover_toggled, TRUE, + fbs.focused_unpressed_toggled); + READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", + fbs.unfocused_hover_toggled, TRUE, + fbs.unfocused_unpressed_toggled); + + + /* now do individual buttons, if specified */ + + /* max button */ { - if (userdef) - theme->btn_max->toggled_mask = RrPixmapMaskCopy(theme->btn_max->mask); - else { - guchar data[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; - theme->btn_max->toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data); - } - } - READ_MASK_COPY("max_pressed.xbm", theme->btn_max->pressed_mask, - theme->btn_max->mask); - READ_MASK_COPY("max_disabled.xbm", theme->btn_max->disabled_mask, - theme->btn_max->mask); - READ_MASK_COPY("max_hover.xbm", theme->btn_max->hover_mask, - theme->btn_max->mask); - READ_MASK_COPY("max_toggled_pressed.xbm", - theme->btn_max->toggled_pressed_mask, - theme->btn_max->toggled_mask); - READ_MASK_COPY("max_toggled_hover.xbm", - theme->btn_max->toggled_hover_mask, - theme->btn_max->toggled_mask); - - /* iconify button masks */ - if (!read_mask(inst, path, theme, "iconify.xbm", &theme->btn_iconify->mask)) { - guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; - theme->btn_iconify->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + guchar normal_mask[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f }; + guchar toggled_mask[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f }; + read_button_styles(db, inst, path, theme, theme->btn_max, "max", + &fbs, normal_mask, toggled_mask); } - READ_MASK_COPY("iconify_pressed.xbm", theme->btn_iconify->pressed_mask, - theme->btn_iconify->mask); - READ_MASK_COPY("iconify_disabled.xbm", theme->btn_iconify->disabled_mask, - theme->btn_iconify->mask); - READ_MASK_COPY("iconify_hover.xbm", theme->btn_iconify->hover_mask, - theme->btn_iconify->mask); - - /* all desktops button masks */ - userdef = TRUE; - if (!read_mask(inst, path, theme, "desk.xbm", &theme->btn_desk->mask)) { - guchar data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; - theme->btn_desk->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); - userdef = FALSE; + + /* close button */ + { + guchar normal_mask[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; + read_button_styles(db, inst, path, theme, theme->btn_close, "close", + &fbs, normal_mask, NULL); } - if (!read_mask(inst, path, theme, "desk_toggled.xbm", - &theme->btn_desk->toggled_mask)) { - if (userdef) - theme->btn_desk->toggled_mask = RrPixmapMaskCopy(theme->btn_desk->mask); - else { - guchar data[] = { 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 }; - theme->btn_desk->toggled_mask = - RrPixmapMaskNew(inst, 6, 6, (gchar*)data); - } + + /* all desktops button */ + { + guchar normal_mask[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 }; + guchar toggled_mask[] = { 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 }; + read_button_styles(db, inst, path, theme, theme->btn_desk, "desk", + &fbs, normal_mask, toggled_mask); } - READ_MASK_COPY("desk_pressed.xbm", theme->btn_desk->pressed_mask, - theme->btn_desk->mask); - READ_MASK_COPY("desk_disabled.xbm", theme->btn_desk->disabled_mask, - theme->btn_desk->mask); - READ_MASK_COPY("desk_hover.xbm", theme->btn_desk->hover_mask, theme->btn_desk->mask); - READ_MASK_COPY("desk_toggled_pressed.xbm", - theme->btn_desk->toggled_pressed_mask, theme->btn_desk->toggled_mask); - READ_MASK_COPY("desk_toggled_hover.xbm", theme->btn_desk->toggled_hover_mask, - theme->btn_desk->toggled_mask); - - /* shade button masks */ - if (!read_mask(inst, path, theme, "shade.xbm", &theme->btn_shade->mask)) { - guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; - theme->btn_shade->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + + /* shade button */ + { + guchar normal_mask[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 }; + read_button_styles(db, inst, path, theme, theme->btn_shade, "shade", + &fbs, normal_mask, normal_mask); } - READ_MASK_COPY("shade_toggled.xbm", theme->btn_shade->toggled_mask, - theme->btn_shade->mask); - READ_MASK_COPY("shade_pressed.xbm", theme->btn_shade->pressed_mask, - theme->btn_shade->mask); - READ_MASK_COPY("shade_disabled.xbm", theme->btn_shade->disabled_mask, - theme->btn_shade->mask); - READ_MASK_COPY("shade_hover.xbm", theme->btn_shade->hover_mask, - theme->btn_shade->mask); - READ_MASK_COPY("shade_toggled_pressed.xbm", - theme->btn_shade->toggled_pressed_mask, - theme->btn_shade->toggled_mask); - READ_MASK_COPY("shade_toggled_hover.xbm", - theme->btn_shade->toggled_hover_mask, - theme->btn_shade->toggled_mask); - - /* close button masks */ - if (!read_mask(inst, path, theme, "close.xbm", &theme->btn_close->mask)) { - guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 }; - theme->btn_close->mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data); + + /* iconify button */ + { + guchar normal_mask[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f }; + read_button_styles(db, inst, path, theme, theme->btn_iconify, "iconify", + &fbs, normal_mask, NULL); } - READ_MASK_COPY("close_pressed.xbm", theme->btn_close->pressed_mask, - theme->btn_close->mask); - READ_MASK_COPY("close_disabled.xbm", theme->btn_close->disabled_mask, - theme->btn_close->mask); - READ_MASK_COPY("close_hover.xbm", theme->btn_close->hover_mask, - theme->btn_close->mask); /* submenu bullet mask */ - if (!read_mask(inst, path, theme, "bullet.xbm", &theme->menu_bullet_mask)) + if (!read_mask(inst, path, "bullet.xbm", &theme->menu_bullet_mask)) { guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 }; theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (gchar*)data); @@ -550,31 +544,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH; theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT; - /* the toggled hover mask = the toggled unpressed mask (i.e. no change) */ - theme->btn_max->toggled_hover_mask = - RrPixmapMaskCopy(theme->btn_max->toggled_mask); - theme->btn_desk->toggled_hover_mask = - RrPixmapMaskCopy(theme->btn_desk->toggled_mask); - theme->btn_shade->toggled_hover_mask = - RrPixmapMaskCopy(theme->btn_shade->toggled_mask); - /* the toggled pressed mask = the toggled unpressed mask (i.e. no change)*/ - theme->btn_max->toggled_pressed_mask = - RrPixmapMaskCopy(theme->btn_max->toggled_mask); - theme->btn_desk->toggled_pressed_mask = - RrPixmapMaskCopy(theme->btn_desk->toggled_mask); - theme->btn_shade->toggled_pressed_mask = - RrPixmapMaskCopy(theme->btn_shade->toggled_mask); - /* read the decoration textures */ READ_APPEARANCE("window.active.title.bg", theme->a_focused_title, FALSE); - READ_APPEARANCE("window.inactive.title.bg", theme->a_unfocused_title, - FALSE); + READ_APPEARANCE("window.inactive.title.bg", theme->a_unfocused_title, FALSE); READ_APPEARANCE("window.active.label.bg", theme->a_focused_label, TRUE); - READ_APPEARANCE("window.inactive.label.bg", theme->a_unfocused_label, - TRUE); + READ_APPEARANCE("window.inactive.label.bg", theme->a_unfocused_label, TRUE); READ_APPEARANCE("window.active.handle.bg", theme->a_focused_handle, FALSE); - READ_APPEARANCE("window.inactive.handle.bg",theme->a_unfocused_handle, - FALSE); + READ_APPEARANCE("window.inactive.handle.bg",theme->a_unfocused_handle, FALSE); READ_APPEARANCE("window.active.grip.bg", theme->a_focused_grip, TRUE); READ_APPEARANCE("window.inactive.grip.bg", theme->a_unfocused_grip, TRUE); READ_APPEARANCE("menu.items.bg", theme->a_menu, FALSE); @@ -585,25 +561,29 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrAppearanceCopy(theme->a_menu_selected); /* read appearances for non-decorations (on-screen-display) */ - if (!read_appearance(db, inst, "osd.bg", theme->osd_bg, FALSE)) { + if (!read_appearance(db, inst, "osd.bg", theme->osd_bg, FALSE)) + { RrAppearanceFree(theme->osd_bg); theme->osd_bg = RrAppearanceCopy(theme->a_focused_title); } if (!read_appearance(db, inst, "osd.active.label.bg", theme->osd_hilite_label, TRUE) && !read_appearance(db, inst, "osd.label.bg", - theme->osd_hilite_label, TRUE)) { + theme->osd_hilite_label, TRUE)) + { RrAppearanceFree(theme->osd_hilite_label); theme->osd_hilite_label = RrAppearanceCopy(theme->a_focused_label); } if (!read_appearance(db, inst, "osd.inactive.label.bg", - theme->osd_unhilite_label, TRUE)) { + theme->osd_unhilite_label, TRUE)) + { RrAppearanceFree(theme->osd_unhilite_label); theme->osd_unhilite_label = RrAppearanceCopy(theme->a_unfocused_label); } /* osd_hilite_fg can't be parentrel */ if (!read_appearance(db, inst, "osd.hilight.bg", - theme->osd_hilite_bg, FALSE)) { + theme->osd_hilite_bg, FALSE)) + { RrAppearanceFree(theme->osd_hilite_bg); if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL) theme->osd_hilite_bg = RrAppearanceCopy(theme->a_focused_label); @@ -612,7 +592,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, } /* osd_unhilite_fg can't be parentrel either */ if (!read_appearance(db, inst, "osd.unhilight.bg", - theme->osd_unhilite_bg, FALSE)) { + theme->osd_unhilite_bg, FALSE)) + { RrAppearanceFree(theme->osd_unhilite_bg); if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) theme->osd_unhilite_bg=RrAppearanceCopy(theme->a_unfocused_label); @@ -620,290 +601,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_unhilite_bg=RrAppearanceCopy(theme->a_unfocused_title); } - /* read buttons textures */ - - /* bases: unpressed, pressed, disabled */ - READ_APPEARANCE("window.active.button.unpressed.bg", - a_focused_unpressed_tmp, TRUE); - READ_APPEARANCE("window.inactive.button.unpressed.bg", - a_unfocused_unpressed_tmp, TRUE); - READ_APPEARANCE("window.active.button.pressed.bg", - a_focused_pressed_tmp, TRUE); - READ_APPEARANCE("window.inactive.button.pressed.bg", - a_unfocused_pressed_tmp, TRUE); - READ_APPEARANCE("window.active.button.disabled.bg", - a_disabled_focused_tmp, TRUE); - READ_APPEARANCE("window.inactive.button.disabled.bg", - a_disabled_unfocused_tmp, TRUE); - - /* hover */ - READ_APPEARANCE_COPY("window.active.button.hover.bg", - a_hover_focused_tmp, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.hover.bg", - a_hover_unfocused_tmp, TRUE, - a_unfocused_unpressed_tmp); - - /* toggled unpressed */ - READ_APPEARANCE_("window.active.button.toggled.unpressed.bg", - "window.active.button.toggled.bg", - a_toggled_focused_unpressed_tmp, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_("window.inactive.button.toggled.unpressed.bg", - "window.inactive.button.toggled.bg", - a_toggled_unfocused_unpressed_tmp, TRUE, - a_unfocused_pressed_tmp); - - /* toggled pressed */ - READ_APPEARANCE_COPY("window.active.button.toggled.pressed.bg", - a_toggled_focused_pressed_tmp, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.toggled.pressed.bg", - a_toggled_unfocused_pressed_tmp, TRUE, - a_unfocused_pressed_tmp); - - /* toggled hover */ - READ_APPEARANCE_COPY("window.active.button.toggled.hover.bg", - a_toggled_hover_focused_tmp, TRUE, - a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.toggled.hover.bg", - a_toggled_hover_unfocused_tmp, TRUE, - a_toggled_unfocused_unpressed_tmp); - - - /* now do individual buttons, if specified */ - - /* max button */ - read_button_colors(db, inst, theme, theme->btn_max, "max"); - - /* bases: unpressed, pressed, disabled */ - READ_APPEARANCE_COPY("window.active.button.max.unpressed.bg", - theme->btn_max->a_focused_unpressed, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.unpressed.bg", - theme->btn_max->a_unfocused_unpressed, TRUE, - a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.max.pressed.bg", - theme->btn_max->a_focused_pressed, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg", - theme->btn_max->a_unfocused_pressed, TRUE, - a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.max.disabled.bg", - theme->btn_max->a_disabled_focused, TRUE, - a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.disabled.bg", - theme->btn_max->a_disabled_unfocused, TRUE, - a_disabled_unfocused_tmp); - - /* hover */ - READ_APPEARANCE_COPY("window.active.button.max.hover.bg", - theme->btn_max->a_hover_focused, TRUE, - a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.hover.bg", - theme->btn_max->a_hover_unfocused, TRUE, - a_hover_unfocused_tmp); - - /* toggled unpressed */ - READ_APPEARANCE_("window.active.button.max.toggled.unpressed.bg", - "window.active.button.max.toggled.bg", - theme->btn_max->a_toggled_focused_unpressed, TRUE, - a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_("window.inactive.button.max.toggled.unpressed.bg", - "window.inactive.button.max.toggled.bg", - theme->btn_max->a_toggled_unfocused_unpressed, TRUE, - a_toggled_unfocused_unpressed_tmp); - - /* toggled pressed */ - READ_APPEARANCE_COPY("window.active.button.max.toggled.pressed.bg", - theme->btn_max->a_toggled_focused_pressed, TRUE, - a_toggled_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.toggled.pressed.bg", - theme->btn_max->a_toggled_unfocused_pressed, TRUE, - a_toggled_unfocused_pressed_tmp); - - /* toggled hover */ - READ_APPEARANCE_COPY("window.active.button.max.toggled.hover.bg", - theme->btn_max->a_toggled_hover_focused, TRUE, - a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.toggled.hover.bg", - theme->btn_max->a_toggled_hover_unfocused, TRUE, - a_toggled_hover_unfocused_tmp); - - /* close button */ - read_button_colors(db, inst, theme, theme->btn_close, "close"); - - READ_APPEARANCE_COPY("window.active.button.close.unpressed.bg", - theme->btn_close->a_focused_unpressed, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.unpressed.bg", - theme->btn_close->a_unfocused_unpressed, TRUE, - a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.close.pressed.bg", - theme->btn_close->a_focused_pressed, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.pressed.bg", - theme->btn_close->a_unfocused_pressed, TRUE, - a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.close.disabled.bg", - theme->btn_close->a_disabled_focused, TRUE, - a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.disabled.bg", - theme->btn_close->a_disabled_unfocused, TRUE, - a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.close.hover.bg", - theme->btn_close->a_hover_focused, TRUE, - a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.hover.bg", - theme->btn_close->a_hover_unfocused, TRUE, - a_hover_unfocused_tmp); - - /* desk button */ - read_button_colors(db, inst, theme, theme->btn_desk, "desk"); - - /* bases: unpressed, pressed, disabled */ - READ_APPEARANCE_COPY("window.active.button.desk.unpressed.bg", - theme->btn_desk->a_focused_unpressed, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.unpressed.bg", - theme->btn_desk->a_unfocused_unpressed, TRUE, - a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg", - theme->btn_desk->a_focused_pressed, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg", - theme->btn_desk->a_unfocused_pressed, TRUE, - a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.disabled.bg", - theme->btn_desk->a_disabled_focused, TRUE, - a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.disabled.bg", - theme->btn_desk->a_disabled_unfocused, TRUE, - a_disabled_unfocused_tmp); - - /* hover */ - READ_APPEARANCE_COPY("window.active.button.desk.hover.bg", - theme->btn_desk->a_hover_focused, TRUE, - a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.hover.bg", - theme->btn_desk->a_hover_unfocused, TRUE, - a_hover_unfocused_tmp); - - /* toggled unpressed */ - READ_APPEARANCE_("window.active.button.desk.toggled.unpressed.bg", - "window.active.button.desk.toggled.bg", - theme->btn_desk->a_toggled_focused_unpressed, TRUE, - a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_("window.inactive.button.desk.toggled.unpressed.bg", - "window.inactive.button.desk.toggled.bg", - theme->btn_desk->a_toggled_unfocused_unpressed, TRUE, - a_toggled_unfocused_unpressed_tmp); - - /* toggled pressed */ - READ_APPEARANCE_COPY("window.active.button.desk.toggled.pressed.bg", - theme->btn_desk->a_toggled_focused_pressed, TRUE, - a_toggled_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.pressed.bg", - theme->btn_desk->a_toggled_unfocused_pressed, TRUE, - a_toggled_unfocused_pressed_tmp); - - /* toggled hover */ - READ_APPEARANCE_COPY("window.active.button.desk.toggled.hover.bg", - theme->btn_desk->a_toggled_hover_focused, TRUE, - a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.hover.bg", - theme->btn_desk->a_toggled_hover_unfocused, TRUE, - a_toggled_hover_unfocused_tmp); - - /* shade button */ - read_button_colors(db, inst, theme, theme->btn_shade, "shade"); - - /* bases: unpressed, pressed, disabled */ - READ_APPEARANCE_COPY("window.active.button.shade.unpressed.bg", - theme->btn_shade->a_focused_unpressed, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.unpressed.bg", - theme->btn_shade->a_unfocused_unpressed, TRUE, - a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg", - theme->btn_shade->a_focused_pressed, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg", - theme->btn_shade->a_unfocused_pressed, TRUE, - a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.disabled.bg", - theme->btn_shade->a_disabled_focused, TRUE, - a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.disabled.bg", - theme->btn_shade->a_disabled_unfocused, TRUE, - a_disabled_unfocused_tmp); - - /* hover */ - READ_APPEARANCE_COPY("window.active.button.shade.hover.bg", - theme->btn_shade->a_hover_focused, TRUE, - a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.hover.bg", - theme->btn_shade->a_hover_unfocused, TRUE, - a_hover_unfocused_tmp); - - /* toggled unpressed */ - READ_APPEARANCE_("window.active.button.shade.toggled.unpressed.bg", - "window.active.button.shade.toggled.bg", - theme->btn_shade->a_toggled_focused_unpressed, TRUE, - a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_("window.inactive.button.shade.toggled.unpressed.bg", - "window.inactive.button.shade.toggled.bg", - theme->btn_shade->a_toggled_unfocused_unpressed, TRUE, - a_toggled_unfocused_unpressed_tmp); - - /* toggled pressed */ - READ_APPEARANCE_COPY("window.active.button.shade.toggled.pressed.bg", - theme->btn_shade->a_toggled_focused_pressed, TRUE, - a_toggled_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.pressed.bg", - theme->btn_shade->a_toggled_unfocused_pressed, TRUE, - a_toggled_unfocused_pressed_tmp); - - /* toggled hover */ - READ_APPEARANCE_COPY("window.active.button.shade.toggled.hover.bg", - theme->btn_shade->a_toggled_hover_focused, TRUE, - a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.hover.bg", - theme->btn_shade->a_toggled_hover_unfocused, TRUE, - a_toggled_hover_unfocused_tmp); - - /* iconify button */ - read_button_colors(db, inst, theme, theme->btn_iconify, "iconify"); - - READ_APPEARANCE_COPY("window.active.button.iconify.unpressed.bg", - theme->btn_iconify->a_focused_unpressed, TRUE, - a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.unpressed.bg", - theme->btn_iconify->a_unfocused_unpressed, TRUE, - a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.iconify.pressed.bg", - theme->btn_iconify->a_focused_pressed, TRUE, - a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.pressed.bg", - theme->btn_iconify->a_unfocused_pressed, TRUE, - a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.iconify.disabled.bg", - theme->btn_iconify->a_disabled_focused, TRUE, - a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.disabled.bg", - theme->btn_iconify->a_disabled_unfocused, TRUE, - a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.iconify.hover.bg", - theme->btn_iconify->a_hover_focused, TRUE, - a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.hover.bg", - theme->btn_iconify->a_hover_unfocused, TRUE, - a_hover_unfocused_tmp); - /* osd buttons */ - READ_APPEARANCE_COPY("osd.button.unpressed.bg", theme->osd_unpressed_button, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY_TEXTURES("osd.button.pressed.bg", theme->osd_pressed_button, TRUE, a_focused_pressed_tmp, 5); - READ_APPEARANCE_COPY_TEXTURES("osd.button.focused.bg", theme->osd_focused_button, TRUE, a_focused_unpressed_tmp, 5); + READ_APPEARANCE_COPY("osd.button.unpressed.bg", theme->osd_unpressed_button, TRUE, fbs.focused_unpressed); + READ_APPEARANCE_COPY_TEXTURES("osd.button.pressed.bg", theme->osd_pressed_button, TRUE, fbs.focused_pressed, 5); + READ_APPEARANCE_COPY_TEXTURES("osd.button.focused.bg", theme->osd_focused_button, TRUE, fbs.focused_unpressed, 5); theme->a_icon->surface.grad = theme->a_clear->surface.grad = @@ -937,8 +638,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_focused_label->texture[0].data.text.shadow_offset_x = i; theme->a_focused_label->texture[0].data.text.shadow_offset_y = i; } - if ((p = strstr(str, "shadowtint="))) - { + if ((p = strstr(str, "shadowtint="))) { i = parse_inline_number(p + strlen("shadowtint=")); j = (i > 0 ? 0 : 255); i = ABS(i*255/100); @@ -951,17 +651,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, } } - theme->a_focused_label->texture[0].data.text.shadow_color = - theme->title_focused_shadow_color; - theme->a_focused_label->texture[0].data.text.shadow_alpha = - theme->title_focused_shadow_alpha; + theme->a_focused_label->texture[0].data.text.shadow_color = theme->title_focused_shadow_color; + theme->a_focused_label->texture[0].data.text.shadow_alpha = theme->title_focused_shadow_alpha; theme->osd_hilite_label->texture[0].type = RR_TEXTURE_TEXT; theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; - theme->osd_hilite_label->texture[0].data.text.font = - theme->osd_font_hilite; - theme->osd_hilite_label->texture[0].data.text.color = - theme->osd_text_active_color; + theme->osd_hilite_label->texture[0].data.text.font = theme->osd_font_hilite; + theme->osd_hilite_label->texture[0].data.text.color = theme->osd_text_active_color; if (read_string(db, "osd.active.label.text.font", &str) || read_string(db, "osd.label.text.font", &str)) @@ -977,8 +673,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_hilite_label->texture[0].data.text.shadow_offset_x = i; theme->osd_hilite_label->texture[0].data.text.shadow_offset_y = i; } - if ((p = strstr(str, "shadowtint="))) - { + if ((p = strstr(str, "shadowtint="))) { i = parse_inline_number(p + strlen("shadowtint=")); j = (i > 0 ? 0 : 255); i = ABS(i*255/100); @@ -1045,10 +740,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_unfocused_label->texture[0].type = RR_TEXTURE_TEXT; theme->a_unfocused_label->texture[0].data.text.justify = winjust; - theme->a_unfocused_label->texture[0].data.text.font = - theme->win_font_unfocused; - theme->a_unfocused_label->texture[0].data.text.color = - theme->title_unfocused_color; + theme->a_unfocused_label->texture[0].data.text.font = theme->win_font_unfocused; + theme->a_unfocused_label->texture[0].data.text.color = theme->title_unfocused_color; if (read_string(db, "window.inactive.label.text.font", &str)) { char *p; @@ -1062,8 +755,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_unfocused_label->texture[0].data.text.shadow_offset_x = i; theme->a_unfocused_label->texture[0].data.text.shadow_offset_y = i; } - if ((p = strstr(str, "shadowtint="))) - { + if ((p = strstr(str, "shadowtint="))) { i = parse_inline_number(p + strlen("shadowtint=")); j = (i > 0 ? 0 : 255); i = ABS(i*255/100); @@ -1088,8 +780,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_unhilite_label->texture[0].data.text.color = theme->osd_text_inactive_color; - if (read_string(db, "osd.inactive.label.text.font", &str)) - { + if (read_string(db, "osd.inactive.label.text.font", &str)) { char *p; gint i = 0; gint j; @@ -1101,8 +792,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_unhilite_label->texture[0].data.text.shadow_offset_x=i; theme->osd_unhilite_label->texture[0].data.text.shadow_offset_y=i; } - if ((p = strstr(str, "shadowtint="))) - { + if ((p = strstr(str, "shadowtint="))) { i = parse_inline_number(p + strlen("shadowtint=")); j = (i > 0 ? 0 : 255); i = ABS(i*255/100); @@ -1135,10 +825,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_menu_text_title->texture[0].type = RR_TEXTURE_TEXT; theme->a_menu_text_title->texture[0].data.text.justify = mtitlejust; - theme->a_menu_text_title->texture[0].data.text.font = - theme->menu_title_font; - theme->a_menu_text_title->texture[0].data.text.color = - theme->menu_title_color; + theme->a_menu_text_title->texture[0].data.text.font = theme->menu_title_font; + theme->a_menu_text_title->texture[0].data.text.color = theme->menu_title_color; if (read_string(db, "menu.title.text.font", &str)) { char *p; @@ -1152,24 +840,22 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_menu_text_title->texture[0].data.text.shadow_offset_x = i; theme->a_menu_text_title->texture[0].data.text.shadow_offset_y = i; } - if ((p = strstr(str, "shadowtint="))) - { + if ((p = strstr(str, "shadowtint="))) { i = parse_inline_number(p + strlen("shadowtint=")); j = (i > 0 ? 0 : 255); i = ABS(i*255/100); theme->menu_title_shadow_color = RrColorNew(inst, j, j, j); - theme->menu_title_shadow_alpha = i; } else { theme->menu_title_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_title_shadow_alpha = 50; + i = 50; } - } - theme->a_menu_text_title->texture[0].data.text.shadow_color = - theme->menu_title_shadow_color; - theme->a_menu_text_title->texture[0].data.text.shadow_alpha = - theme->menu_title_shadow_alpha; + theme->a_menu_text_title->texture[0].data.text.shadow_color = + theme->menu_title_shadow_color; + theme->a_menu_text_title->texture[0].data.text.shadow_alpha = + i; + } theme->a_menu_text_normal->texture[0].type = theme->a_menu_text_selected->texture[0].type = @@ -1220,313 +906,35 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_menu_text_disabled_selected-> texture[0].data.text.shadow_offset_y = i; } - if ((p = strstr(str, "shadowtint="))) - { + if ((p = strstr(str, "shadowtint="))) { i = parse_inline_number(p + strlen("shadowtint=")); j = (i > 0 ? 0 : 255); i = ABS(i*255/100); - theme->menu_text_normal_shadow_color = RrColorNew(inst, j, j, j); - theme->menu_text_selected_shadow_color = RrColorNew(inst, j, j, j); - theme->menu_text_disabled_shadow_color = RrColorNew(inst, j, j, j); - theme->menu_text_normal_shadow_alpha = i; - theme->menu_text_selected_shadow_alpha = i; - theme->menu_text_disabled_shadow_alpha = i; - theme->menu_text_disabled_selected_shadow_alpha = i; + theme->menu_text_shadow_color = RrColorNew(inst, j, j, j); } else { - theme->menu_text_normal_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_text_selected_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_text_disabled_shadow_color = RrColorNew(inst, 0, 0, 0); - theme->menu_text_normal_shadow_alpha = 50; - theme->menu_text_selected_shadow_alpha = 50; - theme->menu_text_disabled_selected_shadow_alpha = 50; + theme->menu_text_shadow_color = RrColorNew(inst, 0, 0, 0); + i = 50; } + + theme->a_menu_text_normal->texture[0].data.text.shadow_color = + theme->a_menu_text_selected->texture[0].data.text.shadow_color = + theme->a_menu_text_disabled->texture[0].data.text.shadow_color = + theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_color = + theme->menu_text_shadow_color; + + theme->a_menu_text_normal->texture[0].data.text.shadow_alpha = + theme->a_menu_text_selected->texture[0].data.text.shadow_alpha = + theme->a_menu_text_disabled->texture[0].data.text.shadow_alpha = + theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_alpha = + i; } - theme->a_menu_text_normal->texture[0].data.text.shadow_color = - theme->menu_text_normal_shadow_color; - theme->a_menu_text_normal->texture[0].data.text.shadow_alpha = - theme->menu_text_normal_shadow_alpha; - theme->a_menu_text_selected->texture[0].data.text.shadow_color = - theme->menu_text_selected_shadow_color; - theme->a_menu_text_selected->texture[0].data.text.shadow_alpha = - theme->menu_text_selected_shadow_alpha; - theme->a_menu_text_disabled->texture[0].data.text.shadow_color = - theme->menu_text_disabled_shadow_color; - theme->a_menu_text_disabled->texture[0].data.text.shadow_alpha = - theme->menu_text_disabled_shadow_alpha; - theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_color = - theme->menu_text_disabled_shadow_color; - theme->a_menu_text_disabled_selected->texture[0].data.text.shadow_alpha = - theme->menu_text_disabled_shadow_alpha; - - theme->btn_max->a_disabled_focused->texture[0].type = - theme->btn_max->a_disabled_unfocused->texture[0].type = - theme->btn_max->a_hover_focused->texture[0].type = - theme->btn_max->a_hover_unfocused->texture[0].type = - theme->btn_max->a_toggled_hover_focused->texture[0].type = - theme->btn_max->a_toggled_hover_unfocused->texture[0].type = - theme->btn_max->a_toggled_focused_unpressed->texture[0].type = - theme->btn_max->a_toggled_unfocused_unpressed->texture[0].type = - theme->btn_max->a_toggled_focused_pressed->texture[0].type = - theme->btn_max->a_toggled_unfocused_pressed->texture[0].type = - theme->btn_max->a_focused_unpressed->texture[0].type = - theme->btn_max->a_focused_pressed->texture[0].type = - theme->btn_max->a_unfocused_unpressed->texture[0].type = - theme->btn_max->a_unfocused_pressed->texture[0].type = - theme->btn_close->a_disabled_focused->texture[0].type = - theme->btn_close->a_disabled_unfocused->texture[0].type = - theme->btn_close->a_hover_focused->texture[0].type = - theme->btn_close->a_hover_unfocused->texture[0].type = - theme->btn_close->a_focused_unpressed->texture[0].type = - theme->btn_close->a_focused_pressed->texture[0].type = - theme->btn_close->a_unfocused_unpressed->texture[0].type = - theme->btn_close->a_unfocused_pressed->texture[0].type = - theme->btn_desk->a_disabled_focused->texture[0].type = - theme->btn_desk->a_disabled_unfocused->texture[0].type = - theme->btn_desk->a_hover_focused->texture[0].type = - theme->btn_desk->a_hover_unfocused->texture[0].type = - theme->btn_desk->a_toggled_hover_focused->texture[0].type = - theme->btn_desk->a_toggled_hover_unfocused->texture[0].type = - theme->btn_desk->a_toggled_focused_unpressed->texture[0].type = - theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].type = - theme->btn_desk->a_toggled_focused_pressed->texture[0].type = - theme->btn_desk->a_toggled_unfocused_pressed->texture[0].type = - theme->btn_desk->a_focused_unpressed->texture[0].type = - theme->btn_desk->a_focused_pressed->texture[0].type = - theme->btn_desk->a_unfocused_unpressed->texture[0].type = - theme->btn_desk->a_unfocused_pressed->texture[0].type = - theme->btn_shade->a_disabled_focused->texture[0].type = - theme->btn_shade->a_disabled_unfocused->texture[0].type = - theme->btn_shade->a_hover_focused->texture[0].type = - theme->btn_shade->a_hover_unfocused->texture[0].type = - theme->btn_shade->a_toggled_hover_focused->texture[0].type = - theme->btn_shade->a_toggled_hover_unfocused->texture[0].type = - theme->btn_shade->a_toggled_focused_unpressed->texture[0].type = - theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].type = - theme->btn_shade->a_toggled_focused_pressed->texture[0].type = - theme->btn_shade->a_toggled_unfocused_pressed->texture[0].type = - theme->btn_shade->a_focused_unpressed->texture[0].type = - theme->btn_shade->a_focused_pressed->texture[0].type = - theme->btn_shade->a_unfocused_unpressed->texture[0].type = - theme->btn_shade->a_unfocused_pressed->texture[0].type = - theme->btn_iconify->a_disabled_focused->texture[0].type = - theme->btn_iconify->a_disabled_unfocused->texture[0].type = - theme->btn_iconify->a_hover_focused->texture[0].type = - theme->btn_iconify->a_hover_unfocused->texture[0].type = - theme->btn_iconify->a_focused_unpressed->texture[0].type = - theme->btn_iconify->a_focused_pressed->texture[0].type = - theme->btn_iconify->a_unfocused_unpressed->texture[0].type = - theme->btn_iconify->a_unfocused_pressed->texture[0].type = - theme->a_menu_bullet_normal->texture[0].type = + theme->a_menu_bullet_normal->texture[0].type = theme->a_menu_bullet_selected->texture[0].type = RR_TEXTURE_MASK; - - theme->btn_max->a_disabled_focused->texture[0].data.mask.mask = - theme->btn_max->a_disabled_unfocused->texture[0].data.mask.mask = - theme->btn_max->disabled_mask; - theme->btn_max->a_hover_focused->texture[0].data.mask.mask = - theme->btn_max->a_hover_unfocused->texture[0].data.mask.mask = - theme->btn_max->hover_mask; - theme->btn_max->a_focused_pressed->texture[0].data.mask.mask = - theme->btn_max->a_unfocused_pressed->texture[0].data.mask.mask = - theme->btn_max->pressed_mask; - theme->btn_max->a_focused_unpressed->texture[0].data.mask.mask = - theme->btn_max->a_unfocused_unpressed->texture[0].data.mask.mask = - theme->btn_max->mask; - theme->btn_max->a_toggled_hover_focused->texture[0].data.mask.mask = - theme->btn_max->a_toggled_hover_unfocused->texture[0].data.mask.mask = - theme->btn_max->toggled_hover_mask; - theme->btn_max->a_toggled_focused_unpressed->texture[0].data.mask.mask = - theme->btn_max->a_toggled_unfocused_unpressed-> - texture[0].data.mask.mask = theme->btn_max->toggled_mask; - theme->btn_max->a_toggled_focused_pressed->texture[0].data.mask.mask = - theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.mask - = theme->btn_max->toggled_pressed_mask; - theme->btn_close->a_disabled_focused->texture[0].data.mask.mask = - theme->btn_close->a_disabled_unfocused->texture[0].data.mask.mask = - theme->btn_close->disabled_mask; - theme->btn_close->a_hover_focused->texture[0].data.mask.mask = - theme->btn_close->a_hover_unfocused->texture[0].data.mask.mask = - theme->btn_close->hover_mask; - theme->btn_close->a_focused_pressed->texture[0].data.mask.mask = - theme->btn_close->a_unfocused_pressed->texture[0].data.mask.mask = - theme->btn_close->pressed_mask; - theme->btn_close->a_focused_unpressed->texture[0].data.mask.mask = - theme->btn_close->a_unfocused_unpressed->texture[0].data.mask.mask = - theme->btn_close->mask; - theme->btn_desk->a_disabled_focused->texture[0].data.mask.mask = - theme->btn_desk->a_disabled_unfocused->texture[0].data.mask.mask = - theme->btn_desk->disabled_mask; - theme->btn_desk->a_hover_focused->texture[0].data.mask.mask = - theme->btn_desk->a_hover_unfocused->texture[0].data.mask.mask = - theme->btn_desk->hover_mask; - theme->btn_desk->a_focused_pressed->texture[0].data.mask.mask = - theme->btn_desk->a_unfocused_pressed->texture[0].data.mask.mask = - theme->btn_desk->pressed_mask; - theme->btn_desk->a_focused_unpressed->texture[0].data.mask.mask = - theme->btn_desk->a_unfocused_unpressed->texture[0].data.mask.mask = - theme->btn_desk->mask; - theme->btn_desk->a_toggled_hover_focused->texture[0].data.mask.mask = - theme->btn_desk->a_toggled_hover_unfocused->texture[0].data.mask.mask = - theme->btn_desk->toggled_hover_mask; - theme->btn_desk->a_toggled_focused_unpressed->texture[0].data.mask.mask = - theme->btn_desk->a_toggled_unfocused_unpressed-> - texture[0].data.mask.mask = theme->btn_desk->toggled_mask; - theme->btn_desk->a_toggled_focused_pressed->texture[0].data.mask.mask = - theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.mask - = theme->btn_desk->toggled_pressed_mask; - theme->btn_shade->a_disabled_focused->texture[0].data.mask.mask = - theme->btn_shade->a_disabled_unfocused->texture[0].data.mask.mask = - theme->btn_shade->disabled_mask; - theme->btn_shade->a_hover_focused->texture[0].data.mask.mask = - theme->btn_shade->a_hover_unfocused->texture[0].data.mask.mask = - theme->btn_shade->hover_mask; - theme->btn_shade->a_focused_pressed->texture[0].data.mask.mask = - theme->btn_shade->a_unfocused_pressed->texture[0].data.mask.mask = - theme->btn_shade->pressed_mask; - theme->btn_shade->a_focused_unpressed->texture[0].data.mask.mask = - theme->btn_shade->a_unfocused_unpressed->texture[0].data.mask.mask = - theme->btn_shade->mask; - theme->btn_shade->a_toggled_hover_focused->texture[0].data.mask.mask = - theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.mask - = theme->btn_shade->toggled_hover_mask; - theme->btn_shade->a_toggled_focused_unpressed->texture[0].data.mask.mask = - theme->btn_shade->a_toggled_unfocused_unpressed-> - texture[0].data.mask.mask = theme->btn_shade->toggled_mask; - theme->btn_shade->a_toggled_focused_pressed->texture[0].data.mask.mask = - theme->btn_shade->a_toggled_unfocused_pressed-> - texture[0].data.mask.mask = theme->btn_shade->toggled_pressed_mask; - theme->btn_iconify->a_disabled_focused->texture[0].data.mask.mask = - theme->btn_iconify->a_disabled_unfocused->texture[0].data.mask.mask = - theme->btn_iconify->disabled_mask; - theme->btn_iconify->a_hover_focused->texture[0].data.mask.mask = - theme->btn_iconify->a_hover_unfocused->texture[0].data.mask.mask = - theme->btn_iconify->hover_mask; - theme->btn_iconify->a_focused_pressed->texture[0].data.mask.mask = - theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.mask = - theme->btn_iconify->pressed_mask; - theme->btn_iconify->a_focused_unpressed->texture[0].data.mask.mask = - theme->btn_iconify->a_unfocused_unpressed->texture[0].data.mask.mask = - theme->btn_iconify->mask; theme->a_menu_bullet_normal->texture[0].data.mask.mask = theme->a_menu_bullet_selected->texture[0].data.mask.mask = theme->menu_bullet_mask; - theme->btn_max->a_disabled_focused->texture[0].data.mask.color = - theme->btn_max->disabled_focused_color; - theme->btn_close->a_disabled_focused->texture[0].data.mask.color = - theme->btn_close->disabled_focused_color; - theme->btn_desk->a_disabled_focused->texture[0].data.mask.color = - theme->btn_desk->disabled_focused_color; - theme->btn_shade->a_disabled_focused->texture[0].data.mask.color = - theme->btn_shade->disabled_focused_color; - theme->btn_iconify->a_disabled_focused->texture[0].data.mask.color = - theme->btn_iconify->disabled_focused_color; - theme->btn_max->a_disabled_unfocused->texture[0].data.mask.color = - theme->btn_max->disabled_unfocused_color; - theme->btn_close->a_disabled_unfocused->texture[0].data.mask.color = - theme->btn_close->disabled_unfocused_color; - theme->btn_desk->a_disabled_unfocused->texture[0].data.mask.color = - theme->btn_desk->disabled_unfocused_color; - theme->btn_shade->a_disabled_unfocused->texture[0].data.mask.color = - theme->btn_shade->disabled_unfocused_color; - theme->btn_iconify->a_disabled_unfocused->texture[0].data.mask.color = - theme->btn_iconify->disabled_unfocused_color; - theme->btn_max->a_hover_focused->texture[0].data.mask.color = - theme->btn_max->hover_focused_color; - theme->btn_close->a_hover_focused->texture[0].data.mask.color = - theme->btn_close->hover_focused_color; - theme->btn_desk->a_hover_focused->texture[0].data.mask.color = - theme->btn_desk->hover_focused_color; - theme->btn_shade->a_hover_focused->texture[0].data.mask.color = - theme->btn_shade->hover_focused_color; - theme->btn_iconify->a_hover_focused->texture[0].data.mask.color = - theme->btn_iconify->hover_focused_color; - theme->btn_max->a_hover_unfocused->texture[0].data.mask.color = - theme->btn_max->hover_unfocused_color; - theme->btn_close->a_hover_unfocused->texture[0].data.mask.color = - theme->btn_close->hover_unfocused_color; - theme->btn_desk->a_hover_unfocused->texture[0].data.mask.color = - theme->btn_desk->hover_unfocused_color; - theme->btn_shade->a_hover_unfocused->texture[0].data.mask.color = - theme->btn_shade->hover_unfocused_color; - theme->btn_iconify->a_hover_unfocused->texture[0].data.mask.color = - theme->btn_iconify->hover_unfocused_color; - theme->btn_max->a_toggled_hover_focused->texture[0].data.mask.color = - theme->btn_max->toggled_hover_focused_color; - theme->btn_desk->a_toggled_hover_focused->texture[0].data.mask.color = - theme->btn_desk->toggled_hover_focused_color; - theme->btn_shade->a_toggled_hover_focused->texture[0].data.mask.color = - theme->btn_shade->toggled_hover_focused_color; - theme->btn_max->a_toggled_hover_unfocused->texture[0].data.mask.color = - theme->btn_max->toggled_hover_unfocused_color; - theme->btn_desk->a_toggled_hover_unfocused->texture[0].data.mask.color = - theme->btn_desk->toggled_hover_unfocused_color; - theme->btn_shade->a_toggled_hover_unfocused->texture[0].data.mask.color = - theme->btn_shade->toggled_hover_unfocused_color; - theme->btn_max->a_toggled_focused_unpressed->texture[0].data.mask.color = - theme->btn_max->toggled_focused_unpressed_color; - theme->btn_desk->a_toggled_focused_unpressed->texture[0].data.mask.color = - theme->btn_desk->toggled_focused_unpressed_color; - theme->btn_shade->a_toggled_focused_unpressed->texture[0].data.mask.color = - theme->btn_shade->toggled_focused_unpressed_color; - theme->btn_max->a_toggled_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_max->toggled_unfocused_unpressed_color; - theme->btn_desk->a_toggled_unfocused_unpressed->texture[0].data.mask.color - = theme->btn_desk->toggled_unfocused_unpressed_color; - theme->btn_shade->a_toggled_unfocused_unpressed->texture[0].data.mask.color - = theme->btn_shade->toggled_unfocused_unpressed_color; - theme->btn_max->a_toggled_focused_pressed->texture[0].data.mask.color = - theme->btn_max->toggled_focused_pressed_color; - theme->btn_desk->a_toggled_focused_pressed->texture[0].data.mask.color = - theme->btn_desk->toggled_focused_pressed_color; - theme->btn_shade->a_toggled_focused_pressed->texture[0].data.mask.color = - theme->btn_shade->toggled_focused_pressed_color; - theme->btn_max->a_toggled_unfocused_pressed->texture[0].data.mask.color = - theme->btn_max->toggled_unfocused_pressed_color; - theme->btn_desk->a_toggled_unfocused_pressed->texture[0].data.mask.color = - theme->btn_desk->toggled_unfocused_pressed_color; - theme->btn_shade->a_toggled_unfocused_pressed->texture[0].data.mask.color = - theme->btn_shade->toggled_unfocused_pressed_color; - theme->btn_max->a_focused_unpressed->texture[0].data.mask.color = - theme->btn_max->focused_unpressed_color; - theme->btn_close->a_focused_unpressed->texture[0].data.mask.color = - theme->btn_close->focused_unpressed_color; - theme->btn_desk->a_focused_unpressed->texture[0].data.mask.color = - theme->btn_desk->focused_unpressed_color; - theme->btn_shade->a_focused_unpressed->texture[0].data.mask.color = - theme->btn_shade->focused_unpressed_color; - theme->btn_iconify->a_focused_unpressed->texture[0].data.mask.color = - theme->btn_iconify->focused_unpressed_color; - theme->btn_max->a_focused_pressed->texture[0].data.mask.color = - theme->btn_max->focused_pressed_color; - theme->btn_close->a_focused_pressed->texture[0].data.mask.color = - theme->btn_close->focused_pressed_color; - theme->btn_desk->a_focused_pressed->texture[0].data.mask.color = - theme->btn_desk->focused_pressed_color; - theme->btn_shade->a_focused_pressed->texture[0].data.mask.color = - theme->btn_shade->focused_pressed_color; - theme->btn_iconify->a_focused_pressed->texture[0].data.mask.color = - theme->btn_iconify->focused_pressed_color; - theme->btn_max->a_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_max->unfocused_unpressed_color; - theme->btn_close->a_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_close->unfocused_unpressed_color; - theme->btn_desk->a_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_desk->unfocused_unpressed_color; - theme->btn_shade->a_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_shade->unfocused_unpressed_color; - theme->btn_iconify->a_unfocused_unpressed->texture[0].data.mask.color = - theme->btn_iconify->unfocused_unpressed_color; - theme->btn_max->a_unfocused_pressed->texture[0].data.mask.color = - theme->btn_max->unfocused_pressed_color; - theme->btn_close->a_unfocused_pressed->texture[0].data.mask.color = - theme->btn_close->unfocused_pressed_color; - theme->btn_desk->a_unfocused_pressed->texture[0].data.mask.color = - theme->btn_desk->unfocused_pressed_color; - theme->btn_shade->a_unfocused_pressed->texture[0].data.mask.color = - theme->btn_shade->unfocused_pressed_color; - theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.color = - theme->btn_iconify->unfocused_pressed_color; theme->a_menu_bullet_normal->texture[0].data.mask.color = theme->menu_bullet_color; theme->a_menu_bullet_selected->texture[0].data.mask.color = @@ -1536,20 +944,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, XrmDestroyDatabase(db); /* set the font heights */ - theme->win_font_height = RrFontHeight - (theme->win_font_focused, - theme->a_focused_label->texture[0].data.text.shadow_offset_y); + theme->win_font_height = RrFontHeight(theme->win_font_focused, + theme->a_focused_label->texture[0].data.text.shadow_offset_y); theme->win_font_height = MAX(theme->win_font_height, - RrFontHeight - (theme->win_font_focused, - theme->a_unfocused_label->texture[0].data.text.shadow_offset_y)); - theme->menu_title_font_height = RrFontHeight - (theme->menu_title_font, - theme->a_menu_text_title->texture[0].data.text.shadow_offset_y); - theme->menu_font_height = RrFontHeight - (theme->menu_font, - theme->a_menu_text_normal->texture[0].data.text.shadow_offset_y); + RrFontHeight(theme->win_font_focused, + theme->a_unfocused_label->texture[0].data.text.shadow_offset_y)); + theme->menu_title_font_height = RrFontHeight(theme->menu_title_font, + theme->a_menu_text_title->texture[0].data.text.shadow_offset_y); + theme->menu_font_height = RrFontHeight(theme->menu_font, + theme->a_menu_text_normal->texture[0].data.text.shadow_offset_y); /* calculate some last extents */ { @@ -1581,20 +985,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->button_size = theme->label_height - 2; theme->grip_width = 25; - RrAppearanceFree(a_disabled_focused_tmp); - RrAppearanceFree(a_disabled_unfocused_tmp); - RrAppearanceFree(a_hover_focused_tmp); - RrAppearanceFree(a_hover_unfocused_tmp); - RrAppearanceFree(a_focused_unpressed_tmp); - RrAppearanceFree(a_focused_pressed_tmp); - RrAppearanceFree(a_unfocused_unpressed_tmp); - RrAppearanceFree(a_unfocused_pressed_tmp); - RrAppearanceFree(a_toggled_hover_focused_tmp); - RrAppearanceFree(a_toggled_hover_unfocused_tmp); - RrAppearanceFree(a_toggled_focused_unpressed_tmp); - RrAppearanceFree(a_toggled_focused_pressed_tmp); - RrAppearanceFree(a_toggled_unfocused_unpressed_tmp); - RrAppearanceFree(a_toggled_unfocused_pressed_tmp); + RrAppearanceFree(fbs.focused_disabled); + RrAppearanceFree(fbs.unfocused_disabled); + RrAppearanceFree(fbs.focused_hover); + RrAppearanceFree(fbs.unfocused_hover); + RrAppearanceFree(fbs.focused_unpressed); + RrAppearanceFree(fbs.focused_pressed); + RrAppearanceFree(fbs.unfocused_unpressed); + RrAppearanceFree(fbs.unfocused_pressed); + RrAppearanceFree(fbs.focused_hover_toggled); + RrAppearanceFree(fbs.unfocused_hover_toggled); + RrAppearanceFree(fbs.focused_unpressed_toggled); + RrAppearanceFree(fbs.focused_pressed_toggled); + RrAppearanceFree(fbs.unfocused_unpressed_toggled); + RrAppearanceFree(fbs.unfocused_pressed_toggled); return theme; } @@ -1622,16 +1026,16 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->cb_focused_color); RrColorFree(theme->title_focused_color); RrColorFree(theme->title_unfocused_color); - RrColorFree(theme->titlebut_disabled_focused_color); - RrColorFree(theme->titlebut_disabled_unfocused_color); - RrColorFree(theme->titlebut_hover_focused_color); - RrColorFree(theme->titlebut_hover_unfocused_color); - RrColorFree(theme->titlebut_toggled_hover_focused_color); - RrColorFree(theme->titlebut_toggled_hover_unfocused_color); - RrColorFree(theme->titlebut_toggled_focused_pressed_color); - RrColorFree(theme->titlebut_toggled_unfocused_pressed_color); - RrColorFree(theme->titlebut_toggled_focused_unpressed_color); - RrColorFree(theme->titlebut_toggled_unfocused_unpressed_color); + RrColorFree(theme->titlebut_focused_disabled_color); + RrColorFree(theme->titlebut_unfocused_disabled_color); + RrColorFree(theme->titlebut_focused_hover_color); + RrColorFree(theme->titlebut_unfocused_hover_color); + RrColorFree(theme->titlebut_focused_hover_toggled_color); + RrColorFree(theme->titlebut_unfocused_hover_toggled_color); + RrColorFree(theme->titlebut_focused_pressed_toggled_color); + RrColorFree(theme->titlebut_unfocused_pressed_toggled_color); + RrColorFree(theme->titlebut_focused_unpressed_toggled_color); + RrColorFree(theme->titlebut_unfocused_unpressed_toggled_color); RrColorFree(theme->titlebut_focused_pressed_color); RrColorFree(theme->titlebut_unfocused_pressed_color); RrColorFree(theme->titlebut_focused_unpressed_color); @@ -1656,10 +1060,7 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->osd_pressed_lineart); RrColorFree(theme->osd_focused_lineart); RrColorFree(theme->menu_title_shadow_color); - RrColorFree(theme->menu_text_normal_shadow_color); - RrColorFree(theme->menu_text_selected_shadow_color); - RrColorFree(theme->menu_text_disabled_shadow_color); - RrColorFree(theme->menu_text_disabled_selected_shadow_color); + RrColorFree(theme->menu_text_shadow_color); g_free(theme->def_win_icon); @@ -1834,8 +1235,7 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst, } static gboolean read_mask(const RrInstance *inst, const gchar *path, - RrTheme *theme, const gchar *maskname, - RrPixmapMask **value) + const gchar *maskname, RrPixmapMask **value) { gboolean ret = FALSE; gchar *s; @@ -2061,110 +1461,79 @@ static RrPixel32* read_c_image(gint width, gint height, const guint8 *data) return im; } -static void read_button_colors(XrmDatabase db, const RrInstance *inst, +static void read_button_styles(XrmDatabase db, const RrInstance *inst, + gchar *path, const RrTheme *theme, RrButton *btn, - const gchar *btnname) + const gchar *btnname, + struct fallbacks *fbs, + guchar *normal_mask, + guchar *toggled_mask) { - gchar *name; - - /* active unpressed */ - name = g_strdup_printf("window.active.button.%s.unpressed.image.color", - btnname); - READ_COLOR(name, btn->focused_unpressed_color, - RrColorCopy(theme->titlebut_focused_unpressed_color)); - g_free(name); - - /* inactive unpressed */ - name = g_strdup_printf("window.inactive.button.%s.unpressed.image.color", - btnname); - READ_COLOR(name, btn->unfocused_unpressed_color, - RrColorCopy(theme->titlebut_unfocused_unpressed_color)); - g_free(name); + gchar name[128], name2[128]; + gboolean userdef = TRUE; - /* active pressed */ - name = g_strdup_printf("window.active.button.%s.pressed.image.color", - btnname); - READ_COLOR(name, btn->focused_pressed_color, - RrColorCopy(theme->titlebut_focused_pressed_color)); - g_free(name); + g_snprintf(name, 128, "%s.xbm", btnname); + if (!read_mask(inst, path, name, &btn->unpressed_mask) && normal_mask) + { + btn->unpressed_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)normal_mask); + userdef = FALSE; + } + g_snprintf(name, 128, "%s_toggled.xbm", btnname); + if (toggled_mask && !read_mask(inst, path, name, &btn->unpressed_toggled_mask)) + { + if (userdef) + btn->unpressed_toggled_mask = RrPixmapMaskCopy(btn->unpressed_mask); + else + btn->unpressed_toggled_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)toggled_mask); + } +#define READ_BUTTON_MASK_COPY(type, fallback) \ + g_snprintf(name, 128, "%s_" #type ".xbm", btnname); \ + READ_MASK_COPY(name, btn->type##_mask, fallback); + + READ_BUTTON_MASK_COPY(pressed, btn->unpressed_mask); + READ_BUTTON_MASK_COPY(disabled, btn->unpressed_mask); + READ_BUTTON_MASK_COPY(hover, btn->unpressed_mask); + if (toggled_mask) { + READ_BUTTON_MASK_COPY(pressed_toggled, btn->unpressed_toggled_mask); + READ_BUTTON_MASK_COPY(hover_toggled, btn->unpressed_toggled_mask); + } - /* inactive pressed */ - name = g_strdup_printf("window.inactive.button.%s.pressed.image.color", - btnname); - READ_COLOR(name, btn->unfocused_pressed_color, - RrColorCopy(theme->titlebut_unfocused_pressed_color)); - g_free(name); - - /* active disabled */ - name = g_strdup_printf("window.active.button.%s.disabled.image.color", - btnname); - READ_COLOR(name, btn->disabled_focused_color, - RrColorCopy(theme->titlebut_disabled_focused_color)); - g_free(name); - - /* inactive disabled */ - name = g_strdup_printf("window.inactive.button.%s.disabled.image.color", - btnname); - READ_COLOR(name, btn->disabled_unfocused_color, - RrColorCopy(theme->titlebut_disabled_unfocused_color)); - g_free(name); - - /* active hover */ - name = g_strdup_printf("window.active.button.%s.hover.image.color", - btnname); - READ_COLOR(name, btn->hover_focused_color, - RrColorCopy(theme->titlebut_hover_focused_color)); - g_free(name); - - /* inactive hover */ - name = g_strdup_printf("window.inactive.button.%s.hover.image.color", - btnname); - READ_COLOR(name, btn->hover_unfocused_color, - RrColorCopy(theme->titlebut_hover_unfocused_color)); - g_free(name); - - /* active toggled unpressed */ - name = g_strdup_printf("window.active.button.%s.toggled." - "unpressed.image.color", btnname); - READ_COLOR(name, btn->toggled_focused_unpressed_color, - RrColorCopy(theme->titlebut_toggled_focused_unpressed_color)); - g_free(name); - - /* inactive toggled unpressed */ - name = g_strdup_printf("window.inactive.button.%s.toggled." - "unpressed.image.color", btnname); - READ_COLOR(name, btn->toggled_unfocused_unpressed_color, - RrColorCopy(theme->titlebut_toggled_unfocused_unpressed_color)); - g_free(name); - - /* active toggled hover */ - name = g_strdup_printf("window.active.button.%s.toggled.hover.image.color", - btnname); - READ_COLOR(name, btn->toggled_hover_focused_color, - RrColorCopy(theme->titlebut_toggled_hover_focused_color)); - - g_free(name); - - /* inactive toggled hover */ - name = g_strdup_printf("window.inactive.button.%s.toggled.hover." - "image.color", btnname); - READ_COLOR(name, btn->toggled_hover_unfocused_color, - RrColorCopy(theme->titlebut_toggled_hover_unfocused_color)); - g_free(name); - - /* active toggled pressed */ - name = g_strdup_printf("window.active.button.%s.toggled.pressed." - "image.color", btnname); - READ_COLOR(name, btn->toggled_focused_pressed_color, - RrColorCopy(theme->titlebut_toggled_focused_pressed_color)); - g_free(name); - - /* inactive toggled pressed */ - name = g_strdup_printf("window.inactive.button.%s.toggled.pressed." - "image.color", btnname); - READ_COLOR(name, btn->toggled_unfocused_pressed_color, - RrColorCopy(theme->titlebut_toggled_unfocused_pressed_color)); - g_free(name); +#define READ_BUTTON_APPEARANCE(typedots, type, fallback) \ + g_snprintf(name, 128, "window.active.button.%s." typedots ".image.color", btnname); \ + READ_COLOR(name, btn->focused_##type##_color, RrColorCopy(theme->titlebut_focused_##type##_color)); \ + g_snprintf(name, 128, "window.inactive.button.%s." typedots ".image.color", btnname); \ + READ_COLOR(name, btn->unfocused_##type##_color, RrColorCopy(theme->titlebut_unfocused_##type##_color)); \ + if (fallback) { \ + g_snprintf(name, 128, "window.active.button.%s." typedots ".bg", btnname); \ + g_snprintf(name2, 128, "window.active.button.%s.toggled.bg", btnname); \ + READ_APPEARANCE_(name, name2, btn->a_focused_##type, TRUE, fbs->focused_##type); \ + g_snprintf(name, 128, "window.inactive.button.%s." typedots ".bg", btnname); \ + g_snprintf(name2, 128, "window.inactive.button.%s.toggled.bg", btnname); \ + READ_APPEARANCE_(name, name2, btn->a_unfocused_##type, TRUE, fbs->unfocused_##type); \ + } else { \ + g_snprintf(name, 128, "window.active.button.%s." typedots ".bg", btnname); \ + READ_APPEARANCE_COPY(name, btn->a_focused_##type, TRUE, fbs->focused_##type); \ + g_snprintf(name, 128, "window.inactive.button.%s." typedots ".bg", btnname); \ + READ_APPEARANCE_COPY(name, btn->a_unfocused_##type, TRUE, fbs->unfocused_##type); \ + } \ + btn->a_unfocused_##type->texture[0].typ##e = \ + btn->a_focused_##type->texture[0].typ##e = \ + RR_TEXTURE_MASK; \ + btn->a_unfocused_##type->texture[0].data.mask.mask = \ + btn->a_focused_##type->texture[0].data.mask.mask = \ + btn->type##_mask; \ + btn->a_unfocused_##type->texture[0].data.mask.color = \ + btn->unfocused_##type##_color; \ + btn->a_focused_##type->texture[0].data.mask.color = \ + btn->focused_##type##_color; + + READ_BUTTON_APPEARANCE("unpressed", unpressed, 0); + READ_BUTTON_APPEARANCE("pressed", pressed, 0); + READ_BUTTON_APPEARANCE("disabled", disabled, 0); + READ_BUTTON_APPEARANCE("hover", hover, 0); + if (toggled_mask) { + READ_BUTTON_APPEARANCE("unpressed.toggled", unpressed_toggled, 1); + READ_BUTTON_APPEARANCE("pressed.toggled", pressed_toggled, 0); + READ_BUTTON_APPEARANCE("hover.toggled", hover_toggled, 0); + } } - - diff --git a/obrender/theme.h b/obrender/theme.h index eb9ac3f9..8797f0b6 100644 --- a/obrender/theme.h +++ b/obrender/theme.h @@ -76,16 +76,16 @@ struct _RrTheme { RrColor *cb_unfocused_color; RrColor *title_focused_color; RrColor *title_unfocused_color; - RrColor *titlebut_disabled_focused_color; - RrColor *titlebut_disabled_unfocused_color; - RrColor *titlebut_hover_focused_color; - RrColor *titlebut_hover_unfocused_color; - RrColor *titlebut_toggled_hover_focused_color; - RrColor *titlebut_toggled_hover_unfocused_color; - RrColor *titlebut_toggled_focused_pressed_color; - RrColor *titlebut_toggled_unfocused_pressed_color; - RrColor *titlebut_toggled_focused_unpressed_color; - RrColor *titlebut_toggled_unfocused_unpressed_color; + RrColor *titlebut_focused_disabled_color; + RrColor *titlebut_unfocused_disabled_color; + RrColor *titlebut_focused_hover_color; + RrColor *titlebut_unfocused_hover_color; + RrColor *titlebut_focused_hover_toggled_color; + RrColor *titlebut_unfocused_hover_toggled_color; + RrColor *titlebut_focused_pressed_toggled_color; + RrColor *titlebut_unfocused_pressed_toggled_color; + RrColor *titlebut_focused_unpressed_toggled_color; + RrColor *titlebut_unfocused_unpressed_toggled_color; RrColor *titlebut_focused_pressed_color; RrColor *titlebut_unfocused_pressed_color; RrColor *titlebut_focused_unpressed_color; @@ -114,15 +114,7 @@ struct _RrTheme { RrColor *osd_pressed_lineart; RrColor *osd_focused_lineart; RrColor *menu_title_shadow_color; - gchar menu_title_shadow_alpha; - RrColor *menu_text_normal_shadow_color; - gchar menu_text_normal_shadow_alpha; - RrColor *menu_text_selected_shadow_color; - gchar menu_text_selected_shadow_alpha; - RrColor *menu_text_disabled_shadow_color; - gchar menu_text_disabled_shadow_alpha; - RrColor *menu_text_disabled_selected_shadow_color; - gchar menu_text_disabled_selected_shadow_alpha; + RrColor *menu_text_shadow_color; /* style settings - pics */ RrPixel32 *def_win_icon; /* RGBA */ |