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.89 by root, Thu Jun 14 19:44:31 2012 UTC vs.
Revision 1.110 by root, Tue Sep 17 18:06:37 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
7#if 0 31typedef rxvt_img::nv nv;
8struct pict
9{
10 Display *dpy;
11 Picture pic;
12 32
13 operator Picture () const 33namespace
34{
35 struct mat3x3
14 { 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
15 return pic; 103 return inv;
16 } 104 }
17 105
18 pict () 106 static mat3x3
19 : pic (0) 107 operator *(const mat3x3 &a, const mat3x3 &b)
20 { 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;
21 } 118 }
22 119
23 pict (rxvt_img *img, XRenderPictFormat *format = 0) 120 mat3x3
24 : dpy (img->s->display->dpy) 121 mat3x3::translate (nv x, nv y)
25 { 122 {
26 XRenderPictureAttributes pa; 123 return mat3x3 (
27 pa.repeat = img->repeat; 124 1, 0, x,
28 pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa); 125 0, 1, y,
126 0, 0, 1
127 );
29 } 128 }
30 129
31 ~pict () 130 mat3x3
131 mat3x3::scale (nv s, nv t)
32 { 132 {
33 if (pic) 133 return mat3x3 (
34 XRenderFreePicture (dpy, pic); 134 s, 0, 0,
135 0, t, 0,
136 0, 0, 1
137 );
35 } 138 }
36}; 139
37#endif 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}
38 230
39static XRenderPictFormat * 231static XRenderPictFormat *
40find_alpha_format_for (Display *dpy, XRenderPictFormat *format) 232find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
41{ 233{
42 if (format->direct.alphaMask) 234 if (format->direct.alphaMask)
… …
55 // should be a very good fallback 247 // should be a very good fallback
56 return XRenderFindStandardFormat (dpy, PictStandardARGB32); 248 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
57} 249}
58 250
59rxvt_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)
60: 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),
61 pm(0), ref(0) 253 pm(0), ref(0)
62{ 254{
63} 255}
64 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
65rxvt_img::rxvt_img (const rxvt_img &img) 263rxvt_img::rxvt_img (const rxvt_img &img)
66: 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)
67{ 265{
68 ++ref->cnt; 266 ++ref->cnt;
69} 267}
70 268
71rxvt_img * 269rxvt_img *
72rxvt_img::new_from_root (rxvt_screen *s) 270rxvt_img::new_from_root (rxvt_screen *s)
73{ 271{
74 Display *dpy = s->display->dpy; 272 Display *dpy = s->dpy;
75 unsigned int root_pm_w, root_pm_h; 273 unsigned int root_pm_w, root_pm_h;
76 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]);
77 if (root_pixmap == None) 275 if (root_pixmap == None)
78 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]);
79 277
80 if (root_pixmap == None) 278 if (root_pixmap == None)
81 return 0; 279 return 0;
82 280
83 Window wdummy; 281 Window wdummy;
… …
106# if HAVE_PIXBUF 304# if HAVE_PIXBUF
107 305
108rxvt_img * 306rxvt_img *
109rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 307rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
110{ 308{
111 Display *dpy = s->display->dpy; 309 Display *dpy = s->dpy;
112 310
113 int width = gdk_pixbuf_get_width (pb); 311 int width = gdk_pixbuf_get_width (pb);
114 int height = gdk_pixbuf_get_height (pb); 312 int height = gdk_pixbuf_get_height (pb);
115 313
116 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 314 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
… …
158 for (int y = 0; y < height; y++) 356 for (int y = 0; y < height; y++)
159 { 357 {
160 unsigned char *src = row; 358 unsigned char *src = row;
161 uint32_t *dst = (uint32_t *)line; 359 uint32_t *dst = (uint32_t *)line;
162 360
163 if (!pb_has_alpha)
164 for (int x = 0; x < width; x++) 361 for (int x = 0; x < width; x++)
165 { 362 {
166 uint8_t r = *src++; 363 uint8_t r = *src++;
167 uint8_t g = *src++; 364 uint8_t g = *src++;
168 uint8_t b = *src++; 365 uint8_t b = *src++;
366 uint8_t a = *src;
169 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
170 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; 376 uint32_t v = (a << 24) | (r << 16) | (g << 8) | b;
171 377
172 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 378 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
173 v = ecb_bswap32 (v); 379 v = ecb_bswap32 (v);
174 380
175 *dst++ = v; 381 *dst++ = v;
176 } 382 }
177 else
178 for (int x = 0; x < width; x++)
179 {
180 uint32_t v = *(uint32_t *)src; src += 4;
181
182 if (ecb_big_endian ())
183 v = ecb_bswap32 (v);
184
185 v = ecb_rotl32 (v, 8); // abgr to bgra
186
187 if (!byte_order_mismatch)
188 v = ecb_bswap32 (v);
189
190 *dst++ = v;
191 }
192 383
193 row += rowstride; 384 row += rowstride;
194 line += xi.bytes_per_line; 385 line += xi.bytes_per_line;
195 } 386 }
196 387
… …
211{ 402{
212 GError *err = 0; 403 GError *err = 0;
213 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 404 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
214 405
215 if (!pb) 406 if (!pb)
407 try
408 {
216 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 }
217 416
218 rxvt_img *img = new_from_pixbuf (s, pb); 417 rxvt_img *img = new_from_pixbuf (s, pb);
219 418
220 g_object_unref (pb); 419 g_object_unref (pb);
221 420
… …
229{ 428{
230 if (--ref->cnt) 429 if (--ref->cnt)
231 return; 430 return;
232 431
233 if (pm && ref->ours) 432 if (pm && ref->ours)
234 XFreePixmap (s->display->dpy, pm); 433 XFreePixmap (d->dpy, pm);
235 434
236 delete ref; 435 delete ref;
237} 436}
238 437
239rxvt_img::~rxvt_img () 438rxvt_img::~rxvt_img ()
… …
242} 441}
243 442
244void 443void
245rxvt_img::alloc () 444rxvt_img::alloc ()
246{ 445{
247 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 446 pm = XCreatePixmap (d->dpy, d->root, w, h, format->depth);
248 ref = new pixref (w, h); 447 ref = new pixref (w, h);
448}
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;
249} 457}
250 458
251Picture 459Picture
252rxvt_img::picture () 460rxvt_img::picture ()
253{ 461{
254 Display *dpy = s->display->dpy; 462 Display *dpy = d->dpy;
255 463
256 XRenderPictureAttributes pa; 464 XRenderPictureAttributes pa;
257 pa.repeat = repeat; 465 pa.repeat = repeat;
258 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 466 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
259 467
… …
264rxvt_img::unshare () 472rxvt_img::unshare ()
265{ 473{
266 if (ref->cnt == 1 && ref->ours) 474 if (ref->cnt == 1 && ref->ours)
267 return; 475 return;
268 476
269 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);
270 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 478 GC gc = XCreateGC (d->dpy, pm, 0, 0);
271 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);
272 XFreeGC (s->display->dpy, gc); 480 XFreeGC (d->dpy, gc);
273 481
274 destroy (); 482 destroy ();
275 483
276 pm = pm2; 484 pm = pm2;
277 ref = new pixref (ref->w, ref->h); 485 ref = new pixref (ref->w, ref->h);
278} 486}
279 487
280void 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
281rxvt_img::fill (const rgba &c) 500rxvt_img::fill (const rgba &c)
282{ 501{
283 XRenderColor rc = { c.r, c.g, c.b, c.a }; 502 fill (c, 0, 0, w, h);
284
285 Display *dpy = s->display->dpy;
286 Picture src = picture ();
287 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
288 XRenderFreePicture (dpy, src);
289} 503}
290 504
291void 505void
292rxvt_img::add_alpha () 506rxvt_img::add_alpha ()
293{ 507{
294 if (format->direct.alphaMask) 508 if (format->direct.alphaMask)
295 return; 509 return;
296 510
297 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));
298
299 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
300 img->alloc ();
301
302 Picture src = picture ();
303 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
304 512
305 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);
306 514
307 XRenderFreePicture (dpy, src); 515 rxvt_img *img = cc;
308 XRenderFreePicture (dpy, dst);
309 516
310 ::swap (img->ref, ref); 517 ::swap (img->ref, ref);
311 ::swap (img->pm , pm ); 518 ::swap (img->pm , pm );
312 519
313 delete img; 520 delete img;
314} 521}
315 522
316static void 523static void
317get_gaussian_kernel (int radius, int width, rxvt_img::nv *kernel, XFixed *params) 524get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
318{ 525{
319 rxvt_img::nv sigma = radius / 2.0; 526 nv sigma = radius / 2.0;
320 rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma; 527 nv scale = sqrt (2.0 * M_PI) * sigma;
321 rxvt_img::nv sum = 0.0; 528 nv sum = 0.0;
322 529
323 for (int i = 0; i < width; i++) 530 for (int i = 0; i < width; i++)
324 { 531 {
325 rxvt_img::nv x = i - width / 2; 532 nv x = i - width / 2;
326 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 533 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
327 sum += kernel[i]; 534 sum += kernel[i];
328 } 535 }
329 536
330 params[0] = XDoubleToFixed (width); 537 params[0] = XDoubleToFixed (width);
… …
335} 542}
336 543
337rxvt_img * 544rxvt_img *
338rxvt_img::blur (int rh, int rv) 545rxvt_img::blur (int rh, int rv)
339{ 546{
340 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 547 if (!(d->flags & DISPLAY_HAS_RENDER_CONV))
341 return clone (); 548 return clone ();
342 549
343 Display *dpy = s->display->dpy; 550 Display *dpy = d->dpy;
344 int size = max (rh, rv) * 2 + 1; 551 int size = max (rh, rv) * 2 + 1;
345 nv *kernel = (nv *)malloc (size * sizeof (nv)); 552 nv *kernel = (nv *)malloc (size * sizeof (nv));
346 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 553 XFixed *params = rxvt_temp_buf<XFixed> (size + 2);
347 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 554 rxvt_img *img = new_empty ();
348 img->alloc ();
349 555
350 XRenderPictureAttributes pa; 556 XRenderPictureAttributes pa;
351 pa.repeat = RepeatPad; 557 pa.repeat = RepeatPad;
352 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 558 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
353 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 559 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
… …
387 0, 0, 593 0, 0,
388 w, h); 594 w, h);
389 } 595 }
390 596
391 free (kernel); 597 free (kernel);
392 free (params);
393 598
394 XRenderFreePicture (dpy, src); 599 XRenderFreePicture (dpy, src);
395 XRenderFreePicture (dpy, dst); 600 XRenderFreePicture (dpy, dst);
396 XRenderFreePicture (dpy, tmp); 601 XRenderFreePicture (dpy, tmp);
397 602
398 return img; 603 return img;
399} 604}
400 605
401static Picture 606rxvt_img *
402create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha) 607rxvt_img::muladd (nv mul, nv add)
403{ 608{
404 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 609 // STEP 1: double the image width, fill all odd columns with white (==1)
405 610
406 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 611 composer cc (this, new rxvt_img (d, format, 0, 0, w * 2, h, repeat));
407 XRenderPictureAttributes pa;
408 pa.repeat = RepeatNormal;
409 pa.component_alpha = component_alpha;
410 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
411 612
412 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 };
413 620
414 return mask; 621 XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
415} 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);
416 624
417static 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
418extract (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)
419{ 666{
420 int32_t x = clamp (c, cl0, cl1); 667 int32_t x = clamp (c, cl0, cl1);
421 c -= x; 668 c -= x;
422 xc = x; 669 xc = x;
423} 670}
424 671
425static bool 672ecb_noinline static bool
426extract (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)
427{ 674{
428 extract (cl0, cl1, r, xr); 675 extract (cl0, cl1, r, xr);
429 extract (cl0, cl1, g, xg); 676 extract (cl0, cl1, g, xg);
430 extract (cl0, cl1, b, xb); 677 extract (cl0, cl1, b, xb);
… …
436void 683void
437rxvt_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)
438{ 685{
439 unshare (); 686 unshare ();
440 687
441 Display *dpy = s->display->dpy; 688 Display *dpy = d->dpy;
442 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 689 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
443 690
444 // 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
445 //while (r | g | b | a) 692 //while (r | g | b | a)
446 { 693 {
… …
470rxvt_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)
471{ 718{
472 if (r < 0 || g < 0 || b < 0 || a < 0) 719 if (r < 0 || g < 0 || b < 0 || a < 0)
473 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); 720 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
474 721
475 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
476 img->alloc ();
477 img->fill (rgba (0, 0, 0, 0));
478
479 // premultiply (yeah, these are not exact, sue me or fix it) 722 // premultiply (yeah, these are not exact, sue me or fix it)
480 r = (r * (a >> 8)) >> 8; 723 r = (r * (a >> 8)) >> 8;
481 g = (g * (a >> 8)) >> 8; 724 g = (g * (a >> 8)) >> 8;
482 b = (b * (a >> 8)) >> 8; 725 b = (b * (a >> 8)) >> 8;
483 726
484 Display *dpy = s->display->dpy; 727 composer cc (this);
728 rxvt_img *img = cc;
729 img->fill (rgba (0, 0, 0, 0));
485 730
486 Picture src = picture (); 731 cc.mask (true);
487 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
488 Picture mul = create_xrender_mask (dpy, pm, True, True);
489 732
490 //TODO: this operator does not yet implement some useful contrast 733 //TODO: this operator does not yet implement some useful contrast
491 while (r | g | b | a) 734 while (r | g | b | a)
492 { 735 {
493 unsigned short xr, xg, xb, xa; 736 unsigned short xr, xg, xb, xa;
494 XRenderColor mask_c; 737 XRenderColor mask_c;
495 738
496 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))
497 { 740 {
498 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); 741 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
499 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);
500 } 743 }
501 } 744 }
502
503 XRenderFreePicture (dpy, mul);
504 XRenderFreePicture (dpy, dst);
505 XRenderFreePicture (dpy, src);
506 745
507 ::swap (img->ref, ref); 746 ::swap (img->ref, ref);
508 ::swap (img->pm , pm ); 747 ::swap (img->pm , pm );
509 748
510 delete img; 749 delete img;
… …
513void 752void
514rxvt_img::draw (rxvt_img *img, int op, nv mask) 753rxvt_img::draw (rxvt_img *img, int op, nv mask)
515{ 754{
516 unshare (); 755 unshare ();
517 756
518 Display *dpy = s->display->dpy; 757 composer cc (img, this);
519 Picture src = img->picture ();
520 Picture dst = picture ();
521 Picture mask_p = 0;
522 758
523 if (mask != 1.) 759 if (mask != 1.)
524 { 760 cc.mask (rgba (0, 0, 0, float_to_component (mask)));
525 mask_p = create_xrender_mask (dpy, img->pm, False, False);
526 XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
527 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
528 }
529 761
530 XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h); 762 XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
531
532 XRenderFreePicture (dpy, src);
533 XRenderFreePicture (dpy, dst);
534
535 if (mask_p)
536 XRenderFreePicture (dpy, mask_p);
537} 763}
538 764
539rxvt_img * 765rxvt_img *
540rxvt_img::clone () 766rxvt_img::clone ()
541{ 767{
… …
545rxvt_img * 771rxvt_img *
546rxvt_img::reify () 772rxvt_img::reify ()
547{ 773{
548 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 774 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
549 return clone (); 775 return clone ();
550
551 Display *dpy = s->display->dpy;
552 776
553 // add an alpha channel if... 777 // add an alpha channel if...
554 bool alpha = !format->direct.alphaMask // pixmap has none yet 778 bool alpha = !format->direct.alphaMask // pixmap has none yet
555 && (x || y) // we need one because of non-zero offset 779 && (x || y) // we need one because of non-zero offset
556 && repeat == RepeatNone; // and we have no good pixels to fill with 780 && repeat == RepeatNone; // and we have no good pixels to fill with
557 781
558 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,
559 img->alloc (); 783 0, 0, w, h, repeat));
560 784
561 Picture src = picture (); 785 if (repeat == RepeatNone)
562 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
563
564 if (alpha)
565 { 786 {
566 XRenderColor rc = { 0, 0, 0, 0 }; 787 XRenderColor rc = { 0, 0, 0, 0 };
567 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
568 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);
569 } 790 }
570 else 791 else
571 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);
572 793
573 XRenderFreePicture (dpy, src);
574 XRenderFreePicture (dpy, dst);
575
576 return img; 794 return cc;
577} 795}
578 796
579rxvt_img * 797rxvt_img *
580rxvt_img::sub_rect (int x, int y, int width, int height) 798rxvt_img::sub_rect (int x, int y, int width, int height)
581{ 799{
… …
595 } 813 }
596 814
597 return img; 815 return img;
598} 816}
599 817
600static void
601mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3])
602{
603 rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
604 rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
605 rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
606
607 rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
608
609 inv [0][0] = invdet * s0;
610 inv [0][1] = invdet * s1;
611 inv [0][2] = invdet * s2;
612
613 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
614 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
615 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
616
617 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
618 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
619 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
620}
621
622static rxvt_img::nv
623mat_apply (rxvt_img::nv mat[3][3], int i, rxvt_img::nv x, rxvt_img::nv y)
624{
625 rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
626 rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
627
628 return v * (1. / w);
629}
630
631rxvt_img * 818rxvt_img *
632rxvt_img::transform (nv matrix[3][3]) 819rxvt_img::transform (const nv matrix[3][3])
633{ 820{
821 return transform (mat3x3 (&matrix[0][0]));
822}
823
824rxvt_img *
825rxvt_img::transform (const nv *matrix)
826{
827 mat3x3 m (matrix);
828
634 // calculate new pixel bounding box coordinates 829 // calculate new pixel bounding box coordinates
635 nv rmin[2], rmax[2]; 830 nv rmin[2], rmax[2];
636 831
637 for (int i = 0; i < 2; ++i) 832 for (int i = 0; i < 2; ++i)
638 { 833 {
639 nv v; 834 nv v;
835
640 v = mat_apply (matrix, i, 0+x, 0+y); rmin [i] = rmax [i] = v; 836 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
641 v = mat_apply (matrix, i, w+x, 0+y); 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);
642 v = mat_apply (matrix, i, 0+x, h+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);
643 v = mat_apply (matrix, i, w+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);
644 } 840 }
841
842 float sx = rmin [0] - x;
843 float sy = rmin [1] - y;
645 844
646 // TODO: adjust matrix for subpixel accuracy 845 // TODO: adjust matrix for subpixel accuracy
647 int dx = floor (rmin [0]); 846 int nx = floor (rmin [0]);
648 int dy = floor (rmin [1]); 847 int ny = floor (rmin [1]);
649 848
650 int new_width = ceil (rmax [0] - dx); 849 int new_width = ceil (rmax [0] - rmin [0]);
651 int new_height = ceil (rmax [1] - dy); 850 int new_height = ceil (rmax [1] - rmin [1]);
652 851
653 nv inv[3][3]; 852 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
654 mat_invert (matrix, inv);
655 853
656 rxvt_img *img = new rxvt_img (s, format, dx, dy, new_width, new_height, repeat); 854 composer cc (this, new rxvt_img (d, format, nx, ny, new_width, new_height, repeat));
657 img->alloc ();
658
659 Display *dpy = s->display->dpy;
660 Picture src = picture ();
661 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
662 855
663 XTransform xfrm; 856 XTransform xfrm;
664 857
665 for (int i = 0; i < 3; ++i) 858 for (int i = 0; i < 3; ++i)
666 for (int j = 0; j < 3; ++j) 859 for (int j = 0; j < 3; ++j)
667 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 860 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
668 861
669 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 862 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
670 XRenderSetPictureTransform (dpy, src, &xfrm); 863 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
671 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);
672 865
673 XRenderFreePicture (dpy, src);
674 XRenderFreePicture (dpy, dst);
675
676 return img; 866 return cc;
677} 867}
678 868
679rxvt_img * 869rxvt_img *
680rxvt_img::scale (int new_width, int new_height) 870rxvt_img::scale (int new_width, int new_height)
681{ 871{
682 if (w == new_width && h == new_height) 872 if (w == new_width && h == new_height)
683 return clone (); 873 return clone ();
684 874
685 nv matrix[3][3] = {
686 { new_width / (nv)w, 0, 0 },
687 { 0, new_height / (nv)h, 0 },
688 { 0, 0, 1 }
689 };
690
691 int old_repeat_mode = repeat; 875 int old_repeat_mode = repeat;
692 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
693 877
694 rxvt_img *img = transform (matrix); 878 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
695 879
696 repeat = old_repeat_mode; 880 repeat = old_repeat_mode;
697 img->repeat = repeat; 881 img->repeat = repeat;
698 882
699 return img; 883 return img;
700} 884}
701 885
702rxvt_img * 886rxvt_img *
703rxvt_img::rotate (int cx, int cy, nv phi) 887rxvt_img::rotate (int cx, int cy, nv phi)
704{ 888{
705 nv s = sin (phi);
706 nv c = cos (phi);
707
708 nv matrix[3][3] = {
709 { c, -s, cx - c * cx + s * cy + 200 },
710 { s, c, cy - s * cx - c * cy },
711 { 0, 0, 1 }
712 //{ c, -s, 0 },
713 //{ s, c, 0 },
714 //{ 0, 0, 1 }
715 };
716
717 //move (-cx, -cy); 889 move (-cx, -cy);
718 rxvt_img *img = transform (matrix); 890 rxvt_img *img = transform (mat3x3::rotate (phi));
719 //move ( cx, cy); 891 move ( cx, cy);
720 //img->move (cx, cy); 892 img->move (cx, cy);
721 893
722 return img; 894 return img;
723} 895}
724 896
725rxvt_img * 897rxvt_img *
726rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg) 898rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
727{ 899{
728 if (new_format == format) 900 if (new_format == format)
729 return clone (); 901 return clone ();
730 902
731 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));
732 img->alloc ();
733 904
734 Display *dpy = s->display->dpy;
735 Picture src = picture ();
736 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
737 int op = PictOpSrc; 905 int op = PictOpSrc;
738 906
739 if (format->direct.alphaMask && !new_format->direct.alphaMask) 907 if (format->direct.alphaMask && !new_format->direct.alphaMask)
740 { 908 {
741 // does it have to be that complicated 909 // does it have to be that complicated
742 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a }; 910 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
743 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 911 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
744 912
745 op = PictOpOver; 913 op = PictOpOver;
746 } 914 }
747 915
748 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);
749 917
750 XRenderFreePicture (dpy, src); 918 return cc;
751 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 }
752 963
753 return img; 964 return img;
754} 965}
755 966
756rxvt_img * 967rxvt_img *
757rxvt_img::blend (rxvt_img *img, nv factor) 968rxvt_img::filter (const char *name, int nparams, nv *params)
758{ 969{
759 rxvt_img *img2 = clone (); 970 composer cc (this);
760 Display *dpy = s->display->dpy;
761 Picture src = img->picture ();
762 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
763 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
764 971
765 XRenderColor mask_c; 972 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
766 973
767 mask_c.alpha = float_to_component (factor); 974 for (int i = 0; i < nparams; ++i)
768 mask_c.red = 975 xparams [i] = XDoubleToFixed (params [i]);
769 mask_c.green =
770 mask_c.blue = 0;
771 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
772 976
977 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
978
773 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);
774 980
775 XRenderFreePicture (dpy, src);
776 XRenderFreePicture (dpy, dst);
777 XRenderFreePicture (dpy, mask);
778
779 return img2; 981 return cc;
780} 982}
781 983
782#endif 984#endif
783 985

Diff Legend

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