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.78 by sf-exg, Mon Jun 11 12:08:30 2012 UTC vs.
Revision 1.107 by root, Thu May 22 18:54:33 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
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
… …
106 for (int y = 0; y < height; y++) 349 for (int y = 0; y < height; y++)
107 { 350 {
108 unsigned char *src = row; 351 unsigned char *src = row;
109 uint32_t *dst = (uint32_t *)line; 352 uint32_t *dst = (uint32_t *)line;
110 353
111 if (!pb_has_alpha)
112 for (int x = 0; x < width; x++) 354 for (int x = 0; x < width; x++)
113 { 355 {
114 uint8_t r = *src++; 356 uint8_t r = *src++;
115 uint8_t g = *src++; 357 uint8_t g = *src++;
116 uint8_t b = *src++; 358 uint8_t b = *src++;
359 uint8_t a = *src;
117 360
361 // this is done so it can be jump-free, but newer gcc's clone inner the loop
362 a = pb_has_alpha ? a : 255;
363 src += pb_has_alpha;
364
365 r = (r * a + 127) / 255;
366 g = (g * a + 127) / 255;
367 b = (b * a + 127) / 255;
368
118 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; 369 uint32_t v = (a << 24) | (r << 16) | (g << 8) | b;
119 370
120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 371 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121 v = ecb_bswap32 (v); 372 v = ecb_bswap32 (v);
122 373
123 *dst++ = v; 374 *dst++ = v;
124 } 375 }
125 else
126 for (int x = 0; x < width; x++)
127 {
128 uint32_t v = *(uint32_t *)src; src += 4;
129
130 if (ecb_big_endian ())
131 v = ecb_bswap32 (v);
132
133 v = ecb_rotl32 (v, 8); // abgr to bgra
134
135 if (!byte_order_mismatch)
136 v = ecb_bswap32 (v);
137
138 *dst++ = v;
139 }
140 376
141 row += rowstride; 377 row += rowstride;
142 line += xi.bytes_per_line; 378 line += xi.bytes_per_line;
143 } 379 }
144 380
… …
177{ 413{
178 if (--ref->cnt) 414 if (--ref->cnt)
179 return; 415 return;
180 416
181 if (pm && ref->ours) 417 if (pm && ref->ours)
182 XFreePixmap (s->display->dpy, pm); 418 XFreePixmap (s->dpy, pm);
183 419
184 delete ref; 420 delete ref;
185} 421}
186 422
187rxvt_img::~rxvt_img () 423rxvt_img::~rxvt_img ()
… …
190} 426}
191 427
192void 428void
193rxvt_img::alloc () 429rxvt_img::alloc ()
194{ 430{
195 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 431 pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
196 ref = new pixref (w, h); 432 ref = new pixref (w, h);
197} 433}
198 434
435rxvt_img *
436rxvt_img::new_empty ()
437{
438 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
439 img->alloc ();
440
441 return img;
442}
443
199Picture 444Picture
200rxvt_img::src_picture () 445rxvt_img::picture ()
201{ 446{
202 Display *dpy = s->display->dpy; 447 Display *dpy = s->dpy;
203 448
204 XRenderPictureAttributes pa; 449 XRenderPictureAttributes pa;
205 pa.repeat = repeat; 450 pa.repeat = repeat;
206 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 451 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
207 452
… …
212rxvt_img::unshare () 457rxvt_img::unshare ()
213{ 458{
214 if (ref->cnt == 1 && ref->ours) 459 if (ref->cnt == 1 && ref->ours)
215 return; 460 return;
216 461
217 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 462 Pixmap pm2 = XCreatePixmap (s->dpy, s->display->root, ref->w, ref->h, format->depth);
218 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 463 GC gc = XCreateGC (s->dpy, pm, 0, 0);
219 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 464 XCopyArea (s->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
220 XFreeGC (s->display->dpy, gc); 465 XFreeGC (s->dpy, gc);
221 466
222 destroy (); 467 destroy ();
223 468
224 pm = pm2; 469 pm = pm2;
225 ref = new pixref (ref->w, ref->h); 470 ref = new pixref (ref->w, ref->h);
226} 471}
227 472
228void 473void
229rxvt_img::fill (const rxvt_color &c) 474rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
230{ 475{
231 rgba cc;
232 c.get (cc);
233 XRenderColor rc = { cc.r, cc.g, cc.b, cc.a }; 476 XRenderColor rc = { c.r, c.g, c.b, c.a };
234 477
235 Display *dpy = s->display->dpy; 478 Display *dpy = s->dpy;
236 Picture src = src_picture (); 479 Picture src = picture ();
237 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h); 480 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
238 XRenderFreePicture (dpy, src); 481 XRenderFreePicture (dpy, src);
239} 482}
240 483
484void
485rxvt_img::fill (const rgba &c)
486{
487 fill (c, 0, 0, w, h);
488}
489
490void
491rxvt_img::add_alpha ()
492{
493 if (format->direct.alphaMask)
494 return;
495
496 composer cc (this, new rxvt_img (s, find_alpha_format_for (s->dpy, format), x, y, w, h, repeat));
497
498 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
499
500 rxvt_img *img = cc;
501
502 ::swap (img->ref, ref);
503 ::swap (img->pm , pm );
504
505 delete img;
506}
507
241static void 508static void
242get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 509get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
243{ 510{
244 double sigma = radius / 2.0; 511 nv sigma = radius / 2.0;
245 double scale = sqrt (2.0 * M_PI) * sigma; 512 nv scale = sqrt (2.0 * M_PI) * sigma;
246 double sum = 0.0; 513 nv sum = 0.0;
247 514
248 for (int i = 0; i < width; i++) 515 for (int i = 0; i < width; i++)
249 { 516 {
250 double x = i - width / 2; 517 nv x = i - width / 2;
251 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 518 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
252 sum += kernel[i]; 519 sum += kernel[i];
253 } 520 }
254 521
255 params[0] = XDoubleToFixed (width); 522 params[0] = XDoubleToFixed (width);
… …
263rxvt_img::blur (int rh, int rv) 530rxvt_img::blur (int rh, int rv)
264{ 531{
265 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 532 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
266 return clone (); 533 return clone ();
267 534
268 Display *dpy = s->display->dpy; 535 Display *dpy = s->dpy;
269 int size = max (rh, rv) * 2 + 1; 536 int size = max (rh, rv) * 2 + 1;
270 double *kernel = (double *)malloc (size * sizeof (double)); 537 nv *kernel = (nv *)malloc (size * sizeof (nv));
271 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 538 XFixed *params = rxvt_temp_buf<XFixed> (size + 2);
272 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 539 rxvt_img *img = new_empty ();
273 img->alloc ();
274 540
275 XRenderPictureAttributes pa; 541 XRenderPictureAttributes pa;
276 pa.repeat = RepeatPad; 542 pa.repeat = RepeatPad;
277 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 543 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
278 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 544 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
… …
312 0, 0, 578 0, 0,
313 w, h); 579 w, h);
314 } 580 }
315 581
316 free (kernel); 582 free (kernel);
317 free (params);
318 583
319 XRenderFreePicture (dpy, src); 584 XRenderFreePicture (dpy, src);
320 XRenderFreePicture (dpy, dst); 585 XRenderFreePicture (dpy, dst);
321 XRenderFreePicture (dpy, tmp); 586 XRenderFreePicture (dpy, tmp);
322 587
323 return img; 588 return img;
324} 589}
325 590
326static Picture 591rxvt_img *
327create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha) 592rxvt_img::muladd (nv mul, nv add)
328{ 593{
329 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 594 // STEP 1: double the image width, fill all odd columns with white (==1)
330 595
331 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 596 composer cc (this, new rxvt_img (s, format, 0, 0, w * 2, h, repeat));
332 XRenderPictureAttributes pa;
333 pa.repeat = RepeatNormal;
334 pa.component_alpha = component_alpha;
335 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
336 597
337 XFreePixmap (dpy, pixmap); 598 // why the hell does XRenderSetPictureTransform want a writable matrix :(
599 // that keeps us from just static const'ing this matrix.
600 XTransform h_double = {
601 0x08000, 0, 0,
602 0, 0x10000, 0,
603 0, 0, 0x10000
604 };
338 605
339 return mask; 606 XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
340} 607 XRenderSetPictureTransform (cc.dpy, cc.src, &h_double);
608 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
341 609
342static void 610 cc.mask (false, 2, 1);
611
612 static const XRenderColor c0 = { 0, 0, 0, 0 };
613 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1);
614 static const XRenderColor c1 = { 65535, 65535, 65535, 65535 };
615 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1);
616
617 Picture white = XRenderCreateSolidFill (cc.dpy, &c1);
618
619 XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
620
621 XRenderFreePicture (cc.dpy, white);
622
623 // STEP 2: convolve the image with a 3x1 filter
624 // a 2x1 filter would obviously suffice, but given the total lack of specification
625 // for xrender, I expect different xrender implementations to randomly diverge.
626 // we also halve the image, and hope for the best (again, for lack of specs).
627 composer cc2 (cc.dstimg);
628
629 XFixed kernel [] = {
630 XDoubleToFixed (3), XDoubleToFixed (1),
631 XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add)
632 };
633
634 XTransform h_halve = {
635 0x20000, 0, 0,
636 0, 0x10000, 0,
637 0, 0, 0x10000
638 };
639
640 XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0);
641 XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve);
642 XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel));
643
644 XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
645
646 return cc2;
647}
648
649ecb_noinline static void
343extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) 650extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
344{ 651{
345 int32_t x = clamp (c, cl0, cl1); 652 int32_t x = clamp (c, cl0, cl1);
346 c -= x; 653 c -= x;
347 xc = x; 654 xc = x;
348} 655}
349 656
350static bool 657ecb_noinline static bool
351extract (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) 658extract (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)
352{ 659{
353 extract (cl0, cl1, r, xr); 660 extract (cl0, cl1, r, xr);
354 extract (cl0, cl1, g, xg); 661 extract (cl0, cl1, g, xg);
355 extract (cl0, cl1, b, xb); 662 extract (cl0, cl1, b, xb);
… …
361void 668void
362rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) 669rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
363{ 670{
364 unshare (); 671 unshare ();
365 672
366 Display *dpy = s->display->dpy; 673 Display *dpy = s->dpy;
367 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 674 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
368 675
369 // loop should not be needed for brightness, as only -1..1 makes sense 676 // loop should not be needed for brightness, as only -1..1 makes sense
370 //while (r | g | b | a) 677 //while (r | g | b | a)
371 { 678 {
… …
395rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) 702rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
396{ 703{
397 if (r < 0 || g < 0 || b < 0 || a < 0) 704 if (r < 0 || g < 0 || b < 0 || a < 0)
398 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); 705 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
399 706
400 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
401 img->alloc ();
402
403 {
404 rxvt_color empty;
405 empty.set (s, rgba (0, 0, 0, 0));
406 img->fill (empty);
407 }
408
409 // premultiply (yeah, these are not exact, sue me or fix it) 707 // premultiply (yeah, these are not exact, sue me or fix it)
410 r = (r * (a >> 8)) >> 8; 708 r = (r * (a >> 8)) >> 8;
411 g = (g * (a >> 8)) >> 8; 709 g = (g * (a >> 8)) >> 8;
412 b = (b * (a >> 8)) >> 8; 710 b = (b * (a >> 8)) >> 8;
413 711
414 Display *dpy = s->display->dpy; 712 composer cc (this);
713 rxvt_img *img = cc;
714 img->fill (rgba (0, 0, 0, 0));
415 715
416 Picture src = src_picture (); 716 cc.mask (true);
417 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
418 Picture mul = create_xrender_mask (dpy, pm, True, True);
419 717
420 //TODO: this operator does not yet implement some useful contrast 718 //TODO: this operator does not yet implement some useful contrast
421 while (r | g | b | a) 719 while (r | g | b | a)
422 { 720 {
423 unsigned short xr, xg, xb, xa; 721 unsigned short xr, xg, xb, xa;
424 XRenderColor mask_c; 722 XRenderColor mask_c;
425 723
426 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) 724 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
427 { 725 {
428 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); 726 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
429 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h); 727 XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
430 } 728 }
431 } 729 }
432
433 XRenderFreePicture (dpy, mul);
434 XRenderFreePicture (dpy, dst);
435 XRenderFreePicture (dpy, src);
436 730
437 ::swap (img->ref, ref); 731 ::swap (img->ref, ref);
438 ::swap (img->pm , pm ); 732 ::swap (img->pm , pm );
439 733
440 delete img; 734 delete img;
441} 735}
442 736
737void
738rxvt_img::draw (rxvt_img *img, int op, nv mask)
739{
740 unshare ();
741
742 composer cc (img, this);
743
744 if (mask != 1.)
745 cc.mask (rgba (0, 0, 0, float_to_component (mask)));
746
747 XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
748}
749
443rxvt_img * 750rxvt_img *
444rxvt_img::clone () 751rxvt_img::clone ()
445{ 752{
446 return new rxvt_img (*this); 753 return new rxvt_img (*this);
447}
448
449static XRenderPictFormat *
450find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
451{
452 if (format->direct.alphaMask)
453 return format; // already has alpha
454
455 // try to find a suitable alpha format, one bit alpha is enough for our purposes
456 if (format->type == PictTypeDirect)
457 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
458 if (f->direct.alphaMask
459 && f->type == PictTypeDirect
460 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
461 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
462 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
463 return f;
464
465 // should be a very good fallback
466 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
467} 754}
468 755
469rxvt_img * 756rxvt_img *
470rxvt_img::reify () 757rxvt_img::reify ()
471{ 758{
472 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 759 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
473 return clone (); 760 return clone ();
474
475 Display *dpy = s->display->dpy;
476 761
477 // add an alpha channel if... 762 // add an alpha channel if...
478 bool alpha = !format->direct.alphaMask // pixmap has none yet 763 bool alpha = !format->direct.alphaMask // pixmap has none yet
479 && (x || y) // we need one because of non-zero offset 764 && (x || y) // we need one because of non-zero offset
480 && repeat == RepeatNone; // and we have no good pixels to fill with 765 && repeat == RepeatNone; // and we have no good pixels to fill with
481 766
482 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 767 composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
483 img->alloc (); 768 0, 0, w, h, repeat));
484 769
485 Picture src = src_picture (); 770 if (repeat == RepeatNone)
486 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
487
488 if (alpha)
489 { 771 {
490 XRenderColor rc = { 0, 0, 0, 0 }; 772 XRenderColor rc = { 0, 0, 0, 0 };
491 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 773 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
492 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); 774 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
493 } 775 }
494 else 776 else
495 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 777 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
496 778
497 XRenderFreePicture (dpy, src);
498 XRenderFreePicture (dpy, dst);
499
500 return img; 779 return cc;
501} 780}
502 781
503rxvt_img * 782rxvt_img *
504rxvt_img::sub_rect (int x, int y, int width, int height) 783rxvt_img::sub_rect (int x, int y, int width, int height)
505{ 784{
506 rxvt_img *img = clone (); 785 rxvt_img *img = clone ();
507 786
508 img->x += x; 787 img->x -= x;
509 img->y += y; 788 img->y -= y;
510 789
511 if (w != width || h != height) 790 if (w != width || h != height)
512 { 791 {
513 img->w = width; 792 img->w = width;
514 img->h = height; 793 img->h = height;
… …
520 799
521 return img; 800 return img;
522} 801}
523 802
524rxvt_img * 803rxvt_img *
525rxvt_img::transform (int new_width, int new_height, double matrix[9]) 804rxvt_img::transform (const nv matrix[3][3])
526{ 805{
527 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); 806 return transform (mat3x3 (&matrix[0][0]));
528 img->alloc (); 807}
529 808
530 Display *dpy = s->display->dpy; 809rxvt_img *
531 Picture src = src_picture (); 810rxvt_img::transform (const nv *matrix)
532 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 811{
812 mat3x3 m (matrix);
813
814 // calculate new pixel bounding box coordinates
815 nv rmin[2], rmax[2];
816
817 for (int i = 0; i < 2; ++i)
818 {
819 nv v;
820
821 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
822 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
823 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
824 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
825 }
826
827 float sx = rmin [0] - x;
828 float sy = rmin [1] - y;
829
830 // TODO: adjust matrix for subpixel accuracy
831 int nx = floor (rmin [0]);
832 int ny = floor (rmin [1]);
833
834 int new_width = ceil (rmax [0] - rmin [0]);
835 int new_height = ceil (rmax [1] - rmin [1]);
836
837 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
838
839 composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
533 840
534 XTransform xfrm; 841 XTransform xfrm;
535 842
536 for (int i = 0; i < 3; ++i) 843 for (int i = 0; i < 3; ++i)
537 for (int j = 0; j < 3; ++j) 844 for (int j = 0; j < 3; ++j)
538 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 845 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
539 846
540 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
541 xfrm.matrix [1][2] -= XDoubleToFixed (y);
542
543 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 847 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
544 XRenderSetPictureTransform (dpy, src, &xfrm); 848 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
545 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 849 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
546 850
547 XRenderFreePicture (dpy, src);
548 XRenderFreePicture (dpy, dst);
549
550 return img; 851 return cc;
551} 852}
552 853
553rxvt_img * 854rxvt_img *
554rxvt_img::scale (int new_width, int new_height) 855rxvt_img::scale (int new_width, int new_height)
555{ 856{
556 if (w == new_width && h == new_height) 857 if (w == new_width && h == new_height)
557 return clone (); 858 return clone ();
558 859
559 double matrix[9] = {
560 w / (double)new_width, 0, 0,
561 0, h / (double)new_height, 0,
562 0, 0, 1
563 };
564
565 int old_repeat_mode = repeat; 860 int old_repeat_mode = repeat;
566 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 861 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
567 862
568 rxvt_img *img = transform (new_width, new_height, matrix); 863 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
569 864
570 repeat = old_repeat_mode; 865 repeat = old_repeat_mode;
571 img->repeat = repeat; 866 img->repeat = repeat;
572 867
573 return img; 868 return img;
574} 869}
575 870
576rxvt_img * 871rxvt_img *
577rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 872rxvt_img::rotate (int cx, int cy, nv phi)
578{ 873{
579 double s = sin (phi); 874 move (-cx, -cy);
580 double c = cos (phi); 875 rxvt_img *img = transform (mat3x3::rotate (phi));
876 move ( cx, cy);
877 img->move (cx, cy);
581 878
582 double matrix[9] = { 879 return img;
583 c, -s, -c * x + s * y + x,
584 s, c, -s * x - c * y + y,
585 0, 0, 1
586 };
587
588 return transform (new_width, new_height, matrix);
589} 880}
590 881
591rxvt_img * 882rxvt_img *
592rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 883rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
593{ 884{
594 if (new_format == format) 885 if (new_format == format)
595 return clone (); 886 return clone ();
596 887
597 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 888 composer cc (this, new rxvt_img (s, new_format, x, y, w, h, repeat));
598 img->alloc ();
599 889
600 Display *dpy = s->display->dpy;
601 Picture src = src_picture ();
602 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
603 int op = PictOpSrc; 890 int op = PictOpSrc;
604 891
605 if (format->direct.alphaMask && !new_format->direct.alphaMask) 892 if (format->direct.alphaMask && !new_format->direct.alphaMask)
606 { 893 {
607 // does it have to be that complicated 894 // does it have to be that complicated
608 rgba c;
609 bg.get (c);
610
611 XRenderColor rc = { c.r, c.g, c.b, 0xffff }; 895 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
612 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 896 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
613 897
614 op = PictOpOver; 898 op = PictOpOver;
615 } 899 }
616 900
617 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 901 XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
618 902
619 XRenderFreePicture (dpy, src); 903 return cc;
620 XRenderFreePicture (dpy, dst); 904}
905
906rxvt_img *
907rxvt_img::tint (const rgba &c)
908{
909 composer cc (this);
910 cc.mask (true);
911 cc.fill (c);
912
913 XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
914
915 return cc;
916}
917
918rxvt_img *
919rxvt_img::shade (nv factor, rgba c)
920{
921 clamp_it (factor, -1., 1.);
922 factor++;
923
924 if (factor > 1)
925 {
926 c.r = c.r * (2 - factor);
927 c.g = c.g * (2 - factor);
928 c.b = c.b * (2 - factor);
929 }
930 else
931 {
932 c.r = c.r * factor;
933 c.g = c.g * factor;
934 c.b = c.b * factor;
935 }
936
937 rxvt_img *img = this->tint (c);
938
939 if (factor > 1)
940 {
941 c.a = 0xffff;
942 c.r =
943 c.g =
944 c.b = 0xffff * (factor - 1);
945
946 img->brightness (c.r, c.g, c.b, c.a);
947 }
621 948
622 return img; 949 return img;
623} 950}
624 951
625rxvt_img * 952rxvt_img *
626rxvt_img::blend (rxvt_img *img, double factor) 953rxvt_img::filter (const char *name, int nparams, nv *params)
627{ 954{
628 rxvt_img *img2 = clone (); 955 composer cc (this);
629 Display *dpy = s->display->dpy;
630 Picture src = img->src_picture ();
631 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
632 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
633 956
634 XRenderColor mask_c; 957 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
635 958
636 mask_c.alpha = float_to_component (factor); 959 for (int i = 0; i < nparams; ++i)
637 mask_c.red = 960 xparams [i] = XDoubleToFixed (params [i]);
638 mask_c.green =
639 mask_c.blue = 0;
640 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
641 961
962 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
963
642 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h); 964 XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
643 965
644 XRenderFreePicture (dpy, src);
645 XRenderFreePicture (dpy, dst);
646 XRenderFreePicture (dpy, mask);
647
648 return img2; 966 return cc;
649} 967}
650 968
651#endif 969#endif
652 970

Diff Legend

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