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.54 by root, Thu Jun 7 20:24:39 2012 UTC vs.
Revision 1.106 by sf-exg, Fri Mar 1 09:34:40 2013 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
6 30
31typedef rxvt_img::nv nv;
32
33namespace
34{
35 struct mat3x3
36 {
37 nv v[3][3];
38
39 mat3x3 ()
40 {
41 }
42
43 mat3x3 (const nv *matrix)
44 {
45 memcpy (v, matrix, sizeof (v));
46 }
47
48 mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
49 {
50 v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
51 v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
52 v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
53 }
54
55 mat3x3 inverse ();
56
57 nv *operator [](int i) { return &v[i][0]; }
58 const nv *operator [](int i) const { return &v[i][0]; }
59
60 operator const nv * () const { return &v[0][0]; }
61 operator nv * () { return &v[0][0]; }
62
63 // quite inefficient, hopefully gcc pulls the w calc out of any loops
64 nv apply1 (int i, nv x, nv y)
65 {
66 mat3x3 &m = *this;
67
68 nv v = m[i][0] * x + m[i][1] * y + m[i][2];
69 nv w = m[2][0] * x + m[2][1] * y + m[2][2];
70
71 return v * (1. / w);
72 }
73
74 static mat3x3 translate (nv x, nv y);
75 static mat3x3 scale (nv s, nv t);
76 static mat3x3 rotate (nv phi);
77 };
78
79 mat3x3
80 mat3x3::inverse ()
81 {
82 mat3x3 &m = *this;
83 mat3x3 inv;
84
85 nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
86 nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
87 nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
88
89 nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
90
91 inv[0][0] = invdet * s0;
92 inv[0][1] = invdet * s1;
93 inv[0][2] = invdet * s2;
94
95 inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
96 inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
97 inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
98
99 inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
100 inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
101 inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
102
103 return inv;
104 }
105
106 static mat3x3
107 operator *(const mat3x3 &a, const mat3x3 &b)
108 {
109 mat3x3 r;
110
111 for (int i = 0; i < 3; ++i)
112 for (int j = 0; j < 3; ++j)
113 r[i][j] = a[i][0] * b[0][j]
114 + a[i][1] * b[1][j]
115 + a[i][2] * b[2][j];
116
117 return r;
118 }
119
120 mat3x3
121 mat3x3::translate (nv x, nv y)
122 {
123 return mat3x3 (
124 1, 0, x,
125 0, 1, y,
126 0, 0, 1
127 );
128 }
129
130 mat3x3
131 mat3x3::scale (nv s, nv t)
132 {
133 return mat3x3 (
134 s, 0, 0,
135 0, t, 0,
136 0, 0, 1
137 );
138 }
139
140 // clockwise
141 mat3x3
142 mat3x3::rotate (nv phi)
143 {
144 nv s = sin (phi);
145 nv c = cos (phi);
146
147 return mat3x3 (
148 c, -s, 0,
149 s, c, 0,
150 0, 0, 1
151 );
152 }
153
154 struct composer
155 {
156 rxvt_img *srcimg, *dstimg;
157 Picture src, dst, msk;
158 Display *dpy;
159
160 ecb_noinline
161 composer (rxvt_img *srcimg, rxvt_img *dstimg = 0)
162 : srcimg (srcimg), dstimg (dstimg), msk (0)
163 {
164 if (!this->dstimg)
165 this->dstimg = srcimg->new_empty ();
166 else if (!this->dstimg->pm) // somewhat unsatisfying
167 this->dstimg->alloc ();
168
169 dpy = srcimg->s->dpy;
170 src = srcimg->picture ();
171 dst = this->dstimg->picture ();
172 }
173
174 ecb_noinline
175 void mask (bool rgb = true, int w = 1, int h = 1)
176 {
177 Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, w, h, rgb ? 32 : 8);
178
179 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, rgb ? PictStandardARGB32 : PictStandardA8);
180 XRenderPictureAttributes pa;
181 pa.repeat = RepeatNormal;
182 pa.component_alpha = rgb;
183 msk = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
184
185 XFreePixmap (dpy, pixmap);
186
187 ecb_assume (msk);
188 }
189
190 // CreateSolidFill creates a very very very weird picture
191 void mask (const rgba &c)
192 {
193 XRenderColor rc = {
194 c.r * c.a / 65535,
195 c.g * c.a / 65535,
196 c.b * c.a / 65535,
197 c.a
198 };
199 msk = XRenderCreateSolidFill (dpy, &rc);
200 ecb_assume (msk);
201 }
202
203 void fill (const rgba &c)
204 {
205 XRenderColor rc = {
206 c.r * c.a / 65535,
207 c.g * c.a / 65535,
208 c.b * c.a / 65535,
209 c.a
210 };
211
212 XRenderFillRectangle (dpy, PictOpSrc, msk, &rc, 0, 0, 1, 1);
213 }
214
215 operator rxvt_img *()
216 {
217 return dstimg;
218 }
219
220 ecb_noinline
221 ~composer ()
222 {
223 XRenderFreePicture (dpy, src);
224 XRenderFreePicture (dpy, dst);
225 if (msk) XRenderFreePicture (dpy, msk);
226 }
227 };
228}
229
230static XRenderPictFormat *
231find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
232{
233 if (format->direct.alphaMask)
234 return format; // already has alpha
235
236 // try to find a suitable alpha format, one bit alpha is enough for our purposes
237 if (format->type == PictTypeDirect)
238 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
239 if (f->direct.alphaMask
240 && f->type == PictTypeDirect
241 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
242 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
243 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
244 return f;
245
246 // should be a very good fallback
247 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
248}
249
7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat) 250rxvt_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), 251: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), ref(0) 252 pm(0), ref(0)
10{ 253{
11} 254}
… …
14: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref) 257: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
15{ 258{
16 ++ref->cnt; 259 ++ref->cnt;
17} 260}
18 261
19#if 0
20rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
21: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22{
23}
24#endif
25
26rxvt_img * 262rxvt_img *
27rxvt_img::new_from_root (rxvt_screen *s) 263rxvt_img::new_from_root (rxvt_screen *s)
28{ 264{
29 Display *dpy = s->display->dpy; 265 Display *dpy = s->dpy;
30 unsigned int root_pm_w, root_pm_h; 266 unsigned int root_pm_w, root_pm_h;
31 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]); 267 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_XROOTPMAP_ID]);
32 if (root_pixmap == None) 268 if (root_pixmap == None)
33 root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]); 269 root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_ESETROOT_PMAP_ID]);
34 270
35 if (root_pixmap == None) 271 if (root_pixmap == None)
36 return 0; 272 return 0;
37 273
38 Window wdummy; 274 Window wdummy;
… …
56 img->ref->ours = false; 292 img->ref->ours = false;
57 293
58 return img; 294 return img;
59} 295}
60 296
297# if HAVE_PIXBUF
298
61rxvt_img * 299rxvt_img *
62rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 300rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
63{ 301{
64 Display *dpy = s->display->dpy; 302 Display *dpy = s->dpy;
65 303
66 int width = gdk_pixbuf_get_width (pb); 304 int width = gdk_pixbuf_get_width (pb);
67 int height = gdk_pixbuf_get_height (pb); 305 int height = gdk_pixbuf_get_height (pb);
68 306
69 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 307 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"); 308 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71 309
72 // since we require rgb24/argb32 formats from xrender we assume 310 // 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 311 // 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 312
76 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 313 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
77 314
78 XImage xi; 315 XImage xi;
79 316
80 xi.width = width; 317 xi.width = width;
81 xi.height = height; 318 xi.height = height;
82 xi.xoffset = 0; 319 xi.xoffset = 0;
83 xi.format = ZPixmap; 320 xi.format = ZPixmap;
84 xi.byte_order = ImageByteOrder (dpy); 321 xi.byte_order = ImageByteOrder (dpy);
85 xi.bitmap_unit = 32; //XY only, unused 322 xi.bitmap_unit = 0; //XY only, unused
86 xi.bitmap_bit_order = LSBFirst; //XY only, unused 323 xi.bitmap_bit_order = 0; //XY only, unused
87 xi.bitmap_pad = BitmapPad (dpy); 324 xi.bitmap_pad = BitmapPad (dpy);
88 xi.depth = depth; 325 xi.depth = 32;
89 xi.bytes_per_line = 0; 326 xi.bytes_per_line = 0;
90 xi.bits_per_pixel = 32; //Z only 327 xi.bits_per_pixel = 32; //Z only
91 xi.red_mask = 0x00000000; //Z only, unused 328 xi.red_mask = 0x00000000; //Z only, unused
92 xi.green_mask = 0x00000000; //Z only, unused 329 xi.green_mask = 0x00000000; //Z only, unused
93 xi.blue_mask = 0x00000000; //Z only, unused 330 xi.blue_mask = 0x00000000; //Z only, unused
… …
102 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n"); 339 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
103 340
104 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 341 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
105 342
106 int rowstride = gdk_pixbuf_get_rowstride (pb); 343 int rowstride = gdk_pixbuf_get_rowstride (pb);
107 344 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
108 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
109 unsigned char *row = gdk_pixbuf_get_pixels (pb); 345 unsigned char *row = gdk_pixbuf_get_pixels (pb);
346
110 char *line = xi.data; 347 char *line = xi.data;
111 348
112 for (int y = 0; y < height; y++) 349 for (int y = 0; y < height; y++)
113 { 350 {
114 unsigned char *src = row; 351 unsigned char *src = row;
115 uint32_t *dst = (uint32_t *)line; 352 uint32_t *dst = (uint32_t *)line;
116 353
117 if (depth == 24)
118 for (int x = 0; x < width; x++) 354 for (int x = 0; x < width; x++)
119 { 355 {
120 uint8_t r = *src++; 356 uint8_t r = *src++;
121 uint8_t g = *src++; 357 uint8_t g = *src++;
122 uint8_t b = *src++; 358 uint8_t b = *src++;
359 uint8_t a = *src;
123 360
361 // this is done so it can be jump-free, but newer gcc's clone inner the loop
362 a = pb_has_alpha ? a : 255;
363 src += pb_has_alpha;
364
365 r = (r * a + 127) / 255;
366 g = (g * a + 127) / 255;
367 b = (b * a + 127) / 255;
368
124 uint32_t v = (r << 16) | (g << 8) | b; 369 uint32_t v = (a << 24) | (r << 16) | (g << 8) | b;
125 370
126 if (ecb_big_endian ()) 371 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
127 v = ecb_bswap32 (v); 372 v = ecb_bswap32 (v);
128 373
129 if (byte_order_mismatch)
130 v = ecb_bswap32 (v);
131
132 *dst++ = v; 374 *dst++ = v;
133 } 375 }
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 376
150 row += rowstride; 377 row += rowstride;
151 line += xi.bytes_per_line; 378 line += xi.bytes_per_line;
152 } 379 }
153 380
154 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height); 381 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
155 img->alloc (); 382 img->alloc ();
156 383
157 GC gc = XCreateGC (dpy, img->pm, 0, 0); 384 GC gc = XCreateGC (dpy, img->pm, 0, 0);
158 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); 385 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
159 XFreeGC (dpy, gc); 386 XFreeGC (dpy, gc);
… …
177 g_object_unref (pb); 404 g_object_unref (pb);
178 405
179 return img; 406 return img;
180} 407}
181 408
409# endif
410
182void 411void
183rxvt_img::destroy () 412rxvt_img::destroy ()
184{ 413{
185 if (--ref->cnt) 414 if (--ref->cnt)
186 return; 415 return;
187 416
188 if (pm && ref->ours) 417 if (pm && ref->ours)
189 XFreePixmap (s->display->dpy, pm); 418 XFreePixmap (s->dpy, pm);
190 419
191 delete ref; 420 delete ref;
192} 421}
193 422
194rxvt_img::~rxvt_img () 423rxvt_img::~rxvt_img ()
… …
197} 426}
198 427
199void 428void
200rxvt_img::alloc () 429rxvt_img::alloc ()
201{ 430{
202 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 431 pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
203 ref = new pixref (w, h); 432 ref = new pixref (w, h);
204} 433}
205 434
435rxvt_img *
436rxvt_img::new_empty ()
437{
438 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
439 img->alloc ();
440
441 return img;
442}
443
206Picture 444Picture
207rxvt_img::src_picture () 445rxvt_img::picture ()
208{ 446{
209 Display *dpy = s->display->dpy; 447 Display *dpy = s->dpy;
210 448
211 XRenderPictureAttributes pa; 449 XRenderPictureAttributes pa;
212 pa.repeat = repeat; 450 pa.repeat = repeat;
213 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 451 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
214 452
… …
219rxvt_img::unshare () 457rxvt_img::unshare ()
220{ 458{
221 if (ref->cnt == 1 && ref->ours) 459 if (ref->cnt == 1 && ref->ours)
222 return; 460 return;
223 461
224 //TODO: maybe should reify instead
225 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 462 Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
226 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 463 GC gc = XCreateGC (s->dpy, pm, 0, 0);
227 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 464 XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
228 XFreeGC (s->display->dpy, gc); 465 XFreeGC (s->dpy, gc);
229 466
230 destroy (); 467 destroy ();
231 468
232 pm = pm2; 469 pm = pm2;
233 ref = new pixref (ref->w, ref->h); 470 ref = new pixref (ref->w, ref->h);
234} 471}
235 472
236void 473void
474rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
475{
476 XRenderColor rc = { c.r, c.g, c.b, c.a };
477
478 Display *dpy = s->dpy;
479 Picture src = picture ();
480 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
481 XRenderFreePicture (dpy, src);
482}
483
484void
237rxvt_img::fill (const rxvt_color &c) 485rxvt_img::fill (const rgba &c)
238{ 486{
239 XGCValues gcv; 487 fill (c, 0, 0, w, h);
240 gcv.foreground = c; 488}
241 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 489
242 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 490void
243 XFreeGC (s->display->dpy, gc); 491rxvt_img::add_alpha ()
492{
493 if (format->direct.alphaMask)
494 return;
495
496 composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat));
497
498 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
499
500 rxvt_img *img = cc;
501
502 ::swap (img->ref, ref);
503 ::swap (img->pm , pm );
504
505 delete img;
244} 506}
245 507
246static void 508static void
247get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 509get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
248{ 510{
249 double sigma = radius / 2.0; 511 nv sigma = radius / 2.0;
250 double scale = sqrt (2.0 * M_PI) * sigma; 512 nv scale = sqrt (2.0 * M_PI) * sigma;
251 double sum = 0.0; 513 nv sum = 0.0;
252 514
253 for (int i = 0; i < width; i++) 515 for (int i = 0; i < width; i++)
254 { 516 {
255 double x = i - width / 2; 517 nv x = i - width / 2;
256 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 518 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
257 sum += kernel[i]; 519 sum += kernel[i];
258 } 520 }
259 521
260 params[0] = XDoubleToFixed (width); 522 params[0] = XDoubleToFixed (width);
… …
268rxvt_img::blur (int rh, int rv) 530rxvt_img::blur (int rh, int rv)
269{ 531{
270 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 532 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
271 return clone (); 533 return clone ();
272 534
273 Display *dpy = s->display->dpy; 535 Display *dpy = s->dpy;
274 int size = max (rh, rv) * 2 + 1; 536 int size = max (rh, rv) * 2 + 1;
275 double *kernel = (double *)malloc (size * sizeof (double)); 537 nv *kernel = (nv *)malloc (size * sizeof (nv));
276 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 538 XFixed *params = rxvt_temp_buf<XFixed> (size + 2);
277 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 539 rxvt_img *img = new_empty ();
278 img->alloc ();
279
280 Picture src = src_picture ();
281 540
282 XRenderPictureAttributes pa; 541 XRenderPictureAttributes pa;
283 pa.repeat = RepeatPad; 542 pa.repeat = RepeatPad;
284 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 543 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
544 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
285 545
286 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 546 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
287 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 547 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
288 XFreePixmap (dpy, tmp_pm); 548 XFreePixmap (dpy, tmp_pm);
289 549
… …
305 565
306 size = rv * 2 + 1; 566 size = rv * 2 + 1;
307 get_gaussian_kernel (rv, size, kernel, params); 567 get_gaussian_kernel (rv, size, kernel, params);
308 ::swap (params[0], params[1]); 568 ::swap (params[0], params[1]);
309 569
310 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 570 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
311 XRenderComposite (dpy, 571 XRenderComposite (dpy,
312 PictOpSrc, 572 PictOpSrc,
313 tmp, 573 tmp,
314 None, 574 None,
315 dst, 575 dst,
… …
318 0, 0, 578 0, 0,
319 w, h); 579 w, h);
320 } 580 }
321 581
322 free (kernel); 582 free (kernel);
323 free (params); 583
324 XRenderFreePicture (dpy, src); 584 XRenderFreePicture (dpy, src);
325 XRenderFreePicture (dpy, dst); 585 XRenderFreePicture (dpy, dst);
326 XRenderFreePicture (dpy, tmp); 586 XRenderFreePicture (dpy, tmp);
327 587
328 return img; 588 return img;
329} 589}
330 590
331static Picture 591rxvt_img *
332create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 592rxvt_img::muladd (nv mul, nv add)
333{ 593{
334 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 594 // STEP 1: double the image width, fill all odd columns with white (==1)
335 595
336 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 596 composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat));
337 XRenderPictureAttributes pa;
338 pa.repeat = True;
339 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
340 597
341 XFreePixmap (dpy, pixmap); 598 // why the hell does XRenderSetPictureTransform want a writable matrix :(
599 // that keeps us from just static const'ing this matrix.
600 XTransform h_double = {
601 0x08000, 0, 0,
602 0, 0x10000, 0,
603 0, 0, 0x10000
604 };
342 605
343 return mask; 606 XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
607 XRenderSetPictureTransform (cc.dpy, cc.src, &h_double);
608 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
609
610 cc.mask (false, 2, 1);
611
612 static const XRenderColor c0 = { 0, 0, 0, 0 };
613 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1);
614 static const XRenderColor c1 = { 65535, 65535, 65535, 65535 };
615 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1);
616
617 Picture white = XRenderCreateSolidFill (cc.dpy, &c1);
618
619 XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
620
621 XRenderFreePicture (cc.dpy, white);
622
623 // STEP 2: convolve the image with a 3x1 filter
624 // a 2x1 filter would obviously suffice, but given the total lack of specification
625 // for xrender, I expect different xrender implementations to randomly diverge.
626 // we also halve the image, and hope for the best (again, for lack of specs).
627 composer cc2 (cc.dstimg);
628
629 XFixed kernel [] = {
630 XDoubleToFixed (3), XDoubleToFixed (1),
631 XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add)
632 };
633
634 XTransform h_halve = {
635 0x20000, 0, 0,
636 0, 0x10000, 0,
637 0, 0, 0x10000
638 };
639
640 XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0);
641 XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve);
642 XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel));
643
644 XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
645
646 return cc2;
647}
648
649ecb_noinline static void
650extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
651{
652 int32_t x = clamp (c, cl0, cl1);
653 c -= x;
654 xc = x;
655}
656
657ecb_noinline static bool
658extract (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)
659{
660 extract (cl0, cl1, r, xr);
661 extract (cl0, cl1, g, xg);
662 extract (cl0, cl1, b, xb);
663 extract (cl0, cl1, a, xa);
664
665 return xr | xg | xb | xa;
344} 666}
345 667
346void 668void
347rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 669rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
348{ 670{
671 unshare ();
672
349 Display *dpy = s->display->dpy; 673 Display *dpy = s->dpy;
350 Picture src = create_xrender_mask (dpy, pm, True);
351 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 674 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
352 675
676 // loop should not be needed for brightness, as only -1..1 makes sense
677 //while (r | g | b | a)
678 {
679 unsigned short xr, xg, xb, xa;
353 XRenderColor mask_c; 680 XRenderColor mask_c;
354 mask_c.red = r; 681
355 mask_c.green = g; 682 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
356 mask_c.blue = b;
357 mask_c.alpha = a;
358 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 683 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
359 684
360 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 685 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
686 {
687 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
688 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
689 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
690 mask_c.green = -mask_c.green;
691 mask_c.blue = -mask_c.blue;
692 mask_c.alpha = -mask_c.alpha;
693 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
694 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
695 }
696 }
361 697
362 XRenderFreePicture (dpy, src);
363 XRenderFreePicture (dpy, dst); 698 XRenderFreePicture (dpy, dst);
364} 699}
365 700
366void 701void
367rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 702rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
368{ 703{
369 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 704 if (r < 0 || g < 0 || b < 0 || a < 0)
370 return; 705 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
371 706
372 Display *dpy = s->display->dpy; 707 // premultiply (yeah, these are not exact, sue me or fix it)
373 Picture src = create_xrender_mask (dpy, pm, True); 708 r = (r * (a >> 8)) >> 8;
374 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 709 g = (g * (a >> 8)) >> 8;
710 b = (b * (a >> 8)) >> 8;
375 711
712 composer cc (this);
713 rxvt_img *img = cc;
714 img->fill (rgba (0, 0, 0, 0));
715
716 cc.mask (true);
717
718 //TODO: this operator does not yet implement some useful contrast
719 while (r | g | b | a)
720 {
721 unsigned short xr, xg, xb, xa;
376 XRenderColor mask_c; 722 XRenderColor mask_c;
377 mask_c.red = r; 723
378 mask_c.green = g; 724 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
379 mask_c.blue = b; 725 {
380 mask_c.alpha = a;
381 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 726 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
382
383 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 727 XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
728 }
729 }
384 730
385 XRenderFreePicture (dpy, src); 731 ::swap (img->ref, ref);
386 XRenderFreePicture (dpy, dst); 732 ::swap (img->pm , pm );
733
734 delete img;
735}
736
737void
738rxvt_img::draw (rxvt_img *img, int op, nv mask)
739{
740 unshare ();
741
742 composer cc (img, this);
743
744 if (mask != 1.)
745 cc.mask (rgba (0, 0, 0, float_to_component (mask)));
746
747 XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
387} 748}
388 749
389rxvt_img * 750rxvt_img *
390rxvt_img::clone () 751rxvt_img::clone ()
391{ 752{
392 return new rxvt_img (*this); 753 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);
413} 754}
414 755
415rxvt_img * 756rxvt_img *
416rxvt_img::reify () 757rxvt_img::reify ()
417{ 758{
418 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 759 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
419 return clone (); 760 return clone ();
420 761
421 Display *dpy = s->display->dpy; 762 // add an alpha channel if...
422
423 bool alpha = !format->direct.alphaMask 763 bool alpha = !format->direct.alphaMask // pixmap has none yet
424 && (x || y) 764 && (x || y) // we need one because of non-zero offset
425 && repeat == RepeatNone; 765 && repeat == RepeatNone; // and we have no good pixels to fill with
426 766
427 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 767 composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
428 img->alloc (); 768 0, 0, w, h, repeat));
429 769
430 Picture src = src_picture (); 770 if (repeat == RepeatNone)
431 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
432
433 if (alpha)
434 { 771 {
435 XRenderColor rc = { 0, 0, 0, 0 }; 772 XRenderColor rc = { 0, 0, 0, 0 };
436 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 773 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
437 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); 774 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
438 } 775 }
439 else 776 else
440 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 777 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
441 778
442 XRenderFreePicture (dpy, src);
443 XRenderFreePicture (dpy, dst);
444
445 return img; 779 return cc;
446} 780}
447 781
448rxvt_img * 782rxvt_img *
449rxvt_img::sub_rect (int x, int y, int width, int height) 783rxvt_img::sub_rect (int x, int y, int width, int height)
450{ 784{
451 rxvt_img *img = clone (); 785 rxvt_img *img = clone ();
452 786
453 img->x += x; 787 img->x -= x;
454 img->y += y; 788 img->y -= y;
455 789
456 if (w != width || h != height) 790 if (w != width || h != height)
457 { 791 {
458 img->w = width; 792 img->w = width;
459 img->h = height; 793 img->h = height;
… …
465 799
466 return img; 800 return img;
467} 801}
468 802
469rxvt_img * 803rxvt_img *
470rxvt_img::transform (int new_width, int new_height, double matrix[9]) 804rxvt_img::transform (const nv matrix[3][3])
471{ 805{
472 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); 806 return transform (mat3x3 (&matrix[0][0]));
473 img->alloc (); 807}
474 808
475 Display *dpy = s->display->dpy; 809rxvt_img *
476 Picture src = src_picture (); 810rxvt_img::transform (const nv *matrix)
477 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 811{
812 mat3x3 m (matrix);
813
814 // calculate new pixel bounding box coordinates
815 nv rmin[2], rmax[2];
816
817 for (int i = 0; i < 2; ++i)
818 {
819 nv v;
820
821 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
822 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
823 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
824 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
825 }
826
827 float sx = rmin [0] - x;
828 float sy = rmin [1] - y;
829
830 // TODO: adjust matrix for subpixel accuracy
831 int nx = floor (rmin [0]);
832 int ny = floor (rmin [1]);
833
834 int new_width = ceil (rmax [0] - rmin [0]);
835 int new_height = ceil (rmax [1] - rmin [1]);
836
837 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
838
839 composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
478 840
479 XTransform xfrm; 841 XTransform xfrm;
480 842
481 for (int i = 0; i < 3; ++i) 843 for (int i = 0; i < 3; ++i)
482 for (int j = 0; j < 3; ++j) 844 for (int j = 0; j < 3; ++j)
483 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 845 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
484 846
485#if 0
486 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
487 xfrm.matrix [1][2] -= XDoubleToFixed (y);
488#endif
489
490 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 847 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
491 XRenderSetPictureTransform (dpy, src, &xfrm); 848 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
492 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 849 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
493 850
494 XRenderFreePicture (dpy, src);
495 XRenderFreePicture (dpy, dst);
496
497 return img; 851 return cc;
498} 852}
499 853
500rxvt_img * 854rxvt_img *
501rxvt_img::scale (int new_width, int new_height) 855rxvt_img::scale (int new_width, int new_height)
502{ 856{
503 if (w == new_width && h == new_height) 857 if (w == new_width && h == new_height)
504 return clone (); 858 return clone ();
505 859
506 double matrix[9] = {
507 w / (double)new_width, 0, 0,
508 0, h / (double)new_height, 0,
509 0, 0, 1
510 };
511
512 int old_repeat_mode = repeat; 860 int old_repeat_mode = repeat;
513 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems 861 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
514 862
515 rxvt_img *img = transform (new_width, new_height, matrix); 863 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
516 864
517 repeat = old_repeat_mode; 865 repeat = old_repeat_mode;
518 img->repeat = repeat; 866 img->repeat = repeat;
519 867
520 return img; 868 return img;
521} 869}
522 870
523rxvt_img * 871rxvt_img *
524rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 872rxvt_img::rotate (int cx, int cy, nv phi)
525{ 873{
526 double s = sin (phi); 874 move (-cx, -cy);
527 double c = cos (phi); 875 rxvt_img *img = transform (mat3x3::rotate (phi));
876 move ( cx, cy);
877 img->move (cx, cy);
528 878
529 double matrix[9] = { 879 return img;
530 c, -s, -c * x + s * y + x,
531 s, c, -s * x - c * y + y,
532 0, 0, 1
533 };
534
535 return transform (new_width, new_height, matrix);
536} 880}
537 881
538rxvt_img * 882rxvt_img *
539rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 883rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
540{ 884{
541 if (new_format == format) 885 if (new_format == format)
542 return clone (); 886 return clone ();
543 887
544 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 888 composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
545 img->alloc ();
546 889
547 Display *dpy = s->display->dpy;
548 Picture src = src_picture ();
549 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
550 int op = PictOpSrc; 890 int op = PictOpSrc;
551 891
552 if (format->direct.alphaMask && !new_format->direct.alphaMask) 892 if (format->direct.alphaMask && !new_format->direct.alphaMask)
553 { 893 {
554 // does it have to be that complicated 894 // does it have to be that complicated
555 rgba c;
556 bg.get (c);
557
558 XRenderColor rc = { c.r, c.g, c.b, 0xffff }; 895 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
559 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 896 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
560 897
561 op = PictOpOver; 898 op = PictOpOver;
562 } 899 }
563 900
564 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 901 XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
565 902
566 XRenderFreePicture (dpy, src); 903 return cc;
567 XRenderFreePicture (dpy, dst); 904}
905
906rxvt_img *
907rxvt_img::tint (const rgba &c)
908{
909 composer cc (this);
910 cc.mask (true);
911 cc.fill (c);
912
913 XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
914
915 return cc;
916}
917
918rxvt_img *
919rxvt_img::shade (nv factor, rgba c)
920{
921 clamp_it (factor, -1., 1.);
922 factor++;
923
924 if (factor > 1)
925 {
926 c.r = c.r * (2 - factor);
927 c.g = c.g * (2 - factor);
928 c.b = c.b * (2 - factor);
929 }
930 else
931 {
932 c.r = c.r * factor;
933 c.g = c.g * factor;
934 c.b = c.b * factor;
935 }
936
937 rxvt_img *img = this->tint (c);
938
939 if (factor > 1)
940 {
941 c.a = 0xffff;
942 c.r =
943 c.g =
944 c.b = 0xffff * (factor - 1);
945
946 img->brightness (c.r, c.g, c.b, c.a);
947 }
568 948
569 return img; 949 return img;
570} 950}
571 951
572rxvt_img * 952rxvt_img *
573rxvt_img::blend (rxvt_img *img, double factor) 953rxvt_img::filter (const char *name, int nparams, nv *params)
574{ 954{
575 rxvt_img *img2 = clone (); 955 composer cc (this);
576 Display *dpy = s->display->dpy;
577 Picture src = img->src_picture ();
578 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
579 Picture mask = create_xrender_mask (dpy, img->pm, False);
580 956
581 XRenderColor mask_c; 957 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
582 958
583 mask_c.alpha = float_to_component (factor); 959 for (int i = 0; i < nparams; ++i)
584 mask_c.red = 960 xparams [i] = XDoubleToFixed (params [i]);
585 mask_c.green =
586 mask_c.blue = 0;
587 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
588 961
962 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
963
589 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h); 964 XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
590 965
591 XRenderFreePicture (dpy, src);
592 XRenderFreePicture (dpy, dst);
593 XRenderFreePicture (dpy, mask);
594
595 return img2; 966 return cc;
596} 967}
597 968
598#endif 969#endif
599 970

Diff Legend

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