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.76 by root, Sun Jun 10 10:29:26 2012 UTC vs.
Revision 1.100 by root, Mon Jul 2 02:01:41 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 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}
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;
… …
50 293
51 return img; 294 return img;
52} 295}
53 296
54# if HAVE_PIXBUF 297# if HAVE_PIXBUF
298
55rxvt_img * 299rxvt_img *
56rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 300rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
57{ 301{
58 Display *dpy = s->display->dpy; 302 Display *dpy = s->dpy;
59 303
60 int width = gdk_pixbuf_get_width (pb); 304 int width = gdk_pixbuf_get_width (pb);
61 int height = gdk_pixbuf_get_height (pb); 305 int height = gdk_pixbuf_get_height (pb);
62 306
63 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 307 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
… …
113 uint8_t r = *src++; 357 uint8_t r = *src++;
114 uint8_t g = *src++; 358 uint8_t g = *src++;
115 uint8_t b = *src++; 359 uint8_t b = *src++;
116 360
117 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; 361 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
118 362
119 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 363 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
120 v = ecb_bswap32 (v); 364 v = ecb_bswap32 (v);
121 365
122 *dst++ = v; 366 *dst++ = v;
123 } 367 }
… …
166 410
167 g_object_unref (pb); 411 g_object_unref (pb);
168 412
169 return img; 413 return img;
170} 414}
415
171# endif 416# endif
172 417
173void 418void
174rxvt_img::destroy () 419rxvt_img::destroy ()
175{ 420{
176 if (--ref->cnt) 421 if (--ref->cnt)
177 return; 422 return;
178 423
179 if (pm && ref->ours) 424 if (pm && ref->ours)
180 XFreePixmap (s->display->dpy, pm); 425 XFreePixmap (s->dpy, pm);
181 426
182 delete ref; 427 delete ref;
183} 428}
184 429
185rxvt_img::~rxvt_img () 430rxvt_img::~rxvt_img ()
… …
188} 433}
189 434
190void 435void
191rxvt_img::alloc () 436rxvt_img::alloc ()
192{ 437{
193 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 438 pm = XCreatePixmap (s->dpy, s->display->root, w, h, format->depth);
194 ref = new pixref (w, h); 439 ref = new pixref (w, h);
195} 440}
196 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
197Picture 451Picture
198rxvt_img::src_picture () 452rxvt_img::picture ()
199{ 453{
200 Display *dpy = s->display->dpy; 454 Display *dpy = s->dpy;
201 455
202 XRenderPictureAttributes pa; 456 XRenderPictureAttributes pa;
203 pa.repeat = repeat; 457 pa.repeat = repeat;
204 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 458 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
205 459
… …
210rxvt_img::unshare () 464rxvt_img::unshare ()
211{ 465{
212 if (ref->cnt == 1 && ref->ours) 466 if (ref->cnt == 1 && ref->ours)
213 return; 467 return;
214 468
215 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);
216 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 470 GC gc = XCreateGC (s->dpy, pm, 0, 0);
217 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);
218 XFreeGC (s->display->dpy, gc); 472 XFreeGC (s->dpy, gc);
219 473
220 destroy (); 474 destroy ();
221 475
222 pm = pm2; 476 pm = pm2;
223 ref = new pixref (ref->w, ref->h); 477 ref = new pixref (ref->w, ref->h);
224} 478}
225 479
226void 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
227rxvt_img::fill (const rxvt_color &c) 492rxvt_img::fill (const rgba &c)
228{ 493{
229 XGCValues gcv; 494 fill (c, 0, 0, w, h);
230 gcv.foreground = c; 495}
231 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 496
232 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 497void
233 XFreeGC (s->display->dpy, gc); 498rxvt_img::add_alpha ()
499{
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;
234} 513}
235 514
236static void 515static void
237get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 516get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
238{ 517{
239 double sigma = radius / 2.0; 518 nv sigma = radius / 2.0;
240 double scale = sqrt (2.0 * M_PI) * sigma; 519 nv scale = sqrt (2.0 * M_PI) * sigma;
241 double sum = 0.0; 520 nv sum = 0.0;
242 521
243 for (int i = 0; i < width; i++) 522 for (int i = 0; i < width; i++)
244 { 523 {
245 double x = i - width / 2; 524 nv x = i - width / 2;
246 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 525 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
247 sum += kernel[i]; 526 sum += kernel[i];
248 } 527 }
249 528
250 params[0] = XDoubleToFixed (width); 529 params[0] = XDoubleToFixed (width);
… …
258rxvt_img::blur (int rh, int rv) 537rxvt_img::blur (int rh, int rv)
259{ 538{
260 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 539 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
261 return clone (); 540 return clone ();
262 541
263 Display *dpy = s->display->dpy; 542 Display *dpy = s->dpy;
264 int size = max (rh, rv) * 2 + 1; 543 int size = max (rh, rv) * 2 + 1;
265 double *kernel = (double *)malloc (size * sizeof (double)); 544 nv *kernel = (nv *)malloc (size * sizeof (nv));
266 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 545 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
267 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 546 rxvt_img *img = new_empty ();
268 img->alloc ();
269 547
270 XRenderPictureAttributes pa; 548 XRenderPictureAttributes pa;
271 pa.repeat = RepeatPad; 549 pa.repeat = RepeatPad;
272 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 550 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
273 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 551 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
… …
308 w, h); 586 w, h);
309 } 587 }
310 588
311 free (kernel); 589 free (kernel);
312 free (params); 590 free (params);
591
313 XRenderFreePicture (dpy, src); 592 XRenderFreePicture (dpy, src);
314 XRenderFreePicture (dpy, dst); 593 XRenderFreePicture (dpy, dst);
315 XRenderFreePicture (dpy, tmp); 594 XRenderFreePicture (dpy, tmp);
316 595
317 return img; 596 return img;
318} 597}
319 598
320static Picture 599ecb_noinline static void
321create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
322{
323 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
324
325 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
326 XRenderPictureAttributes pa;
327 pa.repeat = RepeatNormal;
328 pa.component_alpha = component_alpha;
329 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
330
331 XFreePixmap (dpy, pixmap);
332
333 return mask;
334}
335
336static void
337extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) 600extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
338{ 601{
339 int32_t x = clamp (c, cl0, cl1); 602 int32_t x = clamp (c, cl0, cl1);
340 c -= x; 603 c -= x;
341 xc = x; 604 xc = x;
342} 605}
343 606
344static bool 607ecb_noinline static bool
345extract (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) 608extract (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)
346{ 609{
347 extract (cl0, cl1, r, xr); 610 extract (cl0, cl1, r, xr);
348 extract (cl0, cl1, g, xg); 611 extract (cl0, cl1, g, xg);
349 extract (cl0, cl1, b, xb); 612 extract (cl0, cl1, b, xb);
… …
355void 618void
356rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) 619rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
357{ 620{
358 unshare (); 621 unshare ();
359 622
360 Display *dpy = s->display->dpy; 623 Display *dpy = s->dpy;
361 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 624 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
362 625
363 // loop should not be needed for brightness, as only -1..1 makes sense 626 // loop should not be needed for brightness, as only -1..1 makes sense
364 //while (r | g | b | a) 627 //while (r | g | b | a)
365 { 628 {
… …
389rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) 652rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
390{ 653{
391 if (r < 0 || g < 0 || b < 0 || a < 0) 654 if (r < 0 || g < 0 || b < 0 || a < 0)
392 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); 655 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
393 656
394 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
395 img->alloc ();
396
397 {
398 rxvt_color empty;
399 empty.set (s, rgba (0, 0, 0, 0));
400 img->fill (empty);
401 }
402
403 // premultiply (yeah, these are not exact, sue me or fix it) 657 // premultiply (yeah, these are not exact, sue me or fix it)
404 r = (r * (a >> 8)) >> 8; 658 r = (r * (a >> 8)) >> 8;
405 g = (g * (a >> 8)) >> 8; 659 g = (g * (a >> 8)) >> 8;
406 b = (b * (a >> 8)) >> 8; 660 b = (b * (a >> 8)) >> 8;
407 661
408 Display *dpy = s->display->dpy; 662 composer cc (this);
663 rxvt_img *img = cc;
664 img->fill (rgba (0, 0, 0, 0));
409 665
410 Picture src = src_picture (); 666 cc.mask (true);
411 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
412 Picture mul = create_xrender_mask (dpy, pm, True, True);
413 667
414 //TODO: this operator does not yet implement some useful contrast 668 //TODO: this operator does not yet implement some useful contrast
415 while (r | g | b | a) 669 while (r | g | b | a)
416 { 670 {
417 unsigned short xr, xg, xb, xa; 671 unsigned short xr, xg, xb, xa;
418 XRenderColor mask_c; 672 XRenderColor mask_c;
419 673
420 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) 674 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
421 { 675 {
422 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); 676 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
423 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h); 677 XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
424 } 678 }
425 } 679 }
426
427 XRenderFreePicture (dpy, mul);
428 XRenderFreePicture (dpy, dst);
429 XRenderFreePicture (dpy, src);
430 680
431 ::swap (img->ref, ref); 681 ::swap (img->ref, ref);
432 ::swap (img->pm , pm ); 682 ::swap (img->pm , pm );
433 683
434 delete img; 684 delete img;
435} 685}
436 686
687void
688rxvt_img::draw (rxvt_img *img, int op, nv mask)
689{
690 unshare ();
691
692 composer cc (img, this);
693
694 if (mask != 1.)
695 cc.mask (rgba (0, 0, 0, float_to_component (mask)));
696
697 XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
698}
699
437rxvt_img * 700rxvt_img *
438rxvt_img::clone () 701rxvt_img::clone ()
439{ 702{
440 return new rxvt_img (*this); 703 return new rxvt_img (*this);
441}
442
443static XRenderPictFormat *
444find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
445{
446 if (format->direct.alphaMask)
447 return format; // already has alpha
448
449 // try to find a suitable alpha format, one bit alpha is enough for our purposes
450 if (format->type == PictTypeDirect)
451 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
452 if (f->direct.alphaMask
453 && f->type == PictTypeDirect
454 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
455 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
456 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
457 return f;
458
459 // should be a very good fallback
460 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
461} 704}
462 705
463rxvt_img * 706rxvt_img *
464rxvt_img::reify () 707rxvt_img::reify ()
465{ 708{
466 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 709 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
467 return clone (); 710 return clone ();
468 711
469 Display *dpy = s->display->dpy; 712 Display *dpy = s->dpy;
470 713
471 // add an alpha channel if... 714 // add an alpha channel if...
472 bool alpha = !format->direct.alphaMask // pixmap has none yet 715 bool alpha = !format->direct.alphaMask // pixmap has none yet
473 && (x || y) // we need one because of non-zero offset 716 && (x || y) // we need one because of non-zero offset
474 && repeat == RepeatNone; // and we have no good pixels to fill with 717 && repeat == RepeatNone; // and we have no good pixels to fill with
475 718
476 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 719 composer cc (this, new rxvt_img (s, alpha ? find_alpha_format_for (s->dpy, format) : format,
477 img->alloc (); 720 0, 0, w, h, repeat));
478 721
479 Picture src = src_picture ();
480 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
481
482 if (alpha) 722 if (alpha)
483 { 723 {
484 XRenderColor rc = { 0, 0, 0, 0 }; 724 XRenderColor rc = { 0, 0, 0, 0 };
485 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 725 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
486 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); 726 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
487 } 727 }
488 else 728 else
489 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 729 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
490 730
491 XRenderFreePicture (dpy, src);
492 XRenderFreePicture (dpy, dst);
493
494 return img; 731 return cc;
495} 732}
496 733
497rxvt_img * 734rxvt_img *
498rxvt_img::sub_rect (int x, int y, int width, int height) 735rxvt_img::sub_rect (int x, int y, int width, int height)
499{ 736{
500 rxvt_img *img = clone (); 737 rxvt_img *img = clone ();
501 738
502 img->x += x; 739 img->x -= x;
503 img->y += y; 740 img->y -= y;
504 741
505 if (w != width || h != height) 742 if (w != width || h != height)
506 { 743 {
507 img->w = width; 744 img->w = width;
508 img->h = height; 745 img->h = height;
… …
514 751
515 return img; 752 return img;
516} 753}
517 754
518rxvt_img * 755rxvt_img *
519rxvt_img::transform (int new_width, int new_height, double matrix[9]) 756rxvt_img::transform (const nv matrix[3][3])
520{ 757{
521 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); 758 return transform (mat3x3 (&matrix[0][0]));
522 img->alloc (); 759}
523 760
524 Display *dpy = s->display->dpy; 761rxvt_img *
525 Picture src = src_picture (); 762rxvt_img::transform (const nv *matrix)
526 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 763{
764 mat3x3 m (matrix);
765
766 // calculate new pixel bounding box coordinates
767 nv rmin[2], rmax[2];
768
769 for (int i = 0; i < 2; ++i)
770 {
771 nv v;
772
773 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
774 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
775 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
776 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
777 }
778
779 float sx = rmin [0] - x;
780 float sy = rmin [1] - y;
781
782 // TODO: adjust matrix for subpixel accuracy
783 int nx = floor (rmin [0]);
784 int ny = floor (rmin [1]);
785
786 int new_width = ceil (rmax [0] - rmin [0]);
787 int new_height = ceil (rmax [1] - rmin [1]);
788
789 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
790
791 composer cc (this, new rxvt_img (s, format, nx, ny, new_width, new_height, repeat));
527 792
528 XTransform xfrm; 793 XTransform xfrm;
529 794
530 for (int i = 0; i < 3; ++i) 795 for (int i = 0; i < 3; ++i)
531 for (int j = 0; j < 3; ++j) 796 for (int j = 0; j < 3; ++j)
532 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 797 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
533 798
534 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
535 xfrm.matrix [1][2] -= XDoubleToFixed (y);
536
537 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 799 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
538 XRenderSetPictureTransform (dpy, src, &xfrm); 800 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
539 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 801 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
540 802
541 XRenderFreePicture (dpy, src);
542 XRenderFreePicture (dpy, dst);
543
544 return img; 803 return cc;
545} 804}
546 805
547rxvt_img * 806rxvt_img *
548rxvt_img::scale (int new_width, int new_height) 807rxvt_img::scale (int new_width, int new_height)
549{ 808{
550 if (w == new_width && h == new_height) 809 if (w == new_width && h == new_height)
551 return clone (); 810 return clone ();
552 811
553 double matrix[9] = {
554 w / (double)new_width, 0, 0,
555 0, h / (double)new_height, 0,
556 0, 0, 1
557 };
558
559 int old_repeat_mode = repeat; 812 int old_repeat_mode = repeat;
560 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems 813 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
561 814
562 rxvt_img *img = transform (new_width, new_height, matrix); 815 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
563 816
564 repeat = old_repeat_mode; 817 repeat = old_repeat_mode;
565 img->repeat = repeat; 818 img->repeat = repeat;
566 819
567 return img; 820 return img;
568} 821}
569 822
570rxvt_img * 823rxvt_img *
571rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 824rxvt_img::rotate (int cx, int cy, nv phi)
572{ 825{
573 double s = sin (phi); 826 move (-cx, -cy);
574 double c = cos (phi); 827 rxvt_img *img = transform (mat3x3::rotate (phi));
828 move ( cx, cy);
829 img->move (cx, cy);
575 830
576 double matrix[9] = { 831 return img;
577 c, -s, -c * x + s * y + x,
578 s, c, -s * x - c * y + y,
579 0, 0, 1
580 };
581
582 return transform (new_width, new_height, matrix);
583} 832}
584 833
585rxvt_img * 834rxvt_img *
586rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 835rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
587{ 836{
588 if (new_format == format) 837 if (new_format == format)
589 return clone (); 838 return clone ();
590 839
591 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));
592 img->alloc ();
593 841
594 Display *dpy = s->display->dpy;
595 Picture src = src_picture ();
596 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
597 int op = PictOpSrc; 842 int op = PictOpSrc;
598 843
599 if (format->direct.alphaMask && !new_format->direct.alphaMask) 844 if (format->direct.alphaMask && !new_format->direct.alphaMask)
600 { 845 {
601 // does it have to be that complicated 846 // does it have to be that complicated
602 rgba c;
603 bg.get (c);
604
605 XRenderColor rc = { c.r, c.g, c.b, 0xffff }; 847 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
606 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 848 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
607 849
608 op = PictOpOver; 850 op = PictOpOver;
609 } 851 }
610 852
611 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);
612 854
613 XRenderFreePicture (dpy, src);
614 XRenderFreePicture (dpy, dst);
615
616 return img; 855 return cc;
617} 856}
618 857
619rxvt_img * 858rxvt_img *
620rxvt_img::blend (rxvt_img *img, double factor) 859rxvt_img::tint (const rgba &c)
621{ 860{
622 rxvt_img *img2 = clone (); 861 composer cc (this);
623 Display *dpy = s->display->dpy; 862 cc.mask (true);
624 Picture src = img->src_picture (); 863 cc.fill (c);
625 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
626 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
627 864
628 XRenderColor mask_c;
629
630 mask_c.alpha = float_to_component (factor);
631 mask_c.red =
632 mask_c.green =
633 mask_c.blue = 0;
634 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
635
636 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);
637 866
638 XRenderFreePicture (dpy, src);
639 XRenderFreePicture (dpy, dst);
640 XRenderFreePicture (dpy, mask);
641
642 return img2; 867 return cc;
868}
869
870rxvt_img *
871rxvt_img::filter (const char *name, int nparams, nv *params)
872{
873 composer cc (this);
874
875 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
876
877 for (int i = 0; i < nparams; ++i)
878 xparams [i] = XDoubleToFixed (params [i]);
879
880 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
881
882 XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
883
884 return cc;
643} 885}
644 886
645#endif 887#endif
646 888

Diff Legend

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