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.84 by root, Thu Jun 14 18:19:11 2012 UTC vs.
Revision 1.109 by sf-exg, Sat Jul 15 08:16:31 2017 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
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->d->dpy;
170 src = srcimg->picture ();
171 dst = this->dstimg->picture ();
172 }
173
174 ecb_noinline
175 void mask (bool rgb = true, int w = 1, int h = 1)
176 {
177 Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, w, h, rgb ? 32 : 8);
178
179 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, rgb ? PictStandardARGB32 : PictStandardA8);
180 XRenderPictureAttributes pa;
181 pa.repeat = RepeatNormal;
182 pa.component_alpha = rgb;
183 msk = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
184
185 XFreePixmap (dpy, pixmap);
186
187 ecb_assume (msk);
188 }
189
190 // CreateSolidFill creates a very very very weird picture
191 void mask (const rgba &c)
192 {
193 // the casts are needed in C++11 (see 8.5.1)
194 XRenderColor rc = {
195 (unsigned short)(c.r * c.a / 65535),
196 (unsigned short)(c.g * c.a / 65535),
197 (unsigned short)(c.b * c.a / 65535),
198 c.a
199 };
200 msk = XRenderCreateSolidFill (dpy, &rc);
201 ecb_assume (msk);
202 }
203
204 void fill (const rgba &c)
205 {
206 XRenderColor rc = {
207 (unsigned short)(c.r * c.a / 65535),
208 (unsigned short)(c.g * c.a / 65535),
209 (unsigned short)(c.b * c.a / 65535),
210 c.a
211 };
212
213 XRenderFillRectangle (dpy, PictOpSrc, msk, &rc, 0, 0, 1, 1);
214 }
215
216 operator rxvt_img *()
217 {
218 return dstimg;
219 }
220
221 ecb_noinline
222 ~composer ()
223 {
224 XRenderFreePicture (dpy, src);
225 XRenderFreePicture (dpy, dst);
226 if (msk) XRenderFreePicture (dpy, msk);
227 }
228 };
229}
6 230
7static XRenderPictFormat * 231static XRenderPictFormat *
8find_alpha_format_for (Display *dpy, XRenderPictFormat *format) 232find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
9{ 233{
10 if (format->direct.alphaMask) 234 if (format->direct.alphaMask)
… …
23 // should be a very good fallback 247 // should be a very good fallback
24 return XRenderFindStandardFormat (dpy, PictStandardARGB32); 248 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
25} 249}
26 250
27rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat) 251rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
28: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat), 252: d(screen->display), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
29 pm(0), ref(0) 253 pm(0), ref(0)
30{ 254{
31} 255}
32 256
257rxvt_img::rxvt_img (rxvt_display *display, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
258: d(display), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
259 pm(0), ref(0)
260{
261}
262
33rxvt_img::rxvt_img (const rxvt_img &img) 263rxvt_img::rxvt_img (const rxvt_img &img)
34: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref) 264: d(img.d), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
35{ 265{
36 ++ref->cnt; 266 ++ref->cnt;
37} 267}
38 268
39rxvt_img * 269rxvt_img *
40rxvt_img::new_from_root (rxvt_screen *s) 270rxvt_img::new_from_root (rxvt_screen *s)
41{ 271{
42 Display *dpy = s->display->dpy; 272 Display *dpy = s->dpy;
43 unsigned int root_pm_w, root_pm_h; 273 unsigned int root_pm_w, root_pm_h;
44 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]); 274 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_XROOTPMAP_ID]);
45 if (root_pixmap == None) 275 if (root_pixmap == None)
46 root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]); 276 root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_ESETROOT_PMAP_ID]);
47 277
48 if (root_pixmap == None) 278 if (root_pixmap == None)
49 return 0; 279 return 0;
50 280
51 Window wdummy; 281 Window wdummy;
… …
74# if HAVE_PIXBUF 304# if HAVE_PIXBUF
75 305
76rxvt_img * 306rxvt_img *
77rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 307rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
78{ 308{
79 Display *dpy = s->display->dpy; 309 Display *dpy = s->dpy;
80 310
81 int width = gdk_pixbuf_get_width (pb); 311 int width = gdk_pixbuf_get_width (pb);
82 int height = gdk_pixbuf_get_height (pb); 312 int height = gdk_pixbuf_get_height (pb);
83 313
84 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 314 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
… …
126 for (int y = 0; y < height; y++) 356 for (int y = 0; y < height; y++)
127 { 357 {
128 unsigned char *src = row; 358 unsigned char *src = row;
129 uint32_t *dst = (uint32_t *)line; 359 uint32_t *dst = (uint32_t *)line;
130 360
131 if (!pb_has_alpha)
132 for (int x = 0; x < width; x++) 361 for (int x = 0; x < width; x++)
133 { 362 {
134 uint8_t r = *src++; 363 uint8_t r = *src++;
135 uint8_t g = *src++; 364 uint8_t g = *src++;
136 uint8_t b = *src++; 365 uint8_t b = *src++;
366 uint8_t a = *src;
137 367
368 // this is done so it can be jump-free, but newer gcc's clone inner the loop
369 a = pb_has_alpha ? a : 255;
370 src += pb_has_alpha;
371
372 r = (r * a + 127) / 255;
373 g = (g * a + 127) / 255;
374 b = (b * a + 127) / 255;
375
138 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; 376 uint32_t v = (a << 24) | (r << 16) | (g << 8) | b;
139 377
140 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 378 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
141 v = ecb_bswap32 (v); 379 v = ecb_bswap32 (v);
142 380
143 *dst++ = v; 381 *dst++ = v;
144 } 382 }
145 else
146 for (int x = 0; x < width; x++)
147 {
148 uint32_t v = *(uint32_t *)src; src += 4;
149
150 if (ecb_big_endian ())
151 v = ecb_bswap32 (v);
152
153 v = ecb_rotl32 (v, 8); // abgr to bgra
154
155 if (!byte_order_mismatch)
156 v = ecb_bswap32 (v);
157
158 *dst++ = v;
159 }
160 383
161 row += rowstride; 384 row += rowstride;
162 line += xi.bytes_per_line; 385 line += xi.bytes_per_line;
163 } 386 }
164 387
… …
197{ 420{
198 if (--ref->cnt) 421 if (--ref->cnt)
199 return; 422 return;
200 423
201 if (pm && ref->ours) 424 if (pm && ref->ours)
202 XFreePixmap (s->display->dpy, pm); 425 XFreePixmap (d->dpy, pm);
203 426
204 delete ref; 427 delete ref;
205} 428}
206 429
207rxvt_img::~rxvt_img () 430rxvt_img::~rxvt_img ()
… …
210} 433}
211 434
212void 435void
213rxvt_img::alloc () 436rxvt_img::alloc ()
214{ 437{
215 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 438 pm = XCreatePixmap (d->dpy, d->root, w, h, format->depth);
216 ref = new pixref (w, h); 439 ref = new pixref (w, h);
217} 440}
218 441
442rxvt_img *
443rxvt_img::new_empty ()
444{
445 rxvt_img *img = new rxvt_img (d, format, x, y, w, h, repeat);
446 img->alloc ();
447
448 return img;
449}
450
219Picture 451Picture
220rxvt_img::src_picture () 452rxvt_img::picture ()
221{ 453{
222 Display *dpy = s->display->dpy; 454 Display *dpy = d->dpy;
223 455
224 XRenderPictureAttributes pa; 456 XRenderPictureAttributes pa;
225 pa.repeat = repeat; 457 pa.repeat = repeat;
226 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 458 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
227 459
… …
232rxvt_img::unshare () 464rxvt_img::unshare ()
233{ 465{
234 if (ref->cnt == 1 && ref->ours) 466 if (ref->cnt == 1 && ref->ours)
235 return; 467 return;
236 468
237 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 469 Pixmap pm2 = XCreatePixmap (d->dpy, d->root, ref->w, ref->h, format->depth);
238 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 470 GC gc = XCreateGC (d->dpy, pm, 0, 0);
239 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 471 XCopyArea (d->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
240 XFreeGC (s->display->dpy, gc); 472 XFreeGC (d->dpy, gc);
241 473
242 destroy (); 474 destroy ();
243 475
244 pm = pm2; 476 pm = pm2;
245 ref = new pixref (ref->w, ref->h); 477 ref = new pixref (ref->w, ref->h);
246} 478}
247 479
248void 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 = d->dpy;
486 Picture src = picture ();
487 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
488 XRenderFreePicture (dpy, src);
489}
490
491void
249rxvt_img::fill (const rgba &c) 492rxvt_img::fill (const rgba &c)
250{ 493{
251 XRenderColor rc = { c.r, c.g, c.b, c.a }; 494 fill (c, 0, 0, w, h);
252
253 Display *dpy = s->display->dpy;
254 Picture src = src_picture ();
255 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
256 XRenderFreePicture (dpy, src);
257} 495}
258 496
259void 497void
260rxvt_img::add_alpha () 498rxvt_img::add_alpha ()
261{ 499{
262 if (format->direct.alphaMask) 500 if (format->direct.alphaMask)
263 return; 501 return;
264 502
265 Display *dpy = s->display->dpy; 503 composer cc (this, new rxvt_img (d, find_alpha_format_for (d->dpy, format), x, y, w, h, repeat));
266
267 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
268 img->alloc ();
269
270 Picture src = src_picture ();
271 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
272 504
273 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 505 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
274 506
275 XRenderFreePicture (dpy, src); 507 rxvt_img *img = cc;
276 XRenderFreePicture (dpy, dst);
277 508
278 ::swap (img->ref, ref); 509 ::swap (img->ref, ref);
279 ::swap (img->pm , pm ); 510 ::swap (img->pm , pm );
280 511
281 delete img; 512 delete img;
282} 513}
283 514
284static void 515static void
285get_gaussian_kernel (int radius, int width, rxvt_img::nv *kernel, XFixed *params) 516get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
286{ 517{
287 rxvt_img::nv sigma = radius / 2.0; 518 nv sigma = radius / 2.0;
288 rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma; 519 nv scale = sqrt (2.0 * M_PI) * sigma;
289 rxvt_img::nv sum = 0.0; 520 nv sum = 0.0;
290 521
291 for (int i = 0; i < width; i++) 522 for (int i = 0; i < width; i++)
292 { 523 {
293 rxvt_img::nv x = i - width / 2; 524 nv x = i - width / 2;
294 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 525 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
295 sum += kernel[i]; 526 sum += kernel[i];
296 } 527 }
297 528
298 params[0] = XDoubleToFixed (width); 529 params[0] = XDoubleToFixed (width);
… …
303} 534}
304 535
305rxvt_img * 536rxvt_img *
306rxvt_img::blur (int rh, int rv) 537rxvt_img::blur (int rh, int rv)
307{ 538{
308 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 539 if (!(d->flags & DISPLAY_HAS_RENDER_CONV))
309 return clone (); 540 return clone ();
310 541
311 Display *dpy = s->display->dpy; 542 Display *dpy = d->dpy;
312 int size = max (rh, rv) * 2 + 1; 543 int size = max (rh, rv) * 2 + 1;
313 nv *kernel = (nv *)malloc (size * sizeof (nv)); 544 nv *kernel = (nv *)malloc (size * sizeof (nv));
314 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 545 XFixed *params = rxvt_temp_buf<XFixed> (size + 2);
315 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 546 rxvt_img *img = new_empty ();
316 img->alloc ();
317 547
318 XRenderPictureAttributes pa; 548 XRenderPictureAttributes pa;
319 pa.repeat = RepeatPad; 549 pa.repeat = RepeatPad;
320 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 550 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
321 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 551 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
… …
355 0, 0, 585 0, 0,
356 w, h); 586 w, h);
357 } 587 }
358 588
359 free (kernel); 589 free (kernel);
360 free (params);
361 590
362 XRenderFreePicture (dpy, src); 591 XRenderFreePicture (dpy, src);
363 XRenderFreePicture (dpy, dst); 592 XRenderFreePicture (dpy, dst);
364 XRenderFreePicture (dpy, tmp); 593 XRenderFreePicture (dpy, tmp);
365 594
366 return img; 595 return img;
367} 596}
368 597
369static Picture 598rxvt_img *
370create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha) 599rxvt_img::muladd (nv mul, nv add)
371{ 600{
372 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 601 // STEP 1: double the image width, fill all odd columns with white (==1)
373 602
374 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 603 composer cc (this, new rxvt_img (d, format, 0, 0, w * 2, h, repeat));
375 XRenderPictureAttributes pa;
376 pa.repeat = RepeatNormal;
377 pa.component_alpha = component_alpha;
378 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
379 604
380 XFreePixmap (dpy, pixmap); 605 // why the hell does XRenderSetPictureTransform want a writable matrix :(
606 // that keeps us from just static const'ing this matrix.
607 XTransform h_double = {
608 0x08000, 0, 0,
609 0, 0x10000, 0,
610 0, 0, 0x10000
611 };
381 612
382 return mask; 613 XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
383} 614 XRenderSetPictureTransform (cc.dpy, cc.src, &h_double);
615 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
384 616
385static void 617 cc.mask (false, 2, 1);
618
619 static const XRenderColor c0 = { 0, 0, 0, 0 };
620 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1);
621 static const XRenderColor c1 = { 65535, 65535, 65535, 65535 };
622 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1);
623
624 Picture white = XRenderCreateSolidFill (cc.dpy, &c1);
625
626 XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
627
628 XRenderFreePicture (cc.dpy, white);
629
630 // STEP 2: convolve the image with a 3x1 filter
631 // a 2x1 filter would obviously suffice, but given the total lack of specification
632 // for xrender, I expect different xrender implementations to randomly diverge.
633 // we also halve the image, and hope for the best (again, for lack of specs).
634 composer cc2 (cc.dstimg);
635
636 XFixed kernel [] = {
637 XDoubleToFixed (3), XDoubleToFixed (1),
638 XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add)
639 };
640
641 XTransform h_halve = {
642 0x20000, 0, 0,
643 0, 0x10000, 0,
644 0, 0, 0x10000
645 };
646
647 XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0);
648 XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve);
649 XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel));
650
651 XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
652
653 return cc2;
654}
655
656ecb_noinline static void
386extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc) 657extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
387{ 658{
388 int32_t x = clamp (c, cl0, cl1); 659 int32_t x = clamp (c, cl0, cl1);
389 c -= x; 660 c -= x;
390 xc = x; 661 xc = x;
391} 662}
392 663
393static bool 664ecb_noinline static bool
394extract (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) 665extract (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)
395{ 666{
396 extract (cl0, cl1, r, xr); 667 extract (cl0, cl1, r, xr);
397 extract (cl0, cl1, g, xg); 668 extract (cl0, cl1, g, xg);
398 extract (cl0, cl1, b, xb); 669 extract (cl0, cl1, b, xb);
… …
404void 675void
405rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a) 676rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
406{ 677{
407 unshare (); 678 unshare ();
408 679
409 Display *dpy = s->display->dpy; 680 Display *dpy = d->dpy;
410 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 681 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
411 682
412 // loop should not be needed for brightness, as only -1..1 makes sense 683 // loop should not be needed for brightness, as only -1..1 makes sense
413 //while (r | g | b | a) 684 //while (r | g | b | a)
414 { 685 {
… …
438rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a) 709rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
439{ 710{
440 if (r < 0 || g < 0 || b < 0 || a < 0) 711 if (r < 0 || g < 0 || b < 0 || a < 0)
441 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); 712 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
442 713
443 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
444 img->alloc ();
445 img->fill (rgba (0, 0, 0, 0));
446
447 // premultiply (yeah, these are not exact, sue me or fix it) 714 // premultiply (yeah, these are not exact, sue me or fix it)
448 r = (r * (a >> 8)) >> 8; 715 r = (r * (a >> 8)) >> 8;
449 g = (g * (a >> 8)) >> 8; 716 g = (g * (a >> 8)) >> 8;
450 b = (b * (a >> 8)) >> 8; 717 b = (b * (a >> 8)) >> 8;
451 718
452 Display *dpy = s->display->dpy; 719 composer cc (this);
720 rxvt_img *img = cc;
721 img->fill (rgba (0, 0, 0, 0));
453 722
454 Picture src = src_picture (); 723 cc.mask (true);
455 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
456 Picture mul = create_xrender_mask (dpy, pm, True, True);
457 724
458 //TODO: this operator does not yet implement some useful contrast 725 //TODO: this operator does not yet implement some useful contrast
459 while (r | g | b | a) 726 while (r | g | b | a)
460 { 727 {
461 unsigned short xr, xg, xb, xa; 728 unsigned short xr, xg, xb, xa;
462 XRenderColor mask_c; 729 XRenderColor mask_c;
463 730
464 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha)) 731 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
465 { 732 {
466 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1); 733 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
467 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h); 734 XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
468 } 735 }
469 } 736 }
470
471 XRenderFreePicture (dpy, mul);
472 XRenderFreePicture (dpy, dst);
473 XRenderFreePicture (dpy, src);
474 737
475 ::swap (img->ref, ref); 738 ::swap (img->ref, ref);
476 ::swap (img->pm , pm ); 739 ::swap (img->pm , pm );
477 740
478 delete img; 741 delete img;
479} 742}
480 743
744void
745rxvt_img::draw (rxvt_img *img, int op, nv mask)
746{
747 unshare ();
748
749 composer cc (img, this);
750
751 if (mask != 1.)
752 cc.mask (rgba (0, 0, 0, float_to_component (mask)));
753
754 XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
755}
756
481rxvt_img * 757rxvt_img *
482rxvt_img::clone () 758rxvt_img::clone ()
483{ 759{
484 return new rxvt_img (*this); 760 return new rxvt_img (*this);
485} 761}
… …
487rxvt_img * 763rxvt_img *
488rxvt_img::reify () 764rxvt_img::reify ()
489{ 765{
490 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 766 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
491 return clone (); 767 return clone ();
492
493 Display *dpy = s->display->dpy;
494 768
495 // add an alpha channel if... 769 // add an alpha channel if...
496 bool alpha = !format->direct.alphaMask // pixmap has none yet 770 bool alpha = !format->direct.alphaMask // pixmap has none yet
497 && (x || y) // we need one because of non-zero offset 771 && (x || y) // we need one because of non-zero offset
498 && repeat == RepeatNone; // and we have no good pixels to fill with 772 && repeat == RepeatNone; // and we have no good pixels to fill with
499 773
500 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 774 composer cc (this, new rxvt_img (d, alpha ? find_alpha_format_for (d->dpy, format) : format,
501 img->alloc (); 775 0, 0, w, h, repeat));
502 776
503 Picture src = src_picture (); 777 if (repeat == RepeatNone)
504 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
505
506 if (alpha)
507 { 778 {
508 XRenderColor rc = { 0, 0, 0, 0 }; 779 XRenderColor rc = { 0, 0, 0, 0 };
509 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 780 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
510 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); 781 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
511 } 782 }
512 else 783 else
513 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 784 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
514 785
515 XRenderFreePicture (dpy, src);
516 XRenderFreePicture (dpy, dst);
517
518 return img; 786 return cc;
519} 787}
520 788
521rxvt_img * 789rxvt_img *
522rxvt_img::sub_rect (int x, int y, int width, int height) 790rxvt_img::sub_rect (int x, int y, int width, int height)
523{ 791{
524 rxvt_img *img = clone (); 792 rxvt_img *img = clone ();
525 793
526 img->x += x; 794 img->x -= x;
527 img->y += y; 795 img->y -= y;
528 796
529 if (w != width || h != height) 797 if (w != width || h != height)
530 { 798 {
531 img->w = width; 799 img->w = width;
532 img->h = height; 800 img->h = height;
… …
537 } 805 }
538 806
539 return img; 807 return img;
540} 808}
541 809
542static void
543mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3])
544{
545 rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
546 rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
547 rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
548
549 rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
550
551 inv [0][0] = invdet * s0;
552 inv [0][1] = invdet * s1;
553 inv [0][2] = invdet * s2;
554
555 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
556 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
557 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
558
559 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
560 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
561 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
562}
563
564static rxvt_img::nv
565mat_apply (rxvt_img::nv mat[3][3], int i, rxvt_img::nv x, rxvt_img::nv y)
566{
567 rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
568 rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
569
570 return v * (1. / w);
571}
572
573rxvt_img * 810rxvt_img *
574rxvt_img::transform (nv matrix[3][3]) 811rxvt_img::transform (const nv matrix[3][3])
575{ 812{
576 // find new offset 813 return transform (mat3x3 (&matrix[0][0]));
577 int ox = mat_apply (matrix, 0, x, y); 814}
578 int oy = mat_apply (matrix, 1, x, y); 815
816rxvt_img *
817rxvt_img::transform (const nv *matrix)
818{
819 mat3x3 m (matrix);
579 820
580 // calculate new pixel bounding box coordinates 821 // calculate new pixel bounding box coordinates
581 nv d [2], rmin[2], rmax[2]; 822 nv rmin[2], rmax[2];
582 823
583 for (int i = 0; i < 2; ++i) 824 for (int i = 0; i < 2; ++i)
584 { 825 {
585 nv v; 826 nv v;
827
586 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v; 828 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
587 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v); 829 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
588 v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v); 830 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
589 v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v); 831 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
590 } 832 }
591 833
834 float sx = rmin [0] - x;
835 float sy = rmin [1] - y;
836
837 // TODO: adjust matrix for subpixel accuracy
592 int dx = floor (rmin [0]); 838 int nx = floor (rmin [0]);
593 int dy = floor (rmin [1]); 839 int ny = floor (rmin [1]);
594 840
595 int new_width = ceil (rmax [0] - dx); 841 int new_width = ceil (rmax [0] - rmin [0]);
596 int new_height = ceil (rmax [1] - dy); 842 int new_height = ceil (rmax [1] - rmin [1]);
597 843
598 nv inv[3][3]; 844 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
599 mat_invert (matrix, inv);
600 845
601 rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat); 846 composer cc (this, new rxvt_img (d, format, nx, ny, new_width, new_height, repeat));
602 img->alloc ();
603
604 Display *dpy = s->display->dpy;
605 Picture src = src_picture ();
606 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
607 847
608 XTransform xfrm; 848 XTransform xfrm;
609 849
610 for (int i = 0; i < 3; ++i) 850 for (int i = 0; i < 3; ++i)
611 for (int j = 0; j < 3; ++j) 851 for (int j = 0; j < 3; ++j)
612 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 852 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
613 853
614 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 854 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
615 XRenderSetPictureTransform (dpy, src, &xfrm); 855 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
616 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height); 856 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
617 857
618 XRenderFreePicture (dpy, src);
619 XRenderFreePicture (dpy, dst);
620
621 return img; 858 return cc;
622} 859}
623 860
624rxvt_img * 861rxvt_img *
625rxvt_img::scale (int new_width, int new_height) 862rxvt_img::scale (int new_width, int new_height)
626{ 863{
627 if (w == new_width && h == new_height) 864 if (w == new_width && h == new_height)
628 return clone (); 865 return clone ();
629 866
630 nv matrix[3][3] = {
631 { new_width / (nv)w, 0, 0 },
632 { 0, new_height / (nv)h, 0 },
633 { 0, 0, 1 }
634 };
635
636 int old_repeat_mode = repeat; 867 int old_repeat_mode = repeat;
637 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 868 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
638 869
639 rxvt_img *img = transform (matrix); 870 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
640 871
641 repeat = old_repeat_mode; 872 repeat = old_repeat_mode;
642 img->repeat = repeat; 873 img->repeat = repeat;
643 874
644 return img; 875 return img;
645} 876}
646 877
647rxvt_img * 878rxvt_img *
648rxvt_img::rotate (int cx, int cy, nv phi) 879rxvt_img::rotate (int cx, int cy, nv phi)
649{ 880{
650 nv s = sin (phi);
651 nv c = cos (phi);
652
653 nv matrix[3][3] = {
654 { c, -s, cx - c * cx + s * cy },
655 { s, c, cy - s * cx - c * cy },
656 { 0, 0, 1 }
657 //{ c, -s, 0 },
658 //{ s, c, 0 },
659 //{ 0, 0, 1 }
660 };
661
662 //move (-cx, -cy); 881 move (-cx, -cy);
663 rxvt_img *img = transform (matrix); 882 rxvt_img *img = transform (mat3x3::rotate (phi));
664 //move ( cx, cy); 883 move ( cx, cy);
665 //img->move (cx, cy); 884 img->move (cx, cy);
666 885
667 return img; 886 return img;
668} 887}
669 888
670rxvt_img * 889rxvt_img *
671rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg) 890rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
672{ 891{
673 if (new_format == format) 892 if (new_format == format)
674 return clone (); 893 return clone ();
675 894
676 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 895 composer cc (this, new rxvt_img (d, new_format, x, y, w, h, repeat));
677 img->alloc ();
678 896
679 Display *dpy = s->display->dpy;
680 Picture src = src_picture ();
681 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
682 int op = PictOpSrc; 897 int op = PictOpSrc;
683 898
684 if (format->direct.alphaMask && !new_format->direct.alphaMask) 899 if (format->direct.alphaMask && !new_format->direct.alphaMask)
685 { 900 {
686 // does it have to be that complicated 901 // does it have to be that complicated
687 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a }; 902 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
688 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 903 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
689 904
690 op = PictOpOver; 905 op = PictOpOver;
691 } 906 }
692 907
693 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 908 XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
694 909
695 XRenderFreePicture (dpy, src); 910 return cc;
696 XRenderFreePicture (dpy, dst); 911}
912
913rxvt_img *
914rxvt_img::tint (const rgba &c)
915{
916 composer cc (this);
917 cc.mask (true);
918 cc.fill (c);
919
920 XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
921
922 return cc;
923}
924
925rxvt_img *
926rxvt_img::shade (nv factor, rgba c)
927{
928 clamp_it (factor, -1., 1.);
929 factor++;
930
931 if (factor > 1)
932 {
933 c.r = c.r * (2 - factor);
934 c.g = c.g * (2 - factor);
935 c.b = c.b * (2 - factor);
936 }
937 else
938 {
939 c.r = c.r * factor;
940 c.g = c.g * factor;
941 c.b = c.b * factor;
942 }
943
944 rxvt_img *img = this->tint (c);
945
946 if (factor > 1)
947 {
948 c.a = 0xffff;
949 c.r =
950 c.g =
951 c.b = 0xffff * (factor - 1);
952
953 img->brightness (c.r, c.g, c.b, c.a);
954 }
697 955
698 return img; 956 return img;
699} 957}
700 958
701rxvt_img * 959rxvt_img *
702rxvt_img::blend (rxvt_img *img, nv factor) 960rxvt_img::filter (const char *name, int nparams, nv *params)
703{ 961{
704 rxvt_img *img2 = clone (); 962 composer cc (this);
705 Display *dpy = s->display->dpy;
706 Picture src = img->src_picture ();
707 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
708 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
709 963
710 XRenderColor mask_c; 964 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
711 965
712 mask_c.alpha = float_to_component (factor); 966 for (int i = 0; i < nparams; ++i)
713 mask_c.red = 967 xparams [i] = XDoubleToFixed (params [i]);
714 mask_c.green =
715 mask_c.blue = 0;
716 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
717 968
969 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
970
718 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h); 971 XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
719 972
720 XRenderFreePicture (dpy, src);
721 XRenderFreePicture (dpy, dst);
722 XRenderFreePicture (dpy, mask);
723
724 return img2; 973 return cc;
725} 974}
726 975
727#endif 976#endif
728 977

Diff Legend

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