# include <stdlib.h>
#endif
-static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h);
+static void RrPixel32_to_pixmap(RrAppearance *l,
+ gint x, gint y, gint w, gint h);
void RrPaint(RrAppearance *l, Window win, gint w, gint h)
{
int i, transferred = 0, sw;
RrPixel32 *source, *dest;
Pixmap oldp;
- Rect tarea; /* area in which to draw textures */
+ RrRect tarea; /* area in which to draw textures */
gboolean resized;
if (w <= 0 || h <= 0) return;
resized = (l->w != w || l->h != h);
- if (resized) {
- oldp = l->pixmap; /* save to free after changing the visible pixmap */
- l->pixmap = XCreatePixmap(RrDisplay(l->inst),
- RrRootWindow(l->inst),
- w, h, RrDepth(l->inst));
- } else
- oldp = None;
+ oldp = l->pixmap; /* save to free after changing the visible pixmap */
+ l->pixmap = XCreatePixmap(RrDisplay(l->inst),
+ RrRootWindow(l->inst),
+ w, h, RrDepth(l->inst));
g_assert(l->pixmap != None);
l->w = w;
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 + l->surface.parentx +
- sw * l->surface.parenty);
- dest = l->surface.RrPixel_data;
+ source = (l->surface.parent->surface.pixel_data +
+ l->surface.parentx + sw * l->surface.parenty);
+ dest = l->surface.pixel_data;
for (i = 0; i < h; i++, source += sw, dest += w) {
memcpy(dest, source, w * sizeof(RrPixel32));
}
- } else if (l->surface.grad == RR_SURFACE_SOLID)
- gradient_solid(l, 0, 0, w, h);
- else
- gradient_render(&l->surface, w, h);
+ } else
+ RrRender(l, w, h);
RECT_SET(tarea, 0, 0, w, h);
if (l->surface.grad != RR_SURFACE_PARENTREL) {
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;
}
spc->interlaced = spo->interlaced;
spc->border = spo->border;
- spc->RrPixel_data = NULL;
+ spc->parent = NULL;
+ spc->parentx = spc->parenty = 0;
+ spc->pixel_data = NULL;
copy->textures = orig->textures;
copy->texture = g_memdup(orig->texture,
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);
}
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 = RrEndian;
+ im->byte_order = LSBFirst;
/* this malloc is a complete waste of time on normal 32bpp
as reduce_depth just sets im->data = data and returns
*/
break;
case RR_TEXTURE_TEXT:
m = RrFontMeasureString(l->texture[i].data.text.font,
- l->texture[i].data.text.string,
- l->texture[i].data.text.shadow,
- l->texture[i].data.text.offset);
+ l->texture[i].data.text.string);
*w = MAX(*w, m);
- m = RrFontHeight(l->texture[i].data.text.font,
- l->texture[i].data.text.shadow,
- l->texture[i].data.text.offset);
+ m = RrFontHeight(l->texture[i].data.text.font);
*h += MAX(*h, m);
break;
case RR_TEXTURE_RGBA: