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.83 by root, Thu Jun 14 18:06:15 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
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}
6 230
7static XRenderPictFormat * 231static XRenderPictFormat *
8find_alpha_format_for (Display *dpy, XRenderPictFormat *format) 232find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
9{ 233{
10 if (format->direct.alphaMask) 234 if (format->direct.alphaMask)
… …
23 // should be a very good fallback 247 // should be a very good fallback
24 return XRenderFindStandardFormat (dpy, PictStandardARGB32); 248 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
25} 249}
26 250
27rxvt_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)
28: 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),
29 pm(0), ref(0) 253 pm(0), ref(0)
30{ 254{
31} 255}
32 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
33rxvt_img::rxvt_img (const rxvt_img &img) 263rxvt_img::rxvt_img (const rxvt_img &img)
34: 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)
35{ 265{
36 ++ref->cnt; 266 ++ref->cnt;
37} 267}
38 268
39rxvt_img * 269rxvt_img *
40rxvt_img::new_from_root (rxvt_screen *s) 270rxvt_img::new_from_root (rxvt_screen *s)
41{ 271{
42 Display *dpy = s->display->dpy; 272 Display *dpy = s->dpy;
43 unsigned int root_pm_w, root_pm_h; 273 unsigned int root_pm_w, root_pm_h;
44 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]);
45 if (root_pixmap == None) 275 if (root_pixmap == None)
46 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]);
47 277
48 if (root_pixmap == None) 278 if (root_pixmap == None)
49 return 0; 279 return 0;
50 280
51 Window wdummy; 281 Window wdummy;
… …
74# if HAVE_PIXBUF 304# if HAVE_PIXBUF
75 305
76rxvt_img * 306rxvt_img *
77rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 307rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
78{ 308{
79 Display *dpy = s->display->dpy; 309 Display *dpy = s->dpy;
80 310
81 int width = gdk_pixbuf_get_width (pb); 311 int width = gdk_pixbuf_get_width (pb);
82 int height = gdk_pixbuf_get_height (pb); 312 int height = gdk_pixbuf_get_height (pb);
83 313
84 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 314 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
… …
126 for (int y = 0; y < height; y++) 356 for (int y = 0; y < height; y++)
127 { 357 {
128 unsigned char *src = row; 358 unsigned char *src = row;
129 uint32_t *dst = (uint32_t *)line; 359 uint32_t *dst = (uint32_t *)line;
130 360
131 if (!pb_has_alpha)
132 for (int x = 0; x < width; x++) 361 for (int x = 0; x < width; x++)
133 { 362 {
134 uint8_t r = *src++; 363 uint8_t r = *src++;
135 uint8_t g = *src++; 364 uint8_t g = *src++;
136 uint8_t b = *src++; 365 uint8_t b = *src++;
366 uint8_t a = *src;
137 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
138 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; 376 uint32_t v = (a << 24) | (r << 16) | (g << 8) | b;
139 377
140 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 378 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
141 v = ecb_bswap32 (v); 379 v = ecb_bswap32 (v);
142 380
143 *dst++ = v; 381 *dst++ = v;
144 } 382 }
145 else
146 for (int x = 0; x < width; x++)
147 {
148 uint32_t v = *(uint32_t *)src; src += 4;
149
150 if (ecb_big_endian ())
151 v = ecb_bswap32 (v);
152
153 v = ecb_rotl32 (v, 8); // abgr to bgra
154
155 if (!byte_order_mismatch)
156 v = ecb_bswap32 (v);
157
158 *dst++ = v;
159 }
160 383
161 row += rowstride; 384 row += rowstride;
162 line += xi.bytes_per_line; 385 line += xi.bytes_per_line;
163 } 386 }
164 387
… …
179{ 402{
180 GError *err = 0; 403 GError *err = 0;
181 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 404 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
182 405
183 if (!pb) 406 if (!pb)
407 try
408 {
184 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 }
185 416
186 rxvt_img *img = new_from_pixbuf (s, pb); 417 rxvt_img *img = new_from_pixbuf (s, pb);
187 418
188 g_object_unref (pb); 419 g_object_unref (pb);
189 420
… …
197{ 428{
198 if (--ref->cnt) 429 if (--ref->cnt)
199 return; 430 return;
200 431
201 if (pm && ref->ours) 432 if (pm && ref->ours)
202 XFreePixmap (s->display->dpy, pm); 433 XFreePixmap (d->dpy, pm);
203 434
204 delete ref; 435 delete ref;
205} 436}
206 437
207rxvt_img::~rxvt_img () 438rxvt_img::~rxvt_img ()
… …
210} 441}
211 442
212void 443void
213rxvt_img::alloc () 444rxvt_img::alloc ()
214{ 445{
215 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 446 pm = XCreatePixmap (d->dpy, d->root, w, h, format->depth);
216 ref = new pixref (w, h); 447 ref = new pixref (w, h);
217} 448}
218 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
219Picture 459Picture
220rxvt_img::src_picture () 460rxvt_img::picture ()
221{ 461{
222 Display *dpy = s->display->dpy; 462 Display *dpy = d->dpy;
223 463
224 XRenderPictureAttributes pa; 464 XRenderPictureAttributes pa;
225 pa.repeat = repeat; 465 pa.repeat = repeat;
226 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 466 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
227 467
… …
232rxvt_img::unshare () 472rxvt_img::unshare ()
233{ 473{
234 if (ref->cnt == 1 && ref->ours) 474 if (ref->cnt == 1 && ref->ours)
235 return; 475 return;
236 476
237 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);
238 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 478 GC gc = XCreateGC (d->dpy, pm, 0, 0);
239 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);
240 XFreeGC (s->display->dpy, gc); 480 XFreeGC (d->dpy, gc);
241 481
242 destroy (); 482 destroy ();
243 483
244 pm = pm2; 484 pm = pm2;
245 ref = new pixref (ref->w, ref->h); 485 ref = new pixref (ref->w, ref->h);
246} 486}
247 487
248void 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
249rxvt_img::fill (const rgba &c) 500rxvt_img::fill (const rgba &c)
250{ 501{
251 XRenderColor rc = { c.r, c.g, c.b, c.a }; 502 fill (c, 0, 0, w, h);
252
253 Display *dpy = s->display->dpy;
254 Picture src = src_picture ();
255 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
256 XRenderFreePicture (dpy, src);
257} 503}
258 504
259void 505void
260rxvt_img::add_alpha () 506rxvt_img::add_alpha ()
261{ 507{
262 if (format->direct.alphaMask) 508 if (format->direct.alphaMask)
263 return; 509 return;
264 510
265 Display *dpy = s->display->dpy; 511 composer cc (this, new rxvt_img (d, find_alpha_format_for (d->dpy, format), x, y, w, h, repeat));
266
267 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
268 img->alloc ();
269
270 Picture src = src_picture ();
271 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
272 512
273 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 513 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
274 514
275 XRenderFreePicture (dpy, src); 515 rxvt_img *img = cc;
276 XRenderFreePicture (dpy, dst);
277 516
278 ::swap (img->ref, ref); 517 ::swap (img->ref, ref);
279 ::swap (img->pm , pm ); 518 ::swap (img->pm , pm );
280 519
281 delete img; 520 delete img;
282} 521}
283 522
284static void 523static void
285get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 524get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
286{ 525{
287 double sigma = radius / 2.0; 526 nv sigma = radius / 2.0;
288 double scale = sqrt (2.0 * M_PI) * sigma; 527 nv scale = sqrt (2.0 * M_PI) * sigma;
289 double sum = 0.0; 528 nv sum = 0.0;
290 529
291 for (int i = 0; i < width; i++) 530 for (int i = 0; i < width; i++)
292 { 531 {
293 double x = i - width / 2; 532 nv x = i - width / 2;
294 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 533 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
295 sum += kernel[i]; 534 sum += kernel[i];
296 } 535 }
297 536
298 params[0] = XDoubleToFixed (width); 537 params[0] = XDoubleToFixed (width);
… …
303} 542}
304 543
305rxvt_img * 544rxvt_img *
306rxvt_img::blur (int rh, int rv) 545rxvt_img::blur (int rh, int rv)
307{ 546{
308 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 547 if (!(d->flags & DISPLAY_HAS_RENDER_CONV))
309 return clone (); 548 return clone ();
310 549
311 Display *dpy = s->display->dpy; 550 Display *dpy = d->dpy;
312 int size = max (rh, rv) * 2 + 1; 551 int size = max (rh, rv) * 2 + 1;
313 double *kernel = (double *)malloc (size * sizeof (double)); 552 nv *kernel = (nv *)malloc (size * sizeof (nv));
314 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 553 XFixed *params = rxvt_temp_buf<XFixed> (size + 2);
315 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 554 rxvt_img *img = new_empty ();
316 img->alloc ();
317 555
318 XRenderPictureAttributes pa; 556 XRenderPictureAttributes pa;
319 pa.repeat = RepeatPad; 557 pa.repeat = RepeatPad;
320 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 558 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
321 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 559 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
… …
355 0, 0, 593 0, 0,
356 w, h); 594 w, h);
357 } 595 }
358 596
359 free (kernel); 597 free (kernel);
360 free (params);
361 598
362 XRenderFreePicture (dpy, src); 599 XRenderFreePicture (dpy, src);
363 XRenderFreePicture (dpy, dst); 600 XRenderFreePicture (dpy, dst);
364 XRenderFreePicture (dpy, tmp); 601 XRenderFreePicture (dpy, tmp);
365 602
366 return img; 603 return img;
367} 604}
368 605
369static Picture 606rxvt_img *
370create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha) 607rxvt_img::muladd (nv mul, nv add)
371{ 608{
372 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 609 // STEP 1: double the image width, fill all odd columns with white (==1)
373 610
374 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 611 composer cc (this, new rxvt_img (d, format, 0, 0, w * 2, h, repeat));
375 XRenderPictureAttributes pa;
376 pa.repeat = RepeatNormal;
377 pa.component_alpha = component_alpha;
378 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
379 612
380 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 };
381 620
382 return mask; 621 XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
383} 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);
384 624
385static void 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
386extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) 665extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
387{ 666{
388 int32_t x = clamp (c, cl0, cl1); 667 int32_t x = clamp (c, cl0, cl1);
389 c -= x; 668 c -= x;
390 xc = x; 669 xc = x;
391} 670}
392 671
393static bool 672ecb_noinline static bool
394extract (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) 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)
395{ 674{
396 extract (cl0, cl1, r, xr); 675 extract (cl0, cl1, r, xr);
397 extract (cl0, cl1, g, xg); 676 extract (cl0, cl1, g, xg);
398 extract (cl0, cl1, b, xb); 677 extract (cl0, cl1, b, xb);
… …
404void 683void
405rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) 684rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
406{ 685{
407 unshare (); 686 unshare ();
408 687
409 Display *dpy = s->display->dpy; 688 Display *dpy = d->dpy;
410 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 689 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
411 690
412 // loop should not be needed for brightness, as only -1..1 makes sense 691 // loop should not be needed for brightness, as only -1..1 makes sense
413 //while (r | g | b | a) 692 //while (r | g | b | a)
414 { 693 {
… …
438rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) 717rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
439{ 718{
440 if (r < 0 || g < 0 || b < 0 || a < 0) 719 if (r < 0 || g < 0 || b < 0 || a < 0)
441 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); 720 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
442 721
443 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
444 img->alloc ();
445 img->fill (rgba (0, 0, 0, 0));
446
447 // premultiply (yeah, these are not exact, sue me or fix it) 722 // premultiply (yeah, these are not exact, sue me or fix it)
448 r = (r * (a >> 8)) >> 8; 723 r = (r * (a >> 8)) >> 8;
449 g = (g * (a >> 8)) >> 8; 724 g = (g * (a >> 8)) >> 8;
450 b = (b * (a >> 8)) >> 8; 725 b = (b * (a >> 8)) >> 8;
451 726
452 Display *dpy = s->display->dpy; 727 composer cc (this);
728 rxvt_img *img = cc;
729 img->fill (rgba (0, 0, 0, 0));
453 730
454 Picture src = src_picture (); 731 cc.mask (true);
455 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
456 Picture mul = create_xrender_mask (dpy, pm, True, True);
457 732
458 //TODO: this operator does not yet implement some useful contrast 733 //TODO: this operator does not yet implement some useful contrast
459 while (r | g | b | a) 734 while (r | g | b | a)
460 { 735 {
461 unsigned short xr, xg, xb, xa; 736 unsigned short xr, xg, xb, xa;
462 XRenderColor mask_c; 737 XRenderColor mask_c;
463 738
464 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) 739 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
465 { 740 {
466 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); 741 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
467 XRenderComposite (dpy, PictOpAdd, src, mul, 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);
468 } 743 }
469 } 744 }
470
471 XRenderFreePicture (dpy, mul);
472 XRenderFreePicture (dpy, dst);
473 XRenderFreePicture (dpy, src);
474 745
475 ::swap (img->ref, ref); 746 ::swap (img->ref, ref);
476 ::swap (img->pm , pm ); 747 ::swap (img->pm , pm );
477 748
478 delete img; 749 delete img;
479} 750}
480 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);
763}
764
481rxvt_img * 765rxvt_img *
482rxvt_img::clone () 766rxvt_img::clone ()
483{ 767{
484 return new rxvt_img (*this); 768 return new rxvt_img (*this);
485} 769}
… …
487rxvt_img * 771rxvt_img *
488rxvt_img::reify () 772rxvt_img::reify ()
489{ 773{
490 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 774 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
491 return clone (); 775 return clone ();
492
493 Display *dpy = s->display->dpy;
494 776
495 // add an alpha channel if... 777 // add an alpha channel if...
496 bool alpha = !format->direct.alphaMask // pixmap has none yet 778 bool alpha = !format->direct.alphaMask // pixmap has none yet
497 && (x || y) // we need one because of non-zero offset 779 && (x || y) // we need one because of non-zero offset
498 && repeat == RepeatNone; // and we have no good pixels to fill with 780 && repeat == RepeatNone; // and we have no good pixels to fill with
499 781
500 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,
501 img->alloc (); 783 0, 0, w, h, repeat));
502 784
503 Picture src = src_picture (); 785 if (repeat == RepeatNone)
504 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
505
506 if (alpha)
507 { 786 {
508 XRenderColor rc = { 0, 0, 0, 0 }; 787 XRenderColor rc = { 0, 0, 0, 0 };
509 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
510 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);
511 } 790 }
512 else 791 else
513 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);
514 793
515 XRenderFreePicture (dpy, src);
516 XRenderFreePicture (dpy, dst);
517
518 return img; 794 return cc;
519} 795}
520 796
521rxvt_img * 797rxvt_img *
522rxvt_img::sub_rect (int x, int y, int width, int height) 798rxvt_img::sub_rect (int x, int y, int width, int height)
523{ 799{
524 rxvt_img *img = clone (); 800 rxvt_img *img = clone ();
525 801
526 img->x += x; 802 img->x -= x;
527 img->y += y; 803 img->y -= y;
528 804
529 if (w != width || h != height) 805 if (w != width || h != height)
530 { 806 {
531 img->w = width; 807 img->w = width;
532 img->h = height; 808 img->h = height;
… …
537 } 813 }
538 814
539 return img; 815 return img;
540} 816}
541 817
542static void
543mat_invert (double mat[3][3], double (&inv)[3][3])
544{
545 double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
546 double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
547 double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
548
549 double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
550
551 inv [0][0] = invdet * s0;
552 inv [0][1] = invdet * s1;
553 inv [0][2] = invdet * s2;
554
555 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
556 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
557 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
558
559 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
560 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
561 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
562}
563
564static double
565mat_apply (double mat[3][3], int i, double x, double y)
566{
567 double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
568 double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
569
570 return v * (1. / w);
571}
572
573rxvt_img * 818rxvt_img *
574rxvt_img::transform (double matrix[3][3]) 819rxvt_img::transform (const nv matrix[3][3])
575{ 820{
576 // find new offset 821 return transform (mat3x3 (&matrix[0][0]));
577 int ox = mat_apply (matrix, 0, x, y); 822}
578 int oy = mat_apply (matrix, 1, x, y); 823
824rxvt_img *
825rxvt_img::transform (const nv *matrix)
826{
827 mat3x3 m (matrix);
579 828
580 // calculate new pixel bounding box coordinates 829 // calculate new pixel bounding box coordinates
581 double d [2], rmin[2], rmax[2]; 830 nv rmin[2], rmax[2];
582 831
583 for (int i = 0; i < 2; ++i) 832 for (int i = 0; i < 2; ++i)
584 { 833 {
585 double v; 834 nv v;
835
586 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v; 836 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
587 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v); 837 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
588 v = mat_apply (matrix, i, 0, h); 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);
589 v = mat_apply (matrix, i, w, h); 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);
590 } 840 }
591 841
842 float sx = rmin [0] - x;
843 float sy = rmin [1] - y;
844
845 // TODO: adjust matrix for subpixel accuracy
592 int dx = floor (rmin [0]); 846 int nx = floor (rmin [0]);
593 int dy = floor (rmin [1]); 847 int ny = floor (rmin [1]);
594 848
595 int new_width = ceil (rmax [0] - dx); 849 int new_width = ceil (rmax [0] - rmin [0]);
596 int new_height = ceil (rmax [1] - dy); 850 int new_height = ceil (rmax [1] - rmin [1]);
597 851
598 double inv[3][3]; 852 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
599 mat_invert (matrix, inv);
600 853
601 rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat); 854 composer cc (this, new rxvt_img (d, format, nx, ny, new_width, new_height, repeat));
602 img->alloc ();
603
604 Display *dpy = s->display->dpy;
605 Picture src = src_picture ();
606 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
607 855
608 XTransform xfrm; 856 XTransform xfrm;
609 857
610 for (int i = 0; i < 3; ++i) 858 for (int i = 0; i < 3; ++i)
611 for (int j = 0; j < 3; ++j) 859 for (int j = 0; j < 3; ++j)
612 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 860 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
613 861
614 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 862 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
615 XRenderSetPictureTransform (dpy, src, &xfrm); 863 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
616 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 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);
617 865
618 XRenderFreePicture (dpy, src);
619 XRenderFreePicture (dpy, dst);
620
621 return img; 866 return cc;
622} 867}
623 868
624rxvt_img * 869rxvt_img *
625rxvt_img::scale (int new_width, int new_height) 870rxvt_img::scale (int new_width, int new_height)
626{ 871{
627 if (w == new_width && h == new_height) 872 if (w == new_width && h == new_height)
628 return clone (); 873 return clone ();
629 874
630 double matrix[3][3] = {
631 { new_width / (double)w, 0, 0 },
632 { 0, new_height / (double)h, 0 },
633 { 0, 0, 1 }
634 };
635
636 int old_repeat_mode = repeat; 875 int old_repeat_mode = repeat;
637 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 876 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
638 877
639 rxvt_img *img = transform (matrix); 878 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
640 879
641 repeat = old_repeat_mode; 880 repeat = old_repeat_mode;
642 img->repeat = repeat; 881 img->repeat = repeat;
643 882
644 return img; 883 return img;
645} 884}
646 885
647rxvt_img * 886rxvt_img *
648rxvt_img::rotate (int cx, int cy, double phi) 887rxvt_img::rotate (int cx, int cy, nv phi)
649{ 888{
650 double s = sin (phi);
651 double c = cos (phi);
652
653 double matrix[3][3] = {
654 { c, -s, cx - c * cx + s * cy },
655 { s, c, cy - s * cx - c * cy },
656 { 0, 0, 1 }
657 //{ c, -s, 0 },
658 //{ s, c, 0 },
659 //{ 0, 0, 1 }
660 };
661
662 //move (-cx, -cy); 889 move (-cx, -cy);
663 rxvt_img *img = transform (matrix); 890 rxvt_img *img = transform (mat3x3::rotate (phi));
664 //move ( cx, cy); 891 move ( cx, cy);
665 //img->move (cx, cy); 892 img->move (cx, cy);
666 893
667 return img; 894 return img;
668} 895}
669 896
670rxvt_img * 897rxvt_img *
671rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg) 898rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
672{ 899{
673 if (new_format == format) 900 if (new_format == format)
674 return clone (); 901 return clone ();
675 902
676 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));
677 img->alloc ();
678 904
679 Display *dpy = s->display->dpy;
680 Picture src = src_picture ();
681 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
682 int op = PictOpSrc; 905 int op = PictOpSrc;
683 906
684 if (format->direct.alphaMask && !new_format->direct.alphaMask) 907 if (format->direct.alphaMask && !new_format->direct.alphaMask)
685 { 908 {
686 // does it have to be that complicated 909 // does it have to be that complicated
687 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a }; 910 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
688 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 911 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
689 912
690 op = PictOpOver; 913 op = PictOpOver;
691 } 914 }
692 915
693 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);
694 917
695 XRenderFreePicture (dpy, src); 918 return cc;
696 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 }
697 963
698 return img; 964 return img;
699} 965}
700 966
701rxvt_img * 967rxvt_img *
702rxvt_img::blend (rxvt_img *img, double factor) 968rxvt_img::filter (const char *name, int nparams, nv *params)
703{ 969{
704 rxvt_img *img2 = clone (); 970 composer cc (this);
705 Display *dpy = s->display->dpy;
706 Picture src = img->src_picture ();
707 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
708 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
709 971
710 XRenderColor mask_c; 972 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
711 973
712 mask_c.alpha = float_to_component (factor); 974 for (int i = 0; i < nparams; ++i)
713 mask_c.red = 975 xparams [i] = XDoubleToFixed (params [i]);
714 mask_c.green =
715 mask_c.blue = 0;
716 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
717 976
977 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
978
718 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);
719 980
720 XRenderFreePicture (dpy, src);
721 XRenderFreePicture (dpy, dst);
722 XRenderFreePicture (dpy, mask);
723
724 return img2; 981 return cc;
725} 982}
726 983
727#endif 984#endif
728 985

Diff Legend

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