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.91 by root, Fri Jun 15 13:21:59 2012 UTC vs.
Revision 1.98 by root, Sun Jun 17 21:58:18 2012 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 2 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 x = 1, int y = 1)
176 {
177 Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, x, y, 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 XRenderColor rc = {
194 c.r * c.a / 65535,
195 c.g * c.a / 65535,
196 c.b * c.a / 65535,
197 c.a
198 };
199 msk = XRenderCreateSolidFill (dpy, &rc);
200 ecb_assume (msk);
201 }
202
203 void fill (const rgba &c)
204 {
205 XRenderColor rc = {
206 c.r * c.a / 65535,
207 c.g * c.a / 65535,
208 c.b * c.a / 65535,
209 c.a
210 };
211
212 XRenderFillRectangle (dpy, PictOpSrc, msk, &rc, 0, 0, 1, 1);
213 }
214
215 operator rxvt_img *()
216 {
217 return dstimg;
218 }
219
220 ecb_noinline
221 ~composer ()
222 {
223 XRenderFreePicture (dpy, src);
224 XRenderFreePicture (dpy, dst);
225 if (msk) XRenderFreePicture (dpy, msk);
226 }
227 };
228}
38 229
39static XRenderPictFormat * 230static XRenderPictFormat *
40find_alpha_format_for (Display *dpy, XRenderPictFormat *format) 231find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
41{ 232{
42 if (format->direct.alphaMask) 233 if (format->direct.alphaMask)
… …
69} 260}
70 261
71rxvt_img * 262rxvt_img *
72rxvt_img::new_from_root (rxvt_screen *s) 263rxvt_img::new_from_root (rxvt_screen *s)
73{ 264{
74 Display *dpy = s->display->dpy; 265 Display *dpy = s->dpy;
75 unsigned int root_pm_w, root_pm_h; 266 unsigned int root_pm_w, root_pm_h;
76 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]); 267 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_XROOTPMAP_ID]);
77 if (root_pixmap == None) 268 if (root_pixmap == None)
78 root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]); 269 root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_ESETROOT_PMAP_ID]);
79 270
80 if (root_pixmap == None) 271 if (root_pixmap == None)
81 return 0; 272 return 0;
82 273
83 Window wdummy; 274 Window wdummy;
… …
106# if HAVE_PIXBUF 297# if HAVE_PIXBUF
107 298
108rxvt_img * 299rxvt_img *
109rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 300rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
110{ 301{
111 Display *dpy = s->display->dpy; 302 Display *dpy = s->dpy;
112 303
113 int width = gdk_pixbuf_get_width (pb); 304 int width = gdk_pixbuf_get_width (pb);
114 int height = gdk_pixbuf_get_height (pb); 305 int height = gdk_pixbuf_get_height (pb);
115 306
116 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 307 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
… …
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++;
169 360
170 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; 361 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
171 362
172 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 363 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
173 v = ecb_bswap32 (v); 364 v = ecb_bswap32 (v);
174 365
175 *dst++ = v; 366 *dst++ = v;
176 } 367 }
… …
229{ 420{
230 if (--ref->cnt) 421 if (--ref->cnt)
231 return; 422 return;
232 423
233 if (pm && ref->ours) 424 if (pm && ref->ours)
234 XFreePixmap (s->display->dpy, pm); 425 XFreePixmap (s->dpy, pm);
235 426
236 delete ref; 427 delete ref;
237} 428}
238 429
239rxvt_img::~rxvt_img () 430rxvt_img::~rxvt_img ()
… …
242} 433}
243 434
244void 435void
245rxvt_img::alloc () 436rxvt_img::alloc ()
246{ 437{
247 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 438 pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
248 ref = new pixref (w, h); 439 ref = new pixref (w, h);
440}
441
442rxvt_img *
443rxvt_img::new_empty ()
444{
445 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
446 img->alloc ();
447
448 return img;
249} 449}
250 450
251Picture 451Picture
252rxvt_img::picture () 452rxvt_img::picture ()
253{ 453{
254 Display *dpy = s->display->dpy; 454 Display *dpy = s->dpy;
255 455
256 XRenderPictureAttributes pa; 456 XRenderPictureAttributes pa;
257 pa.repeat = repeat; 457 pa.repeat = repeat;
258 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 458 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
259 459
… …
264rxvt_img::unshare () 464rxvt_img::unshare ()
265{ 465{
266 if (ref->cnt == 1 && ref->ours) 466 if (ref->cnt == 1 && ref->ours)
267 return; 467 return;
268 468
269 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 469 Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
270 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 470 GC gc = XCreateGC (s->dpy, pm, 0, 0);
271 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 471 XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
272 XFreeGC (s->display->dpy, gc); 472 XFreeGC (s->dpy, gc);
273 473
274 destroy (); 474 destroy ();
275 475
276 pm = pm2; 476 pm = pm2;
277 ref = new pixref (ref->w, ref->h); 477 ref = new pixref (ref->w, ref->h);
… …
280void 480void
281rxvt_img::fill (const rgba &c) 481rxvt_img::fill (const rgba &c)
282{ 482{
283 XRenderColor rc = { c.r, c.g, c.b, c.a }; 483 XRenderColor rc = { c.r, c.g, c.b, c.a };
284 484
285 Display *dpy = s->display->dpy; 485 Display *dpy = s->dpy;
286 Picture src = picture (); 486 Picture src = picture ();
287 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h); 487 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
288 XRenderFreePicture (dpy, src); 488 XRenderFreePicture (dpy, src);
289} 489}
290 490
… …
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 = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
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);
… …
396 XRenderFreePicture (dpy, tmp); 588 XRenderFreePicture (dpy, tmp);
397 589
398 return img; 590 return img;
399} 591}
400 592
401static Picture 593ecb_noinline static void
402create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
403{
404 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
405
406 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
407 XRenderPictureAttributes pa;
408 pa.repeat = RepeatNormal;
409 pa.component_alpha = component_alpha;
410 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
411
412 XFreePixmap (dpy, pixmap);
413
414 return mask;
415}
416
417static void
418extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) 594extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
419{ 595{
420 int32_t x = clamp (c, cl0, cl1); 596 int32_t x = clamp (c, cl0, cl1);
421 c -= x; 597 c -= x;
422 xc = x; 598 xc = x;
423} 599}
424 600
425static bool 601ecb_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) 602extract (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{ 603{
428 extract (cl0, cl1, r, xr); 604 extract (cl0, cl1, r, xr);
429 extract (cl0, cl1, g, xg); 605 extract (cl0, cl1, g, xg);
430 extract (cl0, cl1, b, xb); 606 extract (cl0, cl1, b, xb);
… …
436void 612void
437rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) 613rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
438{ 614{
439 unshare (); 615 unshare ();
440 616
441 Display *dpy = s->display->dpy; 617 Display *dpy = s->dpy;
442 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 618 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
443 619
444 // loop should not be needed for brightness, as only -1..1 makes sense 620 // loop should not be needed for brightness, as only -1..1 makes sense
445 //while (r | g | b | a) 621 //while (r | g | b | a)
446 { 622 {
… …
470rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) 646rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
471{ 647{
472 if (r < 0 || g < 0 || b < 0 || a < 0) 648 if (r < 0 || g < 0 || b < 0 || a < 0)
473 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); 649 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
474 650
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) 651 // premultiply (yeah, these are not exact, sue me or fix it)
480 r = (r * (a >> 8)) >> 8; 652 r = (r * (a >> 8)) >> 8;
481 g = (g * (a >> 8)) >> 8; 653 g = (g * (a >> 8)) >> 8;
482 b = (b * (a >> 8)) >> 8; 654 b = (b * (a >> 8)) >> 8;
483 655
484 Display *dpy = s->display->dpy; 656 composer cc (this);
657 rxvt_img *img = cc;
658 img->fill (rgba (0, 0, 0, 0));
485 659
486 Picture src = picture (); 660 cc.mask (true);
487 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
488 Picture mul = create_xrender_mask (dpy, pm, True, True);
489 661
490 //TODO: this operator does not yet implement some useful contrast 662 //TODO: this operator does not yet implement some useful contrast
491 while (r | g | b | a) 663 while (r | g | b | a)
492 { 664 {
493 unsigned short xr, xg, xb, xa; 665 unsigned short xr, xg, xb, xa;
494 XRenderColor mask_c; 666 XRenderColor mask_c;
495 667
496 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) 668 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
497 { 669 {
498 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); 670 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); 671 XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
500 } 672 }
501 } 673 }
502
503 XRenderFreePicture (dpy, mul);
504 XRenderFreePicture (dpy, dst);
505 XRenderFreePicture (dpy, src);
506 674
507 ::swap (img->ref, ref); 675 ::swap (img->ref, ref);
508 ::swap (img->pm , pm ); 676 ::swap (img->pm , pm );
509 677
510 delete img; 678 delete img;
… …
513void 681void
514rxvt_img::draw (rxvt_img *img, int op, nv mask) 682rxvt_img::draw (rxvt_img *img, int op, nv mask)
515{ 683{
516 unshare (); 684 unshare ();
517 685
518 Display *dpy = s->display->dpy; 686 composer cc (img, this);
519 Picture src = img->picture ();
520 Picture dst = picture ();
521 Picture mask_p = 0;
522 687
523 if (mask != 1.) 688 if (mask != 1.)
524 { 689 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 690
530 XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h); 691 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} 692}
538 693
539rxvt_img * 694rxvt_img *
540rxvt_img::clone () 695rxvt_img::clone ()
541{ 696{
… …
546rxvt_img::reify () 701rxvt_img::reify ()
547{ 702{
548 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 703 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
549 return clone (); 704 return clone ();
550 705
551 Display *dpy = s->display->dpy; 706 Display *dpy = s->dpy;
552 707
553 // add an alpha channel if... 708 // add an alpha channel if...
554 bool alpha = !format->direct.alphaMask // pixmap has none yet 709 bool alpha = !format->direct.alphaMask // pixmap has none yet
555 && (x || y) // we need one because of non-zero offset 710 && (x || y) // we need one because of non-zero offset
556 && repeat == RepeatNone; // and we have no good pixels to fill with 711 && repeat == RepeatNone; // and we have no good pixels to fill with
557 712
558 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 713 composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
559 img->alloc (); 714 0, 0, w, h, repeat));
560 715
561 Picture src = picture ();
562 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
563
564 if (alpha) 716 if (alpha)
565 { 717 {
566 XRenderColor rc = { 0, 0, 0, 0 }; 718 XRenderColor rc = { 0, 0, 0, 0 };
567 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 719 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); 720 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
569 } 721 }
570 else 722 else
571 XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h); 723 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
572 724
573 XRenderFreePicture (dpy, src);
574 XRenderFreePicture (dpy, dst);
575
576 return img; 725 return cc;
577} 726}
578 727
579rxvt_img * 728rxvt_img *
580rxvt_img::sub_rect (int x, int y, int width, int height) 729rxvt_img::sub_rect (int x, int y, int width, int height)
581{ 730{
… …
595 } 744 }
596 745
597 return img; 746 return img;
598} 747}
599 748
600typedef rxvt_img::nv matrix[3][3];
601
602static void
603mat_invert (matrix mat, rxvt_img::nv (&inv)[3][3])
604{
605 rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
606 rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
607 rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
608
609 rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
610
611 inv [0][0] = invdet * s0;
612 inv [0][1] = invdet * s1;
613 inv [0][2] = invdet * s2;
614
615 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
616 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
617 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
618
619 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
620 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
621 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
622}
623
624static rxvt_img::nv
625mat_apply (matrix mat, int i, rxvt_img::nv x, rxvt_img::nv y)
626{
627 rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
628 rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
629
630 return v * (1. / w);
631}
632
633static void
634mat_mult (matrix a, matrix b, matrix r)
635{
636 for (int i = 0; i < 3; ++i)
637 for (int j = 0; j < 3; ++j)
638 r [i][j] = a [i][0] * b [0][j]
639 + a [i][1] * b [1][j]
640 + a [i][2] * b [2][j];
641}
642
643static void
644mat_trans (rxvt_img::nv x, rxvt_img::nv y, matrix mat)
645{
646 mat [0][0] = 1; mat [0][1] = 0; mat [0][2] = x;
647 mat [1][0] = 0; mat [1][1] = 1; mat [1][2] = y;
648 mat [2][0] = 0; mat [2][1] = 0; mat [2][2] = 1;
649}
650
651rxvt_img * 749rxvt_img *
652rxvt_img::transform (nv matrix[3][3]) 750rxvt_img::transform (const nv matrix[3][3])
653{ 751{
752 return transform (mat3x3 (&matrix[0][0]));
753}
754
755rxvt_img *
756rxvt_img::transform (const nv *matrix)
757{
758 mat3x3 m (matrix);
759
654 // calculate new pixel bounding box coordinates 760 // calculate new pixel bounding box coordinates
655 nv r[2], rmin[2], rmax[2]; 761 nv rmin[2], rmax[2];
656 762
657 for (int i = 0; i < 2; ++i) 763 for (int i = 0; i < 2; ++i)
658 { 764 {
659 nv v; 765 nv v;
660 766
661 v = mat_apply (matrix, i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v; 767 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
662 v = mat_apply (matrix, i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v); 768 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
663 v = mat_apply (matrix, i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v); 769 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
664 v = mat_apply (matrix, i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v); 770 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
665 } 771 }
666 772
667 float sx = rmin [0] - x; 773 float sx = rmin [0] - x;
668 float sy = rmin [1] - y; 774 float sy = rmin [1] - y;
669 775
… …
672 int ny = floor (rmin [1]); 778 int ny = floor (rmin [1]);
673 779
674 int new_width = ceil (rmax [0] - rmin [0]); 780 int new_width = ceil (rmax [0] - rmin [0]);
675 int new_height = ceil (rmax [1] - rmin [1]); 781 int new_height = ceil (rmax [1] - rmin [1]);
676 782
677 ::matrix tr, tmp; 783 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
678 mat_trans (x, y, tr);
679 mat_mult (matrix, tr, tmp);
680 mat_trans (-x, -y, tr);
681 mat_mult (tr, tmp, matrix);
682 784
683 ::matrix inv; 785 composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
684 mat_invert (matrix, inv);
685
686 rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
687 img->alloc ();
688
689 Display *dpy = s->display->dpy;
690 Picture src = picture ();
691 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
692 786
693 XTransform xfrm; 787 XTransform xfrm;
694 788
695 for (int i = 0; i < 3; ++i) 789 for (int i = 0; i < 3; ++i)
696 for (int j = 0; j < 3; ++j) 790 for (int j = 0; j < 3; ++j)
697 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 791 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
698 792
699 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 793 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
700 XRenderSetPictureTransform (dpy, src, &xfrm); 794 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
701 XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height); 795 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
702#if 1
703 {
704 XRenderColor rc = { 65535,0,0,65535 };
705 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, new_width, new_height);
706 }{
707 XRenderColor rc = { 0,0,0,65535 };
708 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 1, 1, new_width - 2, new_height - 2);
709 }
710 XRenderComposite (dpy, PictOpOver, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
711#endif
712 796
713 XRenderFreePicture (dpy, src);
714 XRenderFreePicture (dpy, dst);
715
716 return img; 797 return cc;
717} 798}
718 799
719rxvt_img * 800rxvt_img *
720rxvt_img::scale (int new_width, int new_height) 801rxvt_img::scale (int new_width, int new_height)
721{ 802{
722 if (w == new_width && h == new_height) 803 if (w == new_width && h == new_height)
723 return clone (); 804 return clone ();
724 805
725 nv matrix[3][3] = {
726 { new_width / (nv)w, 0, 0 },
727 { 0, new_height / (nv)h, 0 },
728 { 0, 0, 1 }
729 };
730
731 int old_repeat_mode = repeat; 806 int old_repeat_mode = repeat;
732 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 807 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
733 808
734 rxvt_img *img = transform (matrix); 809 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
735 810
736 repeat = old_repeat_mode; 811 repeat = old_repeat_mode;
737 img->repeat = repeat; 812 img->repeat = repeat;
738 813
739 return img; 814 return img;
740} 815}
741 816
742rxvt_img * 817rxvt_img *
743rxvt_img::rotate (int cx, int cy, nv phi) 818rxvt_img::rotate (int cx, int cy, nv phi)
744{ 819{
745 nv s = sin (phi);
746 nv c = cos (phi);
747
748 nv matrix[3][3] = {
749#if 0 820#if 0
750 { c, -s, cx - c * cx + s * cy }, 821 { c, -s, cx - c * cx + s * cy },
751 { s, c, cy - s * cx - c * cy }, 822 { s, c, cy - s * cx - c * cy },
752 { 0, 0, 1 } 823 { 0, 0, 1 }
753#else
754 { c, -s, 0 },
755 { s, c, 0 },
756 { 0, 0, 1 }
757#endif 824#endif
758 };
759 825
760 move (-cx, -cy); 826 move (-cx, -cy);
761 rxvt_img *img = transform (matrix); 827 rxvt_img *img = transform (mat3x3::rotate (phi));
762 move ( cx, cy); 828 move ( cx, cy);
763 img->move (cx, cy); 829 img->move (cx, cy);
764 830
765 return img; 831 return img;
766} 832}
… …
769rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg) 835rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
770{ 836{
771 if (new_format == format) 837 if (new_format == format)
772 return clone (); 838 return clone ();
773 839
774 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 840 composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
775 img->alloc ();
776 841
777 Display *dpy = s->display->dpy;
778 Picture src = picture ();
779 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
780 int op = PictOpSrc; 842 int op = PictOpSrc;
781 843
782 if (format->direct.alphaMask && !new_format->direct.alphaMask) 844 if (format->direct.alphaMask && !new_format->direct.alphaMask)
783 { 845 {
784 // does it have to be that complicated 846 // does it have to be that complicated
785 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a }; 847 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
786 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 848 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
787 849
788 op = PictOpOver; 850 op = PictOpOver;
789 } 851 }
790 852
791 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 853 XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
792 854
793 XRenderFreePicture (dpy, src);
794 XRenderFreePicture (dpy, dst);
795
796 return img; 855 return cc;
797} 856}
798 857
799rxvt_img * 858rxvt_img *
800rxvt_img::blend (rxvt_img *img, nv factor) 859rxvt_img::tint (const rgba &c)
801{ 860{
802 rxvt_img *img2 = clone (); 861 composer cc (this);
803 Display *dpy = s->display->dpy; 862 cc.mask (true);
804 Picture src = img->picture (); 863 cc.fill (c);
805 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
806 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
807 864
808 XRenderColor mask_c;
809
810 mask_c.alpha = float_to_component (factor);
811 mask_c.red =
812 mask_c.green =
813 mask_c.blue = 0;
814 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
815
816 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h); 865 XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
817 866
818 XRenderFreePicture (dpy, src);
819 XRenderFreePicture (dpy, dst);
820 XRenderFreePicture (dpy, mask);
821
822 return img2; 867 return cc;
868}
869
870rxvt_img *
871rxvt_img::filter (const char *name, int nparams, nv *params)
872{
873 rxvt_img *img = new_empty ();
874
875 composer cc (img);
876
877 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
878
879 for (int i = 0; i < nparams; ++i)
880 xparams [i] = XDoubleToFixed (params [i]);
881
882 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
883
884 XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
885
886 return cc;
823} 887}
824 888
825#endif 889#endif
826 890

Diff Legend

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