# include <stdlib.h>
#endif
-static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h);
+static void pixel_data_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) {
if (!transferred) {
transferred = 1;
if (l->surface.grad != RR_SURFACE_SOLID)
- RrPixel32_to_pixmap(l, 0, 0, w, h);
+ pixel_data_to_pixmap(l, 0, 0, w, h);
}
if (l->xftdraw == NULL) {
l->xftdraw = XftDrawCreate(RrDisplay(l->inst), l->pixmap,
RrVisual(l->inst),
RrColormap(l->inst));
}
- font_draw(l->xftdraw, &l->texture[i].data.text, &tarea);
- break;
+ RrFontDraw(l->xftdraw, &l->texture[i].data.text, &tarea);
+ break;
+ case RR_TEXTURE_LINE_ART:
+ if (!transferred) {
+ transferred = 1;
+ if (l->surface.grad != RR_SURFACE_SOLID)
+ pixel_data_to_pixmap(l, 0, 0, w, h);
+ }
+ g_message("%d %d -> %d %d",
+ l->texture[i].data.lineart.x1,
+ l->texture[i].data.lineart.y1,
+ l->texture[i].data.lineart.x2,
+ l->texture[i].data.lineart.y2);
+ XDrawLine(RrDisplay(l->inst), l->pixmap,
+ RrColorGC(l->texture[i].data.lineart.color),
+ l->texture[i].data.lineart.x1,
+ l->texture[i].data.lineart.y1,
+ l->texture[i].data.lineart.x2,
+ l->texture[i].data.lineart.y2);
+ break;
case RR_TEXTURE_MASK:
if (!transferred) {
transferred = 1;
if (l->surface.grad != RR_SURFACE_SOLID)
- RrPixel32_to_pixmap(l, 0, 0, w, h);
+ pixel_data_to_pixmap(l, 0, 0, w, h);
}
- if (l->texture[i].data.mask.color->gc == None)
- color_allocate_gc(l->texture[i].data.mask.color);
RrPixmapMaskDraw(l->pixmap, &l->texture[i].data.mask, &tarea);
- break;
+ break;
case RR_TEXTURE_RGBA:
- image_draw(l->surface.RrPixel_data,
- &l->texture[i].data.rgba, &tarea);
+ g_assert(!transferred);
+ RrImageDraw(l->surface.pixel_data,
+ &l->texture[i].data.rgba, &tarea);
break;
}
}
if (!transferred) {
transferred = 1;
if (l->surface.grad != RR_SURFACE_SOLID)
- RrPixel32_to_pixmap(l, 0, 0, w, h);
+ pixel_data_to_pixmap(l, 0, 0, w, h);
}
-
XSetWindowBackgroundPixmap(RrDisplay(l->inst), win, l->pixmap);
XClearWindow(RrDisplay(l->inst), win);
if (oldp) XFreePixmap(RrDisplay(l->inst), oldp);
{
RrSurface *spo, *spc;
RrAppearance *copy = g_new(RrAppearance, 1);
+ gint i;
copy->inst = orig->inst;
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,
orig->textures * sizeof(RrTexture));
+ for (i = 0; i < copy->textures; ++i)
+ if (copy->texture[i].type == RR_TEXTURE_RGBA) {
+ g_free(copy->texture[i].data.rgba.cache);
+ copy->texture[i].data.rgba.cache = NULL;
+ }
copy->pixmap = None;
copy->xftdraw = NULL;
copy->w = copy->h = 0;
void RrAppearanceFree(RrAppearance *a)
{
+ gint i;
+
if (a) {
RrSurface *p;
if (a->pixmap != None) XFreePixmap(RrDisplay(a->inst), a->pixmap);
if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw);
+ for (i = 0; i < a->textures; ++i)
+ if (a->texture[i].type == RR_TEXTURE_RGBA) {
+ g_free(a->texture[i].data.rgba.cache);
+ a->texture[i].data.rgba.cache = NULL;
+ }
if (a->textures)
g_free(a->texture);
p = &a->surface;
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);
}
}
-static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h)
+static void pixel_data_to_pixmap(RrAppearance *l,
+ gint x, gint y, gint w, gint h)
{
RrPixel32 *in, *scratch;
Pixmap out;
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 = render_endian;
+ 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
*/
scratch = g_new(RrPixel32, im->width * im->height);
im->data = (char*) scratch;
- reduce_depth(l->inst, in, im);
+ RrReduceDepth(l->inst, in, im);
XPutImage(RrDisplay(l->inst), out,
DefaultGC(RrDisplay(l->inst), RrScreen(l->inst)),
im, 0, 0, x, y, w, h);
*h = MAX(*h, l->texture[i].data.mask.mask->height);
break;
case RR_TEXTURE_TEXT:
- m = font_measure_string(l->texture[i].data.text.font,
- l->texture[i].data.text.string,
- l->texture[i].data.text.shadow,
- l->texture[i].data.text.offset);
+ m = RrFontMeasureString(l->texture[i].data.text.font,
+ l->texture[i].data.text.string);
*w = MAX(*w, m);
- m = font_height(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:
*w += MAX(*w, l->texture[i].data.rgba.width);
*h += MAX(*h, l->texture[i].data.rgba.height);
break;
+ case RR_TEXTURE_LINE_ART:
+ *w += MAX(*w, MAX(l->texture[i].data.lineart.x1,
+ l->texture[i].data.lineart.x2));
+ *h += MAX(*h, MAX(l->texture[i].data.lineart.y1,
+ l->texture[i].data.lineart.y2));
+ break;
}
}
}
*data = g_new(RrPixel32, pw * ph);
- increase_depth(inst, *data, xi);
+ RrIncreaseDepth(inst, *data, xi);
if (mask) {
/* apply transparency from the mask */
for (i = 0, y = 0; y < ph; ++y) {
for (x = 0; x < pw; ++x, ++i) {
if (!((((unsigned)xm->data[di + x / 8]) >> (x % 8)) & 0x1))
- (*data)[i] &= ~(0xff << default_alpha_offset);
+ (*data)[i] &= ~(0xff << RrDefaultAlphaOffset);
}
di += xm->bytes_per_line;
}