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.7 by sf-exg, Sun Jun 3 20:34:25 2012 UTC vs.
Revision 1.45 by root, Thu Jun 7 17:21:56 2012 UTC

… …
2#include "../config.h" 2#include "../config.h"
3#include "rxvt.h" 3#include "rxvt.h"
4 4
5#if HAVE_IMG 5#if HAVE_IMG
6 6
7#define float_to_component(d) ((d) * 65535.99)
8
9rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
10: s(screen), w(width), h(height), format(format), shared(false) 8: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), ref(0)
11{ 10{
12 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
13} 11}
14 12
13rxvt_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), ref(img.ref)
15{
16 ++ref->cnt;
17}
18
19#if 0
15rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap) 20rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
16: s(screen), pm(pixmap), w(width), h(height), format(format), shared(false) 21: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
17{ 22{
23}
24#endif
25
26rxvt_img *
27rxvt_img::new_from_root (rxvt_screen *s)
28{
29 Display *dpy = s->display->dpy;
30 unsigned int root_pm_w, root_pm_h;
31 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);
32 if (root_pixmap == None)
33 root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);
34
35 if (root_pixmap == None)
36 return 0;
37
38 Window wdummy;
39 int idummy;
40 unsigned int udummy;
41
42 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pm_w, &root_pm_h, &udummy, &udummy))
43 return 0;
44
45 rxvt_img *img = new rxvt_img (
46 s,
47 XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
48 0,
49 0,
50 root_pm_w,
51 root_pm_h
52 );
53
54 img->pm = root_pixmap;
55 img->ref = new pixref (root_pm_w, root_pm_h);
56 img->ref->ours = false;
57
58 return img;
18} 59}
19 60
20rxvt_img * 61rxvt_img *
21rxvt_img::new_from_file (rxvt_screen *s, const char *filename) 62rxvt_img::new_from_file (rxvt_screen *s, const char *filename)
22{ 63{
23 GError *err; 64 GError *err = 0;
24 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 65 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
25 66
26 if (!pb) 67 if (!pb)
27 return 0; 68 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
28 69
29 rxvt_img *img = new rxvt_img ( 70 rxvt_img *img = new rxvt_img (
30 s, 71 s,
31 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24), 72 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
73 0,
74 0,
32 gdk_pixbuf_get_width (pb), 75 gdk_pixbuf_get_width (pb),
33 gdk_pixbuf_get_height (pb) 76 gdk_pixbuf_get_height (pb)
34 ); 77 );
35 78 img->alloc ();
36 img->render (pb, 0, 0, img->w, img->h, 0, 0); 79 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
37 80
81 g_object_unref (pb);
82
83 return img;
84}
85
86void
87rxvt_img::destroy ()
88{
89 if (--ref->cnt)
38 return img; 90 return;
91
92 if (pm && ref->ours)
93 XFreePixmap (s->display->dpy, pm);
94
95 delete ref;
39} 96}
40 97
41rxvt_img::~rxvt_img () 98rxvt_img::~rxvt_img ()
42{ 99{
43 if (!shared) 100 destroy ();
101}
102
103void
104rxvt_img::alloc ()
105{
106 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
107 ref = new pixref (w, h);
108}
109
110Picture
111rxvt_img::src_picture ()
112{
113 Display *dpy = s->display->dpy;
114
115 XRenderPictureAttributes pa;
116 pa.repeat = repeat;
117 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
118
119 return pic;
120}
121
122void
123rxvt_img::unshare ()
124{
125 if (ref->cnt == 1 && ref->ours)
126 return;
127
128 //TODO: maybe should reify instead
129 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
130 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
131 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
44 XFreePixmap (s->display->dpy, pm); 132 XFreeGC (s->display->dpy, gc);
133
134 destroy ();
135
136 pm = pm2;
137 ref = new pixref (ref->w, ref->h);
45} 138}
46 139
47void 140void
48rxvt_img::fill (const rxvt_color &c) 141rxvt_img::fill (const rxvt_color &c)
49{ 142{
… …
73 166
74 for (int i = 0; i < width; i++) 167 for (int i = 0; i < width; i++)
75 params[i+2] = XDoubleToFixed (kernel[i] / sum); 168 params[i+2] = XDoubleToFixed (kernel[i] / sum);
76} 169}
77 170
78void 171rxvt_img *
79rxvt_img::blur (int rh, int rv) 172rxvt_img::blur (int rh, int rv)
80{ 173{
81 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 174 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
82 return; 175 return clone ();
83 176
84 Display *dpy = s->display->dpy; 177 Display *dpy = s->display->dpy;
85 int size = max (rh, rv) * 2 + 1; 178 int size = max (rh, rv) * 2 + 1;
86 double *kernel = (double *)malloc (size * sizeof (double)); 179 double *kernel = (double *)malloc (size * sizeof (double));
87 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 180 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
181 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
182 img->alloc ();
183
184 Picture src = src_picture ();
88 185
89 XRenderPictureAttributes pa; 186 XRenderPictureAttributes pa;
90
91 pa.repeat = RepeatPad; 187 pa.repeat = RepeatPad;
92 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 188 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
189
93 Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth); 190 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
94 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa); 191 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
95 XFreePixmap (dpy, tmp); 192 XFreePixmap (dpy, tmp_pm);
96 193
97 if (kernel && params) 194 if (kernel && params)
98 { 195 {
99 size = rh * 2 + 1; 196 size = rh * 2 + 1;
100 get_gaussian_kernel (rh, size, kernel, params); 197 get_gaussian_kernel (rh, size, kernel, params);
101 198
102 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 199 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
103 XRenderComposite (dpy, 200 XRenderComposite (dpy,
104 PictOpSrc, 201 PictOpSrc,
105 src, 202 src,
203 None,
204 tmp,
205 0, 0,
206 0, 0,
207 0, 0,
208 w, h);
209
210 size = rv * 2 + 1;
211 get_gaussian_kernel (rv, size, kernel, params);
212 ::swap (params[0], params[1]);
213
214 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
215 XRenderComposite (dpy,
216 PictOpSrc,
217 tmp,
106 None, 218 None,
107 dst, 219 dst,
108 0, 0, 220 0, 0,
109 0, 0, 221 0, 0,
110 0, 0, 222 0, 0,
111 w, h); 223 w, h);
112
113 ::swap (src, dst);
114
115 size = rv * 2 + 1;
116 get_gaussian_kernel (rv, size, kernel, params);
117 ::swap (params[0], params[1]);
118
119 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
120 XRenderComposite (dpy,
121 PictOpSrc,
122 src,
123 None,
124 dst,
125 0, 0,
126 0, 0,
127 0, 0,
128 w, h);
129 } 224 }
130 225
131 free (kernel); 226 free (kernel);
132 free (params); 227 free (params);
133 XRenderFreePicture (dpy, src); 228 XRenderFreePicture (dpy, src);
134 XRenderFreePicture (dpy, dst); 229 XRenderFreePicture (dpy, dst);
230 XRenderFreePicture (dpy, tmp);
231
232 return img;
135} 233}
136 234
137static Picture 235static Picture
138create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 236create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
139{ 237{
… …
148 246
149 return mask; 247 return mask;
150} 248}
151 249
152void 250void
153rxvt_img::brightness (double r, double g, double b, double a) 251rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
154{ 252{
155 Display *dpy = s->display->dpy; 253 Display *dpy = s->display->dpy;
156 Picture src = create_xrender_mask (dpy, pm, True); 254 Picture src = create_xrender_mask (dpy, pm, True);
157 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 255 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
158 256
159 XRenderColor mask_c; 257 XRenderColor mask_c;
160 mask_c.red = float_to_component (r); 258 mask_c.red = r;
161 mask_c.green = float_to_component (g); 259 mask_c.green = g;
162 mask_c.blue = float_to_component (b); 260 mask_c.blue = b;
163 mask_c.alpha = float_to_component (a); 261 mask_c.alpha = a;
164 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 262 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
165 263
166 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 264 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
265
266 XRenderFreePicture (dpy, src);
267 XRenderFreePicture (dpy, dst);
167} 268}
168 269
169void 270void
170rxvt_img::contrast (double r, double g, double b, double a) 271rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
171{ 272{
172 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 273 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
173 return; 274 return;
174 275
175 Display *dpy = s->display->dpy; 276 Display *dpy = s->display->dpy;
176 Picture src = create_xrender_mask (dpy, pm, True); 277 Picture src = create_xrender_mask (dpy, pm, True);
177 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 278 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
178 279
179 XRenderColor mask_c; 280 XRenderColor mask_c;
180 mask_c.red = float_to_component (r); 281 mask_c.red = r;
181 mask_c.green = float_to_component (g); 282 mask_c.green = g;
182 mask_c.blue = float_to_component (b); 283 mask_c.blue = b;
183 mask_c.alpha = float_to_component (a); 284 mask_c.alpha = a;
184 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 285 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
185 286
186 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 287 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
187}
188 288
189void 289 XRenderFreePicture (dpy, src);
290 XRenderFreePicture (dpy, dst);
291}
292
293bool
190rxvt_img::render (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y) 294rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
191{ 295{
192 //TODO 296 Display *dpy = s->display->dpy;
193}
194 297
195rxvt_img * 298 if (s->visual->c_class != TrueColor)
196rxvt_img::copy () 299 return false;
197{ 300
301 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
302
303 red_mask = (uint32_t)format->direct.redMask << format->direct.red;
304 green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
305 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
306 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
307
308 int width_r = ecb_popcount32 (red_mask);
309 int width_g = ecb_popcount32 (green_mask);
310 int width_b = ecb_popcount32 (blue_mask);
311 int width_a = ecb_popcount32 (alpha_mask);
312
313 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
314 return false;
315
316 int sh_r = ecb_ctz32 (red_mask);
317 int sh_g = ecb_ctz32 (green_mask);
318 int sh_b = ecb_ctz32 (blue_mask);
319 int sh_a = ecb_ctz32 (alpha_mask);
320
321 if (width > 32767 || height > 32767)
322 return false;
323
324 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
325 width, height, 32, 0);
326 if (!ximage)
327 return false;
328
329 if (height > INT_MAX / ximage->bytes_per_line
330 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
331 {
332 XDestroyImage (ximage);
333 return false;
334 }
335
198 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 336 GC gc = XCreateGC (dpy, pm, 0, 0);
199 Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth); 337
200 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0); 338 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
339
340 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
341 int channels = gdk_pixbuf_get_n_channels (pixbuf);
342 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
343 char *line = ximage->data;
344
345 for (int y = 0; y < height; y++)
346 {
347 for (int x = 0; x < width; x++)
348 {
349 unsigned char *pixel = row + x * channels;
350 uint32_t value;
351 unsigned char r, g, b, a;
352
353 if (channels == 4)
354 {
355 a = pixel[3];
356 r = pixel[0] * a / 0xff;
357 g = pixel[1] * a / 0xff;
358 b = pixel[2] * a / 0xff;
359 }
360 else
361 {
362 a = 0xff;
363 r = pixel[0];
364 g = pixel[1];
365 b = pixel[2];
366 }
367
368 value = ((r >> (8 - width_r)) << sh_r)
369 | ((g >> (8 - width_g)) << sh_g)
370 | ((b >> (8 - width_b)) << sh_b)
371 | ((a >> (8 - width_a)) << sh_a);
372
373 if (ximage->bits_per_pixel == 32)
374 ((uint32_t *)line)[x] = value;
375 else
376 XPutPixel (ximage, x, y, value);
377 }
378
379 row += rowstride;
380 line += ximage->bytes_per_line;
381 }
382
383 XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
384 XDestroyImage (ximage);
201 XFreeGC (s->display->dpy, gc); 385 XFreeGC (dpy, gc);
202 return new rxvt_img (s, format, w, h, pm2);
203}
204 386
387 return true;
388}
389
205rxvt_img * 390rxvt_img *
391rxvt_img::clone ()
392{
393 return new rxvt_img (*this);
394}
395
396rxvt_img *
397rxvt_img::reify ()
398{
399 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
400 return clone ();
401
402 Display *dpy = s->display->dpy;
403
404 bool alpha = !format->direct.alphaMask
405 && (x || y)
406 && repeat == RepeatNone;
407
408 rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h, repeat);
409 img->alloc ();
410
411 Picture src = src_picture ();
412 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
413
414 if (alpha)
415 {
416 XRenderColor rc = { 0, 0, 0, 0 };
417 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
418 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
419 }
420 else
421 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
422
423 XRenderFreePicture (dpy, src);
424 XRenderFreePicture (dpy, dst);
425
426 return img;
427}
428
429rxvt_img *
430rxvt_img::sub_rect (int x, int y, int width, int height)
431{
432 rxvt_img *img = clone ();
433
434 img->x += x;
435 img->y += y;
436
437 if (w != width || h != height)
438 {
439 img->w = width;
440 img->h = height;
441
442 rxvt_img *img2 = img->reify ();
443 delete img;
444 img = img2;
445 }
446
447 return img;
448}
449
450rxvt_img *
206rxvt_img::transform (int new_width, int new_height, double matrix[16]) 451rxvt_img::transform (int new_width, int new_height, double matrix[9])
207{ 452{
208 //TODO 453 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
454 img->alloc ();
455
456 Display *dpy = s->display->dpy;
457 Picture src = src_picture ();
458 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
459
460 XTransform xfrm;
461
462 for (int i = 0; i < 3; ++i)
463 for (int j = 0; j < 3; ++j)
464 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
465
466#if 0
467 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
468 xfrm.matrix [1][2] -= XDoubleToFixed (y);
469#endif
470
471 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
472 XRenderSetPictureTransform (dpy, src, &xfrm);
473 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
474
475 XRenderFreePicture (dpy, src);
476 XRenderFreePicture (dpy, dst);
477
478 return img;
209} 479}
210 480
211rxvt_img * 481rxvt_img *
212rxvt_img::scale (int new_width, int new_height) 482rxvt_img::scale (int new_width, int new_height)
213{ 483{
214 // use transform 484 if (w == new_width && h == new_height)
215 //TODO 485 return clone ();
216}
217 486
487 double matrix[9] = {
488 w / (double)new_width, 0, 0,
489 0, h / (double)new_height, 0,
490 0, 0, 1
491 };
492
493 int old_repeat_mode = repeat;
494 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
495
496 rxvt_img *img = transform (new_width, new_height, matrix);
497
498 repeat = old_repeat_mode;
499 img->repeat = repeat;
500
501 return img;
502}
503
218rxvt_img * 504rxvt_img *
505rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
506{
507 double s = sin (phi);
508 double c = cos (phi);
509
510 double matrix[9] = {
511 c, -s, -c * x + s * y + x,
512 s, c, -s * x - c * y + y,
513 0, 0, 1
514 };
515
516 return transform (new_width, new_height, matrix);
517}
518
519rxvt_img *
219rxvt_img::convert_to (XRenderPictFormat *new_format) 520rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
220{ 521{
522 if (new_format == format)
523 return clone ();
524
525 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
526 img->alloc ();
527
221 Display *dpy = s->display->dpy; 528 Display *dpy = s->display->dpy;
222 Pixmap new_pm = XCreatePixmap (dpy, pm, w, h, new_format->depth); 529 Picture src = src_picture ();
223 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
224 Picture dst = XRenderCreatePicture (dpy, new_pm, new_format, 0, 0); 530 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
531 int op = PictOpSrc;
225 532
533 if (format->direct.alphaMask && !new_format->direct.alphaMask)
534 {
535 // does it have to be that complicated
536 rgba c;
537 bg.get (c);
538
539 XRenderColor rc = { c.r, c.g, c.b, 0xffff };
540 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
541
542 op = PictOpOver;
543 }
544
226 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 545 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
227 546
228 XRenderFreePicture (dpy, src);
229 XRenderFreePicture (dpy, dst); 547 XRenderFreePicture (dpy, src);
548 XRenderFreePicture (dpy, dst);
230 549
231 rxvt_img *img = new rxvt_img ( 550 return img;
232 s, 551}
233 new_format,
234 w,
235 h,
236 new_pm
237 );
238 552
553rxvt_img *
554rxvt_img::blend (rxvt_img *img, double factor)
555{
556 rxvt_img *img2 = clone ();
557 Display *dpy = s->display->dpy;
558 Picture src = img->src_picture ();
559 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
560 Picture mask = create_xrender_mask (dpy, img->pm, False);
561
562 XRenderColor mask_c;
563
564 mask_c.alpha = float_to_component (factor);
565 mask_c.red =
566 mask_c.green =
567 mask_c.blue = 0;
568 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
569
570 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
571
572 XRenderFreePicture (dpy, src);
573 XRenderFreePicture (dpy, dst);
574 XRenderFreePicture (dpy, mask);
575
239 return img; 576 return img2;
240} 577}
241 578
242#endif 579#endif
243 580

Diff Legend

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