nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reindent the file....

Browse source 
but while i'm at it:
  - add support for bevels/borders on solid textures.
  - reverse the colors in the rectangle gradient, the pipecross and pyramid
    ones may need to be reversed as well.
This commit is contained in:
Dana Jansens 2003-05-20 07:30:27 +00:00
parent 13f701bdb1
commit 895cd9f43d
1 changed files with 429 additions and 362 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

201
render/gradient.c
View file

@ -151,21 +151,27 @@ void gradient_diagonal(Surface *sf, int w, int h)
int x, y; int x, y;
for (y = 0; y < h; ++y) { for (y = 0; y < h; ++y) {
drx = (float)(sf->data.planar.secondary->r - sf->data.planar.primary->r); drx = (float)(sf->data.planar.secondary->r -
sf->data.planar.primary->r);
dry = drx/(float)h; dry = drx/(float)h;
drx/= (float)w; drx/= (float)w;
dgx = (float)(sf->data.planar.secondary->g - sf->data.planar.primary->g); dgx = (float)(sf->data.planar.secondary->g -
sf->data.planar.primary->g);
dgy = dgx/(float)h; dgy = dgx/(float)h;
dgx/= (float)w; dgx/= (float)w;
dbx = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b); dbx = (float)(sf->data.planar.secondary->b -
sf->data.planar.primary->b);
dby = dbx/(float)h; dby = dbx/(float)h;
dbx/= (float)w; dbx/= (float)w;
for (x = 0; x < w; ++x, ++data) { for (x = 0; x < w; ++x, ++data) {
r = sf->data.planar.primary->r + ((int)(drx * x) + (int)(dry * y))/2; r = sf->data.planar.primary->r +
g = sf->data.planar.primary->g + ((int)(dgx * x) + (int)(dgy * y))/2; ((int)(drx * x) + (int)(dry * y))/2;
b = sf->data.planar.primary->b + ((int)(dbx * x) + (int)(dby * y))/2; g = sf->data.planar.primary->g +
((int)(dgx * x) + (int)(dgy * y))/2;
b = sf->data.planar.primary->b +
((int)(dbx * x) + (int)(dby * y))/2;
current = (r << default_red_offset) current = (r << default_red_offset)
+ (g << default_green_offset) + (g << default_green_offset)
+ (b << default_blue_offset); + (b << default_blue_offset);
@ -183,21 +189,27 @@ void gradient_crossdiagonal(Surface *sf, int w, int h)
int x, y; int x, y;
for (y = 0; y < h; ++y) { for (y = 0; y < h; ++y) {
drx = (float)(sf->data.planar.secondary->r - sf->data.planar.primary->r); drx = (float)(sf->data.planar.secondary->r -
sf->data.planar.primary->r);
dry = drx/(float)h; dry = drx/(float)h;
drx/= (float)w; drx/= (float)w;
dgx = (float)(sf->data.planar.secondary->g - sf->data.planar.primary->g); dgx = (float)(sf->data.planar.secondary->g -
sf->data.planar.primary->g);
dgy = dgx/(float)h; dgy = dgx/(float)h;
dgx/= (float)w; dgx/= (float)w;
dbx = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b); dbx = (float)(sf->data.planar.secondary->b -
sf->data.planar.primary->b);
dby = dbx/(float)h; dby = dbx/(float)h;
dbx/= (float)w; dbx/= (float)w;
for (x = w; x > 0; --x, ++data) { for (x = w; x > 0; --x, ++data) {
r = sf->data.planar.primary->r + ((int)(drx * (x-1)) + (int)(dry * y))/2; r = sf->data.planar.primary->r +
g = sf->data.planar.primary->g + ((int)(dgx * (x-1)) + (int)(dgy * y))/2; ((int)(drx * (x-1)) + (int)(dry * y))/2;
b = sf->data.planar.primary->b + ((int)(dbx * (x-1)) + (int)(dby * y))/2; g = sf->data.planar.primary->g +
((int)(dgx * (x-1)) + (int)(dgy * y))/2;
b = sf->data.planar.primary->b +
((int)(dbx * (x-1)) + (int)(dby * y))/2;
current = (r << default_red_offset) current = (r << default_red_offset)
+ (g << default_green_offset) + (g << default_green_offset)
+ (b << default_blue_offset); + (b << default_blue_offset);
@ -224,9 +236,9 @@ void highlight(pixel32 *x, pixel32 *y, gboolean raised)
g += g >> 1; g += g >> 1;
b = (*up >> default_blue_offset) & 0xFF; b = (*up >> default_blue_offset) & 0xFF;
b += b >> 1; b += b >> 1;
if (r > 255) r = 255; if (r > 0xFF) r = 0xFF;
if (g > 255) g = 255; if (g > 0xFF) g = 0xFF;
if (b > 255) b = 255; if (b > 0xFF) b = 0xFF;
*up = (r << default_red_offset) + (g << default_green_offset) *up = (r << default_red_offset) + (g << default_green_offset)
+ (b << default_blue_offset); + (b << default_blue_offset);
@ -240,12 +252,42 @@ void highlight(pixel32 *x, pixel32 *y, gboolean raised)
+ (b << default_blue_offset); + (b << default_blue_offset);
} }
static void create_bevel_colors(Appearance *l)
{
int r, g, b;
/* light color */
r = l->surface.data.planar.primary->r;
r += r >> 1;
g = l->surface.data.planar.primary->g;
g += g >> 1;
b = l->surface.data.planar.primary->b;
b += b >> 1;
if (r > 0xFF) r = 0xFF;
if (g > 0xFF) g = 0xFF;
if (b > 0xFF) b = 0xFF;
g_assert(!l->surface.data.planar.bevel_light);
l->surface.data.planar.bevel_light = color_new(r, g, b);
color_allocate_gc(l->surface.data.planar.bevel_light);
/* dark color */
r = l->surface.data.planar.primary->r;
r = (r >> 1) + (r >> 2);
g = l->surface.data.planar.primary->g;
g = (g >> 1) + (g >> 2);
b = l->surface.data.planar.primary->b;
b = (b >> 1) + (b >> 2);
g_assert(!l->surface.data.planar.bevel_dark);
l->surface.data.planar.bevel_dark = color_new(r, g, b);
color_allocate_gc(l->surface.data.planar.bevel_dark);
}
void gradient_solid(Appearance *l, int x, int y, int w, int h) void gradient_solid(Appearance *l, int x, int y, int w, int h)
{ {
pixel32 pix; pixel32 pix;
int i, a, b; int i, a, b;
PlanarSurface *sp = &l->surface.data.planar; PlanarSurface *sp = &l->surface.data.planar;
int left = x, top = y, right = w - 1, bottom = h - 1; int left = x, top = y, right = x + w - 1, bottom = y + h - 1;
if (sp->primary->gc == None) if (sp->primary->gc == None)
color_allocate_gc(sp->primary); color_allocate_gc(sp->primary);
@ -257,84 +299,93 @@ void gradient_solid(Appearance *l, int x, int y, int w, int h)
for (b = 0; b < l->area.height; b++) for (b = 0; b < l->area.height; b++)
sp->pixel_data[a + b*l->area.width] = pix; sp->pixel_data[a + b*l->area.width] = pix;
XFillRectangle(ob_display, l->pixmap, sp->primary->gc XFillRectangle(ob_display, l->pixmap, sp->primary->gc,
, x, y, w, h); x, y, w, h);
if (l->surface.data.planar.interlaced) { if (sp->interlaced) {
if (sp->secondary->gc == None) if (sp->secondary->gc == None)
color_allocate_gc(sp->secondary); color_allocate_gc(sp->secondary);
for (i = y; i < h; i += 2) for (i = y; i < h; i += 2)
XDrawLine(ob_display, l->pixmap, sp->secondary->gc, XDrawLine(ob_display, l->pixmap, sp->secondary->gc,
x, i, w, i); x, i, w, i);
} }
/*
switch (texture.relief()) { switch (sp->relief) {
case RenderTexture::Raised: case Raised:
switch (texture.bevel()) { if (!sp->bevel_dark)
case RenderTexture::Bevel1: create_bevel_colors(l);
XDrawLine(ob_display, l->pixmap, texture.bevelDarkColor().gc(),
switch (sp->bevel) {
case Bevel1:
XDrawLine(ob_display, l->pixmap, sp->bevel_dark->gc,
left, bottom, right, bottom); left, bottom, right, bottom);
XDrawLine(ob_display, l->pixmap, texture.bevelDarkColor().gc(), XDrawLine(ob_display, l->pixmap, sp->bevel_dark->gc,
right, bottom, right, top); right, bottom, right, top);
XDrawLine(ob_display, l->pixmap, texture.bevelLightColor().gc(), XDrawLine(ob_display, l->pixmap, sp->bevel_light->gc,
left, top, right, top); left, top, right, top);
XDrawLine(ob_display, l->pixmap, texture.bevelLightColor().gc(), XDrawLine(ob_display, l->pixmap, sp->bevel_light->gc,
left, bottom, left, top); left, bottom, left, top);
break; break;
case RenderTexture::Bevel2: case Bevel2:
XDrawLine(ob_display, l->pixmap, texture.bevelDarkColor().gc(), XDrawLine(ob_display, l->pixmap,
sp->bevel_dark->gc,
left + 1, bottom - 2, right - 2, bottom - 2); left + 1, bottom - 2, right - 2, bottom - 2);
XDrawLine(ob_display, l->pixmap, texture.bevelDarkColor().gc(), XDrawLine(ob_display, l->pixmap,
sp->bevel_dark->gc,
right - 2, bottom - 2, right - 2, top + 1); right - 2, bottom - 2, right - 2, top + 1);
XDrawLine(ob_display, l->pixmap, texture.bevelLightColor().gc(), XDrawLine(ob_display, l->pixmap,
sp->bevel_light->gc,
left + 1, top + 1, right - 2, top + 1); left + 1, top + 1, right - 2, top + 1);
XDrawLine(**display, sf.pixmap(), texture.bevelLightColor().gc(), XDrawLine(ob_display, l->pixmap,
sp->bevel_light->gc,
left + 1, bottom - 2, left + 1, top + 1); left + 1, bottom - 2, left + 1, top + 1);
break; break;
default: default:
assert(false); // unhandled RenderTexture::BevelType g_assert_not_reached(); /* unhandled BevelType */
} }
break; break;
case RenderTexture::Sunken: case Sunken:
switch (texture.bevel()) { if (!sp->bevel_dark)
case RenderTexture::Bevel1: create_bevel_colors(l);
XDrawLine(**display, sf.pixmap(), texture.bevelLightColor().gc(),
switch (sp->bevel) {
case Bevel1:
XDrawLine(ob_display, l->pixmap, sp->bevel_light->gc,
left, bottom, right, bottom); left, bottom, right, bottom);
XDrawLine(**display, sf.pixmap(), texture.bevelLightColor().gc(), XDrawLine(ob_display, l->pixmap, sp->bevel_light->gc,
right, bottom, right, top); right, bottom, right, top);
XDrawLine(**display, sf.pixmap(), texture.bevelDarkColor().gc(), XDrawLine(ob_display, l->pixmap, sp->bevel_dark->gc,
left, top, right, top); left, top, right, top);
XDrawLine(**display, sf.pixmap(), texture.bevelDarkColor().gc(), XDrawLine(ob_display, l->pixmap, sp->bevel_dark->gc,
left, bottom, left, top); left, bottom, left, top);
break; break;
case RenderTexture::Bevel2: case Bevel2:
XDrawLine(**display, sf.pixmap(), texture.bevelLightColor().gc(), XDrawLine(ob_display, l->pixmap, sp->bevel_light->gc,
left + 1, bottom - 2, right - 2, bottom - 2); left + 1, bottom - 2, right - 2, bottom - 2);
XDrawLine(**display, sf.pixmap(), texture.bevelLightColor().gc(), XDrawLine(ob_display, l->pixmap, sp->bevel_light->gc,
right - 2, bottom - 2, right - 2, top + 1); right - 2, bottom - 2, right - 2, top + 1);
XDrawLine(**display, sf.pixmap(), texture.bevelDarkColor().gc(), XDrawLine(ob_display, l->pixmap, sp->bevel_dark->gc,
left + 1, top + 1, right - 2, top + 1); left + 1, top + 1, right - 2, top + 1);
XDrawLine(**display, sf.pixmap(), texture.bevelDarkColor().gc(), XDrawLine(ob_display, l->pixmap, sp->bevel_dark->gc,
left + 1, bottom - 2, left + 1, top + 1); left + 1, bottom - 2, left + 1, top + 1);
break; break;
default: default:
assert(false); // unhandled RenderTexture::BevelType g_assert_not_reached(); /* unhandled BevelType */
} }
break; break;
case RenderTexture::Flat: case Flat:
if (texture.border()) if (sp->border)
XDrawRectangle(**display, sf.pixmap(), texture.borderColor().gc(), XDrawRectangle(ob_display, l->pixmap, sp->border_color->gc,
left, top, right, bottom); left, top, right, bottom);
break; break;
default: default:
assert(false); // unhandled RenderTexture::ReliefType g_assert_not_reached(); /* unhandled ReliefType */
} }
*/
} }
void gradient_pyramid(Surface *sf, int inw, int inh) void gradient_pyramid(Surface *sf, int inw, int inh)
@ -346,21 +397,27 @@ void gradient_pyramid(Surface *sf, int inw, int inh)
unsigned int r,g,b; unsigned int r,g,b;
int x, y, h=(inh/2) + 1, w=(inw/2) + 1; int x, y, h=(inh/2) + 1, w=(inw/2) + 1;
for (y = 0; y < h; ++y) { for (y = 0; y < h; ++y) {
drx = (float)(sf->data.planar.secondary->r - sf->data.planar.primary->r); drx = (float)(sf->data.planar.secondary->r -
sf->data.planar.primary->r);
dry = drx/(float)h; dry = drx/(float)h;
drx/= (float)w; drx/= (float)w;
dgx = (float)(sf->data.planar.secondary->g - sf->data.planar.primary->g); dgx = (float)(sf->data.planar.secondary->g -
sf->data.planar.primary->g);
dgy = dgx/(float)h; dgy = dgx/(float)h;
dgx/= (float)w; dgx/= (float)w;
dbx = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b); dbx = (float)(sf->data.planar.secondary->b -
sf->data.planar.primary->b);
dby = dbx/(float)h; dby = dbx/(float)h;
dbx/= (float)w; dbx/= (float)w;
for (x = 0; x < w; ++x, data) { for (x = 0; x < w; ++x, data) {
r = sf->data.planar.primary->r + ((int)(drx * x) + (int)(dry * y))/2; r = sf->data.planar.primary->r +
g = sf->data.planar.primary->g + ((int)(dgx * x) + (int)(dgy * y))/2; ((int)(drx * x) + (int)(dry * y))/2;
b = sf->data.planar.primary->b + ((int)(dbx * x) + (int)(dby * y))/2; g = sf->data.planar.primary->g +
((int)(dgx * x) + (int)(dgy * y))/2;
b = sf->data.planar.primary->b +
((int)(dbx * x) + (int)(dby * y))/2;
current = (r << default_red_offset) current = (r << default_red_offset)
+ (g << default_green_offset) + (g << default_green_offset)
+ (b << default_blue_offset); + (b << default_blue_offset);
@ -384,25 +441,30 @@ void gradient_rectangle(Surface *sf, int inw, int inh)
int x, y, h=(inh/2) + 1, w=(inw/2) + 1; int x, y, h=(inh/2) + 1, w=(inw/2) + 1;
int val; int val;
g_message("rectangle");
for (y = 0; y < h; ++y) { for (y = 0; y < h; ++y) {
drx = (float)(sf->data.planar.secondary->r - sf->data.planar.primary->r); drx = (float)(sf->data.planar.primary->r -
sf->data.planar.secondary->r);
dry = drx/(float)h; dry = drx/(float)h;
drx/= (float)w; drx/= (float)w;
dgx = (float)(sf->data.planar.secondary->g - sf->data.planar.primary->g); dgx = (float)(sf->data.planar.primary->g -
sf->data.planar.secondary->g);
dgy = dgx/(float)h; dgy = dgx/(float)h;
dgx/= (float)w; dgx/= (float)w;
dbx = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b); dbx = (float)(sf->data.planar.primary->b -
sf->data.planar.secondary->b);
dby = dbx/(float)h; dby = dbx/(float)h;
dbx/= (float)w; dbx/= (float)w;
for (x = 0; x < w; ++x, data) { for (x = 0; x < w; ++x, data) {
if ((float)x/(float)w < (float)y/(float)h) val = (int)(drx * x); if ((float)x/(float)w < (float)y/(float)h) val = (int)(drx * x);
else val = (int)(dry * y); else val = (int)(dry * y);
r = sf->data.planar.primary->r + val; r = sf->data.planar.secondary->r + val;
g = sf->data.planar.primary->g + val; g = sf->data.planar.secondary->g + val;
b = sf->data.planar.primary->b + val; b = sf->data.planar.secondary->b + val;
current = (r << default_red_offset) current = (r << default_red_offset)
+ (g << default_green_offset) + (g << default_green_offset)
+ (b << default_blue_offset); + (b << default_blue_offset);
@ -426,16 +488,21 @@ void gradient_pipecross(Surface *sf, int inw, int inh)
int x, y, h=(inh/2) + 1, w=(inw/2) + 1; int x, y, h=(inh/2) + 1, w=(inw/2) + 1;
int val; int val;
g_message("pipecross");
for (y = 0; y < h; ++y) { for (y = 0; y < h; ++y) {
drx = (float)(sf->data.planar.secondary->r - sf->data.planar.primary->r); drx = (float)(sf->data.planar.secondary->r -
sf->data.planar.primary->r);
dry = drx/(float)h; dry = drx/(float)h;
drx/= (float)w; drx/= (float)w;
dgx = (float)(sf->data.planar.secondary->g - sf->data.planar.primary->g); dgx = (float)(sf->data.planar.secondary->g -
sf->data.planar.primary->g);
dgy = dgx/(float)h; dgy = dgx/(float)h;
dgx/= (float)w; dgx/= (float)w;
dbx = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b); dbx = (float)(sf->data.planar.secondary->b -
sf->data.planar.primary->b);
dby = dbx/(float)h; dby = dbx/(float)h;
dbx/= (float)w; dbx/= (float)w;
for (x = 0; x < w; ++x, data) { for (x = 0; x < w; ++x, data) {