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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines