ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtimg.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.42 by root, Thu Jun 7 11:52:26 2012 UTC vs.
Revision 1.55 by root, Thu Jun 7 20:26:21 2012 UTC

… …
57 57
58 return img; 58 return img;
59} 59}
60 60
61rxvt_img * 61rxvt_img *
62rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
63{
64 Display *dpy = s->display->dpy;
65
66 int width = gdk_pixbuf_get_width (pb);
67 int height = gdk_pixbuf_get_height (pb);
68
69 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
70 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71
72 // since we require rgb24/argb32 formats from xrender we assume
73 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
74 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
75
76 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
77
78 XImage xi;
79
80 xi.width = width;
81 xi.height = height;
82 xi.xoffset = 0;
83 xi.format = ZPixmap;
84 xi.byte_order = ImageByteOrder (dpy);
85 xi.bitmap_unit = 0; //XY only, unused
86 xi.bitmap_bit_order = 0; //XY only, unused
87 xi.bitmap_pad = BitmapPad (dpy);
88 xi.depth = depth;
89 xi.bytes_per_line = 0;
90 xi.bits_per_pixel = 32; //Z only
91 xi.red_mask = 0x00000000; //Z only, unused
92 xi.green_mask = 0x00000000; //Z only, unused
93 xi.blue_mask = 0x00000000; //Z only, unused
94 xi.obdata = 0; // probably unused
95
96 bool byte_order_mismatch = byte_order != xi.byte_order;
97
98 if (!XInitImage (&xi))
99 rxvt_fatal ("unable to initialise ximage, please report.\n");
100
101 if (height > INT_MAX / xi.bytes_per_line)
102 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
103
104 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
105
106 int rowstride = gdk_pixbuf_get_rowstride (pb);
107
108 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
109 unsigned char *row = gdk_pixbuf_get_pixels (pb);
110 char *line = xi.data;
111
112 for (int y = 0; y < height; y++)
113 {
114 unsigned char *src = row;
115 uint32_t *dst = (uint32_t *)line;
116
117 if (depth == 24)
118 for (int x = 0; x < width; x++)
119 {
120 uint8_t r = *src++;
121 uint8_t g = *src++;
122 uint8_t b = *src++;
123
124 uint32_t v = (r << 16) | (g << 8) | b;
125
126 if (ecb_big_endian ())
127 v = ecb_bswap32 (v);
128
129 if (byte_order_mismatch)
130 v = ecb_bswap32 (v);
131
132 *dst++ = v;
133 }
134 else
135 for (int x = 0; x < width; x++)
136 {
137 uint32_t v = *(uint32_t *)src; src += 4;
138
139 if (ecb_little_endian ())
140 v = ecb_bswap32 (v);
141
142 v = ecb_rotr32 (v, 8);
143
144 if (byte_order_mismatch)
145 v = ecb_bswap32 (v);
146
147 *dst++ = v;
148 }
149
150 row += rowstride;
151 line += xi.bytes_per_line;
152 }
153
154 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
155 img->alloc ();
156
157 GC gc = XCreateGC (dpy, img->pm, 0, 0);
158 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
159 XFreeGC (dpy, gc);
160
161 free (xi.data);
162
163 return img;
164}
165
166rxvt_img *
62rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 167rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
63{ 168{
64 GError *err = 0; 169 GError *err = 0;
65 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 170 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
66 171
67 if (!pb) 172 if (!pb)
68 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 173 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
69 174
70 rxvt_img *img = new rxvt_img ( 175 rxvt_img *img = new_from_pixbuf (s, pb);
71 s,
72 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
73 0,
74 0,
75 gdk_pixbuf_get_width (pb),
76 gdk_pixbuf_get_height (pb)
77 );
78 img->alloc ();
79 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
80 176
81 g_object_unref (pb); 177 g_object_unref (pb);
82 178
83 return img; 179 return img;
84} 180}
… …
288 384
289 XRenderFreePicture (dpy, src); 385 XRenderFreePicture (dpy, src);
290 XRenderFreePicture (dpy, dst); 386 XRenderFreePicture (dpy, dst);
291} 387}
292 388
293bool
294rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
295{
296 Display *dpy = s->display->dpy;
297
298 if (s->visual->c_class != TrueColor)
299 return false;
300
301 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
302
303 red_mask = (uint32_t)format->direct.redMask << format->direct.red;
304 green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
305 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
306 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
307
308 int width_r = ecb_popcount32 (red_mask);
309 int width_g = ecb_popcount32 (green_mask);
310 int width_b = ecb_popcount32 (blue_mask);
311 int width_a = ecb_popcount32 (alpha_mask);
312
313 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
314 return false;
315
316 int sh_r = ecb_ctz32 (red_mask);
317 int sh_g = ecb_ctz32 (green_mask);
318 int sh_b = ecb_ctz32 (blue_mask);
319 int sh_a = ecb_ctz32 (alpha_mask);
320
321 if (width > 32767 || height > 32767)
322 return false;
323
324 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
325 width, height, 32, 0);
326 if (!ximage)
327 return false;
328
329 if (height > INT_MAX / ximage->bytes_per_line
330 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
331 {
332 XDestroyImage (ximage);
333 return false;
334 }
335
336 GC gc = XCreateGC (dpy, pm, 0, 0);
337
338 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
339
340 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
341 int channels = gdk_pixbuf_get_n_channels (pixbuf);
342 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
343 char *line = ximage->data;
344
345 for (int y = 0; y < height; y++)
346 {
347 for (int x = 0; x < width; x++)
348 {
349 unsigned char *pixel = row + x * channels;
350 uint32_t value;
351 unsigned char r, g, b, a;
352
353 if (channels == 4)
354 {
355 a = pixel[3];
356 r = pixel[0] * a / 0xff;
357 g = pixel[1] * a / 0xff;
358 b = pixel[2] * a / 0xff;
359 }
360 else
361 {
362 a = 0xff;
363 r = pixel[0];
364 g = pixel[1];
365 b = pixel[2];
366 }
367
368 value = ((r >> (8 - width_r)) << sh_r)
369 | ((g >> (8 - width_g)) << sh_g)
370 | ((b >> (8 - width_b)) << sh_b)
371 | ((a >> (8 - width_a)) << sh_a);
372
373 if (ximage->bits_per_pixel == 32)
374 ((uint32_t *)line)[x] = value;
375 else
376 XPutPixel (ximage, x, y, value);
377 }
378
379 row += rowstride;
380 line += ximage->bytes_per_line;
381 }
382
383 XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
384 XDestroyImage (ximage);
385 XFreeGC (dpy, gc);
386
387 return true;
388}
389
390rxvt_img * 389rxvt_img *
391rxvt_img::clone () 390rxvt_img::clone ()
392{ 391{
393 return new rxvt_img (*this); 392 return new rxvt_img (*this);
393}
394
395static XRenderPictFormat *
396find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
397{
398 if (format->direct.alphaMask)
399 return format; // already has alpha
400
401 // try to find a suitable alpha format, one bit alpha is enough for our purposes
402 if (format->type == PictTypeDirect)
403 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
404 if (f->direct.alphaMask
405 && f->type == PictTypeDirect
406 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
407 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
408 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
409 return f;
410
411 // should be a very good fallback
412 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
394} 413}
395 414
396rxvt_img * 415rxvt_img *
397rxvt_img::reify () 416rxvt_img::reify ()
398{ 417{
… …
403 422
404 bool alpha = !format->direct.alphaMask 423 bool alpha = !format->direct.alphaMask
405 && (x || y) 424 && (x || y)
406 && repeat == RepeatNone; 425 && repeat == RepeatNone;
407 426
408 rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h, repeat); 427 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
409 img->alloc (); 428 img->alloc ();
410 429
411 Picture src = src_picture (); 430 Picture src = src_picture ();
412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 431 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
413 432
414 if (alpha) 433 if (alpha)
415 { 434 {
416 XRenderColor rc = { 0, 0, 0, 0 }; 435 XRenderColor rc = { 0, 0, 0, 0 };
417 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 436 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
418 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); 437 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
419 } 438 }
420 else 439 else
421 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 440 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
422 441
… …
461 480
462 for (int i = 0; i < 3; ++i) 481 for (int i = 0; i < 3; ++i)
463 for (int j = 0; j < 3; ++j) 482 for (int j = 0; j < 3; ++j)
464 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 483 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
465 484
485#if 0
466 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO 486 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
467 xfrm.matrix [0][3] += XDoubleToFixed (y); 487 xfrm.matrix [1][2] -= XDoubleToFixed (y);
488#endif
468 489
469 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 490 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
470 XRenderSetPictureTransform (dpy, src, &xfrm); 491 XRenderSetPictureTransform (dpy, src, &xfrm);
471 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 492 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
472 493
… …
477} 498}
478 499
479rxvt_img * 500rxvt_img *
480rxvt_img::scale (int new_width, int new_height) 501rxvt_img::scale (int new_width, int new_height)
481{ 502{
503 if (w == new_width && h == new_height)
504 return clone ();
505
482 double matrix[9] = { 506 double matrix[9] = {
483 w / (double)new_width, 0, 0, 507 w / (double)new_width, 0, 0,
484 0, h / (double)new_height, 0, 508 0, h / (double)new_height, 0,
485 0, 0, 1 509 0, 0, 1
486 }; 510 };
… …
510 534
511 return transform (new_width, new_height, matrix); 535 return transform (new_width, new_height, matrix);
512} 536}
513 537
514rxvt_img * 538rxvt_img *
515rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 539rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
516{ 540{
517 if (new_format == format) 541 if (new_format == format)
518 return clone (); 542 return clone ();
519 543
520 rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat); 544 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
521 img->alloc (); 545 img->alloc ();
522
523 printf ("convert %d to %d\n", format->direct.alphaMask, new_format->direct.alphaMask);//D
524 546
525 Display *dpy = s->display->dpy; 547 Display *dpy = s->display->dpy;
526 Picture src = src_picture (); 548 Picture src = src_picture ();
527 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 549 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
528 int op = PictOpSrc; 550 int op = PictOpSrc;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines