- PlanarSurface *p;
- if (a->pixmap != None) XFreePixmap(ob_display, a->pixmap);
- if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw);
- if (a->textures)
- g_free(a->texture);
- if (a->surface.type == Surface_Planar) {
- p = &a->surface.data.planar;
- if (p->primary != NULL) color_free(p->primary);
- if (p->secondary != NULL) color_free(p->secondary);
- if (p->border_color != NULL) color_free(p->border_color);
+ if (a) {
+ RrSurface *p;
+ if (a->pixmap != None) XFreePixmap(RrDisplay(a->inst), a->pixmap);
+ if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw);
+ if (a->textures)
+ g_free(a->texture);
+ p = &a->surface;
+ RrColorFree(p->primary);
+ RrColorFree(p->secondary);
+ RrColorFree(p->border_color);
+ RrColorFree(p->bevel_dark);
+ RrColorFree(p->bevel_light);
+ g_free(p->pixel_data);
+
+ g_free(a);
+ }
+}
+
+
+static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h)
+{
+ RrPixel32 *in, *scratch;
+ Pixmap out;
+ XImage *im = NULL;
+ im = XCreateImage(RrDisplay(l->inst), RrVisual(l->inst), RrDepth(l->inst),
+ ZPixmap, 0, NULL, w, h, 32, 0);
+ g_assert(im != NULL);
+
+ in = l->surface.pixel_data;
+ out = l->pixmap;
+
+ 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;
+ RrReduceDepth(l->inst, in, im);
+ XPutImage(RrDisplay(l->inst), out,
+ DefaultGC(RrDisplay(l->inst), RrScreen(l->inst)),
+ im, 0, 0, x, y, w, h);
+ im->data = NULL;
+ XDestroyImage(im);
+ g_free(scratch);
+}
+
+void RrMinsize(RrAppearance *l, gint *w, gint *h)
+{
+ gint i;
+ gint m;
+ *w = *h = 0;
+
+ for (i = 0; i < l->textures; ++i) {
+ switch (l->texture[i].type) {
+ case RR_TEXTURE_NONE:
+ break;
+ case RR_TEXTURE_MASK:
+ *w = MAX(*w, l->texture[i].data.mask.mask->width);
+ *h = MAX(*h, l->texture[i].data.mask.mask->height);
+ break;
+ case RR_TEXTURE_TEXT:
+ m = RrFontMeasureString(l->texture[i].data.text.font,
+ l->texture[i].data.text.string);
+ *w = MAX(*w, m);
+ 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;
+ }
+ }
+
+ if (l->surface.relief != RR_RELIEF_FLAT) {
+ switch (l->surface.bevel) {
+ case RR_BEVEL_1:
+ *w += 2;
+ *h += 2;
+ break;
+ case RR_BEVEL_2:
+ *w += 4;
+ *h += 4;
+ break;
+ }
+ } else if (l->surface.border) {
+ *w += 2;
+ *h += 2;