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.55 by root, Thu Jun 7 20:26:21 2012 UTC vs.
Revision 1.96 by root, Sat Jun 16 15:55:19 2012 UTC

1/*----------------------------------------------------------------------*
2 * File: rxvtimg.h
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
36 struct mat3x3
37 {
38 nv v[3][3];
39
40 mat3x3 ()
41 {
42 }
43
44 mat3x3 (const nv *matrix)
45 {
46 memcpy (v, matrix, sizeof (v));
47 }
48
49 mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
50 {
51 v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
52 v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
53 v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
54 }
55
56 mat3x3 invert ();
57
58 nv *operator [](int i) { return &v[i][0]; }
59 const nv *operator [](int i) const { return &v[i][0]; }
60
61 operator const nv * () const { return &v[0][0]; }
62 operator nv * () { return &v[0][0]; }
63
64 // quite inefficient, hopefully gcc pulls the w calc out of any loops
65 nv apply1 (int i, nv x, nv y)
66 {
67 mat3x3 &m = *this;
68
69 nv v = m[i][0] * x + m[i][1] * y + m[i][2];
70 nv w = m[2][0] * x + m[2][1] * y + m[2][2];
71
72 return v * (1. / w);
73 }
74
75 static mat3x3 translate (nv x, nv y);
76 static mat3x3 scale (nv s, nv t);
77 static mat3x3 rotate (nv phi);
78 };
79
80 mat3x3
81 mat3x3::invert ()
82 {
83 mat3x3 &m = *this;
84 mat3x3 inv;
85
86 nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
87 nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
88 nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
89
90 nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
91
92 inv[0][0] = invdet * s0;
93 inv[0][1] = invdet * s1;
94 inv[0][2] = invdet * s2;
95
96 inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
97 inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
98 inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
99
100 inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
101 inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
102 inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
103
104 return inv;
105 }
106
107 static mat3x3
108 operator *(const mat3x3 &a, const mat3x3 &b)
109 {
110 mat3x3 r;
111
112 for (int i = 0; i < 3; ++i)
113 for (int j = 0; j < 3; ++j)
114 r[i][j] = a[i][0] * b[0][j]
115 + a[i][1] * b[1][j]
116 + a[i][2] * b[2][j];
117
118 return r;
119 }
120
121 mat3x3
122 mat3x3::translate (nv x, nv y)
123 {
124 return mat3x3 (
125 1, 0, x,
126 0, 1, y,
127 0, 0, 1
128 );
129 }
130
131 mat3x3
132 mat3x3::scale (nv s, nv t)
133 {
134 return mat3x3 (
135 s, 0, 0,
136 0, t, 0,
137 0, 0, 1
138 );
139 }
140
141 // clockwise
142 mat3x3
143 mat3x3::rotate (nv phi)
144 {
145 nv s = sin (phi);
146 nv c = cos (phi);
147
148 return mat3x3 (
149 c, -s, 0,
150 s, c, 0,
151 0, 0, 1
152 );
153 }
154
155}
156
157#if 0
158struct pict
159{
160 Display *dpy;
161 Picture pic;
162
163 operator Picture () const
164 {
165 return pic;
166 }
167
168 pict ()
169 : pic (0)
170 {
171 }
172
173 pict (rxvt_img *img, XRenderPictFormat *format = 0)
174 : dpy (img->s->display->dpy)
175 {
176 XRenderPictureAttributes pa;
177 pa.repeat = img->repeat;
178 pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);
179 }
180
181 ~pict ()
182 {
183 if (pic)
184 XRenderFreePicture (dpy, pic);
185 }
186};
187#endif
188
189static XRenderPictFormat *
190find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
191{
192 if (format->direct.alphaMask)
193 return format; // already has alpha
194
195 // try to find a suitable alpha format, one bit alpha is enough for our purposes
196 if (format->type == PictTypeDirect)
197 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
198 if (f->direct.alphaMask
199 && f->type == PictTypeDirect
200 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
201 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
202 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
203 return f;
204
205 // should be a very good fallback
206 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
207}
208
7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat) 209rxvt_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), 210: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), ref(0) 211 pm(0), ref(0)
10{ 212{
11} 213}
… …
13rxvt_img::rxvt_img (const rxvt_img &img) 215rxvt_img::rxvt_img (const rxvt_img &img)
14: 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) 216: 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)
15{ 217{
16 ++ref->cnt; 218 ++ref->cnt;
17} 219}
18
19#if 0
20rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
21: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22{
23}
24#endif
25 220
26rxvt_img * 221rxvt_img *
27rxvt_img::new_from_root (rxvt_screen *s) 222rxvt_img::new_from_root (rxvt_screen *s)
28{ 223{
29 Display *dpy = s->display->dpy; 224 Display *dpy = s->display->dpy;
… …
56 img->ref->ours = false; 251 img->ref->ours = false;
57 252
58 return img; 253 return img;
59} 254}
60 255
256# if HAVE_PIXBUF
257
61rxvt_img * 258rxvt_img *
62rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 259rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
63{ 260{
64 Display *dpy = s->display->dpy; 261 Display *dpy = s->display->dpy;
65 262
… …
69 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 266 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
70 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n"); 267 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71 268
72 // since we require rgb24/argb32 formats from xrender we assume 269 // since we require rgb24/argb32 formats from xrender we assume
73 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender 270 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
74 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
75 271
76 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 272 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
77 273
78 XImage xi; 274 XImage xi;
79 275
… …
83 xi.format = ZPixmap; 279 xi.format = ZPixmap;
84 xi.byte_order = ImageByteOrder (dpy); 280 xi.byte_order = ImageByteOrder (dpy);
85 xi.bitmap_unit = 0; //XY only, unused 281 xi.bitmap_unit = 0; //XY only, unused
86 xi.bitmap_bit_order = 0; //XY only, unused 282 xi.bitmap_bit_order = 0; //XY only, unused
87 xi.bitmap_pad = BitmapPad (dpy); 283 xi.bitmap_pad = BitmapPad (dpy);
88 xi.depth = depth; 284 xi.depth = 32;
89 xi.bytes_per_line = 0; 285 xi.bytes_per_line = 0;
90 xi.bits_per_pixel = 32; //Z only 286 xi.bits_per_pixel = 32; //Z only
91 xi.red_mask = 0x00000000; //Z only, unused 287 xi.red_mask = 0x00000000; //Z only, unused
92 xi.green_mask = 0x00000000; //Z only, unused 288 xi.green_mask = 0x00000000; //Z only, unused
93 xi.blue_mask = 0x00000000; //Z only, unused 289 xi.blue_mask = 0x00000000; //Z only, unused
… …
102 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n"); 298 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
103 299
104 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 300 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
105 301
106 int rowstride = gdk_pixbuf_get_rowstride (pb); 302 int rowstride = gdk_pixbuf_get_rowstride (pb);
107 303 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
108 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
109 unsigned char *row = gdk_pixbuf_get_pixels (pb); 304 unsigned char *row = gdk_pixbuf_get_pixels (pb);
305
110 char *line = xi.data; 306 char *line = xi.data;
111 307
112 for (int y = 0; y < height; y++) 308 for (int y = 0; y < height; y++)
113 { 309 {
114 unsigned char *src = row; 310 unsigned char *src = row;
115 uint32_t *dst = (uint32_t *)line; 311 uint32_t *dst = (uint32_t *)line;
116 312
117 if (depth == 24) 313 if (!pb_has_alpha)
118 for (int x = 0; x < width; x++) 314 for (int x = 0; x < width; x++)
119 { 315 {
120 uint8_t r = *src++; 316 uint8_t r = *src++;
121 uint8_t g = *src++; 317 uint8_t g = *src++;
122 uint8_t b = *src++; 318 uint8_t b = *src++;
123 319
124 uint32_t v = (r << 16) | (g << 8) | b; 320 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
125 321
126 if (ecb_big_endian ()) 322 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
127 v = ecb_bswap32 (v);
128
129 if (byte_order_mismatch)
130 v = ecb_bswap32 (v); 323 v = ecb_bswap32 (v);
131 324
132 *dst++ = v; 325 *dst++ = v;
133 } 326 }
134 else 327 else
135 for (int x = 0; x < width; x++) 328 for (int x = 0; x < width; x++)
136 { 329 {
137 uint32_t v = *(uint32_t *)src; src += 4; 330 uint32_t v = *(uint32_t *)src; src += 4;
138 331
139 if (ecb_little_endian ()) 332 if (ecb_big_endian ())
140 v = ecb_bswap32 (v); 333 v = ecb_bswap32 (v);
141 334
142 v = ecb_rotr32 (v, 8); 335 v = ecb_rotl32 (v, 8); // abgr to bgra
143 336
144 if (byte_order_mismatch) 337 if (!byte_order_mismatch)
145 v = ecb_bswap32 (v); 338 v = ecb_bswap32 (v);
146 339
147 *dst++ = v; 340 *dst++ = v;
148 } 341 }
149 342
150 row += rowstride; 343 row += rowstride;
151 line += xi.bytes_per_line; 344 line += xi.bytes_per_line;
152 } 345 }
153 346
154 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height); 347 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
155 img->alloc (); 348 img->alloc ();
156 349
157 GC gc = XCreateGC (dpy, img->pm, 0, 0); 350 GC gc = XCreateGC (dpy, img->pm, 0, 0);
158 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height); 351 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
159 XFreeGC (dpy, gc); 352 XFreeGC (dpy, gc);
… …
177 g_object_unref (pb); 370 g_object_unref (pb);
178 371
179 return img; 372 return img;
180} 373}
181 374
375# endif
376
182void 377void
183rxvt_img::destroy () 378rxvt_img::destroy ()
184{ 379{
185 if (--ref->cnt) 380 if (--ref->cnt)
186 return; 381 return;
… …
202 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 397 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
203 ref = new pixref (w, h); 398 ref = new pixref (w, h);
204} 399}
205 400
206Picture 401Picture
207rxvt_img::src_picture () 402rxvt_img::picture ()
208{ 403{
209 Display *dpy = s->display->dpy; 404 Display *dpy = s->display->dpy;
210 405
211 XRenderPictureAttributes pa; 406 XRenderPictureAttributes pa;
212 pa.repeat = repeat; 407 pa.repeat = repeat;
… …
219rxvt_img::unshare () 414rxvt_img::unshare ()
220{ 415{
221 if (ref->cnt == 1 && ref->ours) 416 if (ref->cnt == 1 && ref->ours)
222 return; 417 return;
223 418
224 //TODO: maybe should reify instead
225 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth); 419 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
226 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 420 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
227 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0); 421 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
228 XFreeGC (s->display->dpy, gc); 422 XFreeGC (s->display->dpy, gc);
229 423
… …
232 pm = pm2; 426 pm = pm2;
233 ref = new pixref (ref->w, ref->h); 427 ref = new pixref (ref->w, ref->h);
234} 428}
235 429
236void 430void
237rxvt_img::fill (const rxvt_color &c) 431rxvt_img::fill (const rgba &c)
238{ 432{
239 XGCValues gcv; 433 XRenderColor rc = { c.r, c.g, c.b, c.a };
240 gcv.foreground = c; 434
241 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 435 Display *dpy = s->display->dpy;
242 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 436 Picture src = picture ();
243 XFreeGC (s->display->dpy, gc); 437 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
438 XRenderFreePicture (dpy, src);
439}
440
441void
442rxvt_img::add_alpha ()
443{
444 if (format->direct.alphaMask)
445 return;
446
447 Display *dpy = s->display->dpy;
448
449 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
450 img->alloc ();
451
452 Picture src = picture ();
453 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
454
455 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
456
457 XRenderFreePicture (dpy, src);
458 XRenderFreePicture (dpy, dst);
459
460 ::swap (img->ref, ref);
461 ::swap (img->pm , pm );
462
463 delete img;
244} 464}
245 465
246static void 466static void
247get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 467get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
248{ 468{
249 double sigma = radius / 2.0; 469 nv sigma = radius / 2.0;
250 double scale = sqrt (2.0 * M_PI) * sigma; 470 nv scale = sqrt (2.0 * M_PI) * sigma;
251 double sum = 0.0; 471 nv sum = 0.0;
252 472
253 for (int i = 0; i < width; i++) 473 for (int i = 0; i < width; i++)
254 { 474 {
255 double x = i - width / 2; 475 nv x = i - width / 2;
256 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 476 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
257 sum += kernel[i]; 477 sum += kernel[i];
258 } 478 }
259 479
260 params[0] = XDoubleToFixed (width); 480 params[0] = XDoubleToFixed (width);
… …
270 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 490 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
271 return clone (); 491 return clone ();
272 492
273 Display *dpy = s->display->dpy; 493 Display *dpy = s->display->dpy;
274 int size = max (rh, rv) * 2 + 1; 494 int size = max (rh, rv) * 2 + 1;
275 double *kernel = (double *)malloc (size * sizeof (double)); 495 nv *kernel = (nv *)malloc (size * sizeof (nv));
276 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 496 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
277 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 497 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
278 img->alloc (); 498 img->alloc ();
279 499
280 Picture src = src_picture ();
281
282 XRenderPictureAttributes pa; 500 XRenderPictureAttributes pa;
283 pa.repeat = RepeatPad; 501 pa.repeat = RepeatPad;
284 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 502 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
503 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
285 504
286 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 505 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
287 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 506 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
288 XFreePixmap (dpy, tmp_pm); 507 XFreePixmap (dpy, tmp_pm);
289 508
… …
305 524
306 size = rv * 2 + 1; 525 size = rv * 2 + 1;
307 get_gaussian_kernel (rv, size, kernel, params); 526 get_gaussian_kernel (rv, size, kernel, params);
308 ::swap (params[0], params[1]); 527 ::swap (params[0], params[1]);
309 528
310 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 529 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
311 XRenderComposite (dpy, 530 XRenderComposite (dpy,
312 PictOpSrc, 531 PictOpSrc,
313 tmp, 532 tmp,
314 None, 533 None,
315 dst, 534 dst,
… …
319 w, h); 538 w, h);
320 } 539 }
321 540
322 free (kernel); 541 free (kernel);
323 free (params); 542 free (params);
543
324 XRenderFreePicture (dpy, src); 544 XRenderFreePicture (dpy, src);
325 XRenderFreePicture (dpy, dst); 545 XRenderFreePicture (dpy, dst);
326 XRenderFreePicture (dpy, tmp); 546 XRenderFreePicture (dpy, tmp);
327 547
328 return img; 548 return img;
329} 549}
330 550
331static Picture 551static Picture
332create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 552create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
333{ 553{
334 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 554 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
335 555
336 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 556 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
337 XRenderPictureAttributes pa; 557 XRenderPictureAttributes pa;
338 pa.repeat = True; 558 pa.repeat = RepeatNormal;
559 pa.component_alpha = component_alpha;
339 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 560 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
340 561
341 XFreePixmap (dpy, pixmap); 562 XFreePixmap (dpy, pixmap);
342 563
343 return mask; 564 return mask;
344} 565}
345 566
567static void
568extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
569{
570 int32_t x = clamp (c, cl0, cl1);
571 c -= x;
572 xc = x;
573}
574
575static bool
576extract (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)
577{
578 extract (cl0, cl1, r, xr);
579 extract (cl0, cl1, g, xg);
580 extract (cl0, cl1, b, xb);
581 extract (cl0, cl1, a, xa);
582
583 return xr | xg | xb | xa;
584}
585
346void 586void
347rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 587rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
348{ 588{
589 unshare ();
590
349 Display *dpy = s->display->dpy; 591 Display *dpy = s->display->dpy;
350 Picture src = create_xrender_mask (dpy, pm, True);
351 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 592 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
352 593
594 // loop should not be needed for brightness, as only -1..1 makes sense
595 //while (r | g | b | a)
596 {
597 unsigned short xr, xg, xb, xa;
353 XRenderColor mask_c; 598 XRenderColor mask_c;
354 mask_c.red = r; 599
355 mask_c.green = g; 600 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
356 mask_c.blue = b; 601 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
357 mask_c.alpha = a; 602
603 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
604 {
605 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
606 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
607 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
608 mask_c.green = -mask_c.green;
609 mask_c.blue = -mask_c.blue;
610 mask_c.alpha = -mask_c.alpha;
611 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
612 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
613 }
614 }
615
616 XRenderFreePicture (dpy, dst);
617}
618
619void
620rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
621{
622 if (r < 0 || g < 0 || b < 0 || a < 0)
623 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
624
625 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
626 img->alloc ();
627 img->fill (rgba (0, 0, 0, 0));
628
629 // premultiply (yeah, these are not exact, sue me or fix it)
630 r = (r * (a >> 8)) >> 8;
631 g = (g * (a >> 8)) >> 8;
632 b = (b * (a >> 8)) >> 8;
633
634 Display *dpy = s->display->dpy;
635
636 Picture src = picture ();
637 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
638 Picture mul = create_xrender_mask (dpy, pm, True, True);
639
640 //TODO: this operator does not yet implement some useful contrast
641 while (r | g | b | a)
642 {
643 unsigned short xr, xg, xb, xa;
644 XRenderColor mask_c;
645
646 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
647 {
648 XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
649 XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
650 }
651 }
652
653 XRenderFreePicture (dpy, mul);
654 XRenderFreePicture (dpy, dst);
655 XRenderFreePicture (dpy, src);
656
657 ::swap (img->ref, ref);
658 ::swap (img->pm , pm );
659
660 delete img;
661}
662
663void
664rxvt_img::draw (rxvt_img *img, int op, nv mask)
665{
666 unshare ();
667
668 Display *dpy = s->display->dpy;
669 Picture src = img->picture ();
670 Picture dst = picture ();
671 Picture mask_p = 0;
672
673 if (mask != 1.)
674 {
675 mask_p = create_xrender_mask (dpy, img->pm, False, False);
676 XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
358 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 677 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
678 }
359 679
360 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 680 XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
361 681
362 XRenderFreePicture (dpy, src); 682 XRenderFreePicture (dpy, src);
363 XRenderFreePicture (dpy, dst); 683 XRenderFreePicture (dpy, dst);
364}
365 684
366void 685 if (mask_p)
367rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
368{
369 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
370 return;
371
372 Display *dpy = s->display->dpy;
373 Picture src = create_xrender_mask (dpy, pm, True);
374 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
375
376 XRenderColor mask_c;
377 mask_c.red = r;
378 mask_c.green = g;
379 mask_c.blue = b;
380 mask_c.alpha = a;
381 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
382
383 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
384
385 XRenderFreePicture (dpy, src); 686 XRenderFreePicture (dpy, mask_p);
386 XRenderFreePicture (dpy, dst);
387} 687}
388 688
389rxvt_img * 689rxvt_img *
390rxvt_img::clone () 690rxvt_img::clone ()
391{ 691{
392 return new rxvt_img (*this); 692 return new rxvt_img (*this);
393}
394
395static XRenderPictFormat *
396find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
397{
398 if (format->direct.alphaMask)
399 return format; // already has alpha
400
401 // try to find a suitable alpha format, one bit alpha is enough for our purposes
402 if (format->type == PictTypeDirect)
403 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
404 if (f->direct.alphaMask
405 && f->type == PictTypeDirect
406 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
407 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
408 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
409 return f;
410
411 // should be a very good fallback
412 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
413} 693}
414 694
415rxvt_img * 695rxvt_img *
416rxvt_img::reify () 696rxvt_img::reify ()
417{ 697{
418 if (x == 0 && y == 0 && w == ref->w && h == ref->h) 698 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
419 return clone (); 699 return clone ();
420 700
421 Display *dpy = s->display->dpy; 701 Display *dpy = s->display->dpy;
422 702
703 // add an alpha channel if...
423 bool alpha = !format->direct.alphaMask 704 bool alpha = !format->direct.alphaMask // pixmap has none yet
424 && (x || y) 705 && (x || y) // we need one because of non-zero offset
425 && repeat == RepeatNone; 706 && repeat == RepeatNone; // and we have no good pixels to fill with
426 707
427 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 708 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
428 img->alloc (); 709 img->alloc ();
429 710
430 Picture src = src_picture (); 711 Picture src = picture ();
431 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 712 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
432 713
433 if (alpha) 714 if (alpha)
434 { 715 {
435 XRenderColor rc = { 0, 0, 0, 0 }; 716 XRenderColor rc = { 0, 0, 0, 0 };
436 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 717 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
437 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); 718 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
438 } 719 }
439 else 720 else
440 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 721 XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
441 722
442 XRenderFreePicture (dpy, src); 723 XRenderFreePicture (dpy, src);
443 XRenderFreePicture (dpy, dst); 724 XRenderFreePicture (dpy, dst);
444 725
445 return img; 726 return img;
… …
448rxvt_img * 729rxvt_img *
449rxvt_img::sub_rect (int x, int y, int width, int height) 730rxvt_img::sub_rect (int x, int y, int width, int height)
450{ 731{
451 rxvt_img *img = clone (); 732 rxvt_img *img = clone ();
452 733
453 img->x += x; 734 img->x -= x;
454 img->y += y; 735 img->y -= y;
455 736
456 if (w != width || h != height) 737 if (w != width || h != height)
457 { 738 {
458 img->w = width; 739 img->w = width;
459 img->h = height; 740 img->h = height;
… …
465 746
466 return img; 747 return img;
467} 748}
468 749
469rxvt_img * 750rxvt_img *
470rxvt_img::transform (int new_width, int new_height, double matrix[9]) 751rxvt_img::transform (const nv matrix[3][3])
471{ 752{
753 return transform (mat3x3 (&matrix[0][0]));
754}
755
756rxvt_img *
757rxvt_img::transform (const nv *matrix)
758{
759 mat3x3 m (matrix);
760
761 // calculate new pixel bounding box coordinates
762 nv r[2], rmin[2], rmax[2];
763
764 for (int i = 0; i < 2; ++i)
765 {
766 nv v;
767
768 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;
769 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
770 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
771 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
772 }
773
774 float sx = rmin [0] - x;
775 float sy = rmin [1] - y;
776
777 // TODO: adjust matrix for subpixel accuracy
778 int nx = floor (rmin [0]);
779 int ny = floor (rmin [1]);
780
781 int new_width = ceil (rmax [0] - rmin [0]);
782 int new_height = ceil (rmax [1] - rmin [1]);
783
784 m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);
785
786 mat3x3 inv = m.invert ();
787
472 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat); 788 rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
473 img->alloc (); 789 img->alloc ();
474 790
475 Display *dpy = s->display->dpy; 791 Display *dpy = s->display->dpy;
476 Picture src = src_picture (); 792 Picture src = picture ();
477 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 793 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
478 794
479 XTransform xfrm; 795 XTransform xfrm;
480 796
481 for (int i = 0; i < 3; ++i) 797 for (int i = 0; i < 3; ++i)
482 for (int j = 0; j < 3; ++j) 798 for (int j = 0; j < 3; ++j)
483 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 799 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
484
485#if 0
486 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
487 xfrm.matrix [1][2] -= XDoubleToFixed (y);
488#endif
489 800
490 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 801 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
491 XRenderSetPictureTransform (dpy, src, &xfrm); 802 XRenderSetPictureTransform (dpy, src, &xfrm);
492 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 803 XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
493 804
494 XRenderFreePicture (dpy, src); 805 XRenderFreePicture (dpy, src);
495 XRenderFreePicture (dpy, dst); 806 XRenderFreePicture (dpy, dst);
496 807
497 return img; 808 return img;
… …
501rxvt_img::scale (int new_width, int new_height) 812rxvt_img::scale (int new_width, int new_height)
502{ 813{
503 if (w == new_width && h == new_height) 814 if (w == new_width && h == new_height)
504 return clone (); 815 return clone ();
505 816
506 double matrix[9] = {
507 w / (double)new_width, 0, 0,
508 0, h / (double)new_height, 0,
509 0, 0, 1
510 };
511
512 int old_repeat_mode = repeat; 817 int old_repeat_mode = repeat;
513 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems 818 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
514 819
515 rxvt_img *img = transform (new_width, new_height, matrix); 820 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
516 821
517 repeat = old_repeat_mode; 822 repeat = old_repeat_mode;
518 img->repeat = repeat; 823 img->repeat = repeat;
519 824
520 return img; 825 return img;
521} 826}
522 827
523rxvt_img * 828rxvt_img *
524rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 829rxvt_img::rotate (int cx, int cy, nv phi)
525{ 830{
526 double s = sin (phi); 831#if 0
527 double c = cos (phi);
528
529 double matrix[9] = {
530 c, -s, -c * x + s * y + x, 832 { c, -s, cx - c * cx + s * cy },
531 s, c, -s * x - c * y + y, 833 { s, c, cy - s * cx - c * cy },
532 0, 0, 1 834 { 0, 0, 1 }
533 }; 835#endif
534 836
535 return transform (new_width, new_height, matrix); 837 move (-cx, -cy);
536} 838 rxvt_img *img = transform (mat3x3::rotate (phi));
839 move ( cx, cy);
840 img->move (cx, cy);
537 841
842 return img;
843}
844
538rxvt_img * 845rxvt_img *
539rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 846rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
540{ 847{
541 if (new_format == format) 848 if (new_format == format)
542 return clone (); 849 return clone ();
543 850
544 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 851 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
545 img->alloc (); 852 img->alloc ();
546 853
547 Display *dpy = s->display->dpy; 854 Display *dpy = s->display->dpy;
548 Picture src = src_picture (); 855 Picture src = picture ();
549 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 856 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
550 int op = PictOpSrc; 857 int op = PictOpSrc;
551 858
552 if (format->direct.alphaMask && !new_format->direct.alphaMask) 859 if (format->direct.alphaMask && !new_format->direct.alphaMask)
553 { 860 {
554 // does it have to be that complicated 861 // does it have to be that complicated
555 rgba c;
556 bg.get (c);
557
558 XRenderColor rc = { c.r, c.g, c.b, 0xffff }; 862 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
559 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 863 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
560 864
561 op = PictOpOver; 865 op = PictOpOver;
562 } 866 }
563 867
… …
568 872
569 return img; 873 return img;
570} 874}
571 875
572rxvt_img * 876rxvt_img *
573rxvt_img::blend (rxvt_img *img, double factor) 877rxvt_img::blend (rxvt_img *img, nv factor)
574{ 878{
575 rxvt_img *img2 = clone (); 879 rxvt_img *img2 = clone ();
576 Display *dpy = s->display->dpy; 880 Display *dpy = s->display->dpy;
577 Picture src = img->src_picture (); 881 Picture src = img->picture ();
578 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 882 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
579 Picture mask = create_xrender_mask (dpy, img->pm, False); 883 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
580 884
581 XRenderColor mask_c; 885 XRenderColor mask_c;
582 886
583 mask_c.alpha = float_to_component (factor); 887 mask_c.alpha = float_to_component (factor);
584 mask_c.red = 888 mask_c.red =

Diff Legend

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