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.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC vs.
Revision 1.97 by sf-exg, Sun Jun 17 17:06:47 2012 UTC

1/*----------------------------------------------------------------------*
2 * File: rxvtimg.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2012 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/
23
24#include <string.h>
1#include <math.h> 25#include <math.h>
2#include "../config.h" 26#include "../config.h"
3#include "rxvt.h" 27#include "rxvt.h"
4 28
5#if HAVE_IMG 29#if HAVE_IMG
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}
6 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{
… …
50 252
51 return img; 253 return img;
52} 254}
53 255
54# if HAVE_PIXBUF 256# if HAVE_PIXBUF
257
55rxvt_img * 258rxvt_img *
56rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb) 259rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
57{ 260{
58 Display *dpy = s->display->dpy; 261 Display *dpy = s->display->dpy;
59 262
… …
63 if (width > 32767 || height > 32767) // well, we *could* upload in chunks 266 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
64 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");
65 268
66 // since we require rgb24/argb32 formats from xrender we assume 269 // since we require rgb24/argb32 formats from xrender we assume
67 // 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
68 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
69 271
70 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 272 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
71 273
72 XImage xi; 274 XImage xi;
73 275
… …
77 xi.format = ZPixmap; 279 xi.format = ZPixmap;
78 xi.byte_order = ImageByteOrder (dpy); 280 xi.byte_order = ImageByteOrder (dpy);
79 xi.bitmap_unit = 0; //XY only, unused 281 xi.bitmap_unit = 0; //XY only, unused
80 xi.bitmap_bit_order = 0; //XY only, unused 282 xi.bitmap_bit_order = 0; //XY only, unused
81 xi.bitmap_pad = BitmapPad (dpy); 283 xi.bitmap_pad = BitmapPad (dpy);
82 xi.depth = depth; 284 xi.depth = 32;
83 xi.bytes_per_line = 0; 285 xi.bytes_per_line = 0;
84 xi.bits_per_pixel = 32; //Z only 286 xi.bits_per_pixel = 32; //Z only
85 xi.red_mask = 0x00000000; //Z only, unused 287 xi.red_mask = 0x00000000; //Z only, unused
86 xi.green_mask = 0x00000000; //Z only, unused 288 xi.green_mask = 0x00000000; //Z only, unused
87 xi.blue_mask = 0x00000000; //Z only, unused 289 xi.blue_mask = 0x00000000; //Z only, unused
… …
96 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");
97 299
98 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line); 300 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
99 301
100 int rowstride = gdk_pixbuf_get_rowstride (pb); 302 int rowstride = gdk_pixbuf_get_rowstride (pb);
101 303 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
102 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
103 unsigned char *row = gdk_pixbuf_get_pixels (pb); 304 unsigned char *row = gdk_pixbuf_get_pixels (pb);
305
104 char *line = xi.data; 306 char *line = xi.data;
105 307
106 for (int y = 0; y < height; y++) 308 for (int y = 0; y < height; y++)
107 { 309 {
108 unsigned char *src = row; 310 unsigned char *src = row;
109 uint32_t *dst = (uint32_t *)line; 311 uint32_t *dst = (uint32_t *)line;
110 312
111 if (depth == 24) 313 if (!pb_has_alpha)
112 for (int x = 0; x < width; x++) 314 for (int x = 0; x < width; x++)
113 { 315 {
114 uint8_t r = *src++; 316 uint8_t r = *src++;
115 uint8_t g = *src++; 317 uint8_t g = *src++;
116 uint8_t b = *src++; 318 uint8_t b = *src++;
117 319
118 uint32_t v = (r << 16) | (g << 8) | b; 320 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
119 321
120 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 322 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
121 v = ecb_bswap32 (v); 323 v = ecb_bswap32 (v);
122 324
123 *dst++ = v; 325 *dst++ = v;
124 } 326 }
… …
140 342
141 row += rowstride; 343 row += rowstride;
142 line += xi.bytes_per_line; 344 line += xi.bytes_per_line;
143 } 345 }
144 346
145 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);
146 img->alloc (); 348 img->alloc ();
147 349
148 GC gc = XCreateGC (dpy, img->pm, 0, 0); 350 GC gc = XCreateGC (dpy, img->pm, 0, 0);
149 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);
150 XFreeGC (dpy, gc); 352 XFreeGC (dpy, gc);
… …
167 369
168 g_object_unref (pb); 370 g_object_unref (pb);
169 371
170 return img; 372 return img;
171} 373}
374
172# endif 375# endif
173 376
174void 377void
175rxvt_img::destroy () 378rxvt_img::destroy ()
176{ 379{
… …
194 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);
195 ref = new pixref (w, h); 398 ref = new pixref (w, h);
196} 399}
197 400
198Picture 401Picture
199rxvt_img::src_picture () 402rxvt_img::picture ()
200{ 403{
201 Display *dpy = s->display->dpy; 404 Display *dpy = s->display->dpy;
202 405
203 XRenderPictureAttributes pa; 406 XRenderPictureAttributes pa;
204 pa.repeat = repeat; 407 pa.repeat = repeat;
… …
223 pm = pm2; 426 pm = pm2;
224 ref = new pixref (ref->w, ref->h); 427 ref = new pixref (ref->w, ref->h);
225} 428}
226 429
227void 430void
228rxvt_img::fill (const rxvt_color &c) 431rxvt_img::fill (const rgba &c)
229{ 432{
230 XGCValues gcv; 433 XRenderColor rc = { c.r, c.g, c.b, c.a };
231 gcv.foreground = c; 434
232 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv); 435 Display *dpy = s->display->dpy;
233 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h); 436 Picture src = picture ();
234 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;
235} 464}
236 465
237static void 466static void
238get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 467get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
239{ 468{
240 double sigma = radius / 2.0; 469 nv sigma = radius / 2.0;
241 double scale = sqrt (2.0 * M_PI) * sigma; 470 nv scale = sqrt (2.0 * M_PI) * sigma;
242 double sum = 0.0; 471 nv sum = 0.0;
243 472
244 for (int i = 0; i < width; i++) 473 for (int i = 0; i < width; i++)
245 { 474 {
246 double x = i - width / 2; 475 nv x = i - width / 2;
247 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 476 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
248 sum += kernel[i]; 477 sum += kernel[i];
249 } 478 }
250 479
251 params[0] = XDoubleToFixed (width); 480 params[0] = XDoubleToFixed (width);
… …
261 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 490 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
262 return clone (); 491 return clone ();
263 492
264 Display *dpy = s->display->dpy; 493 Display *dpy = s->display->dpy;
265 int size = max (rh, rv) * 2 + 1; 494 int size = max (rh, rv) * 2 + 1;
266 double *kernel = (double *)malloc (size * sizeof (double)); 495 nv *kernel = (nv *)malloc (size * sizeof (nv));
267 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 496 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
268 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);
269 img->alloc (); 498 img->alloc ();
270 499
271 XRenderPictureAttributes pa; 500 XRenderPictureAttributes pa;
… …
309 w, h); 538 w, h);
310 } 539 }
311 540
312 free (kernel); 541 free (kernel);
313 free (params); 542 free (params);
543
314 XRenderFreePicture (dpy, src); 544 XRenderFreePicture (dpy, src);
315 XRenderFreePicture (dpy, dst); 545 XRenderFreePicture (dpy, dst);
316 XRenderFreePicture (dpy, tmp); 546 XRenderFreePicture (dpy, tmp);
317 547
318 return img; 548 return img;
… …
392 if (r < 0 || g < 0 || b < 0 || a < 0) 622 if (r < 0 || g < 0 || b < 0 || a < 0)
393 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n"); 623 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
394 624
395 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 625 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
396 img->alloc (); 626 img->alloc ();
397 627 img->fill (rgba (0, 0, 0, 0));
398 {
399 rxvt_color empty;
400 empty.set (s, rgba (0, 0, 0, 0));
401 img->fill (empty);
402 }
403 628
404 // premultiply (yeah, these are not exact, sue me or fix it) 629 // premultiply (yeah, these are not exact, sue me or fix it)
405 r = (r * (a >> 8)) >> 8; 630 r = (r * (a >> 8)) >> 8;
406 g = (g * (a >> 8)) >> 8; 631 g = (g * (a >> 8)) >> 8;
407 b = (b * (a >> 8)) >> 8; 632 b = (b * (a >> 8)) >> 8;
408 633
409 Display *dpy = s->display->dpy; 634 Display *dpy = s->display->dpy;
410 635
411 Picture src = src_picture (); 636 Picture src = picture ();
412 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 637 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
413 Picture mul = create_xrender_mask (dpy, pm, True, True); 638 Picture mul = create_xrender_mask (dpy, pm, True, True);
414 639
415 //TODO: this operator does not yet implement some useful contrast 640 //TODO: this operator does not yet implement some useful contrast
416 while (r | g | b | a) 641 while (r | g | b | a)
… …
433 ::swap (img->pm , pm ); 658 ::swap (img->pm , pm );
434 659
435 delete img; 660 delete img;
436} 661}
437 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) };
677 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
678 }
679
680 XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
681
682 XRenderFreePicture (dpy, src);
683 XRenderFreePicture (dpy, dst);
684
685 if (mask_p)
686 XRenderFreePicture (dpy, mask_p);
687}
688
438rxvt_img * 689rxvt_img *
439rxvt_img::clone () 690rxvt_img::clone ()
440{ 691{
441 return new rxvt_img (*this); 692 return new rxvt_img (*this);
442}
443
444static XRenderPictFormat *
445find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
446{
447 if (format->direct.alphaMask)
448 return format; // already has alpha
449
450 // try to find a suitable alpha format, one bit alpha is enough for our purposes
451 if (format->type == PictTypeDirect)
452 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
453 if (f->direct.alphaMask
454 && f->type == PictTypeDirect
455 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
456 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
457 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
458 return f;
459
460 // should be a very good fallback
461 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
462} 693}
463 694
464rxvt_img * 695rxvt_img *
465rxvt_img::reify () 696rxvt_img::reify ()
466{ 697{
… …
475 && repeat == RepeatNone; // and we have no good pixels to fill with 706 && repeat == RepeatNone; // and we have no good pixels to fill with
476 707
477 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);
478 img->alloc (); 709 img->alloc ();
479 710
480 Picture src = src_picture (); 711 Picture src = picture ();
481 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 712 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
482 713
483 if (alpha) 714 if (alpha)
484 { 715 {
485 XRenderColor rc = { 0, 0, 0, 0 }; 716 XRenderColor rc = { 0, 0, 0, 0 };
486 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
487 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);
488 } 719 }
489 else 720 else
490 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);
491 722
492 XRenderFreePicture (dpy, src); 723 XRenderFreePicture (dpy, src);
493 XRenderFreePicture (dpy, dst); 724 XRenderFreePicture (dpy, dst);
494 725
495 return img; 726 return img;
… …
498rxvt_img * 729rxvt_img *
499rxvt_img::sub_rect (int x, int y, int width, int height) 730rxvt_img::sub_rect (int x, int y, int width, int height)
500{ 731{
501 rxvt_img *img = clone (); 732 rxvt_img *img = clone ();
502 733
503 img->x += x; 734 img->x -= x;
504 img->y += y; 735 img->y -= y;
505 736
506 if (w != width || h != height) 737 if (w != width || h != height)
507 { 738 {
508 img->w = width; 739 img->w = width;
509 img->h = height; 740 img->h = height;
… …
515 746
516 return img; 747 return img;
517} 748}
518 749
519rxvt_img * 750rxvt_img *
520rxvt_img::transform (int new_width, int new_height, double matrix[9]) 751rxvt_img::transform (const nv matrix[3][3])
521{ 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
522 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);
523 img->alloc (); 789 img->alloc ();
524 790
525 Display *dpy = s->display->dpy; 791 Display *dpy = s->display->dpy;
526 Picture src = src_picture (); 792 Picture src = picture ();
527 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 793 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
528 794
529 XTransform xfrm; 795 XTransform xfrm;
530 796
531 for (int i = 0; i < 3; ++i) 797 for (int i = 0; i < 3; ++i)
532 for (int j = 0; j < 3; ++j) 798 for (int j = 0; j < 3; ++j)
533 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 799 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
534
535 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
536 xfrm.matrix [1][2] -= XDoubleToFixed (y);
537 800
538 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 801 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
539 XRenderSetPictureTransform (dpy, src, &xfrm); 802 XRenderSetPictureTransform (dpy, src, &xfrm);
540 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);
541 804
542 XRenderFreePicture (dpy, src); 805 XRenderFreePicture (dpy, src);
543 XRenderFreePicture (dpy, dst); 806 XRenderFreePicture (dpy, dst);
544 807
545 return img; 808 return img;
… …
549rxvt_img::scale (int new_width, int new_height) 812rxvt_img::scale (int new_width, int new_height)
550{ 813{
551 if (w == new_width && h == new_height) 814 if (w == new_width && h == new_height)
552 return clone (); 815 return clone ();
553 816
554 double matrix[9] = {
555 w / (double)new_width, 0, 0,
556 0, h / (double)new_height, 0,
557 0, 0, 1
558 };
559
560 int old_repeat_mode = repeat; 817 int old_repeat_mode = repeat;
561 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
562 819
563 rxvt_img *img = transform (new_width, new_height, matrix); 820 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
564 821
565 repeat = old_repeat_mode; 822 repeat = old_repeat_mode;
566 img->repeat = repeat; 823 img->repeat = repeat;
567 824
568 return img; 825 return img;
569} 826}
570 827
571rxvt_img * 828rxvt_img *
572rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 829rxvt_img::rotate (int cx, int cy, nv phi)
573{ 830{
574 double s = sin (phi); 831#if 0
575 double c = cos (phi);
576
577 double matrix[9] = {
578 c, -s, -c * x + s * y + x, 832 { c, -s, cx - c * cx + s * cy },
579 s, c, -s * x - c * y + y, 833 { s, c, cy - s * cx - c * cy },
580 0, 0, 1 834 { 0, 0, 1 }
581 }; 835#endif
582 836
583 return transform (new_width, new_height, matrix); 837 move (-cx, -cy);
584} 838 rxvt_img *img = transform (mat3x3::rotate (phi));
839 move ( cx, cy);
840 img->move (cx, cy);
585 841
842 return img;
843}
844
586rxvt_img * 845rxvt_img *
587rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg) 846rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
588{ 847{
589 if (new_format == format) 848 if (new_format == format)
590 return clone (); 849 return clone ();
591 850
592 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);
593 img->alloc (); 852 img->alloc ();
594 853
595 Display *dpy = s->display->dpy; 854 Display *dpy = s->display->dpy;
596 Picture src = src_picture (); 855 Picture src = picture ();
597 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 856 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
598 int op = PictOpSrc; 857 int op = PictOpSrc;
599 858
600 if (format->direct.alphaMask && !new_format->direct.alphaMask) 859 if (format->direct.alphaMask && !new_format->direct.alphaMask)
601 { 860 {
602 // does it have to be that complicated 861 // does it have to be that complicated
603 rgba c;
604 bg.get (c);
605
606 XRenderColor rc = { c.r, c.g, c.b, 0xffff }; 862 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
607 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h); 863 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
608 864
609 op = PictOpOver; 865 op = PictOpOver;
610 } 866 }
611 867
… …
616 872
617 return img; 873 return img;
618} 874}
619 875
620rxvt_img * 876rxvt_img *
621rxvt_img::blend (rxvt_img *img, double factor) 877rxvt_img::blend (rxvt_img *img, nv factor)
622{ 878{
623 rxvt_img *img2 = clone (); 879 rxvt_img *img2 = clone ();
624 Display *dpy = s->display->dpy; 880 Display *dpy = s->display->dpy;
625 Picture src = img->src_picture (); 881 Picture src = img->picture ();
626 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 882 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
627 Picture mask = create_xrender_mask (dpy, img->pm, False, False); 883 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
628 884
629 XRenderColor mask_c; 885 XRenderColor mask_c;
630 886

Diff Legend

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