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

Diff Legend

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