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.82 by root, Thu Jun 14 17:06:57 2012 UTC vs.
Revision 1.94 by root, Fri Jun 15 18:10:40 2012 UTC

1#include <string.h>
1#include <math.h> 2#include <math.h>
2#include "../config.h" 3#include "../config.h"
3#include "rxvt.h" 4#include "rxvt.h"
4 5
5#if HAVE_IMG 6#if HAVE_IMG
7
8typedef rxvt_img::nv nv;
9
10namespace
11{
12
13 struct mat3x3
14 {
15 nv v[3][3];
16
17 mat3x3 ()
18 {
19 }
20
21 mat3x3 (nv matrix[3][3])
22 {
23 memcpy (v, matrix, sizeof (v));
24 }
25
26 mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
27 {
28 v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
29 v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
30 v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
31 }
32
33 mat3x3 invert ();
34
35 nv *operator [](int i) { return &v[i][0]; }
36 const nv *operator [](int i) const { return &v[i][0]; }
37
38 // quite inefficient, hopefully gcc pulls the w calc out of any loops
39 nv apply1 (int i, nv x, nv y)
40 {
41 mat3x3 &m = *this;
42
43 nv v = m[i][0] * x + m[i][1] * y + m[i][2];
44 nv w = m[2][0] * x + m[2][1] * y + m[2][2];
45
46 return v * (1. / w);
47 }
48
49 static mat3x3 translate (nv x, nv y);
50 };
51
52 mat3x3
53 mat3x3::invert ()
54 {
55 mat3x3 &m = *this;
56 mat3x3 inv;
57
58 nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
59 nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
60 nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
61
62 nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
63
64 inv[0][0] = invdet * s0;
65 inv[0][1] = invdet * s1;
66 inv[0][2] = invdet * s2;
67
68 inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
69 inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
70 inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
71
72 inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
73 inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
74 inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
75
76 return inv;
77 }
78
79 static mat3x3
80 operator *(const mat3x3 &a, const mat3x3 &b)
81 {
82 mat3x3 r;
83
84 for (int i = 0; i < 3; ++i)
85 for (int j = 0; j < 3; ++j)
86 r[i][j] = a[i][0] * b[0][j]
87 + a[i][1] * b[1][j]
88 + a[i][2] * b[2][j];
89
90 return r;
91 }
92
93 mat3x3
94 mat3x3::translate (nv x, nv y)
95 {
96 return mat3x3 (
97 1, 0, x,
98 0, 1, y,
99 0, 0, 1
100 );
101 }
102
103}
104
105#if 0
106struct pict
107{
108 Display *dpy;
109 Picture pic;
110
111 operator Picture () const
112 {
113 return pic;
114 }
115
116 pict ()
117 : pic (0)
118 {
119 }
120
121 pict (rxvt_img *img, XRenderPictFormat *format = 0)
122 : dpy (img->s->display->dpy)
123 {
124 XRenderPictureAttributes pa;
125 pa.repeat = img->repeat;
126 pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);
127 }
128
129 ~pict ()
130 {
131 if (pic)
132 XRenderFreePicture (dpy, pic);
133 }
134};
135#endif
136
137static XRenderPictFormat *
138find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
139{
140 if (format->direct.alphaMask)
141 return format; // already has alpha
142
143 // try to find a suitable alpha format, one bit alpha is enough for our purposes
144 if (format->type == PictTypeDirect)
145 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
146 if (f->direct.alphaMask
147 && f->type == PictTypeDirect
148 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
149 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
150 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
151 return f;
152
153 // should be a very good fallback
154 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
155}
6 156
7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat) 157rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
8: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat), 158: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), ref(0) 159 pm(0), ref(0)
10{ 160{
… …
195 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 345 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
196 ref = new pixref (w, h); 346 ref = new pixref (w, h);
197} 347}
198 348
199Picture 349Picture
200rxvt_img::src_picture () 350rxvt_img::picture ()
201{ 351{
202 Display *dpy = s->display->dpy; 352 Display *dpy = s->display->dpy;
203 353
204 XRenderPictureAttributes pa; 354 XRenderPictureAttributes pa;
205 pa.repeat = repeat; 355 pa.repeat = repeat;
… …
229rxvt_img::fill (const rgba &c) 379rxvt_img::fill (const rgba &c)
230{ 380{
231 XRenderColor rc = { c.r, c.g, c.b, c.a }; 381 XRenderColor rc = { c.r, c.g, c.b, c.a };
232 382
233 Display *dpy = s->display->dpy; 383 Display *dpy = s->display->dpy;
234 Picture src = src_picture (); 384 Picture src = picture ();
235 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h); 385 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
236 XRenderFreePicture (dpy, src); 386 XRenderFreePicture (dpy, src);
237} 387}
238 388
389void
390rxvt_img::add_alpha ()
391{
392 if (format->direct.alphaMask)
393 return;
394
395 Display *dpy = s->display->dpy;
396
397 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
398 img->alloc ();
399
400 Picture src = picture ();
401 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
402
403 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
404
405 XRenderFreePicture (dpy, src);
406 XRenderFreePicture (dpy, dst);
407
408 ::swap (img->ref, ref);
409 ::swap (img->pm , pm );
410
411 delete img;
412}
413
239static void 414static void
240get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 415get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
241{ 416{
242 double sigma = radius / 2.0; 417 nv sigma = radius / 2.0;
243 double scale = sqrt (2.0 * M_PI) * sigma; 418 nv scale = sqrt (2.0 * M_PI) * sigma;
244 double sum = 0.0; 419 nv sum = 0.0;
245 420
246 for (int i = 0; i < width; i++) 421 for (int i = 0; i < width; i++)
247 { 422 {
248 double x = i - width / 2; 423 nv x = i - width / 2;
249 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 424 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
250 sum += kernel[i]; 425 sum += kernel[i];
251 } 426 }
252 427
253 params[0] = XDoubleToFixed (width); 428 params[0] = XDoubleToFixed (width);
… …
263 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 438 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
264 return clone (); 439 return clone ();
265 440
266 Display *dpy = s->display->dpy; 441 Display *dpy = s->display->dpy;
267 int size = max (rh, rv) * 2 + 1; 442 int size = max (rh, rv) * 2 + 1;
268 double *kernel = (double *)malloc (size * sizeof (double)); 443 nv *kernel = (nv *)malloc (size * sizeof (nv));
269 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 444 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
270 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 445 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
271 img->alloc (); 446 img->alloc ();
272 447
273 XRenderPictureAttributes pa; 448 XRenderPictureAttributes pa;
… …
404 g = (g * (a >> 8)) >> 8; 579 g = (g * (a >> 8)) >> 8;
405 b = (b * (a >> 8)) >> 8; 580 b = (b * (a >> 8)) >> 8;
406 581
407 Display *dpy = s->display->dpy; 582 Display *dpy = s->display->dpy;
408 583
409 Picture src = src_picture (); 584 Picture src = picture ();
410 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 585 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
411 Picture mul = create_xrender_mask (dpy, pm, True, True); 586 Picture mul = create_xrender_mask (dpy, pm, True, True);
412 587
413 //TODO: this operator does not yet implement some useful contrast 588 //TODO: this operator does not yet implement some useful contrast
414 while (r | g | b | a) 589 while (r | g | b | a)
… …
431 ::swap (img->pm , pm ); 606 ::swap (img->pm , pm );
432 607
433 delete img; 608 delete img;
434} 609}
435 610
611void
612rxvt_img::draw (rxvt_img *img, int op, nv mask)
613{
614 unshare ();
615
616 Display *dpy = s->display->dpy;
617 Picture src = img->picture ();
618 Picture dst = picture ();
619 Picture mask_p = 0;
620
621 if (mask != 1.)
622 {
623 mask_p = create_xrender_mask (dpy, img->pm, False, False);
624 XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
625 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
626 }
627
628 XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
629
630 XRenderFreePicture (dpy, src);
631 XRenderFreePicture (dpy, dst);
632
633 if (mask_p)
634 XRenderFreePicture (dpy, mask_p);
635}
636
436rxvt_img * 637rxvt_img *
437rxvt_img::clone () 638rxvt_img::clone ()
438{ 639{
439 return new rxvt_img (*this); 640 return new rxvt_img (*this);
440}
441
442static XRenderPictFormat *
443find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
444{
445 if (format->direct.alphaMask)
446 return format; // already has alpha
447
448 // try to find a suitable alpha format, one bit alpha is enough for our purposes
449 if (format->type == PictTypeDirect)
450 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
451 if (f->direct.alphaMask
452 && f->type == PictTypeDirect
453 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
454 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
455 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
456 return f;
457
458 // should be a very good fallback
459 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
460} 641}
461 642
462rxvt_img * 643rxvt_img *
463rxvt_img::reify () 644rxvt_img::reify ()
464{ 645{
… …
473 && repeat == RepeatNone; // and we have no good pixels to fill with 654 && repeat == RepeatNone; // and we have no good pixels to fill with
474 655
475 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 656 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
476 img->alloc (); 657 img->alloc ();
477 658
478 Picture src = src_picture (); 659 Picture src = picture ();
479 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 660 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
480 661
481 if (alpha) 662 if (alpha)
482 { 663 {
483 XRenderColor rc = { 0, 0, 0, 0 }; 664 XRenderColor rc = { 0, 0, 0, 0 };
484 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 665 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
485 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); 666 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
486 } 667 }
487 else 668 else
488 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 669 XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
489 670
490 XRenderFreePicture (dpy, src); 671 XRenderFreePicture (dpy, src);
491 XRenderFreePicture (dpy, dst); 672 XRenderFreePicture (dpy, dst);
492 673
493 return img; 674 return img;
… …
496rxvt_img * 677rxvt_img *
497rxvt_img::sub_rect (int x, int y, int width, int height) 678rxvt_img::sub_rect (int x, int y, int width, int height)
498{ 679{
499 rxvt_img *img = clone (); 680 rxvt_img *img = clone ();
500 681
501 img->x += x; 682 img->x -= x;
502 img->y += y; 683 img->y -= y;
503 684
504 if (w != width || h != height) 685 if (w != width || h != height)
505 { 686 {
506 img->w = width; 687 img->w = width;
507 img->h = height; 688 img->h = height;
… …
512 } 693 }
513 694
514 return img; 695 return img;
515} 696}
516 697
517static void
518mat_invert (double mat[3][3], double (&inv)[3][3])
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 * 698rxvt_img *
549rxvt_img::transform (double matrix[3][3]) 699rxvt_img::transform (nv matrix[3][3])
550{ 700{
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 701 // calculate new pixel bounding box coordinates
556 double d [2], rmin[2], rmax[2]; 702 nv r[2], rmin[2], rmax[2];
703
704 mat3x3 m (matrix);
557 705
558 for (int i = 0; i < 2; ++i) 706 for (int i = 0; i < 2; ++i)
559 { 707 {
560 double v; 708 nv v;
709
561 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v; 710 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;
562 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v); 711 v = m.apply1 (i, w+x, 0+y); 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); 712 v = m.apply1 (i, 0+x, h+y); 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); 713 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
565 } 714 }
566 715
716 float sx = rmin [0] - x;
717 float sy = rmin [1] - y;
718
719 // TODO: adjust matrix for subpixel accuracy
567 int dx = floor (rmin [0]); 720 int nx = floor (rmin [0]);
568 int dy = floor (rmin [1]); 721 int ny = floor (rmin [1]);
569 722
570 int new_width = ceil (rmax [0] - dx); 723 int new_width = ceil (rmax [0] - rmin [0]);
571 int new_height = ceil (rmax [1] - dy); 724 int new_height = ceil (rmax [1] - rmin [1]);
572 725
573 double inv[3][3]; 726 m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);
574 mat_invert (matrix, inv);
575 727
728 mat3x3 inv = m.invert ();
729
576 rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat); 730 rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
577 img->alloc (); 731 img->alloc ();
578 732
579 Display *dpy = s->display->dpy; 733 Display *dpy = s->display->dpy;
580 Picture src = src_picture (); 734 Picture src = picture ();
581 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 735 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
582 736
583 XTransform xfrm; 737 XTransform xfrm;
584 738
585 for (int i = 0; i < 3; ++i) 739 for (int i = 0; i < 3; ++i)
586 for (int j = 0; j < 3; ++j) 740 for (int j = 0; j < 3; ++j)
587 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 741 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
588 742
589 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 743 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
590 XRenderSetPictureTransform (dpy, src, &xfrm); 744 XRenderSetPictureTransform (dpy, src, &xfrm);
591 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height); 745 XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
592 746
593 XRenderFreePicture (dpy, src); 747 XRenderFreePicture (dpy, src);
594 XRenderFreePicture (dpy, dst); 748 XRenderFreePicture (dpy, dst);
595 749
596 return img; 750 return img;
… …
600rxvt_img::scale (int new_width, int new_height) 754rxvt_img::scale (int new_width, int new_height)
601{ 755{
602 if (w == new_width && h == new_height) 756 if (w == new_width && h == new_height)
603 return clone (); 757 return clone ();
604 758
605 double matrix[3][3] = { 759 nv matrix[3][3] = {
606 { new_width / (double)w, 0, 0 }, 760 { new_width / (nv)w, 0, 0 },
607 { 0, new_height / (double)h, 0 }, 761 { 0, new_height / (nv)h, 0 },
608 { 0, 0, 1 } 762 { 0, 0, 1 }
609 }; 763 };
610 764
611 int old_repeat_mode = repeat; 765 int old_repeat_mode = repeat;
612 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 766 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
613 767
… …
618 772
619 return img; 773 return img;
620} 774}
621 775
622rxvt_img * 776rxvt_img *
623rxvt_img::rotate (int cx, int cy, double phi) 777rxvt_img::rotate (int cx, int cy, nv phi)
624{ 778{
625 double s = sin (phi); 779 nv s = sin (phi);
626 double c = cos (phi); 780 nv c = cos (phi);
627 781
628 double matrix[3][3] = { 782 nv matrix[3][3] = {
783#if 0
629 { c, -s, cx - c * cx + s * cy }, 784 { c, -s, cx - c * cx + s * cy },
630 { s, c, cy - s * cx - c * cy }, 785 { s, c, cy - s * cx - c * cy },
631 { 0, 0, 1 } 786 { 0, 0, 1 }
787#else
632 //{ c, -s, 0 }, 788 { c, -s, 0 },
633 //{ s, c, 0 }, 789 { s, c, 0 },
634 //{ 0, 0, 1 } 790 { 0, 0, 1 }
791#endif
635 }; 792 };
636 793
637 //move (-cx, -cy); 794 move (-cx, -cy);
638 rxvt_img *img = transform (matrix); 795 rxvt_img *img = transform (matrix);
639 //move ( cx, cy); 796 move ( cx, cy);
640 //img->move (cx, cy); 797 img->move (cx, cy);
641 798
642 return img; 799 return img;
643} 800}
644 801
645rxvt_img * 802rxvt_img *
… …
650 807
651 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 808 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
652 img->alloc (); 809 img->alloc ();
653 810
654 Display *dpy = s->display->dpy; 811 Display *dpy = s->display->dpy;
655 Picture src = src_picture (); 812 Picture src = picture ();
656 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 813 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
657 int op = PictOpSrc; 814 int op = PictOpSrc;
658 815
659 if (format->direct.alphaMask && !new_format->direct.alphaMask) 816 if (format->direct.alphaMask && !new_format->direct.alphaMask)
660 { 817 {
… …
672 829
673 return img; 830 return img;
674} 831}
675 832
676rxvt_img * 833rxvt_img *
677rxvt_img::blend (rxvt_img *img, double factor) 834rxvt_img::blend (rxvt_img *img, nv factor)
678{ 835{
679 rxvt_img *img2 = clone (); 836 rxvt_img *img2 = clone ();
680 Display *dpy = s->display->dpy; 837 Display *dpy = s->display->dpy;
681 Picture src = img->src_picture (); 838 Picture src = img->picture ();
682 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 839 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
683 Picture mask = create_xrender_mask (dpy, img->pm, False, False); 840 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
684 841
685 XRenderColor mask_c; 842 XRenderColor mask_c;
686 843

Diff Legend

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