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.83 by root, Thu Jun 14 18:06:15 2012 UTC vs.
Revision 1.97 by sf-exg, Sun Jun 17 17:06:47 2012 UTC

1/*----------------------------------------------------------------------*
2 * File: rxvtimg.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2012 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/
23
24#include <string.h>
1#include <math.h> 25#include <math.h>
2#include "../config.h" 26#include "../config.h"
3#include "rxvt.h" 27#include "rxvt.h"
4 28
5#if HAVE_IMG 29#if HAVE_IMG
30
31typedef rxvt_img::nv nv;
32
33namespace
34{
35
36 struct mat3x3
37 {
38 nv v[3][3];
39
40 mat3x3 ()
41 {
42 }
43
44 mat3x3 (const nv *matrix)
45 {
46 memcpy (v, matrix, sizeof (v));
47 }
48
49 mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
50 {
51 v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
52 v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
53 v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
54 }
55
56 mat3x3 invert ();
57
58 nv *operator [](int i) { return &v[i][0]; }
59 const nv *operator [](int i) const { return &v[i][0]; }
60
61 operator const nv * () const { return &v[0][0]; }
62 operator nv * () { return &v[0][0]; }
63
64 // quite inefficient, hopefully gcc pulls the w calc out of any loops
65 nv apply1 (int i, nv x, nv y)
66 {
67 mat3x3 &m = *this;
68
69 nv v = m[i][0] * x + m[i][1] * y + m[i][2];
70 nv w = m[2][0] * x + m[2][1] * y + m[2][2];
71
72 return v * (1. / w);
73 }
74
75 static mat3x3 translate (nv x, nv y);
76 static mat3x3 scale (nv s, nv t);
77 static mat3x3 rotate (nv phi);
78 };
79
80 mat3x3
81 mat3x3::invert ()
82 {
83 mat3x3 &m = *this;
84 mat3x3 inv;
85
86 nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
87 nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
88 nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
89
90 nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
91
92 inv[0][0] = invdet * s0;
93 inv[0][1] = invdet * s1;
94 inv[0][2] = invdet * s2;
95
96 inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
97 inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
98 inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
99
100 inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
101 inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
102 inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
103
104 return inv;
105 }
106
107 static mat3x3
108 operator *(const mat3x3 &a, const mat3x3 &b)
109 {
110 mat3x3 r;
111
112 for (int i = 0; i < 3; ++i)
113 for (int j = 0; j < 3; ++j)
114 r[i][j] = a[i][0] * b[0][j]
115 + a[i][1] * b[1][j]
116 + a[i][2] * b[2][j];
117
118 return r;
119 }
120
121 mat3x3
122 mat3x3::translate (nv x, nv y)
123 {
124 return mat3x3 (
125 1, 0, x,
126 0, 1, y,
127 0, 0, 1
128 );
129 }
130
131 mat3x3
132 mat3x3::scale (nv s, nv t)
133 {
134 return mat3x3 (
135 s, 0, 0,
136 0, t, 0,
137 0, 0, 1
138 );
139 }
140
141 // clockwise
142 mat3x3
143 mat3x3::rotate (nv phi)
144 {
145 nv s = sin (phi);
146 nv c = cos (phi);
147
148 return mat3x3 (
149 c, -s, 0,
150 s, c, 0,
151 0, 0, 1
152 );
153 }
154
155}
156
157#if 0
158struct pict
159{
160 Display *dpy;
161 Picture pic;
162
163 operator Picture () const
164 {
165 return pic;
166 }
167
168 pict ()
169 : pic (0)
170 {
171 }
172
173 pict (rxvt_img *img, XRenderPictFormat *format = 0)
174 : dpy (img->s->display->dpy)
175 {
176 XRenderPictureAttributes pa;
177 pa.repeat = img->repeat;
178 pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);
179 }
180
181 ~pict ()
182 {
183 if (pic)
184 XRenderFreePicture (dpy, pic);
185 }
186};
187#endif
6 188
7static XRenderPictFormat * 189static XRenderPictFormat *
8find_alpha_format_for (Display *dpy, XRenderPictFormat *format) 190find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
9{ 191{
10 if (format->direct.alphaMask) 192 if (format->direct.alphaMask)
… …
134 uint8_t r = *src++; 316 uint8_t r = *src++;
135 uint8_t g = *src++; 317 uint8_t g = *src++;
136 uint8_t b = *src++; 318 uint8_t b = *src++;
137 319
138 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; 320 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
139 321
140 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 322 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
141 v = ecb_bswap32 (v); 323 v = ecb_bswap32 (v);
142 324
143 *dst++ = v; 325 *dst++ = v;
144 } 326 }
… …
215 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 397 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
216 ref = new pixref (w, h); 398 ref = new pixref (w, h);
217} 399}
218 400
219Picture 401Picture
220rxvt_img::src_picture () 402rxvt_img::picture ()
221{ 403{
222 Display *dpy = s->display->dpy; 404 Display *dpy = s->display->dpy;
223 405
224 XRenderPictureAttributes pa; 406 XRenderPictureAttributes pa;
225 pa.repeat = repeat; 407 pa.repeat = repeat;
… …
249rxvt_img::fill (const rgba &c) 431rxvt_img::fill (const rgba &c)
250{ 432{
251 XRenderColor rc = { c.r, c.g, c.b, c.a }; 433 XRenderColor rc = { c.r, c.g, c.b, c.a };
252 434
253 Display *dpy = s->display->dpy; 435 Display *dpy = s->display->dpy;
254 Picture src = src_picture (); 436 Picture src = picture ();
255 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h); 437 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
256 XRenderFreePicture (dpy, src); 438 XRenderFreePicture (dpy, src);
257} 439}
258 440
259void 441void
… …
265 Display *dpy = s->display->dpy; 447 Display *dpy = s->display->dpy;
266 448
267 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat); 449 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
268 img->alloc (); 450 img->alloc ();
269 451
270 Picture src = src_picture (); 452 Picture src = picture ();
271 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 453 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
272 454
273 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 455 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
274 456
275 XRenderFreePicture (dpy, src); 457 XRenderFreePicture (dpy, src);
276 XRenderFreePicture (dpy, dst); 458 XRenderFreePicture (dpy, dst);
277 459
… …
280 462
281 delete img; 463 delete img;
282} 464}
283 465
284static void 466static void
285get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 467get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
286{ 468{
287 double sigma = radius / 2.0; 469 nv sigma = radius / 2.0;
288 double scale = sqrt (2.0 * M_PI) * sigma; 470 nv scale = sqrt (2.0 * M_PI) * sigma;
289 double sum = 0.0; 471 nv sum = 0.0;
290 472
291 for (int i = 0; i < width; i++) 473 for (int i = 0; i < width; i++)
292 { 474 {
293 double x = i - width / 2; 475 nv x = i - width / 2;
294 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 476 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
295 sum += kernel[i]; 477 sum += kernel[i];
296 } 478 }
297 479
298 params[0] = XDoubleToFixed (width); 480 params[0] = XDoubleToFixed (width);
… …
308 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 490 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
309 return clone (); 491 return clone ();
310 492
311 Display *dpy = s->display->dpy; 493 Display *dpy = s->display->dpy;
312 int size = max (rh, rv) * 2 + 1; 494 int size = max (rh, rv) * 2 + 1;
313 double *kernel = (double *)malloc (size * sizeof (double)); 495 nv *kernel = (nv *)malloc (size * sizeof (nv));
314 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 496 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
315 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 497 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
316 img->alloc (); 498 img->alloc ();
317 499
318 XRenderPictureAttributes pa; 500 XRenderPictureAttributes pa;
… …
449 g = (g * (a >> 8)) >> 8; 631 g = (g * (a >> 8)) >> 8;
450 b = (b * (a >> 8)) >> 8; 632 b = (b * (a >> 8)) >> 8;
451 633
452 Display *dpy = s->display->dpy; 634 Display *dpy = s->display->dpy;
453 635
454 Picture src = src_picture (); 636 Picture src = picture ();
455 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 637 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
456 Picture mul = create_xrender_mask (dpy, pm, True, True); 638 Picture mul = create_xrender_mask (dpy, pm, True, True);
457 639
458 //TODO: this operator does not yet implement some useful contrast 640 //TODO: this operator does not yet implement some useful contrast
459 while (r | g | b | a) 641 while (r | g | b | a)
… …
476 ::swap (img->pm , pm ); 658 ::swap (img->pm , pm );
477 659
478 delete img; 660 delete img;
479} 661}
480 662
663void
664rxvt_img::draw (rxvt_img *img, int op, nv mask)
665{
666 unshare ();
667
668 Display *dpy = s->display->dpy;
669 Picture src = img->picture ();
670 Picture dst = picture ();
671 Picture mask_p = 0;
672
673 if (mask != 1.)
674 {
675 mask_p = create_xrender_mask (dpy, img->pm, False, False);
676 XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
677 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
678 }
679
680 XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
681
682 XRenderFreePicture (dpy, src);
683 XRenderFreePicture (dpy, dst);
684
685 if (mask_p)
686 XRenderFreePicture (dpy, mask_p);
687}
688
481rxvt_img * 689rxvt_img *
482rxvt_img::clone () 690rxvt_img::clone ()
483{ 691{
484 return new rxvt_img (*this); 692 return new rxvt_img (*this);
485} 693}
… …
498 && repeat == RepeatNone; // and we have no good pixels to fill with 706 && repeat == RepeatNone; // and we have no good pixels to fill with
499 707
500 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 708 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
501 img->alloc (); 709 img->alloc ();
502 710
503 Picture src = src_picture (); 711 Picture src = picture ();
504 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 712 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
505 713
506 if (alpha) 714 if (alpha)
507 { 715 {
508 XRenderColor rc = { 0, 0, 0, 0 }; 716 XRenderColor rc = { 0, 0, 0, 0 };
509 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 717 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
510 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); 718 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
511 } 719 }
512 else 720 else
513 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 721 XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
514 722
515 XRenderFreePicture (dpy, src); 723 XRenderFreePicture (dpy, src);
516 XRenderFreePicture (dpy, dst); 724 XRenderFreePicture (dpy, dst);
517 725
518 return img; 726 return img;
… …
521rxvt_img * 729rxvt_img *
522rxvt_img::sub_rect (int x, int y, int width, int height) 730rxvt_img::sub_rect (int x, int y, int width, int height)
523{ 731{
524 rxvt_img *img = clone (); 732 rxvt_img *img = clone ();
525 733
526 img->x += x; 734 img->x -= x;
527 img->y += y; 735 img->y -= y;
528 736
529 if (w != width || h != height) 737 if (w != width || h != height)
530 { 738 {
531 img->w = width; 739 img->w = width;
532 img->h = height; 740 img->h = height;
… …
537 } 745 }
538 746
539 return img; 747 return img;
540} 748}
541 749
542static void
543mat_invert (double mat[3][3], double (&inv)[3][3])
544{
545 double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
546 double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
547 double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
548
549 double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
550
551 inv [0][0] = invdet * s0;
552 inv [0][1] = invdet * s1;
553 inv [0][2] = invdet * s2;
554
555 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
556 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
557 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
558
559 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
560 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
561 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
562}
563
564static double
565mat_apply (double mat[3][3], int i, double x, double y)
566{
567 double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
568 double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
569
570 return v * (1. / w);
571}
572
573rxvt_img * 750rxvt_img *
574rxvt_img::transform (double matrix[3][3]) 751rxvt_img::transform (const nv matrix[3][3])
575{ 752{
576 // find new offset 753 return transform (mat3x3 (&matrix[0][0]));
577 int ox = mat_apply (matrix, 0, x, y); 754}
578 int oy = mat_apply (matrix, 1, x, y); 755
756rxvt_img *
757rxvt_img::transform (const nv *matrix)
758{
759 mat3x3 m (matrix);
579 760
580 // calculate new pixel bounding box coordinates 761 // calculate new pixel bounding box coordinates
581 double d [2], rmin[2], rmax[2]; 762 nv r[2], rmin[2], rmax[2];
582 763
583 for (int i = 0; i < 2; ++i) 764 for (int i = 0; i < 2; ++i)
584 { 765 {
585 double v; 766 nv v;
767
586 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v; 768 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;
587 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v); 769 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
588 v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v); 770 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
589 v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v); 771 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
590 } 772 }
591 773
774 float sx = rmin [0] - x;
775 float sy = rmin [1] - y;
776
777 // TODO: adjust matrix for subpixel accuracy
592 int dx = floor (rmin [0]); 778 int nx = floor (rmin [0]);
593 int dy = floor (rmin [1]); 779 int ny = floor (rmin [1]);
594 780
595 int new_width = ceil (rmax [0] - dx); 781 int new_width = ceil (rmax [0] - rmin [0]);
596 int new_height = ceil (rmax [1] - dy); 782 int new_height = ceil (rmax [1] - rmin [1]);
597 783
598 double inv[3][3]; 784 m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);
599 mat_invert (matrix, inv);
600 785
786 mat3x3 inv = m.invert ();
787
601 rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat); 788 rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
602 img->alloc (); 789 img->alloc ();
603 790
604 Display *dpy = s->display->dpy; 791 Display *dpy = s->display->dpy;
605 Picture src = src_picture (); 792 Picture src = picture ();
606 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 793 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
607 794
608 XTransform xfrm; 795 XTransform xfrm;
609 796
610 for (int i = 0; i < 3; ++i) 797 for (int i = 0; i < 3; ++i)
611 for (int j = 0; j < 3; ++j) 798 for (int j = 0; j < 3; ++j)
612 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 799 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
613 800
614 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 801 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
615 XRenderSetPictureTransform (dpy, src, &xfrm); 802 XRenderSetPictureTransform (dpy, src, &xfrm);
616 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height); 803 XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
617 804
618 XRenderFreePicture (dpy, src); 805 XRenderFreePicture (dpy, src);
619 XRenderFreePicture (dpy, dst); 806 XRenderFreePicture (dpy, dst);
620 807
621 return img; 808 return img;
… …
625rxvt_img::scale (int new_width, int new_height) 812rxvt_img::scale (int new_width, int new_height)
626{ 813{
627 if (w == new_width && h == new_height) 814 if (w == new_width && h == new_height)
628 return clone (); 815 return clone ();
629 816
630 double matrix[3][3] = {
631 { new_width / (double)w, 0, 0 },
632 { 0, new_height / (double)h, 0 },
633 { 0, 0, 1 }
634 };
635
636 int old_repeat_mode = repeat; 817 int old_repeat_mode = repeat;
637 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 818 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
638 819
639 rxvt_img *img = transform (matrix); 820 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
640 821
641 repeat = old_repeat_mode; 822 repeat = old_repeat_mode;
642 img->repeat = repeat; 823 img->repeat = repeat;
643 824
644 return img; 825 return img;
645} 826}
646 827
647rxvt_img * 828rxvt_img *
648rxvt_img::rotate (int cx, int cy, double phi) 829rxvt_img::rotate (int cx, int cy, nv phi)
649{ 830{
650 double s = sin (phi); 831#if 0
651 double c = cos (phi);
652
653 double matrix[3][3] = {
654 { c, -s, cx - c * cx + s * cy }, 832 { c, -s, cx - c * cx + s * cy },
655 { s, c, cy - s * cx - c * cy }, 833 { s, c, cy - s * cx - c * cy },
656 { 0, 0, 1 } 834 { 0, 0, 1 }
657 //{ c, -s, 0 }, 835#endif
658 //{ s, c, 0 },
659 //{ 0, 0, 1 }
660 };
661 836
662 //move (-cx, -cy); 837 move (-cx, -cy);
663 rxvt_img *img = transform (matrix); 838 rxvt_img *img = transform (mat3x3::rotate (phi));
664 //move ( cx, cy); 839 move ( cx, cy);
665 //img->move (cx, cy); 840 img->move (cx, cy);
666 841
667 return img; 842 return img;
668} 843}
669 844
670rxvt_img * 845rxvt_img *
… …
675 850
676 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 851 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
677 img->alloc (); 852 img->alloc ();
678 853
679 Display *dpy = s->display->dpy; 854 Display *dpy = s->display->dpy;
680 Picture src = src_picture (); 855 Picture src = picture ();
681 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 856 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
682 int op = PictOpSrc; 857 int op = PictOpSrc;
683 858
684 if (format->direct.alphaMask && !new_format->direct.alphaMask) 859 if (format->direct.alphaMask && !new_format->direct.alphaMask)
685 { 860 {
… …
697 872
698 return img; 873 return img;
699} 874}
700 875
701rxvt_img * 876rxvt_img *
702rxvt_img::blend (rxvt_img *img, double factor) 877rxvt_img::blend (rxvt_img *img, nv factor)
703{ 878{
704 rxvt_img *img2 = clone (); 879 rxvt_img *img2 = clone ();
705 Display *dpy = s->display->dpy; 880 Display *dpy = s->display->dpy;
706 Picture src = img->src_picture (); 881 Picture src = img->picture ();
707 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 882 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
708 Picture mask = create_xrender_mask (dpy, img->pm, False, False); 883 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
709 884
710 XRenderColor mask_c; 885 XRenderColor mask_c;
711 886

Diff Legend

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