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.63 by root, Fri Jun 8 20:35:43 2012 UTC vs.
Revision 1.82 by root, Thu Jun 14 17:06:57 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
55
54rxvt_img * 56rxvt_img *
55rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 57rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
56{ 58{
57 Display *dpy = s->display->dpy; 59 Display *dpy = s->display->dpy;
58 60
… …
62 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 64 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"); 65 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
64 66
65 // since we require rgb24/argb32 formats from xrender we assume 67 // 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 68 // 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 69
69 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
70 71
71 XImage xi; 72 XImage xi;
72 73
… …
76 xi.format = ZPixmap; 77 xi.format = ZPixmap;
77 xi.byte_order = ImageByteOrder (dpy); 78 xi.byte_order = ImageByteOrder (dpy);
78 xi.bitmap_unit = 0; //XY only, unused 79 xi.bitmap_unit = 0; //XY only, unused
79 xi.bitmap_bit_order = 0; //XY only, unused 80 xi.bitmap_bit_order = 0; //XY only, unused
80 xi.bitmap_pad = BitmapPad (dpy); 81 xi.bitmap_pad = BitmapPad (dpy);
81 xi.depth = depth; 82 xi.depth = 32;
82 xi.bytes_per_line = 0; 83 xi.bytes_per_line = 0;
83 xi.bits_per_pixel = 32; //Z only 84 xi.bits_per_pixel = 32; //Z only
84 xi.red_mask = 0x00000000; //Z only, unused 85 xi.red_mask = 0x00000000; //Z only, unused
85 xi.green_mask = 0x00000000; //Z only, unused 86 xi.green_mask = 0x00000000; //Z only, unused
86 xi.blue_mask = 0x00000000; //Z only, unused 87 xi.blue_mask = 0x00000000; //Z only, unused
… …
95 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n"); 96 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
96 97
97 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 98 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
98 99
99 int rowstride = gdk_pixbuf_get_rowstride (pb); 100 int rowstride = gdk_pixbuf_get_rowstride (pb);
100 101 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); 102 unsigned char *row = gdk_pixbuf_get_pixels (pb);
103
103 char *line = xi.data; 104 char *line = xi.data;
104 105
105 for (int y = 0; y < height; y++) 106 for (int y = 0; y < height; y++)
106 { 107 {
107 unsigned char *src = row; 108 unsigned char *src = row;
108 uint32_t *dst = (uint32_t *)line; 109 uint32_t *dst = (uint32_t *)line;
109 110
110 if (depth == 24) 111 if (!pb_has_alpha)
111 for (int x = 0; x < width; x++) 112 for (int x = 0; x < width; x++)
112 { 113 {
113 uint8_t r = *src++; 114 uint8_t r = *src++;
114 uint8_t g = *src++; 115 uint8_t g = *src++;
115 uint8_t b = *src++; 116 uint8_t b = *src++;
116 117
117 uint32_t v = (r << 16) | (g << 8) | b; 118 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
118 119
119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
120 v = ecb_bswap32 (v); 121 v = ecb_bswap32 (v);
121 122
122 *dst++ = v; 123 *dst++ = v;
… …
139 140
140 row += rowstride; 141 row += rowstride;
141 line += xi.bytes_per_line; 142 line += xi.bytes_per_line;
142 } 143 }
143 144
144 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height); 145 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
145 img->alloc (); 146 img->alloc ();
146 147
147 GC gc = XCreateGC (dpy, img->pm, 0, 0); 148 GC gc = XCreateGC (dpy, img->pm, 0, 0);
148 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); 149 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
149 XFreeGC (dpy, gc); 150 XFreeGC (dpy, gc);
… …
167 g_object_unref (pb); 168 g_object_unref (pb);
168 169
169 return img; 170 return img;
170} 171}
171 172
173# endif
174
172void 175void
173rxvt_img::destroy () 176rxvt_img::destroy ()
174{ 177{
175 if (--ref->cnt) 178 if (--ref->cnt)
176 return; 179 return;
… …
209rxvt_img::unshare () 212rxvt_img::unshare ()
210{ 213{
211 if (ref->cnt == 1 && ref->ours) 214 if (ref->cnt == 1 && ref->ours)
212 return; 215 return;
213 216
214 //TODO: maybe should reify instead
215 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 217 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
216 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 218 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
217 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 219 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
218 XFreeGC (s->display->dpy, gc); 220 XFreeGC (s->display->dpy, gc);
219 221
… …
222 pm = pm2; 224 pm = pm2;
223 ref = new pixref (ref->w, ref->h); 225 ref = new pixref (ref->w, ref->h);
224} 226}
225 227
226void 228void
227rxvt_img::fill (const rxvt_color &c) 229rxvt_img::fill (const rgba &c)
228{ 230{
229 XGCValues gcv; 231 XRenderColor rc = { c.r, c.g, c.b, c.a };
230 gcv.foreground = c; 232
231 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 233 Display *dpy = s->display->dpy;
232 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 234 Picture src = src_picture ();
233 XFreeGC (s->display->dpy, gc); 235 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
236 XRenderFreePicture (dpy, src);
234} 237}
235 238
236static void 239static void
237get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 240get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
238{ 241{
… …
308 w, h); 311 w, h);
309 } 312 }
310 313
311 free (kernel); 314 free (kernel);
312 free (params); 315 free (params);
316
313 XRenderFreePicture (dpy, src); 317 XRenderFreePicture (dpy, src);
314 XRenderFreePicture (dpy, dst); 318 XRenderFreePicture (dpy, dst);
315 XRenderFreePicture (dpy, tmp); 319 XRenderFreePicture (dpy, tmp);
316 320
317 return img; 321 return img;
318} 322}
319 323
320static Picture 324static Picture
321create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 325create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
322{ 326{
323 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 327 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
324 328
325 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 329 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
326 XRenderPictureAttributes pa; 330 XRenderPictureAttributes pa;
327 pa.repeat = True; 331 pa.repeat = RepeatNormal;
332 pa.component_alpha = component_alpha;
328 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 333 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
329 334
330 XFreePixmap (dpy, pixmap); 335 XFreePixmap (dpy, pixmap);
331 336
332 return mask; 337 return mask;
333} 338}
334 339
340static void
341extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
342{
343 int32_t x = clamp (c, cl0, cl1);
344 c -= x;
345 xc = x;
346}
347
348static bool
349extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa)
350{
351 extract (cl0, cl1, r, xr);
352 extract (cl0, cl1, g, xg);
353 extract (cl0, cl1, b, xb);
354 extract (cl0, cl1, a, xa);
355
356 return xr | xg | xb | xa;
357}
358
335void 359void
336rxvt_img::brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a) 360rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
337{ 361{
362 unshare ();
363
338 Display *dpy = s->display->dpy; 364 Display *dpy = s->display->dpy;
339 Picture src = create_xrender_mask (dpy, pm, True);
340 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 365 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
341 366
367 // loop should not be needed for brightness, as only -1..1 makes sense
368 //while (r | g | b | a)
369 {
370 unsigned short xr, xg, xb, xa;
342 XRenderColor mask_c; 371 XRenderColor mask_c;
343 mask_c.red = r; 372
344 mask_c.green = g; 373 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
345 mask_c.blue = b; 374 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
346 mask_c.alpha = a; 375
376 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
377 {
378 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
379 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
380 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
381 mask_c.green = -mask_c.green;
382 mask_c.blue = -mask_c.blue;
383 mask_c.alpha = -mask_c.alpha;
384 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
385 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
386 }
387 }
388
389 XRenderFreePicture (dpy, dst);
390}
391
392void
393rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
394{
395 if (r < 0 || g < 0 || b < 0 || a < 0)
396 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
397
398 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
399 img->alloc ();
400 img->fill (rgba (0, 0, 0, 0));
401
402 // premultiply (yeah, these are not exact, sue me or fix it)
403 r = (r * (a >> 8)) >> 8;
404 g = (g * (a >> 8)) >> 8;
405 b = (b * (a >> 8)) >> 8;
406
407 Display *dpy = s->display->dpy;
408
409 Picture src = src_picture ();
410 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
411 Picture mul = create_xrender_mask (dpy, pm, True, True);
412
413 //TODO: this operator does not yet implement some useful contrast
414 while (r | g | b | a)
415 {
416 unsigned short xr, xg, xb, xa;
417 XRenderColor mask_c;
418
419 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
420 {
347 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 421 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
348
349 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 422 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
423 }
424 }
350 425
426 XRenderFreePicture (dpy, mul);
427 XRenderFreePicture (dpy, dst);
351 XRenderFreePicture (dpy, src); 428 XRenderFreePicture (dpy, src);
352 XRenderFreePicture (dpy, dst);
353}
354 429
355void 430 ::swap (img->ref, ref);
356rxvt_img::contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a) 431 ::swap (img->pm , pm );
357{
358 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
359 return;
360 432
361 Display *dpy = s->display->dpy; 433 delete img;
362 Picture src = create_xrender_mask (dpy, pm, True);
363 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
364
365 XRenderColor mask_c;
366 mask_c.red = r;
367 mask_c.green = g;
368 mask_c.blue = b;
369 mask_c.alpha = a;
370 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
371
372 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
373
374 XRenderFreePicture (dpy, src);
375 XRenderFreePicture (dpy, dst);
376} 434}
377 435
378rxvt_img * 436rxvt_img *
379rxvt_img::clone () 437rxvt_img::clone ()
380{ 438{
… …
454 } 512 }
455 513
456 return img; 514 return img;
457} 515}
458 516
459rxvt_img * 517static void
460rxvt_img::transform (int new_width, int new_height, double matrix[9]) 518mat_invert (double mat[3][3], double (&inv)[3][3])
461{ 519{
520 double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
521 double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
522 double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
523
524 double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
525
526 inv [0][0] = invdet * s0;
527 inv [0][1] = invdet * s1;
528 inv [0][2] = invdet * s2;
529
530 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
531 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
532 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
533
534 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
535 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
536 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
537}
538
539static double
540mat_apply (double mat[3][3], int i, double x, double y)
541{
542 double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
543 double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
544
545 return v * (1. / w);
546}
547
548rxvt_img *
549rxvt_img::transform (double matrix[3][3])
550{
551 // find new offset
552 int ox = mat_apply (matrix, 0, x, y);
553 int oy = mat_apply (matrix, 1, x, y);
554
555 // calculate new pixel bounding box coordinates
556 double d [2], rmin[2], rmax[2];
557
558 for (int i = 0; i < 2; ++i)
559 {
560 double v;
561 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v;
562 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v);
563 v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v);
564 v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v);
565 }
566
567 int dx = floor (rmin [0]);
568 int dy = floor (rmin [1]);
569
570 int new_width = ceil (rmax [0] - dx);
571 int new_height = ceil (rmax [1] - dy);
572
573 double inv[3][3];
574 mat_invert (matrix, inv);
575
462 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); 576 rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);
463 img->alloc (); 577 img->alloc ();
464 578
465 Display *dpy = s->display->dpy; 579 Display *dpy = s->display->dpy;
466 Picture src = src_picture (); 580 Picture src = src_picture ();
467 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 581 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
468 582
469 XTransform xfrm; 583 XTransform xfrm;
470 584
471 for (int i = 0; i < 3; ++i) 585 for (int i = 0; i < 3; ++i)
472 for (int j = 0; j < 3; ++j) 586 for (int j = 0; j < 3; ++j)
473 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 587 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
474
475#if 0
476 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
477 xfrm.matrix [1][2] -= XDoubleToFixed (y);
478#endif
479 588
480 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 589 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
481 XRenderSetPictureTransform (dpy, src, &xfrm); 590 XRenderSetPictureTransform (dpy, src, &xfrm);
482 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 591 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
483 592
484 XRenderFreePicture (dpy, src); 593 XRenderFreePicture (dpy, src);
485 XRenderFreePicture (dpy, dst); 594 XRenderFreePicture (dpy, dst);
486 595
487 return img; 596 return img;
… …
491rxvt_img::scale (int new_width, int new_height) 600rxvt_img::scale (int new_width, int new_height)
492{ 601{
493 if (w == new_width && h == new_height) 602 if (w == new_width && h == new_height)
494 return clone (); 603 return clone ();
495 604
496 double matrix[9] = { 605 double matrix[3][3] = {
497 w / (double)new_width, 0, 0, 606 { new_width / (double)w, 0, 0 },
498 0, h / (double)new_height, 0, 607 { 0, new_height / (double)h, 0 },
499 0, 0, 1 608 { 0, 0, 1 }
500 }; 609 };
501 610
502 int old_repeat_mode = repeat; 611 int old_repeat_mode = repeat;
503 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems 612 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
504 613
505 rxvt_img *img = transform (new_width, new_height, matrix); 614 rxvt_img *img = transform (matrix);
506 615
507 repeat = old_repeat_mode; 616 repeat = old_repeat_mode;
508 img->repeat = repeat; 617 img->repeat = repeat;
509 618
510 return img; 619 return img;
511} 620}
512 621
513rxvt_img * 622rxvt_img *
514rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 623rxvt_img::rotate (int cx, int cy, double phi)
515{ 624{
516 double s = sin (phi); 625 double s = sin (phi);
517 double c = cos (phi); 626 double c = cos (phi);
518 627
519 double matrix[9] = { 628 double matrix[3][3] = {
520 c, -s, -c * x + s * y + x, 629 { c, -s, cx - c * cx + s * cy },
521 s, c, -s * x - c * y + y, 630 { s, c, cy - s * cx - c * cy },
522 0, 0, 1 631 { 0, 0, 1 }
632 //{ c, -s, 0 },
633 //{ s, c, 0 },
634 //{ 0, 0, 1 }
523 }; 635 };
524 636
525 return transform (new_width, new_height, matrix); 637 //move (-cx, -cy);
526} 638 rxvt_img *img = transform (matrix);
639 //move ( cx, cy);
640 //img->move (cx, cy);
527 641
642 return img;
643}
644
528rxvt_img * 645rxvt_img *
529rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 646rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
530{ 647{
531 if (new_format == format) 648 if (new_format == format)
532 return clone (); 649 return clone ();
533 650
534 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 651 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
… …
540 int op = PictOpSrc; 657 int op = PictOpSrc;
541 658
542 if (format->direct.alphaMask && !new_format->direct.alphaMask) 659 if (format->direct.alphaMask && !new_format->direct.alphaMask)
543 { 660 {
544 // does it have to be that complicated 661 // does it have to be that complicated
545 rgba c;
546 bg.get (c);
547
548 XRenderColor rc = { c.r, c.g, c.b, 0xffff }; 662 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
549 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 663 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
550 664
551 op = PictOpOver; 665 op = PictOpOver;
552 } 666 }
553 667
… …
564{ 678{
565 rxvt_img *img2 = clone (); 679 rxvt_img *img2 = clone ();
566 Display *dpy = s->display->dpy; 680 Display *dpy = s->display->dpy;
567 Picture src = img->src_picture (); 681 Picture src = img->src_picture ();
568 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 682 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
569 Picture mask = create_xrender_mask (dpy, img->pm, False); 683 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
570 684
571 XRenderColor mask_c; 685 XRenderColor mask_c;
572 686
573 mask_c.alpha = float_to_component (factor); 687 mask_c.alpha = float_to_component (factor);
574 mask_c.red = 688 mask_c.red =

Diff Legend

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