void RrPaint(RrAppearance *a, Window win, gint w, gint h)
{
- int i, transferred = 0, sw;
+ gint i, transferred = 0, sw;
RrPixel32 *source, *dest;
Pixmap oldp;
RrRect tarea; /* area in which to draw textures */
as reduce_depth just sets im->data = data and returns
*/
scratch = g_new(RrPixel32, im->width * im->height);
- im->data = (char*) scratch;
+ im->data = (gchar*) scratch;
RrReduceDepth(l->inst, in, im);
XPutImage(RrDisplay(l->inst), out,
DefaultGC(RrDisplay(l->inst), RrScreen(l->inst)),
void RrMinsize(RrAppearance *a, gint *w, gint *h)
{
gint i;
- gint m;
+ RrSize *m;
gint l, t, r, b;
*w = *h = 0;
case RR_TEXTURE_TEXT:
m = RrFontMeasureString(a->texture[i].data.text.font,
a->texture[i].data.text.string);
- *w = MAX(*w, m);
- m = RrFontHeight(a->texture[i].data.text.font);
- *h += MAX(*h, m);
+ *w = MAX(*w, m->width + 4);
+ m->height = RrFontHeight(a->texture[i].data.text.font);
+ *h += MAX(*h, m->height);
break;
case RR_TEXTURE_RGBA:
*w += MAX(*w, a->texture[i].data.rgba.width);
if (*h < 1) *h = 1;
}
+static void reverse_bits(gchar *c, gint n)
+{
+ gint i;
+ for (i = 0; i < n; i++)
+ *c++ = (((*c * 0x0802UL & 0x22110UL) |
+ (*c * 0x8020UL & 0x88440UL)) * 0x10101UL) >> 16;
+}
+
gboolean RrPixmapToRGBA(const RrInstance *inst,
Pixmap pmap, Pixmap mask,
gint *w, gint *h, RrPixel32 **data)
guint pw, ph, mw, mh, xb, xd, i, x, y, di;
XImage *xi, *xm = NULL;
- if (!XGetGeometry(RrDisplay(inst),
- pmap, &xr, &xx, &xy, &pw, &ph, &xb, &xd))
+ if (!XGetGeometry(RrDisplay(inst), pmap,
+ &xr, &xx, &xy, &pw, &ph, &xb, &xd))
return FALSE;
+
if (mask) {
if (!XGetGeometry(RrDisplay(inst), mask,
&xr, &xx, &xy, &mw, &mh, &xb, &xd))
XDestroyImage(xi);
return FALSE;
}
+ if ((xm->bits_per_pixel == 1) && (xm->bitmap_bit_order != LSBFirst))
+ reverse_bits(xm->data, xm->bytes_per_line * xm->height);
}
+ if ((xi->bits_per_pixel == 1) && (xi->bitmap_bit_order != LSBFirst))
+ reverse_bits(xi->data, xi->bytes_per_line * xi->height);
+
*data = g_new(RrPixel32, pw * ph);
RrIncreaseDepth(inst, *data, xi);