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

Diff Legend

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