- switch (l->surface.type) {
- case Surface_Planar:
- if (l->surface.data.planar.relief != Flat) {
- switch (l->surface.data.planar.bevel) {
- case Bevel1:
- *w = *h = 2;
- break;
- case Bevel2:
- *w = *h = 4;
- break;
- }
- } else if (l->surface.data.planar.border)
- *w = *h = 2;
-
- for (i = 0; i < l->textures; ++i) {
- switch (l->texture[i].type) {
- case Bitmask:
- *w += l->texture[i].data.mask.mask->w;
- *h += l->texture[i].data.mask.mask->h;
- break;
- case 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);
- *w += m;
- m = font_height(l->texture[i].data.text.font,
- l->texture[i].data.text.shadow,
- l->texture[i].data.text.offset);
- *h += m;
- break;
- case RGBA:
- *w += l->texture[i].data.rgba.width;
- *h += l->texture[i].data.rgba.height;
- break;
- case NoTexture:
- break;
+ for (i = 0; i < l->textures; ++i) {
+ switch (l->texture[i].type) {
+ case Bitmask:
+ *w = MAX(*w, l->texture[i].data.mask.mask->w);
+ *h = MAX(*h, l->texture[i].data.mask.mask->h);
+ break;
+ case 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);
+ *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);
+ *h += MAX(*h, m);
+ break;
+ case RGBA:
+ *w += MAX(*w, l->texture[i].data.rgba.width);
+ *h += MAX(*h, l->texture[i].data.rgba.height);
+ break;
+ case NoTexture:
+ break;
+ }
+ }
+
+ if (l->surface.relief != Flat) {
+ switch (l->surface.bevel) {
+ case Bevel1:
+ *w += 2;
+ *h += 2;
+ break;
+ case Bevel2:
+ *w += 4;
+ *h += 4;
+ break;
+ }
+ } else if (l->surface.border) {
+ *w += 2;
+ *h += 2;
+ }
+
+ if (*w < 1) *w = 1;
+ if (*h < 1) *h = 1;
+}
+
+gboolean render_pixmap_to_rgba(Pixmap pmap, Pixmap mask,
+ int *w, int *h, pixel32 **data)
+{
+ Window xr;
+ int xx, xy;
+ guint pw, ph, mw, mh, xb, xd, i, x, y, di;
+ XImage *xi, *xm = NULL;
+
+ if (!XGetGeometry(ob_display, pmap, &xr, &xx, &xy, &pw, &ph, &xb, &xd))
+ return FALSE;
+ if (mask) {
+ if (!XGetGeometry(ob_display, mask, &xr, &xx, &xy, &mw, &mh, &xb, &xd))
+ return FALSE;
+ if (pw != mw || ph != mh || xd != 1)
+ return FALSE;
+ }
+
+ xi = XGetImage(ob_display, pmap, 0, 0, pw, ph, 0xffffffff, ZPixmap);
+ if (!xi)
+ return FALSE;
+
+ if (mask) {
+ xm = XGetImage(ob_display, mask, 0, 0, mw, mh, 0xffffffff, ZPixmap);
+ if (!xm)
+ return FALSE;
+ }
+
+ *data = g_new(pixel32, pw * ph);
+ increase_depth(*data, xi);
+
+ if (mask) {
+ /* apply transparency from the mask */
+ di = 0;
+ 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);