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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines