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.114 by sf-exg, Wed Jan 10 06:06:16 2024 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);
… …
153{ 402{
154 GError *err = 0; 403 GError *err = 0;
155 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 404 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
156 405
157 if (!pb) 406 if (!pb)
407 try
408 {
158 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 409 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
410 }
411 catch (...)
412 {
413 g_error_free (err);
414 throw;
415 }
159 416
160 rxvt_img *img = new_from_pixbuf (s, pb); 417 rxvt_img *img = new_from_pixbuf (s, pb);
161 418
162 g_object_unref (pb); 419 g_object_unref (pb);
163 420
164 return img; 421 return img;
165} 422}
423
424# endif
166 425
167void 426void
168rxvt_img::destroy () 427rxvt_img::destroy ()
169{ 428{
170 if (--ref->cnt) 429 if (--ref->cnt)
171 return; 430 return;
172 431
173 if (pm && ref->ours) 432 if (pm && ref->ours)
174 XFreePixmap (s->display->dpy, pm); 433 XFreePixmap (d->dpy, pm);
175 434
176 delete ref; 435 delete ref;
177} 436}
178 437
179rxvt_img::~rxvt_img () 438rxvt_img::~rxvt_img ()
… …
182} 441}
183 442
184void 443void
185rxvt_img::alloc () 444rxvt_img::alloc ()
186{ 445{
187 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 446 pm = XCreatePixmap (d->dpy, d->root, w, h, format->depth);
188 ref = new pixref (w, h); 447 ref = new pixref (w, h);
189} 448}
190 449
450rxvt_img *
451rxvt_img::new_empty ()
452{
453 rxvt_img *img = new rxvt_img (d, format, x, y, w, h, repeat);
454 img->alloc ();
455
456 return img;
457}
458
191Picture 459Picture
192rxvt_img::src_picture () 460rxvt_img::picture ()
193{ 461{
194 Display *dpy = s->display->dpy; 462 Display *dpy = d->dpy;
195 463
196 XRenderPictureAttributes pa; 464 XRenderPictureAttributes pa;
197 pa.repeat = repeat; 465 pa.repeat = repeat;
198 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 466 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
199 467
… …
204rxvt_img::unshare () 472rxvt_img::unshare ()
205{ 473{
206 if (ref->cnt == 1 && ref->ours) 474 if (ref->cnt == 1 && ref->ours)
207 return; 475 return;
208 476
209 //TODO: maybe should reify instead
210 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 477 Pixmap pm2 = XCreatePixmap (d->dpy, d->root, ref->w, ref->h, format->depth);
211 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 478 GC gc = XCreateGC (d->dpy, pm, 0, 0);
212 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 479 XCopyArea (d->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
213 XFreeGC (s->display->dpy, gc); 480 XFreeGC (d->dpy, gc);
214 481
215 destroy (); 482 destroy ();
216 483
217 pm = pm2; 484 pm = pm2;
218 ref = new pixref (ref->w, ref->h); 485 ref = new pixref (ref->w, ref->h);
219} 486}
220 487
221void 488void
489rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
490{
491 XRenderColor rc = { c.r, c.g, c.b, c.a };
492
493 Display *dpy = d->dpy;
494 Picture src = picture ();
495 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
496 XRenderFreePicture (dpy, src);
497}
498
499void
222rxvt_img::fill (const rxvt_color &c) 500rxvt_img::fill (const rgba &c)
223{ 501{
224 XGCValues gcv; 502 fill (c, 0, 0, w, h);
225 gcv.foreground = c; 503}
226 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 504
227 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 505void
228 XFreeGC (s->display->dpy, gc); 506rxvt_img::add_alpha ()
507{
508 if (format->direct.alphaMask)
509 return;
510
511 composer cc (this, new rxvt_img (d, find_alpha_format_for (d->dpy, format), x, y, w, h, repeat));
512
513 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
514
515 rxvt_img *img = cc;
516
517 ::swap (img->ref, ref);
518 ::swap (img->pm , pm );
519
520 delete img;
229} 521}
230 522
231static void 523static void
232get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 524get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
233{ 525{
234 double sigma = radius / 2.0; 526 nv sigma = radius / 2.0;
235 double scale = sqrt (2.0 * M_PI) * sigma; 527 nv scale = sqrt (2.0 * M_PI) * sigma;
236 double sum = 0.0; 528 nv sum = 0.0;
237 529
238 for (int i = 0; i < width; i++) 530 for (int i = 0; i < width; i++)
239 { 531 {
240 double x = i - width / 2; 532 nv x = i - width / 2;
241 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 533 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
242 sum += kernel[i]; 534 sum += kernel[i];
243 } 535 }
244 536
245 params[0] = XDoubleToFixed (width); 537 params[0] = XDoubleToFixed (width);
… …
250} 542}
251 543
252rxvt_img * 544rxvt_img *
253rxvt_img::blur (int rh, int rv) 545rxvt_img::blur (int rh, int rv)
254{ 546{
255 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 547 if (!(d->flags & DISPLAY_HAS_RENDER_CONV))
256 return clone (); 548 return clone ();
257 549
258 Display *dpy = s->display->dpy; 550 Display *dpy = d->dpy;
259 int size = max (rh, rv) * 2 + 1; 551 int size = max (rh, rv) * 2 + 1;
260 double *kernel = (double *)malloc (size * sizeof (double)); 552 nv *kernel = (nv *)malloc (size * sizeof (nv));
261 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 553 XFixed *params = rxvt_temp_buf<XFixed> (size + 2);
262 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 554 rxvt_img *img = new_empty ();
263 img->alloc ();
264
265 Picture src = src_picture ();
266 555
267 XRenderPictureAttributes pa; 556 XRenderPictureAttributes pa;
268 pa.repeat = RepeatPad; 557 pa.repeat = RepeatPad;
269 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 558 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
559 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
270 560
271 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 561 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
272 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 562 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
273 XFreePixmap (dpy, tmp_pm); 563 XFreePixmap (dpy, tmp_pm);
274 564
… …
290 580
291 size = rv * 2 + 1; 581 size = rv * 2 + 1;
292 get_gaussian_kernel (rv, size, kernel, params); 582 get_gaussian_kernel (rv, size, kernel, params);
293 ::swap (params[0], params[1]); 583 ::swap (params[0], params[1]);
294 584
295 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 585 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
296 XRenderComposite (dpy, 586 XRenderComposite (dpy,
297 PictOpSrc, 587 PictOpSrc,
298 tmp, 588 tmp,
299 None, 589 None,
300 dst, 590 dst,
… …
303 0, 0, 593 0, 0,
304 w, h); 594 w, h);
305 } 595 }
306 596
307 free (kernel); 597 free (kernel);
308 free (params); 598
309 XRenderFreePicture (dpy, src); 599 XRenderFreePicture (dpy, src);
310 XRenderFreePicture (dpy, dst); 600 XRenderFreePicture (dpy, dst);
311 XRenderFreePicture (dpy, tmp); 601 XRenderFreePicture (dpy, tmp);
312 602
313 return img; 603 return img;
314} 604}
315 605
316static Picture 606rxvt_img *
317create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 607rxvt_img::muladd (nv mul, nv add)
318{ 608{
319 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 609 // STEP 1: double the image width, fill all odd columns with white (==1)
320 610
321 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 611 rxvt_img *img = new rxvt_img (d, format, 0, 0, w * 2, h, repeat);
322 XRenderPictureAttributes pa; 612 composer cc (this, img);
323 pa.repeat = True;
324 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
325 613
326 XFreePixmap (dpy, pixmap); 614 // why the hell does XRenderSetPictureTransform want a writable matrix :(
615 // that keeps us from just static const'ing this matrix.
616 XTransform h_double = {
617 0x08000, 0, 0,
618 0, 0x10000, 0,
619 0, 0, 0x10000
620 };
327 621
328 return mask; 622 XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
623 XRenderSetPictureTransform (cc.dpy, cc.src, &h_double);
624 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
625
626 cc.mask (false, 2, 1);
627
628 static const XRenderColor c0 = { 0, 0, 0, 0 };
629 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1);
630 static const XRenderColor c1 = { 65535, 65535, 65535, 65535 };
631 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1);
632
633 Picture white = XRenderCreateSolidFill (cc.dpy, &c1);
634
635 XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
636
637 XRenderFreePicture (cc.dpy, white);
638
639 // STEP 2: convolve the image with a 3x1 filter
640 // a 2x1 filter would obviously suffice, but given the total lack of specification
641 // for xrender, I expect different xrender implementations to randomly diverge.
642 // we also halve the image, and hope for the best (again, for lack of specs).
643 composer cc2 (img);
644
645 XFixed kernel [] = {
646 XDoubleToFixed (3), XDoubleToFixed (1),
647 XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add)
648 };
649
650 XTransform h_halve = {
651 0x20000, 0, 0,
652 0, 0x10000, 0,
653 0, 0, 0x10000
654 };
655
656 XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0);
657 XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve);
658 XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel));
659
660 XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
661
662 delete img;
663
664 return cc2;
665}
666
667ecb_noinline static void
668extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
669{
670 int32_t x = clamp (c, cl0, cl1);
671 c -= x;
672 xc = x;
673}
674
675ecb_noinline static bool
676extract (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)
677{
678 extract (cl0, cl1, r, xr);
679 extract (cl0, cl1, g, xg);
680 extract (cl0, cl1, b, xb);
681 extract (cl0, cl1, a, xa);
682
683 return xr | xg | xb | xa;
329} 684}
330 685
331void 686void
332rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 687rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
333{ 688{
689 unshare ();
690
334 Display *dpy = s->display->dpy; 691 Display *dpy = d->dpy;
335 Picture src = create_xrender_mask (dpy, pm, True);
336 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 692 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
337 693
694 // loop should not be needed for brightness, as only -1..1 makes sense
695 //while (r | g | b | a)
696 {
338 XRenderColor mask_c; 697 XRenderColor mask_c;
339 mask_c.red = r; 698
340 mask_c.green = g; 699 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); 700 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
344 701
345 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 702 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
703 {
704 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
705 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
706 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
707 mask_c.green = -mask_c.green;
708 mask_c.blue = -mask_c.blue;
709 mask_c.alpha = -mask_c.alpha;
710 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
711 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
712 }
713 }
346 714
347 XRenderFreePicture (dpy, src);
348 XRenderFreePicture (dpy, dst); 715 XRenderFreePicture (dpy, dst);
349} 716}
350 717
351void 718void
352rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 719rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
353{ 720{
354 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 721 if (r < 0 || g < 0 || b < 0 || a < 0)
355 return; 722 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
356 723
357 Display *dpy = s->display->dpy; 724 // premultiply (yeah, these are not exact, sue me or fix it)
358 Picture src = create_xrender_mask (dpy, pm, True); 725 r = (r * (a >> 8)) >> 8;
359 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 726 g = (g * (a >> 8)) >> 8;
727 b = (b * (a >> 8)) >> 8;
360 728
729 composer cc (this);
730 rxvt_img *img = cc;
731 img->fill (rgba (0, 0, 0, 0));
732
733 cc.mask (true);
734
735 //TODO: this operator does not yet implement some useful contrast
736 while (r | g | b | a)
737 {
361 XRenderColor mask_c; 738 XRenderColor mask_c;
362 mask_c.red = r; 739
363 mask_c.green = g; 740 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; 741 {
365 mask_c.alpha = a;
366 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 742 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); 743 XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
744 }
745 }
369 746
370 XRenderFreePicture (dpy, src); 747 ::swap (img->ref, ref);
371 XRenderFreePicture (dpy, dst); 748 ::swap (img->pm , pm );
749
750 delete img;
751}
752
753void
754rxvt_img::draw (rxvt_img *img, int op, nv mask)
755{
756 unshare ();
757
758 composer cc (img, this);
759
760 if (mask != 1.)
761 cc.mask (rgba (0, 0, 0, float_to_component (mask)));
762
763 XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
372} 764}
373 765
374rxvt_img * 766rxvt_img *
375rxvt_img::clone () 767rxvt_img::clone ()
376{ 768{
377 return new rxvt_img (*this); 769 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} 770}
399 771
400rxvt_img * 772rxvt_img *
401rxvt_img::reify () 773rxvt_img::reify ()
402{ 774{
403 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 775 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
404 return clone (); 776 return clone ();
405 777
406 Display *dpy = s->display->dpy; 778 // add an alpha channel if...
407
408 bool alpha = !format->direct.alphaMask 779 bool alpha = !format->direct.alphaMask // pixmap has none yet
409 && (x || y) 780 && (x || y) // we need one because of non-zero offset
410 && repeat == RepeatNone; 781 && repeat == RepeatNone; // and we have no good pixels to fill with
411 782
412 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 783 composer cc (this, new rxvt_img (d, alpha ? find_alpha_format_for (d->dpy, format) : format,
413 img->alloc (); 784 0, 0, w, h, repeat));
414 785
415 Picture src = src_picture (); 786 if (repeat == RepeatNone)
416 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
417
418 if (alpha)
419 { 787 {
420 XRenderColor rc = { 0, 0, 0, 0 }; 788 XRenderColor rc = { 0, 0, 0, 0 };
421 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 789 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); 790 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
423 } 791 }
424 else 792 else
425 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 793 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
426 794
427 XRenderFreePicture (dpy, src);
428 XRenderFreePicture (dpy, dst);
429
430 return img; 795 return cc;
431} 796}
432 797
433rxvt_img * 798rxvt_img *
434rxvt_img::sub_rect (int x, int y, int width, int height) 799rxvt_img::sub_rect (int x, int y, int width, int height)
435{ 800{
436 rxvt_img *img = clone (); 801 rxvt_img *img = clone ();
437 802
438 img->x += x; 803 img->x -= x;
439 img->y += y; 804 img->y -= y;
440 805
441 if (w != width || h != height) 806 if (w != width || h != height)
442 { 807 {
443 img->w = width; 808 img->w = width;
444 img->h = height; 809 img->h = height;
… …
450 815
451 return img; 816 return img;
452} 817}
453 818
454rxvt_img * 819rxvt_img *
455rxvt_img::transform (int new_width, int new_height, double matrix[9]) 820rxvt_img::transform (const nv matrix[3][3])
456{ 821{
457 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); 822 return transform (mat3x3 (&matrix[0][0]));
458 img->alloc (); 823}
459 824
460 Display *dpy = s->display->dpy; 825rxvt_img *
461 Picture src = src_picture (); 826rxvt_img::transform (const nv *matrix)
462 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 827{
828 mat3x3 m (matrix);
829
830 // calculate new pixel bounding box coordinates
831 nv rmin[2], rmax[2];
832
833 for (int i = 0; i < 2; ++i)
834 {
835 nv v;
836
837 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
838 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
839 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
840 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
841 }
842
843 float sx = rmin [0] - x;
844 float sy = rmin [1] - y;
845
846 // TODO: adjust matrix for subpixel accuracy
847 int nx = floor (rmin [0]);
848 int ny = floor (rmin [1]);
849
850 int new_width = ceil (rmax [0] - rmin [0]);
851 int new_height = ceil (rmax [1] - rmin [1]);
852
853 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
854
855 composer cc (this, new rxvt_img (d, format, nx, ny, new_width, new_height, repeat));
463 856
464 XTransform xfrm; 857 XTransform xfrm;
465 858
466 for (int i = 0; i < 3; ++i) 859 for (int i = 0; i < 3; ++i)
467 for (int j = 0; j < 3; ++j) 860 for (int j = 0; j < 3; ++j)
468 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 861 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
469 862
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); 863 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
476 XRenderSetPictureTransform (dpy, src, &xfrm); 864 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
477 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 865 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
478 866
479 XRenderFreePicture (dpy, src);
480 XRenderFreePicture (dpy, dst);
481
482 return img; 867 return cc;
483} 868}
484 869
485rxvt_img * 870rxvt_img *
486rxvt_img::scale (int new_width, int new_height) 871rxvt_img::scale (int new_width, int new_height)
487{ 872{
488 if (w == new_width && h == new_height) 873 if (w == new_width && h == new_height)
489 return clone (); 874 return clone ();
490 875
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; 876 int old_repeat_mode = repeat;
498 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems 877 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
499 878
500 rxvt_img *img = transform (new_width, new_height, matrix); 879 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
501 880
502 repeat = old_repeat_mode; 881 repeat = old_repeat_mode;
503 img->repeat = repeat; 882 img->repeat = repeat;
504 883
505 return img; 884 return img;
506} 885}
507 886
508rxvt_img * 887rxvt_img *
509rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 888rxvt_img::rotate (int cx, int cy, nv phi)
510{ 889{
511 double s = sin (phi); 890 move (-cx, -cy);
512 double c = cos (phi); 891 rxvt_img *img = transform (mat3x3::rotate (phi));
892 move ( cx, cy);
893 img->move (cx, cy);
513 894
514 double matrix[9] = { 895 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} 896}
522 897
523rxvt_img * 898rxvt_img *
524rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 899rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
525{ 900{
526 if (new_format == format) 901 if (new_format == format)
527 return clone (); 902 return clone ();
528 903
529 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 904 composer cc (this, new rxvt_img (d, new_format, x, y, w, h, repeat));
530 img->alloc ();
531 905
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; 906 int op = PictOpSrc;
536 907
537 if (format->direct.alphaMask && !new_format->direct.alphaMask) 908 if (format->direct.alphaMask && !new_format->direct.alphaMask)
538 { 909 {
539 // does it have to be that complicated 910 // 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 }; 911 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
544 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 912 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
545 913
546 op = PictOpOver; 914 op = PictOpOver;
547 } 915 }
548 916
549 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 917 XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
550 918
551 XRenderFreePicture (dpy, src); 919 return cc;
552 XRenderFreePicture (dpy, dst); 920}
921
922rxvt_img *
923rxvt_img::tint (const rgba &c)
924{
925 composer cc (this);
926 cc.mask (true);
927 cc.fill (c);
928
929 XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
930
931 return cc;
932}
933
934rxvt_img *
935rxvt_img::shade (nv factor, rgba c)
936{
937 clamp_it (factor, -1., 1.);
938 factor++;
939
940 if (factor > 1)
941 {
942 c.r = c.r * (2 - factor);
943 c.g = c.g * (2 - factor);
944 c.b = c.b * (2 - factor);
945 }
946 else
947 {
948 c.r = c.r * factor;
949 c.g = c.g * factor;
950 c.b = c.b * factor;
951 }
952
953 rxvt_img *img = this->tint (c);
954
955 if (factor > 1)
956 {
957 c.a = 0xffff;
958 c.r =
959 c.g =
960 c.b = 0xffff * (factor - 1);
961
962 img->brightness (c.r, c.g, c.b, c.a);
963 }
553 964
554 return img; 965 return img;
555} 966}
556 967
557rxvt_img * 968rxvt_img *
558rxvt_img::blend (rxvt_img *img, double factor) 969rxvt_img::filter (const char *name, int nparams, nv *params)
559{ 970{
560 rxvt_img *img2 = clone (); 971 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 972
566 XRenderColor mask_c; 973 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
567 974
568 mask_c.alpha = float_to_component (factor); 975 for (int i = 0; i < nparams; ++i)
569 mask_c.red = 976 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 977
978 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
979
574 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h); 980 XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
575 981
576 XRenderFreePicture (dpy, src);
577 XRenderFreePicture (dpy, dst);
578 XRenderFreePicture (dpy, mask);
579
580 return img2; 982 return cc;
581} 983}
582 984
583#endif 985#endif
584 986

Diff Legend

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