diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/gradient.c | 14 | ||||
| -rw-r--r-- | render/render.c | 16 | ||||
| -rw-r--r-- | render/render.h | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/render/gradient.c b/render/gradient.c index 47f4850f..abbbc659 100644 --- a/render/gradient.c +++ b/render/gradient.c @@ -13,7 +13,7 @@ static void gradient_pyramid(RrSurface *sf, int inw, int inh); void RrRender(RrAppearance *a, int w, int h) { - RrPixel32 *data = a->surface.RrPixel_data; + RrPixel32 *data = a->surface.pixel_data; RrPixel32 current; unsigned int r,g,b; int off, x; @@ -163,7 +163,7 @@ static void gradient_solid(RrAppearance *l, int w, int h) for (a = 0; a < w; a++) for (b = 0; b < h; b++) - sp->RrPixel_data[a + b * w] = pix; + sp->pixel_data[a + b * w] = pix; XFillRectangle(RrDisplay(l->inst), l->pixmap, sp->primary->gc, 0, 0, w, h); @@ -334,7 +334,7 @@ static void gradient_solid(RrAppearance *l, int w, int h) static void gradient_horizontal(RrSurface *sf, int w, int h) { int x, y; - RrPixel32 *data = sf->RrPixel_data, *datav; + RrPixel32 *data = sf->pixel_data, *datav; RrPixel32 current; VARS(x); @@ -359,7 +359,7 @@ static void gradient_horizontal(RrSurface *sf, int w, int h) static void gradient_vertical(RrSurface *sf, int w, int h) { int x, y; - RrPixel32 *data = sf->RrPixel_data; + RrPixel32 *data = sf->pixel_data; RrPixel32 current; VARS(y); @@ -381,7 +381,7 @@ static void gradient_vertical(RrSurface *sf, int w, int h) static void gradient_diagonal(RrSurface *sf, int w, int h) { int x, y; - RrPixel32 *data = sf->RrPixel_data; + RrPixel32 *data = sf->pixel_data; RrColor left, right; RrColor extracorner; @@ -428,7 +428,7 @@ static void gradient_diagonal(RrSurface *sf, int w, int h) static void gradient_crossdiagonal(RrSurface *sf, int w, int h) { int x, y; - RrPixel32 *data = sf->RrPixel_data; + RrPixel32 *data = sf->pixel_data; RrColor left, right; RrColor extracorner; @@ -475,7 +475,7 @@ static void gradient_crossdiagonal(RrSurface *sf, int w, int h) static void gradient_pyramid(RrSurface *sf, int inw, int inh) { int x, y, w = (inw >> 1) + 1, h = (inh >> 1) + 1; - RrPixel32 *data = sf->RrPixel_data; + RrPixel32 *data = sf->pixel_data; RrPixel32 *end = data + inw*inh - 1; RrPixel32 current; RrColor left, right; diff --git a/render/render.c b/render/render.c index 1fbfef67..7be3993e 100644 --- a/render/render.c +++ b/render/render.c @@ -45,17 +45,17 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h) RrVisual(l->inst), RrColormap(l->inst)); g_assert(l->xftdraw != NULL); - g_free(l->surface.RrPixel_data); - l->surface.RrPixel_data = g_new(RrPixel32, w * h); + g_free(l->surface.pixel_data); + l->surface.pixel_data = g_new(RrPixel32, w * h); if (l->surface.grad == RR_SURFACE_PARENTREL) { g_assert (l->surface.parent); g_assert (l->surface.parent->w); sw = l->surface.parent->w; - source = (l->surface.parent->surface.RrPixel_data + + source = (l->surface.parent->surface.pixel_data + l->surface.parentx + sw * l->surface.parenty); - dest = l->surface.RrPixel_data; + dest = l->surface.pixel_data; for (i = 0; i < h; i++, source += sw, dest += w) { memcpy(dest, source, w * sizeof(RrPixel32)); } @@ -109,7 +109,7 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h) RrPixmapMaskDraw(l->pixmap, &l->texture[i].data.mask, &tarea); break; case RR_TEXTURE_RGBA: - RrImageDraw(l->surface.RrPixel_data, + RrImageDraw(l->surface.pixel_data, &l->texture[i].data.rgba, &tarea); break; } @@ -190,7 +190,7 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig) spc->border = spo->border; spc->parent = NULL; spc->parentx = spc->parenty = 0; - spc->RrPixel_data = NULL; + spc->pixel_data = NULL; copy->textures = orig->textures; copy->texture = g_memdup(orig->texture, @@ -215,7 +215,7 @@ void RrAppearanceFree(RrAppearance *a) RrColorFree(p->border_color); RrColorFree(p->bevel_dark); RrColorFree(p->bevel_light); - g_free(p->RrPixel_data); + g_free(p->pixel_data); g_free(a); } @@ -231,7 +231,7 @@ static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h) ZPixmap, 0, NULL, w, h, 32, 0); g_assert(im != NULL); - in = l->surface.RrPixel_data; + in = l->surface.pixel_data; out = l->pixmap; im->byte_order = LSBFirst; diff --git a/render/render.h b/render/render.h index 18ec799c..6c99b43c 100644 --- a/render/render.h +++ b/render/render.h @@ -70,7 +70,7 @@ struct _RrSurface { RrAppearance *parent; gint parentx; gint parenty; - RrPixel32 *RrPixel_data; + RrPixel32 *pixel_data; }; struct _RrTextureText { |