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.33 by root, Thu Jun 7 08:12:55 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) 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(RepeatNormal), 210: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), refcnt(0) 211 pm(0), ref(0)
10{ 212{
11} 213}
12 214
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), refcnt(img.refcnt) 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 if (refcnt)
17 ++*refcnt; 218 ++ref->cnt;
18} 219}
19
20#if 0
21rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
22: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
23{
24}
25#endif
26 220
27rxvt_img * 221rxvt_img *
28rxvt_img::new_from_root (rxvt_screen *s) 222rxvt_img::new_from_root (rxvt_screen *s)
29{ 223{
30 Display *dpy = s->display->dpy; 224 Display *dpy = s->display->dpy;
51 root_pm_w, 245 root_pm_w,
52 root_pm_h 246 root_pm_h
53 ); 247 );
54 248
55 img->pm = root_pixmap; 249 img->pm = root_pixmap;
250 img->ref = new pixref (root_pm_w, root_pm_h);
251 img->ref->ours = false;
252
253 return img;
254}
255
256# if HAVE_PIXBUF
257
258rxvt_img *
259rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
260{
261 Display *dpy = s->display->dpy;
262
263 int width = gdk_pixbuf_get_width (pb);
264 int height = gdk_pixbuf_get_height (pb);
265
266 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
267 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
268
269 // since we require rgb24/argb32 formats from xrender we assume
270 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
271
272 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
273
274 XImage xi;
275
276 xi.width = width;
277 xi.height = height;
278 xi.xoffset = 0;
279 xi.format = ZPixmap;
280 xi.byte_order = ImageByteOrder (dpy);
281 xi.bitmap_unit = 0; //XY only, unused
282 xi.bitmap_bit_order = 0; //XY only, unused
283 xi.bitmap_pad = BitmapPad (dpy);
284 xi.depth = 32;
285 xi.bytes_per_line = 0;
286 xi.bits_per_pixel = 32; //Z only
287 xi.red_mask = 0x00000000; //Z only, unused
288 xi.green_mask = 0x00000000; //Z only, unused
289 xi.blue_mask = 0x00000000; //Z only, unused
290 xi.obdata = 0; // probably unused
291
292 bool byte_order_mismatch = byte_order != xi.byte_order;
293
294 if (!XInitImage (&xi))
295 rxvt_fatal ("unable to initialise ximage, please report.\n");
296
297 if (height > INT_MAX / xi.bytes_per_line)
298 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
299
300 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
301
302 int rowstride = gdk_pixbuf_get_rowstride (pb);
303 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
304 unsigned char *row = gdk_pixbuf_get_pixels (pb);
305
306 char *line = xi.data;
307
308 for (int y = 0; y < height; y++)
309 {
310 unsigned char *src = row;
311 uint32_t *dst = (uint32_t *)line;
312
313 if (!pb_has_alpha)
314 for (int x = 0; x < width; x++)
315 {
316 uint8_t r = *src++;
317 uint8_t g = *src++;
318 uint8_t b = *src++;
319
320 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
321
322 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
323 v = ecb_bswap32 (v);
324
325 *dst++ = v;
326 }
327 else
328 for (int x = 0; x < width; x++)
329 {
330 uint32_t v = *(uint32_t *)src; src += 4;
331
332 if (ecb_big_endian ())
333 v = ecb_bswap32 (v);
334
335 v = ecb_rotl32 (v, 8); // abgr to bgra
336
337 if (!byte_order_mismatch)
338 v = ecb_bswap32 (v);
339
340 *dst++ = v;
341 }
342
343 row += rowstride;
344 line += xi.bytes_per_line;
345 }
346
347 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
348 img->alloc ();
349
350 GC gc = XCreateGC (dpy, img->pm, 0, 0);
351 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
352 XFreeGC (dpy, gc);
353
354 free (xi.data);
56 355
57 return img; 356 return img;
58} 357}
59 358
60rxvt_img * 359rxvt_img *
64 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 363 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
65 364
66 if (!pb) 365 if (!pb)
67 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 366 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
68 367
69 rxvt_img *img = new rxvt_img ( 368 rxvt_img *img = new_from_pixbuf (s, pb);
70 s,
71 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
72 0,
73 0,
74 gdk_pixbuf_get_width (pb),
75 gdk_pixbuf_get_height (pb)
76 );
77 img->alloc ();
78 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
79 369
80 g_object_unref (pb); 370 g_object_unref (pb);
81 371
82 return img; 372 return img;
83} 373}
374
375# endif
84 376
85void 377void
86rxvt_img::destroy () 378rxvt_img::destroy ()
87{ 379{
88 if (!refcnt || --*refcnt) 380 if (--ref->cnt)
89 return; 381 return;
90 382
91 if (pm) 383 if (pm && ref->ours)
92 XFreePixmap (s->display->dpy, pm); 384 XFreePixmap (s->display->dpy, pm);
93 385
94 delete refcnt; 386 delete ref;
95} 387}
96 388
97rxvt_img::~rxvt_img () 389rxvt_img::~rxvt_img ()
98{ 390{
99 destroy (); 391 destroy ();
101 393
102void 394void
103rxvt_img::alloc () 395rxvt_img::alloc ()
104{ 396{
105 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);
106 refcnt = new int (1); 398 ref = new pixref (w, h);
399}
400
401Picture
402rxvt_img::picture ()
403{
404 Display *dpy = s->display->dpy;
405
406 XRenderPictureAttributes pa;
407 pa.repeat = repeat;
408 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
409
410 return pic;
107} 411}
108 412
109void 413void
110rxvt_img::unshare () 414rxvt_img::unshare ()
111{ 415{
112 if (refcnt && *refcnt == 1) 416 if (ref->cnt == 1 && ref->ours)
113 return; 417 return;
114 418
115 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 419 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
116 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 420 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
117 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0); 421 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
118 XFreeGC (s->display->dpy, gc); 422 XFreeGC (s->display->dpy, gc);
119 423
120 destroy (); 424 destroy ();
121 425
122 pm = pm2; 426 pm = pm2;
123 refcnt = new int (1); 427 ref = new pixref (ref->w, ref->h);
124} 428}
125 429
126void 430void
127rxvt_img::fill (const rxvt_color &c) 431rxvt_img::fill (const rgba &c)
128{ 432{
129 XGCValues gcv; 433 XRenderColor rc = { c.r, c.g, c.b, c.a };
130 gcv.foreground = c; 434
131 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 435 Display *dpy = s->display->dpy;
132 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 436 Picture src = picture ();
133 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;
134} 464}
135 465
136static void 466static void
137get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 467get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
138{ 468{
139 double sigma = radius / 2.0; 469 nv sigma = radius / 2.0;
140 double scale = sqrt (2.0 * M_PI) * sigma; 470 nv scale = sqrt (2.0 * M_PI) * sigma;
141 double sum = 0.0; 471 nv sum = 0.0;
142 472
143 for (int i = 0; i < width; i++) 473 for (int i = 0; i < width; i++)
144 { 474 {
145 double x = i - width / 2; 475 nv x = i - width / 2;
146 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 476 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
147 sum += kernel[i]; 477 sum += kernel[i];
148 } 478 }
149 479
150 params[0] = XDoubleToFixed (width); 480 params[0] = XDoubleToFixed (width);
160 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 490 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
161 return clone (); 491 return clone ();
162 492
163 Display *dpy = s->display->dpy; 493 Display *dpy = s->display->dpy;
164 int size = max (rh, rv) * 2 + 1; 494 int size = max (rh, rv) * 2 + 1;
165 double *kernel = (double *)malloc (size * sizeof (double)); 495 nv *kernel = (nv *)malloc (size * sizeof (nv));
166 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 496 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
167 rxvt_img *img = new rxvt_img (s, format, x, y, w, h); 497 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
168 img->alloc (); 498 img->alloc ();
169 499
170 XRenderPictureAttributes pa; 500 XRenderPictureAttributes pa;
171
172 pa.repeat = RepeatPad; 501 pa.repeat = RepeatPad;
173 Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa); 502 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
174 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 503 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
175 504
176 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 505 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
177 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 506 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
178 XFreePixmap (dpy, tmp_pm); 507 XFreePixmap (dpy, tmp_pm);
179 508
195 524
196 size = rv * 2 + 1; 525 size = rv * 2 + 1;
197 get_gaussian_kernel (rv, size, kernel, params); 526 get_gaussian_kernel (rv, size, kernel, params);
198 ::swap (params[0], params[1]); 527 ::swap (params[0], params[1]);
199 528
200 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 529 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
201 XRenderComposite (dpy, 530 XRenderComposite (dpy,
202 PictOpSrc, 531 PictOpSrc,
203 tmp, 532 tmp,
204 None, 533 None,
205 dst, 534 dst,
209 w, h); 538 w, h);
210 } 539 }
211 540
212 free (kernel); 541 free (kernel);
213 free (params); 542 free (params);
543
214 XRenderFreePicture (dpy, src); 544 XRenderFreePicture (dpy, src);
215 XRenderFreePicture (dpy, dst); 545 XRenderFreePicture (dpy, dst);
216 XRenderFreePicture (dpy, tmp); 546 XRenderFreePicture (dpy, tmp);
217 547
218 return img; 548 return img;
219} 549}
220 550
221static Picture 551static Picture
222create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 552create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
223{ 553{
224 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 554 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
225 555
226 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 556 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
227 XRenderPictureAttributes pa; 557 XRenderPictureAttributes pa;
228 pa.repeat = True; 558 pa.repeat = RepeatNormal;
559 pa.component_alpha = component_alpha;
229 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 560 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
230 561
231 XFreePixmap (dpy, pixmap); 562 XFreePixmap (dpy, pixmap);
232 563
233 return mask; 564 return mask;
234} 565}
235 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
236void 586void
237rxvt_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)
238{ 588{
589 unshare ();
590
239 Display *dpy = s->display->dpy; 591 Display *dpy = s->display->dpy;
240 Picture src = create_xrender_mask (dpy, pm, True);
241 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 592 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
242 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;
243 XRenderColor mask_c; 598 XRenderColor mask_c;
244 mask_c.red = r; 599
245 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))
246 mask_c.blue = b; 601 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
247 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) };
248 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 677 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
678 }
249 679
250 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);
251 681
252 XRenderFreePicture (dpy, src); 682 XRenderFreePicture (dpy, src);
253 XRenderFreePicture (dpy, dst); 683 XRenderFreePicture (dpy, dst);
254}
255 684
256void 685 if (mask_p)
257rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a) 686 XRenderFreePicture (dpy, mask_p);
258{ 687}
259 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
260 return;
261 688
689rxvt_img *
690rxvt_img::clone ()
691{
692 return new rxvt_img (*this);
693}
694
695rxvt_img *
696rxvt_img::reify ()
697{
698 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
699 return clone ();
700
262 Display *dpy = s->display->dpy; 701 Display *dpy = s->display->dpy;
263 Picture src = create_xrender_mask (dpy, pm, True); 702
703 // add an alpha channel if...
704 bool alpha = !format->direct.alphaMask // pixmap has none yet
705 && (x || y) // we need one because of non-zero offset
706 && repeat == RepeatNone; // and we have no good pixels to fill with
707
708 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
709 img->alloc ();
710
711 Picture src = picture ();
264 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 712 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
265 713
266 XRenderColor mask_c; 714 if (alpha)
267 mask_c.red = r; 715 {
268 mask_c.green = g; 716 XRenderColor rc = { 0, 0, 0, 0 };
269 mask_c.blue = b; 717 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
270 mask_c.alpha = a; 718 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
271 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 719 }
272 720 else
273 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 721 XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
274 722
275 XRenderFreePicture (dpy, src); 723 XRenderFreePicture (dpy, src);
276 XRenderFreePicture (dpy, dst); 724 XRenderFreePicture (dpy, dst);
277}
278 725
279bool 726 return img;
280rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y) 727}
281{
282 Display *dpy = s->display->dpy;
283 728
284 if (s->visual->c_class != TrueColor) 729rxvt_img *
285 return false; 730rxvt_img::sub_rect (int x, int y, int width, int height)
731{
732 rxvt_img *img = clone ();
286 733
287 uint32_t red_mask, green_mask, blue_mask, alpha_mask; 734 img->x -= x;
735 img->y -= y;
288 736
289 red_mask = (uint32_t)format->direct.redMask << format->direct.red; 737 if (w != width || h != height)
290 green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
291 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
292 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
293
294 int width_r = ecb_popcount32 (red_mask);
295 int width_g = ecb_popcount32 (green_mask);
296 int width_b = ecb_popcount32 (blue_mask);
297 int width_a = ecb_popcount32 (alpha_mask);
298
299 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
300 return false;
301
302 int sh_r = ecb_ctz32 (red_mask);
303 int sh_g = ecb_ctz32 (green_mask);
304 int sh_b = ecb_ctz32 (blue_mask);
305 int sh_a = ecb_ctz32 (alpha_mask);
306
307 if (width > 32767 || height > 32767)
308 return false;
309
310 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
311 width, height, 32, 0);
312 if (!ximage)
313 return false;
314
315 if (height > INT_MAX / ximage->bytes_per_line
316 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
317 {
318 XDestroyImage (ximage);
319 return false;
320 } 738 {
739 img->w = width;
740 img->h = height;
321 741
322 GC gc = XCreateGC (dpy, pm, 0, 0); 742 rxvt_img *img2 = img->reify ();
323 743 delete img;
324 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 744 img = img2;
325
326 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
327 int channels = gdk_pixbuf_get_n_channels (pixbuf);
328 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
329 char *line = ximage->data;
330
331 for (int y = 0; y < height; y++)
332 { 745 }
746
747 return img;
748}
749
750rxvt_img *
751rxvt_img::transform (const nv matrix[3][3])
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
333 for (int x = 0; x < width; x++) 764 for (int i = 0; i < 2; ++i)
334 {
335 unsigned char *pixel = row + x * channels;
336 uint32_t value;
337 unsigned char r, g, b, a;
338
339 if (channels == 4)
340 {
341 a = pixel[3];
342 r = pixel[0] * a / 0xff;
343 g = pixel[1] * a / 0xff;
344 b = pixel[2] * a / 0xff;
345 }
346 else
347 {
348 a = 0xff;
349 r = pixel[0];
350 g = pixel[1];
351 b = pixel[2];
352 }
353
354 value = ((r >> (8 - width_r)) << sh_r)
355 | ((g >> (8 - width_g)) << sh_g)
356 | ((b >> (8 - width_b)) << sh_b)
357 | ((a >> (8 - width_a)) << sh_a);
358
359 if (ximage->bits_per_pixel == 32)
360 ((uint32_t *)line)[x] = value;
361 else
362 XPutPixel (ximage, x, y, value);
363 }
364
365 row += rowstride;
366 line += ximage->bytes_per_line;
367 } 765 {
766 nv v;
368 767
369 XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height); 768 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;
370 XDestroyImage (ximage); 769 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
371 XFreeGC (dpy, gc); 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 }
372 773
373 return true; 774 float sx = rmin [0] - x;
374} 775 float sy = rmin [1] - y;
375 776
376rxvt_img * 777 // TODO: adjust matrix for subpixel accuracy
377rxvt_img::clone () 778 int nx = floor (rmin [0]);
378{ 779 int ny = floor (rmin [1]);
379 return new rxvt_img (*this);
380}
381 780
382rxvt_img * 781 int new_width = ceil (rmax [0] - rmin [0]);
383rxvt_img::reify () 782 int new_height = ceil (rmax [1] - rmin [1]);
384{ 783
784 m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);
785
786 mat3x3 inv = m.invert ();
787
385 rxvt_img *img = new rxvt_img (s, format, 0, 0, w, h); 788 rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
386 img->alloc (); 789 img->alloc ();
387 790
388 // todo, if x==0 and y==0 and w==real width we could clone
389 // but that involves an rtt to find pixmap width.
390
391 Display *dpy = s->display->dpy; 791 Display *dpy = s->display->dpy;
392 XRenderPictureAttributes pa; 792 Picture src = picture ();
393 pa.repeat = repeat;
394 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
395 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 793 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
396 794
795 XTransform xfrm;
796
797 for (int i = 0; i < 3; ++i)
798 for (int j = 0; j < 3; ++j)
799 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
800
801 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
802 XRenderSetPictureTransform (dpy, src, &xfrm);
397 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 803 XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
398 804
399 XRenderFreePicture (dpy, src); 805 XRenderFreePicture (dpy, src);
400 XRenderFreePicture (dpy, dst); 806 XRenderFreePicture (dpy, dst);
401 807
402 return img; 808 return img;
403} 809}
404 810
405rxvt_img * 811rxvt_img *
406rxvt_img::sub_rect (int x, int y, int width, int height) 812rxvt_img::scale (int new_width, int new_height)
407{ 813{
408 rxvt_img *img = clone (); 814 if (w == new_width && h == new_height)
815 return clone ();
409 816
410 img->x += x; 817 int old_repeat_mode = repeat;
411 img->y += y; 818 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
412 img->w = width; 819
413 img->h = height; 820 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
821
822 repeat = old_repeat_mode;
823 img->repeat = repeat;
414 824
415 return img; 825 return img;
416} 826}
417 827
418rxvt_img * 828rxvt_img *
419rxvt_img::transform (int new_width, int new_height, double matrix[9]) 829rxvt_img::rotate (int cx, int cy, nv phi)
420{ 830{
831#if 0
832 { c, -s, cx - c * cx + s * cy },
833 { s, c, cy - s * cx - c * cy },
834 { 0, 0, 1 }
835#endif
836
837 move (-cx, -cy);
838 rxvt_img *img = transform (mat3x3::rotate (phi));
839 move ( cx, cy);
840 img->move (cx, cy);
841
842 return img;
843}
844
845rxvt_img *
846rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
847{
848 if (new_format == format)
849 return clone ();
850
421 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height); 851 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
422 img->alloc (); 852 img->alloc ();
423 853
424 Display *dpy = s->display->dpy; 854 Display *dpy = s->display->dpy;
425 XRenderPictureAttributes pa; 855 Picture src = picture ();
426 pa.repeat = repeat;
427 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
428 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 856 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
857 int op = PictOpSrc;
429 858
430 XTransform xfrm; 859 if (format->direct.alphaMask && !new_format->direct.alphaMask)
860 {
861 // does it have to be that complicated
862 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
863 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
431 864
432 for (int i = 0; i < 3; ++i) 865 op = PictOpOver;
433 for (int j = 0; j < 3; ++j) 866 }
434 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
435 867
436 xfrm.matrix [0][2] += XDoubleToFixed (x);//TODO
437 xfrm.matrix [0][3] += XDoubleToFixed (y);
438
439 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
440 XRenderSetPictureTransform (dpy, src, &xfrm);
441 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 868 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
442 869
443 XRenderFreePicture (dpy, src); 870 XRenderFreePicture (dpy, src);
444 XRenderFreePicture (dpy, dst); 871 XRenderFreePicture (dpy, dst);
445 872
446 return img; 873 return img;
447} 874}
448 875
449rxvt_img * 876rxvt_img *
450rxvt_img::scale (int new_width, int new_height)
451{
452 double matrix[9] = {
453 w / (double)new_width, 0, 0,
454 0, h / (double)new_height, 0,
455 0, 0, 1
456 };
457
458 return transform (new_width, new_height, matrix);
459}
460
461rxvt_img *
462rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
463{
464 double s = sin (phi);
465 double c = cos (phi);
466
467 double matrix[9] = {
468 c, -s, -c * x + s * y + x,
469 s, c, -s * x - c * y + y,
470 0, 0, 1
471 };
472
473 return transform (new_width, new_height, matrix);
474}
475
476rxvt_img *
477rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
478{
479 if (new_format == format)
480 return clone ();
481
482 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h);
483 img->alloc ();
484
485 Display *dpy = s->display->dpy;
486 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
487 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
488 int op = PictOpSrc;
489
490 if (format->direct.alphaMask && !new_format->direct.alphaMask)
491 {
492 // does it have to be that complicated
493 rgba c;
494 bg.get (c);
495
496 XRenderColor rc = { c.r, c.g, c.b, 0xffff };
497 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
498
499 op = PictOpOver;
500 }
501
502 XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
503
504 XRenderFreePicture (dpy, src);
505 XRenderFreePicture (dpy, dst);
506
507 return img;
508}
509
510rxvt_img *
511rxvt_img::blend (rxvt_img *img, double factor) 877rxvt_img::blend (rxvt_img *img, nv factor)
512{ 878{
513 rxvt_img *img2 = clone (); 879 rxvt_img *img2 = clone ();
514 Display *dpy = s->display->dpy; 880 Display *dpy = s->display->dpy;
515 Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 881 Picture src = img->picture ();
516 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 882 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
517 Picture mask = create_xrender_mask (dpy, img->pm, False); 883 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
518 884
519 XRenderColor mask_c; 885 XRenderColor mask_c;
520 886
521 mask_c.alpha = float_to_component (factor); 887 mask_c.alpha = float_to_component (factor);
522 mask_c.red = 888 mask_c.red =

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines