X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fgradient.c;h=6439b301b9bd1d32b4494cdeb1bb7a86698be51d;hb=f4838c9a3d9717a8d8bbf4fb94876dd4fc10f7da;hp=d32d9c81f396166d2fd01a41236a12068451531c;hpb=0ba396fea03de6181a0eea737d24c6bf2190dde9;p=chaz%2Fopenbox diff --git a/render/gradient.c b/render/gradient.c index d32d9c81..6439b301 100644 --- a/render/gradient.c +++ b/render/gradient.c @@ -2,7 +2,7 @@ gradient.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003-2007 Dana Jansens + Copyright (c) 2003-2008 Dana Jansens Copyright (c) 2003 Derek Foreman This program is free software; you can redistribute it and/or modify @@ -22,8 +22,10 @@ #include "gradient.h" #include "color.h" #include +#include -static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised); +static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, + gboolean raised); static void gradient_parentrelative(RrAppearance *a, gint w, gint h); static void gradient_solid(RrAppearance *l, gint w, gint h); static void gradient_splitvertical(RrAppearance *a, gint w, gint h); @@ -73,7 +75,7 @@ void RrRender(RrAppearance *a, gint w, gint h) g_assert_not_reached(); /* unhandled gradient */ return; } - + if (a->surface.interlaced) { gint i; RrPixel32 *p; @@ -110,29 +112,29 @@ void RrRender(RrAppearance *a, gint w, gint h) if (a->surface.relief != RR_RELIEF_FLAT) { if (a->surface.bevel == RR_BEVEL_1) { for (off = 1, x = 1; x < w - 1; ++x, off++) - highlight(data + off, + highlight(&a->surface, data + off, data + off + (h-1) * w, a->surface.relief==RR_RELIEF_RAISED); for (off = 0, x = 0; x < h; ++x, off++) - highlight(data + off * w, + highlight(&a->surface, data + off * w, data + off * w + w - 1, a->surface.relief==RR_RELIEF_RAISED); } if (a->surface.bevel == RR_BEVEL_2) { for (off = 2, x = 2; x < w - 2; ++x, off++) - highlight(data + off + w, + highlight(&a->surface, data + off + w, data + off + (h-2) * w, a->surface.relief==RR_RELIEF_RAISED); for (off = 1, x = 1; x < h-1; ++x, off++) - highlight(data + off * w + 1, + highlight(&a->surface, data + off * w + 1, data + off * w + w - 2, a->surface.relief==RR_RELIEF_RAISED); } } } -static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised) +static void highlight(RrSurface *s, RrPixel32 *x, RrPixel32 *y, gboolean raised) { gint r, g, b; @@ -144,24 +146,25 @@ static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised) up = y; down = x; } + r = (*up >> RrDefaultRedOffset) & 0xFF; - r += r >> 1; + r += (r * s->bevel_light_adjust) >> 8; g = (*up >> RrDefaultGreenOffset) & 0xFF; - g += g >> 1; + g += (g * s->bevel_light_adjust) >> 8; b = (*up >> RrDefaultBlueOffset) & 0xFF; - b += b >> 1; + b += (b * s->bevel_light_adjust) >> 8; if (r > 0xFF) r = 0xFF; if (g > 0xFF) g = 0xFF; if (b > 0xFF) b = 0xFF; *up = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset) + (b << RrDefaultBlueOffset); - + r = (*down >> RrDefaultRedOffset) & 0xFF; - r = (r >> 1) + (r >> 2); + r -= (r * s->bevel_dark_adjust) >> 8; g = (*down >> RrDefaultGreenOffset) & 0xFF; - g = (g >> 1) + (g >> 2); + g -= (g * s->bevel_dark_adjust) >> 8; b = (*down >> RrDefaultBlueOffset) & 0xFF; - b = (b >> 1) + (b >> 2); + b -= (b * s->bevel_dark_adjust) >> 8; *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset) + (b << RrDefaultBlueOffset); } @@ -172,11 +175,11 @@ static void create_bevel_colors(RrAppearance *l) /* light color */ r = l->surface.primary->r; - r += r >> 1; + r += (r * l->surface.bevel_light_adjust) >> 8; g = l->surface.primary->g; - g += g >> 1; + g += (g * l->surface.bevel_light_adjust) >> 8; b = l->surface.primary->b; - b += b >> 1; + b += (b * l->surface.bevel_light_adjust) >> 8; if (r > 0xFF) r = 0xFF; if (g > 0xFF) g = 0xFF; if (b > 0xFF) b = 0xFF; @@ -185,11 +188,11 @@ static void create_bevel_colors(RrAppearance *l) /* dark color */ r = l->surface.primary->r; - r = (r >> 1) + (r >> 2); + r -= (r * l->surface.bevel_dark_adjust) >> 8; g = l->surface.primary->g; - g = (g >> 1) + (g >> 2); + g -= (g * l->surface.bevel_dark_adjust) >> 8; b = l->surface.primary->b; - b = (b >> 1) + (b >> 2); + b -= (b * l->surface.bevel_dark_adjust) >> 8; g_assert(!l->surface.bevel_dark); l->surface.bevel_dark = RrColorNew(l->inst, r, g, b); } @@ -245,7 +248,7 @@ static void gradient_parentrelative(RrAppearance *a, gint w, gint h) } } -static void gradient_solid(RrAppearance *l, gint w, gint h) +static void gradient_solid(RrAppearance *l, gint w, gint h) { gint i; RrPixel32 pix; @@ -277,7 +280,7 @@ static void gradient_solid(RrAppearance *l, gint w, gint h) left, bottom, right, bottom); XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), right, bottom, right, top); - + XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), left, top, right, top); XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), @@ -308,7 +311,7 @@ static void gradient_solid(RrAppearance *l, gint w, gint h) left, bottom, right, bottom); XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light), right, bottom, right, top); - + XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), left, top, right, top); XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark), @@ -336,7 +339,7 @@ static void gradient_solid(RrAppearance *l, gint w, gint h) left, top, right, bottom); } break; - default: + default: g_assert_not_reached(); /* unhandled ReliefType */ } } @@ -420,127 +423,121 @@ static void gradient_solid(RrAppearance *l, gint w, gint h) static void gradient_splitvertical(RrAppearance *a, gint w, gint h) { - gint x, y1, y3, r, g, b; + gint x, y1, y2, y3; RrSurface *sf = &a->surface; RrPixel32 *data = sf->pixel_data; RrPixel32 current; - RrColor *primary_light, *secondary_light; + gint y1sz, y2sz, y3sz; VARS(y1); + VARS(y2); VARS(y3); - r = sf->primary->r; - r += r >> 2; - g = sf->primary->g; - g += g >> 2; - b = sf->primary->b; - b += b >> 2; - if (r > 0xFF) r = 0xFF; - if (g > 0xFF) g = 0xFF; - if (b > 0xFF) b = 0xFF; - primary_light = RrColorNew(a->inst, r, g, b); - - r = sf->secondary->r; - r += r >> 4; - g = sf->secondary->g; - g += g >> 4; - b = sf->secondary->b; - b += b >> 4; - if (r > 0xFF) r = 0xFF; - if (g > 0xFF) g = 0xFF; - if (b > 0xFF) b = 0xFF; - secondary_light = RrColorNew(a->inst, r, g, b); + /* if h <= 5, then a 0 or 1px middle gradient. + if h > 5, then always a 1px middle gradient. + */ + if (h <= 5) { + y1sz = MAX(h/2, 0); + y2sz = (h < 3 ? 0 : h % 2); + y3sz = MAX(h/2, 1); + } + else { + y1sz = h/2 - (1 - (h % 2)); + y2sz = 1; + y3sz = h/2; + } - SETUP(y1, primary_light, sf->primary, (h / 2) -1); - SETUP(y3, sf->secondary, secondary_light, (h / 2) -1); + SETUP(y1, sf->split_primary, sf->primary, y1sz); + if (y2sz) { + /* setup to get the colors _in between_ these other 2 */ + SETUP(y2, sf->primary, sf->secondary, y2sz + 2); + NEXT(y2); /* skip the first one, its the same as the last of y1 */ + } + SETUP(y3, sf->secondary, sf->split_secondary, y3sz); - for (y1 = h - 1; y1 > (h / 2) -1; --y1) { /* 0 -> h-1 */ + for (y1 = y1sz; y1 > 0; --y1) { current = COLOR(y1); - for (x = w - 1; x >= 0; --x) /* 0 -> w */ + for (x = w - 1; x >= 0; --x) *(data++) = current; NEXT(y1); } - - for (y3 = (h / 2) - 1; y3 > 0; --y3) { - current = COLOR(y3); + for (y2 = y2sz; y2 > 0; --y2) { + current = COLOR(y2); for (x = w - 1; x >= 0; --x) *(data++) = current; - NEXT(y3); + NEXT(y2); } - current = COLOR(y3); - for (x = w - 1; x >= 0; --x) /* 0 -> w */ - *(data++) = current; + for (y3 = y3sz; y3 > 0; --y3) { + current = COLOR(y3); + for (x = w - 1; x >= 0; --x) + *(data++) = current; - RrColorFree(primary_light); - RrColorFree(secondary_light); + NEXT(y3); + } } static void gradient_horizontal(RrSurface *sf, gint w, gint h) { gint x, y; RrPixel32 *data = sf->pixel_data, *datav; - RrPixel32 current; VARS(x); SETUP(x, sf->primary, sf->secondary, w); - for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */ - current = COLOR(x); - datav = data; - for (y = h - 1; y >= 0; --y) { /* 0 -> h */ - *datav = current; - datav += w; - } - ++data; - + datav = data; + for (x = w - 1; x > 0; --x) { /* 0 -> w - 1 */ + *datav = COLOR(x); + ++datav; NEXT(x); } - current = COLOR(x); - for (y = h - 1; y >= 0; --y) /* 0 -> h */ - *(data + y * w) = current; + *datav = COLOR(x); + ++datav; + + for (y = h - 1; y > 0; --y) { /* 1 -> h */ + memcpy(datav, data, w * sizeof(RrPixel32)); + datav += w; + } } static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h) { - gint x, y; + gint x, y, half1, half2; RrPixel32 *data = sf->pixel_data, *datav; - RrPixel32 current; VARS(x); - SETUP(x, sf->primary, sf->secondary, w/2); - if (w > 1) { - for (x = w - 1; x > w/2-1; --x) { /* 0 -> w-1 */ - current = COLOR(x); - datav = data; - for (y = h - 1; y >= 0; --y) { /* 0 -> h */ - *datav = current; - datav += w; - } - ++data; + half1 = (w + 1) / 2; + half2 = w / 2; + SETUP(x, sf->primary, sf->secondary, half1); + datav = data; + for (x = half1 - 1; x > 0; --x) { /* 0 -> half1 - 1 */ + *datav = COLOR(x); + ++datav; + NEXT(x); + } + *datav = COLOR(x); + ++datav; + + if (half2 > 0) { + SETUP(x, sf->secondary, sf->primary, half2); + for (x = half2 - 1; x > 0; --x) { /* 0 -> half2 - 1 */ + *datav = COLOR(x); + ++datav; NEXT(x); } - SETUP(x, sf->secondary, sf->primary, w/2); - for (x = w/2 - 1; x > 0; --x) { /* 0 -> w-1 */ - current = COLOR(x); - datav = data; - for (y = h - 1; y >= 0; --y) { /* 0 -> h */ - *datav = current; - datav += w; - } - ++data; + *datav = COLOR(x); + ++datav; + } - NEXT(x); - } + for (y = h - 1; y > 0; --y) { /* 1 -> h */ + memcpy(datav, data, w * sizeof(RrPixel32)); + datav += w; } - current = COLOR(x); - for (y = h - 1; y >= 0; --y) /* 0 -> h */ - *(data + y * w) = current; } static void gradient_vertical(RrSurface *sf, gint w, gint h) @@ -606,7 +603,7 @@ static void gradient_diagonal(RrSurface *sf, gint w, gint h) for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */ *(data++) = COLOR(x); - + NEXT(x); } *data = COLOR(x); @@ -653,7 +650,7 @@ static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h) for (x = w - 1; x > 0; --x) { /* 0 -> w-1 */ *(data++) = COLOR(x); - + NEXT(x); } *data = COLOR(x); @@ -717,7 +714,7 @@ static void gradient_pyramid(RrSurface *sf, gint inw, gint inh) *(data+inw-x) = current; *(end-x) = current; *(end-(inw-x)) = current; - + NEXT(x); } current = COLOR(x);