X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=0cc4ea53162440cc9df58d031baaf9f3e87097f7;hb=87342f85eb75079486e5bbc410f6002ee443dd6a;hp=1fbfef672b09a83ffbc5533875c625d5a2448543;hpb=159ef95805a802b0fe03d4b0ce99f49dadca1709;p=chaz%2Fopenbox diff --git a/render/render.c b/render/render.c index 1fbfef67..0cc4ea53 100644 --- a/render/render.c +++ b/render/render.c @@ -15,8 +15,8 @@ # include #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) { @@ -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)); } @@ -89,7 +89,7 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h) 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, @@ -97,19 +97,36 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h) RrColormap(l->inst)); } RrFontDraw(l->xftdraw, &l->texture[i].data.text, &tarea); - break; + 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) - RrColorAllocateGC(l->texture[i].data.mask.color); RrPixmapMaskDraw(l->pixmap, &l->texture[i].data.mask, &tarea); - break; + break; case RR_TEXTURE_RGBA: - RrImageDraw(l->surface.RrPixel_data, + g_assert(!transferred); + RrImageDraw(l->surface.pixel_data, &l->texture[i].data.rgba, &tarea); break; } @@ -118,10 +135,9 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h) 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); @@ -143,6 +159,7 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig) { RrSurface *spo, *spc; RrAppearance *copy = g_new(RrAppearance, 1); + gint i; copy->inst = orig->inst; @@ -172,6 +189,13 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig) spo->border_color->b); else spc->border_color = NULL; + if (spo->interlace_color != NULL) + spc->interlace_color = RrColorNew(copy->inst, + spo->interlace_color->r, + spo->interlace_color->g, + spo->interlace_color->b); + else spc->interlace_color = NULL; + if (spo->bevel_dark != NULL) spc->bevel_dark = RrColorNew(copy->inst, spo->bevel_dark->r, @@ -190,11 +214,16 @@ 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, 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; @@ -203,26 +232,35 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig) 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->primary); RrColorFree(p->secondary); RrColorFree(p->border_color); + RrColorFree(p->interlace_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; @@ -231,7 +269,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; @@ -274,6 +312,12 @@ void RrMinsize(RrAppearance *l, gint *w, gint *h) *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; } }