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.82 by root, Thu Jun 14 17:06:57 2012 UTC vs.
Revision 1.101 by root, Mon Jul 2 03:57:53 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
31typedef rxvt_img::nv nv;
32
33namespace
34{
35 struct mat3x3
36 {
37 nv v[3][3];
38
39 mat3x3 ()
40 {
41 }
42
43 mat3x3 (const nv *matrix)
44 {
45 memcpy (v, matrix, sizeof (v));
46 }
47
48 mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
49 {
50 v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
51 v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
52 v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
53 }
54
55 mat3x3 inverse ();
56
57 nv *operator [](int i) { return &v[i][0]; }
58 const nv *operator [](int i) const { return &v[i][0]; }
59
60 operator const nv * () const { return &v[0][0]; }
61 operator nv * () { return &v[0][0]; }
62
63 // quite inefficient, hopefully gcc pulls the w calc out of any loops
64 nv apply1 (int i, nv x, nv y)
65 {
66 mat3x3 &m = *this;
67
68 nv v = m[i][0] * x + m[i][1] * y + m[i][2];
69 nv w = m[2][0] * x + m[2][1] * y + m[2][2];
70
71 return v * (1. / w);
72 }
73
74 static mat3x3 translate (nv x, nv y);
75 static mat3x3 scale (nv s, nv t);
76 static mat3x3 rotate (nv phi);
77 };
78
79 mat3x3
80 mat3x3::inverse ()
81 {
82 mat3x3 &m = *this;
83 mat3x3 inv;
84
85 nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
86 nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
87 nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
88
89 nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
90
91 inv[0][0] = invdet * s0;
92 inv[0][1] = invdet * s1;
93 inv[0][2] = invdet * s2;
94
95 inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
96 inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
97 inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
98
99 inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
100 inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
101 inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
102
103 return inv;
104 }
105
106 static mat3x3
107 operator *(const mat3x3 &a, const mat3x3 &b)
108 {
109 mat3x3 r;
110
111 for (int i = 0; i < 3; ++i)
112 for (int j = 0; j < 3; ++j)
113 r[i][j] = a[i][0] * b[0][j]
114 + a[i][1] * b[1][j]
115 + a[i][2] * b[2][j];
116
117 return r;
118 }
119
120 mat3x3
121 mat3x3::translate (nv x, nv y)
122 {
123 return mat3x3 (
124 1, 0, x,
125 0, 1, y,
126 0, 0, 1
127 );
128 }
129
130 mat3x3
131 mat3x3::scale (nv s, nv t)
132 {
133 return mat3x3 (
134 s, 0, 0,
135 0, t, 0,
136 0, 0, 1
137 );
138 }
139
140 // clockwise
141 mat3x3
142 mat3x3::rotate (nv phi)
143 {
144 nv s = sin (phi);
145 nv c = cos (phi);
146
147 return mat3x3 (
148 c, -s, 0,
149 s, c, 0,
150 0, 0, 1
151 );
152 }
153
154 struct composer
155 {
156 rxvt_img *srcimg, *dstimg;
157 Picture src, dst, msk;
158 Display *dpy;
159
160 ecb_noinline
161 composer (rxvt_img *srcimg, rxvt_img *dstimg = 0)
162 : srcimg (srcimg), dstimg (dstimg), msk (0)
163 {
164 if (!this->dstimg)
165 this->dstimg = srcimg->new_empty ();
166 else if (!this->dstimg->pm) // somewhat unsatisfying
167 this->dstimg->alloc ();
168
169 dpy = srcimg->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 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}
229
230static XRenderPictFormat *
231find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
232{
233 if (format->direct.alphaMask)
234 return format; // already has alpha
235
236 // try to find a suitable alpha format, one bit alpha is enough for our purposes
237 if (format->type == PictTypeDirect)
238 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
239 if (f->direct.alphaMask
240 && f->type == PictTypeDirect
241 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
242 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
243 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
244 return f;
245
246 // should be a very good fallback
247 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
248}
249
7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat) 250rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
8: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat), 251: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), ref(0) 252 pm(0), ref(0)
10{ 253{
11} 254}
… …
17} 260}
18 261
19rxvt_img * 262rxvt_img *
20rxvt_img::new_from_root (rxvt_screen *s) 263rxvt_img::new_from_root (rxvt_screen *s)
21{ 264{
22 Display *dpy = s->display->dpy; 265 Display *dpy = s->dpy;
23 unsigned int root_pm_w, root_pm_h; 266 unsigned int root_pm_w, root_pm_h;
24 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]);
25 if (root_pixmap == None) 268 if (root_pixmap == None)
26 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]);
27 270
28 if (root_pixmap == None) 271 if (root_pixmap == None)
29 return 0; 272 return 0;
30 273
31 Window wdummy; 274 Window wdummy;
… …
54# if HAVE_PIXBUF 297# if HAVE_PIXBUF
55 298
56rxvt_img * 299rxvt_img *
57rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 300rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
58{ 301{
59 Display *dpy = s->display->dpy; 302 Display *dpy = s->dpy;
60 303
61 int width = gdk_pixbuf_get_width (pb); 304 int width = gdk_pixbuf_get_width (pb);
62 int height = gdk_pixbuf_get_height (pb); 305 int height = gdk_pixbuf_get_height (pb);
63 306
64 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 307 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
… …
114 uint8_t r = *src++; 357 uint8_t r = *src++;
115 uint8_t g = *src++; 358 uint8_t g = *src++;
116 uint8_t b = *src++; 359 uint8_t b = *src++;
117 360
118 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; 361 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
119 362
120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 363 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121 v = ecb_bswap32 (v); 364 v = ecb_bswap32 (v);
122 365
123 *dst++ = v; 366 *dst++ = v;
124 } 367 }
… …
177{ 420{
178 if (--ref->cnt) 421 if (--ref->cnt)
179 return; 422 return;
180 423
181 if (pm && ref->ours) 424 if (pm && ref->ours)
182 XFreePixmap (s->display->dpy, pm); 425 XFreePixmap (s->dpy, pm);
183 426
184 delete ref; 427 delete ref;
185} 428}
186 429
187rxvt_img::~rxvt_img () 430rxvt_img::~rxvt_img ()
… …
190} 433}
191 434
192void 435void
193rxvt_img::alloc () 436rxvt_img::alloc ()
194{ 437{
195 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 438 pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
196 ref = new pixref (w, h); 439 ref = new pixref (w, h);
197} 440}
198 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;
449}
450
199Picture 451Picture
200rxvt_img::src_picture () 452rxvt_img::picture ()
201{ 453{
202 Display *dpy = s->display->dpy; 454 Display *dpy = s->dpy;
203 455
204 XRenderPictureAttributes pa; 456 XRenderPictureAttributes pa;
205 pa.repeat = repeat; 457 pa.repeat = repeat;
206 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 458 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
207 459
… …
212rxvt_img::unshare () 464rxvt_img::unshare ()
213{ 465{
214 if (ref->cnt == 1 && ref->ours) 466 if (ref->cnt == 1 && ref->ours)
215 return; 467 return;
216 468
217 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);
218 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 470 GC gc = XCreateGC (s->dpy, pm, 0, 0);
219 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);
220 XFreeGC (s->display->dpy, gc); 472 XFreeGC (s->dpy, gc);
221 473
222 destroy (); 474 destroy ();
223 475
224 pm = pm2; 476 pm = pm2;
225 ref = new pixref (ref->w, ref->h); 477 ref = new pixref (ref->w, ref->h);
226} 478}
227 479
228void 480void
481rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
482{
483 XRenderColor rc = { c.r, c.g, c.b, c.a };
484
485 Display *dpy = s->dpy;
486 Picture src = picture ();
487 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
488 XRenderFreePicture (dpy, src);
489}
490
491void
229rxvt_img::fill (const rgba &c) 492rxvt_img::fill (const rgba &c)
230{ 493{
231 XRenderColor rc = { c.r, c.g, c.b, c.a }; 494 fill (c, 0, 0, w, h);
495}
232 496
233 Display *dpy = s->display->dpy; 497void
234 Picture src = src_picture (); 498rxvt_img::add_alpha ()
235 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h); 499{
236 XRenderFreePicture (dpy, src); 500 if (format->direct.alphaMask)
501 return;
502
503 composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat));
504
505 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
506
507 rxvt_img *img = cc;
508
509 ::swap (img->ref, ref);
510 ::swap (img->pm , pm );
511
512 delete img;
237} 513}
238 514
239static void 515static void
240get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 516get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
241{ 517{
242 double sigma = radius / 2.0; 518 nv sigma = radius / 2.0;
243 double scale = sqrt (2.0 * M_PI) * sigma; 519 nv scale = sqrt (2.0 * M_PI) * sigma;
244 double sum = 0.0; 520 nv sum = 0.0;
245 521
246 for (int i = 0; i < width; i++) 522 for (int i = 0; i < width; i++)
247 { 523 {
248 double x = i - width / 2; 524 nv x = i - width / 2;
249 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 525 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
250 sum += kernel[i]; 526 sum += kernel[i];
251 } 527 }
252 528
253 params[0] = XDoubleToFixed (width); 529 params[0] = XDoubleToFixed (width);
… …
261rxvt_img::blur (int rh, int rv) 537rxvt_img::blur (int rh, int rv)
262{ 538{
263 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 539 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
264 return clone (); 540 return clone ();
265 541
266 Display *dpy = s->display->dpy; 542 Display *dpy = s->dpy;
267 int size = max (rh, rv) * 2 + 1; 543 int size = max (rh, rv) * 2 + 1;
268 double *kernel = (double *)malloc (size * sizeof (double)); 544 nv *kernel = (nv *)malloc (size * sizeof (nv));
269 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 545 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
270 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 546 rxvt_img *img = new_empty ();
271 img->alloc ();
272 547
273 XRenderPictureAttributes pa; 548 XRenderPictureAttributes pa;
274 pa.repeat = RepeatPad; 549 pa.repeat = RepeatPad;
275 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 550 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
276 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 551 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
… …
319 XRenderFreePicture (dpy, tmp); 594 XRenderFreePicture (dpy, tmp);
320 595
321 return img; 596 return img;
322} 597}
323 598
324static Picture 599rxvt_img *
325create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha) 600rxvt_img::muladd (nv mul, nv add)
326{ 601{
327 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 602 // STEP 1: double the image width, fill all odd columns with white (==1)
328 603
329 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 604 composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat));
330 XRenderPictureAttributes pa;
331 pa.repeat = RepeatNormal;
332 pa.component_alpha = component_alpha;
333 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
334 605
335 XFreePixmap (dpy, pixmap); 606 // why the hell does XRenderSetPictureTransform want a writable matrix :(
607 // that keeps us from just static const'ing this matrix.
608 XTransform h_double = {
609 32768, 0, 0,
610 0, 65536, 0,
611 0, 0, 65536
612 };
336 613
337 return mask; 614 XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
338} 615 XRenderSetPictureTransform (cc.dpy, cc.src, &h_double);
616 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
339 617
340static void 618 cc.mask (false, 2, 1);
619
620 static const XRenderColor c0 = { 0, 0, 0, 0 };
621 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1);
622 static const XRenderColor c1 = { 65535, 65535, 65535, 65535 };
623 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1);
624
625 Picture white = XRenderCreateSolidFill (cc.dpy, &c1);
626
627 XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
628
629 XRenderFreePicture (cc.dpy, white);
630
631 // STEP 2: convolve the image with a 3x1 filter
632 // a 2x1 filter would obviously suffice, but given the total lack of specification
633 // for xrender, I expect different xrender implementations to randomly diverge.
634 // we also halve the image, and hope for the best (again, for lack of specs).
635 composer cc2 (cc.dstimg);
636
637 XFixed kernel [] = {
638 XDoubleToFixed (3), XDoubleToFixed (1),
639 XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add)
640 };
641
642 XTransform h_halve = {
643 131072, 0, 0,
644 0, 65536, 0,
645 0, 0, 65536
646 };
647
648 XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0);
649 XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve);
650 XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel));
651
652 XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
653
654 return cc2;
655}
656
657ecb_noinline static void
341extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) 658extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
342{ 659{
343 int32_t x = clamp (c, cl0, cl1); 660 int32_t x = clamp (c, cl0, cl1);
344 c -= x; 661 c -= x;
345 xc = x; 662 xc = x;
346} 663}
347 664
348static bool 665ecb_noinline static bool
349extract (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) 666extract (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)
350{ 667{
351 extract (cl0, cl1, r, xr); 668 extract (cl0, cl1, r, xr);
352 extract (cl0, cl1, g, xg); 669 extract (cl0, cl1, g, xg);
353 extract (cl0, cl1, b, xb); 670 extract (cl0, cl1, b, xb);
… …
359void 676void
360rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) 677rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
361{ 678{
362 unshare (); 679 unshare ();
363 680
364 Display *dpy = s->display->dpy; 681 Display *dpy = s->dpy;
365 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 682 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
366 683
367 // loop should not be needed for brightness, as only -1..1 makes sense 684 // loop should not be needed for brightness, as only -1..1 makes sense
368 //while (r | g | b | a) 685 //while (r | g | b | a)
369 { 686 {
… …
393rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) 710rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
394{ 711{
395 if (r < 0 || g < 0 || b < 0 || a < 0) 712 if (r < 0 || g < 0 || b < 0 || a < 0)
396 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); 713 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
397 714
398 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
399 img->alloc ();
400 img->fill (rgba (0, 0, 0, 0));
401
402 // premultiply (yeah, these are not exact, sue me or fix it) 715 // premultiply (yeah, these are not exact, sue me or fix it)
403 r = (r * (a >> 8)) >> 8; 716 r = (r * (a >> 8)) >> 8;
404 g = (g * (a >> 8)) >> 8; 717 g = (g * (a >> 8)) >> 8;
405 b = (b * (a >> 8)) >> 8; 718 b = (b * (a >> 8)) >> 8;
406 719
407 Display *dpy = s->display->dpy; 720 composer cc (this);
721 rxvt_img *img = cc;
722 img->fill (rgba (0, 0, 0, 0));
408 723
409 Picture src = src_picture (); 724 cc.mask (true);
410 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
411 Picture mul = create_xrender_mask (dpy, pm, True, True);
412 725
413 //TODO: this operator does not yet implement some useful contrast 726 //TODO: this operator does not yet implement some useful contrast
414 while (r | g | b | a) 727 while (r | g | b | a)
415 { 728 {
416 unsigned short xr, xg, xb, xa; 729 unsigned short xr, xg, xb, xa;
417 XRenderColor mask_c; 730 XRenderColor mask_c;
418 731
419 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) 732 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
420 { 733 {
421 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); 734 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
422 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h); 735 XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
423 } 736 }
424 } 737 }
425
426 XRenderFreePicture (dpy, mul);
427 XRenderFreePicture (dpy, dst);
428 XRenderFreePicture (dpy, src);
429 738
430 ::swap (img->ref, ref); 739 ::swap (img->ref, ref);
431 ::swap (img->pm , pm ); 740 ::swap (img->pm , pm );
432 741
433 delete img; 742 delete img;
434} 743}
435 744
745void
746rxvt_img::draw (rxvt_img *img, int op, nv mask)
747{
748 unshare ();
749
750 composer cc (img, this);
751
752 if (mask != 1.)
753 cc.mask (rgba (0, 0, 0, float_to_component (mask)));
754
755 XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
756}
757
436rxvt_img * 758rxvt_img *
437rxvt_img::clone () 759rxvt_img::clone ()
438{ 760{
439 return new rxvt_img (*this); 761 return new rxvt_img (*this);
440}
441
442static XRenderPictFormat *
443find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
444{
445 if (format->direct.alphaMask)
446 return format; // already has alpha
447
448 // try to find a suitable alpha format, one bit alpha is enough for our purposes
449 if (format->type == PictTypeDirect)
450 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
451 if (f->direct.alphaMask
452 && f->type == PictTypeDirect
453 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
454 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
455 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
456 return f;
457
458 // should be a very good fallback
459 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
460} 762}
461 763
462rxvt_img * 764rxvt_img *
463rxvt_img::reify () 765rxvt_img::reify ()
464{ 766{
465 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 767 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
466 return clone (); 768 return clone ();
467 769
468 Display *dpy = s->display->dpy; 770 Display *dpy = s->dpy;
469 771
470 // add an alpha channel if... 772 // add an alpha channel if...
471 bool alpha = !format->direct.alphaMask // pixmap has none yet 773 bool alpha = !format->direct.alphaMask // pixmap has none yet
472 && (x || y) // we need one because of non-zero offset 774 && (x || y) // we need one because of non-zero offset
473 && repeat == RepeatNone; // and we have no good pixels to fill with 775 && repeat == RepeatNone; // and we have no good pixels to fill with
474 776
475 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 777 composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
476 img->alloc (); 778 0, 0, w, h, repeat));
477 779
478 Picture src = src_picture ();
479 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
480
481 if (alpha) 780 if (alpha)
482 { 781 {
483 XRenderColor rc = { 0, 0, 0, 0 }; 782 XRenderColor rc = { 0, 0, 0, 0 };
484 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 783 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
485 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); 784 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
486 } 785 }
487 else 786 else
488 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 787 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
489 788
490 XRenderFreePicture (dpy, src);
491 XRenderFreePicture (dpy, dst);
492
493 return img; 789 return cc;
494} 790}
495 791
496rxvt_img * 792rxvt_img *
497rxvt_img::sub_rect (int x, int y, int width, int height) 793rxvt_img::sub_rect (int x, int y, int width, int height)
498{ 794{
499 rxvt_img *img = clone (); 795 rxvt_img *img = clone ();
500 796
501 img->x += x; 797 img->x -= x;
502 img->y += y; 798 img->y -= y;
503 799
504 if (w != width || h != height) 800 if (w != width || h != height)
505 { 801 {
506 img->w = width; 802 img->w = width;
507 img->h = height; 803 img->h = height;
… …
512 } 808 }
513 809
514 return img; 810 return img;
515} 811}
516 812
517static void
518mat_invert (double mat[3][3], double (&inv)[3][3])
519{
520 double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
521 double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
522 double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
523
524 double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
525
526 inv [0][0] = invdet * s0;
527 inv [0][1] = invdet * s1;
528 inv [0][2] = invdet * s2;
529
530 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
531 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
532 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
533
534 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
535 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
536 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
537}
538
539static double
540mat_apply (double mat[3][3], int i, double x, double y)
541{
542 double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
543 double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
544
545 return v * (1. / w);
546}
547
548rxvt_img * 813rxvt_img *
549rxvt_img::transform (double matrix[3][3]) 814rxvt_img::transform (const nv matrix[3][3])
550{ 815{
551 // find new offset 816 return transform (mat3x3 (&matrix[0][0]));
552 int ox = mat_apply (matrix, 0, x, y); 817}
553 int oy = mat_apply (matrix, 1, x, y); 818
819rxvt_img *
820rxvt_img::transform (const nv *matrix)
821{
822 mat3x3 m (matrix);
554 823
555 // calculate new pixel bounding box coordinates 824 // calculate new pixel bounding box coordinates
556 double d [2], rmin[2], rmax[2]; 825 nv rmin[2], rmax[2];
557 826
558 for (int i = 0; i < 2; ++i) 827 for (int i = 0; i < 2; ++i)
559 { 828 {
560 double v; 829 nv v;
830
561 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v; 831 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
562 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v); 832 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
563 v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v); 833 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
564 v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v); 834 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
565 } 835 }
566 836
837 float sx = rmin [0] - x;
838 float sy = rmin [1] - y;
839
840 // TODO: adjust matrix for subpixel accuracy
567 int dx = floor (rmin [0]); 841 int nx = floor (rmin [0]);
568 int dy = floor (rmin [1]); 842 int ny = floor (rmin [1]);
569 843
570 int new_width = ceil (rmax [0] - dx); 844 int new_width = ceil (rmax [0] - rmin [0]);
571 int new_height = ceil (rmax [1] - dy); 845 int new_height = ceil (rmax [1] - rmin [1]);
572 846
573 double inv[3][3]; 847 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
574 mat_invert (matrix, inv);
575 848
576 rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat); 849 composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
577 img->alloc ();
578
579 Display *dpy = s->display->dpy;
580 Picture src = src_picture ();
581 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
582 850
583 XTransform xfrm; 851 XTransform xfrm;
584 852
585 for (int i = 0; i < 3; ++i) 853 for (int i = 0; i < 3; ++i)
586 for (int j = 0; j < 3; ++j) 854 for (int j = 0; j < 3; ++j)
587 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 855 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
588 856
589 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 857 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
590 XRenderSetPictureTransform (dpy, src, &xfrm); 858 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
591 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height); 859 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
592 860
593 XRenderFreePicture (dpy, src);
594 XRenderFreePicture (dpy, dst);
595
596 return img; 861 return cc;
597} 862}
598 863
599rxvt_img * 864rxvt_img *
600rxvt_img::scale (int new_width, int new_height) 865rxvt_img::scale (int new_width, int new_height)
601{ 866{
602 if (w == new_width && h == new_height) 867 if (w == new_width && h == new_height)
603 return clone (); 868 return clone ();
604 869
605 double matrix[3][3] = {
606 { new_width / (double)w, 0, 0 },
607 { 0, new_height / (double)h, 0 },
608 { 0, 0, 1 }
609 };
610
611 int old_repeat_mode = repeat; 870 int old_repeat_mode = repeat;
612 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 871 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
613 872
614 rxvt_img *img = transform (matrix); 873 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
615 874
616 repeat = old_repeat_mode; 875 repeat = old_repeat_mode;
617 img->repeat = repeat; 876 img->repeat = repeat;
618 877
619 return img; 878 return img;
620} 879}
621 880
622rxvt_img * 881rxvt_img *
623rxvt_img::rotate (int cx, int cy, double phi) 882rxvt_img::rotate (int cx, int cy, nv phi)
624{ 883{
625 double s = sin (phi);
626 double c = cos (phi);
627
628 double matrix[3][3] = {
629 { c, -s, cx - c * cx + s * cy },
630 { s, c, cy - s * cx - c * cy },
631 { 0, 0, 1 }
632 //{ c, -s, 0 },
633 //{ s, c, 0 },
634 //{ 0, 0, 1 }
635 };
636
637 //move (-cx, -cy); 884 move (-cx, -cy);
638 rxvt_img *img = transform (matrix); 885 rxvt_img *img = transform (mat3x3::rotate (phi));
639 //move ( cx, cy); 886 move ( cx, cy);
640 //img->move (cx, cy); 887 img->move (cx, cy);
641 888
642 return img; 889 return img;
643} 890}
644 891
645rxvt_img * 892rxvt_img *
646rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg) 893rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
647{ 894{
648 if (new_format == format) 895 if (new_format == format)
649 return clone (); 896 return clone ();
650 897
651 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 898 composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
652 img->alloc ();
653 899
654 Display *dpy = s->display->dpy;
655 Picture src = src_picture ();
656 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
657 int op = PictOpSrc; 900 int op = PictOpSrc;
658 901
659 if (format->direct.alphaMask && !new_format->direct.alphaMask) 902 if (format->direct.alphaMask && !new_format->direct.alphaMask)
660 { 903 {
661 // does it have to be that complicated 904 // does it have to be that complicated
662 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a }; 905 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
663 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 906 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
664 907
665 op = PictOpOver; 908 op = PictOpOver;
666 } 909 }
667 910
668 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 911 XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
669 912
670 XRenderFreePicture (dpy, src);
671 XRenderFreePicture (dpy, dst);
672
673 return img; 913 return cc;
674} 914}
675 915
676rxvt_img * 916rxvt_img *
677rxvt_img::blend (rxvt_img *img, double factor) 917rxvt_img::tint (const rgba &c)
678{ 918{
679 rxvt_img *img2 = clone (); 919 composer cc (this);
680 Display *dpy = s->display->dpy; 920 cc.mask (true);
681 Picture src = img->src_picture (); 921 cc.fill (c);
682 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
683 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
684 922
685 XRenderColor mask_c;
686
687 mask_c.alpha = float_to_component (factor);
688 mask_c.red =
689 mask_c.green =
690 mask_c.blue = 0;
691 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
692
693 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h); 923 XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
694 924
695 XRenderFreePicture (dpy, src);
696 XRenderFreePicture (dpy, dst);
697 XRenderFreePicture (dpy, mask);
698
699 return img2; 925 return cc;
926}
927
928rxvt_img *
929rxvt_img::filter (const char *name, int nparams, nv *params)
930{
931 composer cc (this);
932
933 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
934
935 for (int i = 0; i < nparams; ++i)
936 xparams [i] = XDoubleToFixed (params [i]);
937
938 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
939
940 XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
941
942 return cc;
700} 943}
701 944
702#endif 945#endif
703 946

Diff Legend

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