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.108 by sf-exg, Fri Nov 7 13:45:55 2014 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->s->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)
… …
69} 261}
70 262
71rxvt_img * 263rxvt_img *
72rxvt_img::new_from_root (rxvt_screen *s) 264rxvt_img::new_from_root (rxvt_screen *s)
73{ 265{
74 Display *dpy = s->display->dpy; 266 Display *dpy = s->dpy;
75 unsigned int root_pm_w, root_pm_h; 267 unsigned int root_pm_w, root_pm_h;
76 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]); 268 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_XROOTPMAP_ID]);
77 if (root_pixmap == None) 269 if (root_pixmap == None)
78 root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]); 270 root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_ESETROOT_PMAP_ID]);
79 271
80 if (root_pixmap == None) 272 if (root_pixmap == None)
81 return 0; 273 return 0;
82 274
83 Window wdummy; 275 Window wdummy;
… …
106# if HAVE_PIXBUF 298# if HAVE_PIXBUF
107 299
108rxvt_img * 300rxvt_img *
109rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 301rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
110{ 302{
111 Display *dpy = s->display->dpy; 303 Display *dpy = s->dpy;
112 304
113 int width = gdk_pixbuf_get_width (pb); 305 int width = gdk_pixbuf_get_width (pb);
114 int height = gdk_pixbuf_get_height (pb); 306 int height = gdk_pixbuf_get_height (pb);
115 307
116 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 308 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
… …
158 for (int y = 0; y < height; y++) 350 for (int y = 0; y < height; y++)
159 { 351 {
160 unsigned char *src = row; 352 unsigned char *src = row;
161 uint32_t *dst = (uint32_t *)line; 353 uint32_t *dst = (uint32_t *)line;
162 354
163 if (!pb_has_alpha)
164 for (int x = 0; x < width; x++) 355 for (int x = 0; x < width; x++)
165 { 356 {
166 uint8_t r = *src++; 357 uint8_t r = *src++;
167 uint8_t g = *src++; 358 uint8_t g = *src++;
168 uint8_t b = *src++; 359 uint8_t b = *src++;
360 uint8_t a = *src;
169 361
362 // this is done so it can be jump-free, but newer gcc's clone inner the loop
363 a = pb_has_alpha ? a : 255;
364 src += pb_has_alpha;
365
366 r = (r * a + 127) / 255;
367 g = (g * a + 127) / 255;
368 b = (b * a + 127) / 255;
369
170 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; 370 uint32_t v = (a << 24) | (r << 16) | (g << 8) | b;
171 371
172 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 372 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
173 v = ecb_bswap32 (v); 373 v = ecb_bswap32 (v);
174 374
175 *dst++ = v; 375 *dst++ = v;
176 } 376 }
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 377
193 row += rowstride; 378 row += rowstride;
194 line += xi.bytes_per_line; 379 line += xi.bytes_per_line;
195 } 380 }
196 381
… …
229{ 414{
230 if (--ref->cnt) 415 if (--ref->cnt)
231 return; 416 return;
232 417
233 if (pm && ref->ours) 418 if (pm && ref->ours)
234 XFreePixmap (s->display->dpy, pm); 419 XFreePixmap (s->dpy, pm);
235 420
236 delete ref; 421 delete ref;
237} 422}
238 423
239rxvt_img::~rxvt_img () 424rxvt_img::~rxvt_img ()
… …
242} 427}
243 428
244void 429void
245rxvt_img::alloc () 430rxvt_img::alloc ()
246{ 431{
247 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 432 pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
248 ref = new pixref (w, h); 433 ref = new pixref (w, h);
434}
435
436rxvt_img *
437rxvt_img::new_empty ()
438{
439 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
440 img->alloc ();
441
442 return img;
249} 443}
250 444
251Picture 445Picture
252rxvt_img::picture () 446rxvt_img::picture ()
253{ 447{
254 Display *dpy = s->display->dpy; 448 Display *dpy = s->dpy;
255 449
256 XRenderPictureAttributes pa; 450 XRenderPictureAttributes pa;
257 pa.repeat = repeat; 451 pa.repeat = repeat;
258 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 452 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
259 453
… …
264rxvt_img::unshare () 458rxvt_img::unshare ()
265{ 459{
266 if (ref->cnt == 1 && ref->ours) 460 if (ref->cnt == 1 && ref->ours)
267 return; 461 return;
268 462
269 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 463 Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
270 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 464 GC gc = XCreateGC (s->dpy, pm, 0, 0);
271 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 465 XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
272 XFreeGC (s->display->dpy, gc); 466 XFreeGC (s->dpy, gc);
273 467
274 destroy (); 468 destroy ();
275 469
276 pm = pm2; 470 pm = pm2;
277 ref = new pixref (ref->w, ref->h); 471 ref = new pixref (ref->w, ref->h);
278} 472}
279 473
280void 474void
475rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
476{
477 XRenderColor rc = { c.r, c.g, c.b, c.a };
478
479 Display *dpy = s->dpy;
480 Picture src = picture ();
481 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
482 XRenderFreePicture (dpy, src);
483}
484
485void
281rxvt_img::fill (const rgba &c) 486rxvt_img::fill (const rgba &c)
282{ 487{
283 XRenderColor rc = { c.r, c.g, c.b, c.a }; 488 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} 489}
290 490
291void 491void
292rxvt_img::add_alpha () 492rxvt_img::add_alpha ()
293{ 493{
294 if (format->direct.alphaMask) 494 if (format->direct.alphaMask)
295 return; 495 return;
296 496
297 Display *dpy = s->display->dpy;
298
299 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat); 497 composer cc (this, new rxvt_img (s, find_alpha_format_for (s->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 498
305 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 499 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
306 500
307 XRenderFreePicture (dpy, src); 501 rxvt_img *img = cc;
308 XRenderFreePicture (dpy, dst);
309 502
310 ::swap (img->ref, ref); 503 ::swap (img->ref, ref);
311 ::swap (img->pm , pm ); 504 ::swap (img->pm , pm );
312 505
313 delete img; 506 delete img;
314} 507}
315 508
316static void 509static void
317get_gaussian_kernel (int radius, int width, rxvt_img::nv *kernel, XFixed *params) 510get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
318{ 511{
319 rxvt_img::nv sigma = radius / 2.0; 512 nv sigma = radius / 2.0;
320 rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma; 513 nv scale = sqrt (2.0 * M_PI) * sigma;
321 rxvt_img::nv sum = 0.0; 514 nv sum = 0.0;
322 515
323 for (int i = 0; i < width; i++) 516 for (int i = 0; i < width; i++)
324 { 517 {
325 rxvt_img::nv x = i - width / 2; 518 nv x = i - width / 2;
326 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 519 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
327 sum += kernel[i]; 520 sum += kernel[i];
328 } 521 }
329 522
330 params[0] = XDoubleToFixed (width); 523 params[0] = XDoubleToFixed (width);
… …
338rxvt_img::blur (int rh, int rv) 531rxvt_img::blur (int rh, int rv)
339{ 532{
340 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 533 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
341 return clone (); 534 return clone ();
342 535
343 Display *dpy = s->display->dpy; 536 Display *dpy = s->dpy;
344 int size = max (rh, rv) * 2 + 1; 537 int size = max (rh, rv) * 2 + 1;
345 nv *kernel = (nv *)malloc (size * sizeof (nv)); 538 nv *kernel = (nv *)malloc (size * sizeof (nv));
346 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 539 XFixed *params = rxvt_temp_buf<XFixed> (size + 2);
347 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 540 rxvt_img *img = new_empty ();
348 img->alloc ();
349 541
350 XRenderPictureAttributes pa; 542 XRenderPictureAttributes pa;
351 pa.repeat = RepeatPad; 543 pa.repeat = RepeatPad;
352 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 544 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
353 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 545 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
… …
387 0, 0, 579 0, 0,
388 w, h); 580 w, h);
389 } 581 }
390 582
391 free (kernel); 583 free (kernel);
392 free (params);
393 584
394 XRenderFreePicture (dpy, src); 585 XRenderFreePicture (dpy, src);
395 XRenderFreePicture (dpy, dst); 586 XRenderFreePicture (dpy, dst);
396 XRenderFreePicture (dpy, tmp); 587 XRenderFreePicture (dpy, tmp);
397 588
398 return img; 589 return img;
399} 590}
400 591
401static Picture 592rxvt_img *
402create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha) 593rxvt_img::muladd (nv mul, nv add)
403{ 594{
404 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 595 // STEP 1: double the image width, fill all odd columns with white (==1)
405 596
406 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 597 composer cc (this, new rxvt_img (s, 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 598
412 XFreePixmap (dpy, pixmap); 599 // why the hell does XRenderSetPictureTransform want a writable matrix :(
600 // that keeps us from just static const'ing this matrix.
601 XTransform h_double = {
602 0x08000, 0, 0,
603 0, 0x10000, 0,
604 0, 0, 0x10000
605 };
413 606
414 return mask; 607 XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
415} 608 XRenderSetPictureTransform (cc.dpy, cc.src, &h_double);
609 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
416 610
417static void 611 cc.mask (false, 2, 1);
612
613 static const XRenderColor c0 = { 0, 0, 0, 0 };
614 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1);
615 static const XRenderColor c1 = { 65535, 65535, 65535, 65535 };
616 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1);
617
618 Picture white = XRenderCreateSolidFill (cc.dpy, &c1);
619
620 XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
621
622 XRenderFreePicture (cc.dpy, white);
623
624 // STEP 2: convolve the image with a 3x1 filter
625 // a 2x1 filter would obviously suffice, but given the total lack of specification
626 // for xrender, I expect different xrender implementations to randomly diverge.
627 // we also halve the image, and hope for the best (again, for lack of specs).
628 composer cc2 (cc.dstimg);
629
630 XFixed kernel [] = {
631 XDoubleToFixed (3), XDoubleToFixed (1),
632 XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add)
633 };
634
635 XTransform h_halve = {
636 0x20000, 0, 0,
637 0, 0x10000, 0,
638 0, 0, 0x10000
639 };
640
641 XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0);
642 XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve);
643 XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel));
644
645 XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
646
647 return cc2;
648}
649
650ecb_noinline static void
418extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) 651extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
419{ 652{
420 int32_t x = clamp (c, cl0, cl1); 653 int32_t x = clamp (c, cl0, cl1);
421 c -= x; 654 c -= x;
422 xc = x; 655 xc = x;
423} 656}
424 657
425static bool 658ecb_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) 659extract (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{ 660{
428 extract (cl0, cl1, r, xr); 661 extract (cl0, cl1, r, xr);
429 extract (cl0, cl1, g, xg); 662 extract (cl0, cl1, g, xg);
430 extract (cl0, cl1, b, xb); 663 extract (cl0, cl1, b, xb);
… …
436void 669void
437rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) 670rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
438{ 671{
439 unshare (); 672 unshare ();
440 673
441 Display *dpy = s->display->dpy; 674 Display *dpy = s->dpy;
442 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 675 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
443 676
444 // loop should not be needed for brightness, as only -1..1 makes sense 677 // loop should not be needed for brightness, as only -1..1 makes sense
445 //while (r | g | b | a) 678 //while (r | g | b | a)
446 { 679 {
… …
470rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) 703rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
471{ 704{
472 if (r < 0 || g < 0 || b < 0 || a < 0) 705 if (r < 0 || g < 0 || b < 0 || a < 0)
473 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); 706 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
474 707
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) 708 // premultiply (yeah, these are not exact, sue me or fix it)
480 r = (r * (a >> 8)) >> 8; 709 r = (r * (a >> 8)) >> 8;
481 g = (g * (a >> 8)) >> 8; 710 g = (g * (a >> 8)) >> 8;
482 b = (b * (a >> 8)) >> 8; 711 b = (b * (a >> 8)) >> 8;
483 712
484 Display *dpy = s->display->dpy; 713 composer cc (this);
714 rxvt_img *img = cc;
715 img->fill (rgba (0, 0, 0, 0));
485 716
486 Picture src = picture (); 717 cc.mask (true);
487 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
488 Picture mul = create_xrender_mask (dpy, pm, True, True);
489 718
490 //TODO: this operator does not yet implement some useful contrast 719 //TODO: this operator does not yet implement some useful contrast
491 while (r | g | b | a) 720 while (r | g | b | a)
492 { 721 {
493 unsigned short xr, xg, xb, xa; 722 unsigned short xr, xg, xb, xa;
494 XRenderColor mask_c; 723 XRenderColor mask_c;
495 724
496 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) 725 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
497 { 726 {
498 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); 727 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); 728 XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
500 } 729 }
501 } 730 }
502
503 XRenderFreePicture (dpy, mul);
504 XRenderFreePicture (dpy, dst);
505 XRenderFreePicture (dpy, src);
506 731
507 ::swap (img->ref, ref); 732 ::swap (img->ref, ref);
508 ::swap (img->pm , pm ); 733 ::swap (img->pm , pm );
509 734
510 delete img; 735 delete img;
… …
513void 738void
514rxvt_img::draw (rxvt_img *img, int op, nv mask) 739rxvt_img::draw (rxvt_img *img, int op, nv mask)
515{ 740{
516 unshare (); 741 unshare ();
517 742
518 Display *dpy = s->display->dpy; 743 composer cc (img, this);
519 Picture src = img->picture ();
520 Picture dst = picture ();
521 Picture mask_p = 0;
522 744
523 if (mask != 1.) 745 if (mask != 1.)
524 { 746 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 747
530 XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h); 748 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} 749}
538 750
539rxvt_img * 751rxvt_img *
540rxvt_img::clone () 752rxvt_img::clone ()
541{ 753{
… …
545rxvt_img * 757rxvt_img *
546rxvt_img::reify () 758rxvt_img::reify ()
547{ 759{
548 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 760 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
549 return clone (); 761 return clone ();
550
551 Display *dpy = s->display->dpy;
552 762
553 // add an alpha channel if... 763 // add an alpha channel if...
554 bool alpha = !format->direct.alphaMask // pixmap has none yet 764 bool alpha = !format->direct.alphaMask // pixmap has none yet
555 && (x || y) // we need one because of non-zero offset 765 && (x || y) // we need one because of non-zero offset
556 && repeat == RepeatNone; // and we have no good pixels to fill with 766 && repeat == RepeatNone; // and we have no good pixels to fill with
557 767
558 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 768 composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
559 img->alloc (); 769 0, 0, w, h, repeat));
560 770
561 Picture src = picture (); 771 if (repeat == RepeatNone)
562 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
563
564 if (alpha)
565 { 772 {
566 XRenderColor rc = { 0, 0, 0, 0 }; 773 XRenderColor rc = { 0, 0, 0, 0 };
567 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 774 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); 775 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
569 } 776 }
570 else 777 else
571 XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h); 778 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
572 779
573 XRenderFreePicture (dpy, src);
574 XRenderFreePicture (dpy, dst);
575
576 return img; 780 return cc;
577} 781}
578 782
579rxvt_img * 783rxvt_img *
580rxvt_img::sub_rect (int x, int y, int width, int height) 784rxvt_img::sub_rect (int x, int y, int width, int height)
581{ 785{
… …
595 } 799 }
596 800
597 return img; 801 return img;
598} 802}
599 803
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 * 804rxvt_img *
632rxvt_img::transform (nv matrix[3][3]) 805rxvt_img::transform (const nv matrix[3][3])
633{ 806{
807 return transform (mat3x3 (&matrix[0][0]));
808}
809
810rxvt_img *
811rxvt_img::transform (const nv *matrix)
812{
813 mat3x3 m (matrix);
814
634 // calculate new pixel bounding box coordinates 815 // calculate new pixel bounding box coordinates
635 nv rmin[2], rmax[2]; 816 nv rmin[2], rmax[2];
636 817
637 for (int i = 0; i < 2; ++i) 818 for (int i = 0; i < 2; ++i)
638 { 819 {
639 nv v; 820 nv v;
821
640 v = mat_apply (matrix, i, 0+x, 0+y); rmin [i] = rmax [i] = v; 822 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); 823 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); 824 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); 825 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
644 } 826 }
827
828 float sx = rmin [0] - x;
829 float sy = rmin [1] - y;
645 830
646 // TODO: adjust matrix for subpixel accuracy 831 // TODO: adjust matrix for subpixel accuracy
647 int dx = floor (rmin [0]); 832 int nx = floor (rmin [0]);
648 int dy = floor (rmin [1]); 833 int ny = floor (rmin [1]);
649 834
650 int new_width = ceil (rmax [0] - dx); 835 int new_width = ceil (rmax [0] - rmin [0]);
651 int new_height = ceil (rmax [1] - dy); 836 int new_height = ceil (rmax [1] - rmin [1]);
652 837
653 nv inv[3][3]; 838 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
654 mat_invert (matrix, inv);
655 839
656 rxvt_img *img = new rxvt_img (s, format, dx, dy, new_width, new_height, repeat); 840 composer cc (this, new rxvt_img (s, 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 841
663 XTransform xfrm; 842 XTransform xfrm;
664 843
665 for (int i = 0; i < 3; ++i) 844 for (int i = 0; i < 3; ++i)
666 for (int j = 0; j < 3; ++j) 845 for (int j = 0; j < 3; ++j)
667 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 846 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
668 847
669 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 848 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
670 XRenderSetPictureTransform (dpy, src, &xfrm); 849 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
671 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height); 850 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
672 851
673 XRenderFreePicture (dpy, src);
674 XRenderFreePicture (dpy, dst);
675
676 return img; 852 return cc;
677} 853}
678 854
679rxvt_img * 855rxvt_img *
680rxvt_img::scale (int new_width, int new_height) 856rxvt_img::scale (int new_width, int new_height)
681{ 857{
682 if (w == new_width && h == new_height) 858 if (w == new_width && h == new_height)
683 return clone (); 859 return clone ();
684 860
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; 861 int old_repeat_mode = repeat;
692 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 862 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
693 863
694 rxvt_img *img = transform (matrix); 864 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
695 865
696 repeat = old_repeat_mode; 866 repeat = old_repeat_mode;
697 img->repeat = repeat; 867 img->repeat = repeat;
698 868
699 return img; 869 return img;
700} 870}
701 871
702rxvt_img * 872rxvt_img *
703rxvt_img::rotate (int cx, int cy, nv phi) 873rxvt_img::rotate (int cx, int cy, nv phi)
704{ 874{
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); 875 move (-cx, -cy);
718 rxvt_img *img = transform (matrix); 876 rxvt_img *img = transform (mat3x3::rotate (phi));
719 //move ( cx, cy); 877 move ( cx, cy);
720 //img->move (cx, cy); 878 img->move (cx, cy);
721 879
722 return img; 880 return img;
723} 881}
724 882
725rxvt_img * 883rxvt_img *
726rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg) 884rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
727{ 885{
728 if (new_format == format) 886 if (new_format == format)
729 return clone (); 887 return clone ();
730 888
731 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 889 composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
732 img->alloc ();
733 890
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; 891 int op = PictOpSrc;
738 892
739 if (format->direct.alphaMask && !new_format->direct.alphaMask) 893 if (format->direct.alphaMask && !new_format->direct.alphaMask)
740 { 894 {
741 // does it have to be that complicated 895 // does it have to be that complicated
742 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a }; 896 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
743 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 897 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
744 898
745 op = PictOpOver; 899 op = PictOpOver;
746 } 900 }
747 901
748 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 902 XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
749 903
750 XRenderFreePicture (dpy, src); 904 return cc;
751 XRenderFreePicture (dpy, dst); 905}
906
907rxvt_img *
908rxvt_img::tint (const rgba &c)
909{
910 composer cc (this);
911 cc.mask (true);
912 cc.fill (c);
913
914 XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
915
916 return cc;
917}
918
919rxvt_img *
920rxvt_img::shade (nv factor, rgba c)
921{
922 clamp_it (factor, -1., 1.);
923 factor++;
924
925 if (factor > 1)
926 {
927 c.r = c.r * (2 - factor);
928 c.g = c.g * (2 - factor);
929 c.b = c.b * (2 - factor);
930 }
931 else
932 {
933 c.r = c.r * factor;
934 c.g = c.g * factor;
935 c.b = c.b * factor;
936 }
937
938 rxvt_img *img = this->tint (c);
939
940 if (factor > 1)
941 {
942 c.a = 0xffff;
943 c.r =
944 c.g =
945 c.b = 0xffff * (factor - 1);
946
947 img->brightness (c.r, c.g, c.b, c.a);
948 }
752 949
753 return img; 950 return img;
754} 951}
755 952
756rxvt_img * 953rxvt_img *
757rxvt_img::blend (rxvt_img *img, nv factor) 954rxvt_img::filter (const char *name, int nparams, nv *params)
758{ 955{
759 rxvt_img *img2 = clone (); 956 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 957
765 XRenderColor mask_c; 958 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
766 959
767 mask_c.alpha = float_to_component (factor); 960 for (int i = 0; i < nparams; ++i)
768 mask_c.red = 961 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 962
963 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
964
773 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h); 965 XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
774 966
775 XRenderFreePicture (dpy, src);
776 XRenderFreePicture (dpy, dst);
777 XRenderFreePicture (dpy, mask);
778
779 return img2; 967 return cc;
780} 968}
781 969
782#endif 970#endif
783 971

Diff Legend

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