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.70 by root, Sat Jun 9 11:41:28 2012 UTC vs.
Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC

… …
49 img->ref->ours = false; 49 img->ref->ours = false;
50 50
51 return img; 51 return img;
52} 52}
53 53
54# if HAVE_PIXBUF
54rxvt_img * 55rxvt_img *
55rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 56rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
56{ 57{
57 Display *dpy = s->display->dpy; 58 Display *dpy = s->display->dpy;
58 59
… …
62 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 63 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
63 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n"); 64 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
64 65
65 // since we require rgb24/argb32 formats from xrender we assume 66 // since we require rgb24/argb32 formats from xrender we assume
66 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender 67 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
67 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
68 68
69 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 69 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
70 70
71 XImage xi; 71 XImage xi;
72 72
… …
76 xi.format = ZPixmap; 76 xi.format = ZPixmap;
77 xi.byte_order = ImageByteOrder (dpy); 77 xi.byte_order = ImageByteOrder (dpy);
78 xi.bitmap_unit = 0; //XY only, unused 78 xi.bitmap_unit = 0; //XY only, unused
79 xi.bitmap_bit_order = 0; //XY only, unused 79 xi.bitmap_bit_order = 0; //XY only, unused
80 xi.bitmap_pad = BitmapPad (dpy); 80 xi.bitmap_pad = BitmapPad (dpy);
81 xi.depth = depth; 81 xi.depth = 32;
82 xi.bytes_per_line = 0; 82 xi.bytes_per_line = 0;
83 xi.bits_per_pixel = 32; //Z only 83 xi.bits_per_pixel = 32; //Z only
84 xi.red_mask = 0x00000000; //Z only, unused 84 xi.red_mask = 0x00000000; //Z only, unused
85 xi.green_mask = 0x00000000; //Z only, unused 85 xi.green_mask = 0x00000000; //Z only, unused
86 xi.blue_mask = 0x00000000; //Z only, unused 86 xi.blue_mask = 0x00000000; //Z only, unused
… …
95 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n"); 95 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
96 96
97 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 97 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
98 98
99 int rowstride = gdk_pixbuf_get_rowstride (pb); 99 int rowstride = gdk_pixbuf_get_rowstride (pb);
100 100 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
101 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
102 unsigned char *row = gdk_pixbuf_get_pixels (pb); 101 unsigned char *row = gdk_pixbuf_get_pixels (pb);
102
103 char *line = xi.data; 103 char *line = xi.data;
104 104
105 for (int y = 0; y < height; y++) 105 for (int y = 0; y < height; y++)
106 { 106 {
107 unsigned char *src = row; 107 unsigned char *src = row;
108 uint32_t *dst = (uint32_t *)line; 108 uint32_t *dst = (uint32_t *)line;
109 109
110 if (depth == 24) 110 if (!pb_has_alpha)
111 for (int x = 0; x < width; x++) 111 for (int x = 0; x < width; x++)
112 { 112 {
113 uint8_t r = *src++; 113 uint8_t r = *src++;
114 uint8_t g = *src++; 114 uint8_t g = *src++;
115 uint8_t b = *src++; 115 uint8_t b = *src++;
116 116
117 uint32_t v = (r << 16) | (g << 8) | b; 117 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
118 118
119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
120 v = ecb_bswap32 (v); 120 v = ecb_bswap32 (v);
121 121
122 *dst++ = v; 122 *dst++ = v;
… …
139 139
140 row += rowstride; 140 row += rowstride;
141 line += xi.bytes_per_line; 141 line += xi.bytes_per_line;
142 } 142 }
143 143
144 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height); 144 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
145 img->alloc (); 145 img->alloc ();
146 146
147 GC gc = XCreateGC (dpy, img->pm, 0, 0); 147 GC gc = XCreateGC (dpy, img->pm, 0, 0);
148 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); 148 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
149 XFreeGC (dpy, gc); 149 XFreeGC (dpy, gc);
… …
166 166
167 g_object_unref (pb); 167 g_object_unref (pb);
168 168
169 return img; 169 return img;
170} 170}
171# endif
171 172
172void 173void
173rxvt_img::destroy () 174rxvt_img::destroy ()
174{ 175{
175 if (--ref->cnt) 176 if (--ref->cnt)
… …
315 316
316 return img; 317 return img;
317} 318}
318 319
319static Picture 320static Picture
320create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 321create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
321{ 322{
322 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 323 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
323 324
324 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 325 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
325 XRenderPictureAttributes pa; 326 XRenderPictureAttributes pa;
326 pa.repeat = True; 327 pa.repeat = RepeatNormal;
328 pa.component_alpha = component_alpha;
327 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 329 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
328 330
329 XFreePixmap (dpy, pixmap); 331 XFreePixmap (dpy, pixmap);
330 332
331 return mask; 333 return mask;
332} 334}
… …
378 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h); 380 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
379 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h); 381 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
380 } 382 }
381 } 383 }
382 384
383
384 XRenderFreePicture (dpy, dst); 385 XRenderFreePicture (dpy, dst);
385} 386}
386 387
387void 388void
388rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) 389rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
389{ 390{
390 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 391 if (r < 0 || g < 0 || b < 0 || a < 0)
392 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
393
394 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
395 img->alloc ();
396
391 { 397 {
392 rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n"); 398 rxvt_color empty;
393 return; 399 empty.set (s, rgba (0, 0, 0, 0));
400 img->fill (empty);
394 } 401 }
395 402
396 unshare (); 403 // premultiply (yeah, these are not exact, sue me or fix it)
404 r = (r * (a >> 8)) >> 8;
405 g = (g * (a >> 8)) >> 8;
406 b = (b * (a >> 8)) >> 8;
397 407
398 Display *dpy = s->display->dpy; 408 Display *dpy = s->display->dpy;
399 Picture src = create_xrender_mask (dpy, pm, True); 409
410 Picture src = src_picture ();
400 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 411 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
412 Picture mul = create_xrender_mask (dpy, pm, True, True);
401 413
414 //TODO: this operator does not yet implement some useful contrast
415 while (r | g | b | a)
416 {
417 unsigned short xr, xg, xb, xa;
402 XRenderColor mask_c; 418 XRenderColor mask_c;
403 mask_c.red = r; 419
404 mask_c.green = g; 420 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
405 mask_c.blue = b; 421 {
406 mask_c.alpha = a;
407 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 422 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
408
409 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 423 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
424 }
425 }
410 426
427 XRenderFreePicture (dpy, mul);
428 XRenderFreePicture (dpy, dst);
411 XRenderFreePicture (dpy, src); 429 XRenderFreePicture (dpy, src);
412 XRenderFreePicture (dpy, dst); 430
431 ::swap (img->ref, ref);
432 ::swap (img->pm , pm );
433
434 delete img;
413} 435}
414 436
415rxvt_img * 437rxvt_img *
416rxvt_img::clone () 438rxvt_img::clone ()
417{ 439{
… …
599{ 621{
600 rxvt_img *img2 = clone (); 622 rxvt_img *img2 = clone ();
601 Display *dpy = s->display->dpy; 623 Display *dpy = s->display->dpy;
602 Picture src = img->src_picture (); 624 Picture src = img->src_picture ();
603 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 625 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
604 Picture mask = create_xrender_mask (dpy, img->pm, False); 626 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
605 627
606 XRenderColor mask_c; 628 XRenderColor mask_c;
607 629
608 mask_c.alpha = float_to_component (factor); 630 mask_c.alpha = float_to_component (factor);
609 mask_c.red = 631 mask_c.red =

Diff Legend

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