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.90 by root, Thu Jun 14 19:44: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}
6 156
7#if 0 157#if 0
8struct pict 158struct pict
9{ 159{
10 Display *dpy; 160 Display *dpy;
… …
166 uint8_t r = *src++; 316 uint8_t r = *src++;
167 uint8_t g = *src++; 317 uint8_t g = *src++;
168 uint8_t b = *src++; 318 uint8_t b = *src++;
169 319
170 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b; 320 uint32_t v = (255 << 24) | (r << 16) | (g << 8) | b;
171 321
172 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch) 322 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
173 v = ecb_bswap32 (v); 323 v = ecb_bswap32 (v);
174 324
175 *dst++ = v; 325 *dst++ = v;
176 } 326 }
… …
299 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat); 449 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
300 img->alloc (); 450 img->alloc ();
301 451
302 Picture src = picture (); 452 Picture src = picture ();
303 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 453 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
304 454
305 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 455 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
306 456
307 XRenderFreePicture (dpy, src); 457 XRenderFreePicture (dpy, src);
308 XRenderFreePicture (dpy, dst); 458 XRenderFreePicture (dpy, dst);
309 459
… …
312 462
313 delete img; 463 delete img;
314} 464}
315 465
316static void 466static void
317get_gaussian_kernel (int radius, int width, rxvt_img::nv *kernel, XFixed *params) 467get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
318{ 468{
319 rxvt_img::nv sigma = radius / 2.0; 469 nv sigma = radius / 2.0;
320 rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma; 470 nv scale = sqrt (2.0 * M_PI) * sigma;
321 rxvt_img::nv sum = 0.0; 471 nv sum = 0.0;
322 472
323 for (int i = 0; i < width; i++) 473 for (int i = 0; i < width; i++)
324 { 474 {
325 rxvt_img::nv x = i - width / 2; 475 nv x = i - width / 2;
326 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 476 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
327 sum += kernel[i]; 477 sum += kernel[i];
328 } 478 }
329 479
330 params[0] = XDoubleToFixed (width); 480 params[0] = XDoubleToFixed (width);
… …
517 667
518 Display *dpy = s->display->dpy; 668 Display *dpy = s->display->dpy;
519 Picture src = img->picture (); 669 Picture src = img->picture ();
520 Picture dst = picture (); 670 Picture dst = picture ();
521 Picture mask_p = 0; 671 Picture mask_p = 0;
522 672
523 if (mask != 1.) 673 if (mask != 1.)
524 { 674 {
525 mask_p = create_xrender_mask (dpy, img->pm, False, False); 675 mask_p = create_xrender_mask (dpy, img->pm, False, False);
526 XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) }; 676 XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
527 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 677 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
… …
558 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);
559 img->alloc (); 709 img->alloc ();
560 710
561 Picture src = picture (); 711 Picture src = picture ();
562 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 712 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
563 713
564 if (alpha) 714 if (alpha)
565 { 715 {
566 XRenderColor rc = { 0, 0, 0, 0 }; 716 XRenderColor rc = { 0, 0, 0, 0 };
567 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
568 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);
… …
595 } 745 }
596 746
597 return img; 747 return img;
598} 748}
599 749
600static void
601mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3])
602{
603 rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
604 rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
605 rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
606
607 rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
608
609 inv [0][0] = invdet * s0;
610 inv [0][1] = invdet * s1;
611 inv [0][2] = invdet * s2;
612
613 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
614 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
615 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
616
617 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
618 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
619 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
620}
621
622static rxvt_img::nv
623mat_apply (rxvt_img::nv mat[3][3], int i, rxvt_img::nv x, rxvt_img::nv y)
624{
625 rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
626 rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
627
628 return v * (1. / w);
629}
630
631rxvt_img * 750rxvt_img *
632rxvt_img::transform (nv matrix[3][3]) 751rxvt_img::transform (const nv matrix[3][3])
633{ 752{
753 return transform (mat3x3 (&matrix[0][0]));
754}
755
756rxvt_img *
757rxvt_img::transform (const nv *matrix)
758{
759 mat3x3 m (matrix);
760
634 // calculate new pixel bounding box coordinates 761 // calculate new pixel bounding box coordinates
635 nv rmin[2], rmax[2]; 762 nv r[2], rmin[2], rmax[2];
636 763
637 for (int i = 0; i < 2; ++i) 764 for (int i = 0; i < 2; ++i)
638 { 765 {
639 nv v; 766 nv v;
640 767
641 v = mat_apply (matrix, i, 0+x, 0+y); rmin [i] = rmax [i] = v; 768 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;
642 v = mat_apply (matrix, i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v); 769 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
643 v = mat_apply (matrix, i, 0+x, h+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);
644 v = mat_apply (matrix, i, w+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);
645 } 772 }
773
774 float sx = rmin [0] - x;
775 float sy = rmin [1] - y;
646 776
647 // TODO: adjust matrix for subpixel accuracy 777 // TODO: adjust matrix for subpixel accuracy
648 int dx = floor (rmin [0]); 778 int nx = floor (rmin [0]);
649 int dy = floor (rmin [1]); 779 int ny = floor (rmin [1]);
650 780
651 int new_width = ceil (rmax [0] - dx); 781 int new_width = ceil (rmax [0] - rmin [0]);
652 int new_height = ceil (rmax [1] - dy); 782 int new_height = ceil (rmax [1] - rmin [1]);
653 783
654 nv inv[3][3]; 784 m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);
655 mat_invert (matrix, inv);
656 785
786 mat3x3 inv = m.invert ();
787
657 rxvt_img *img = new rxvt_img (s, format, dx, dy, new_width, new_height, repeat); 788 rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
658 img->alloc (); 789 img->alloc ();
659 790
660 Display *dpy = s->display->dpy; 791 Display *dpy = s->display->dpy;
661 Picture src = picture (); 792 Picture src = picture ();
662 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 793 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
… …
667 for (int j = 0; j < 3; ++j) 798 for (int j = 0; j < 3; ++j)
668 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 799 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
669 800
670 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 801 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
671 XRenderSetPictureTransform (dpy, src, &xfrm); 802 XRenderSetPictureTransform (dpy, src, &xfrm);
672 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 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);
673 804
674 XRenderFreePicture (dpy, src); 805 XRenderFreePicture (dpy, src);
675 XRenderFreePicture (dpy, dst); 806 XRenderFreePicture (dpy, dst);
676 807
677 return img; 808 return img;
… …
681rxvt_img::scale (int new_width, int new_height) 812rxvt_img::scale (int new_width, int new_height)
682{ 813{
683 if (w == new_width && h == new_height) 814 if (w == new_width && h == new_height)
684 return clone (); 815 return clone ();
685 816
686 nv matrix[3][3] = {
687 { new_width / (nv)w, 0, 0 },
688 { 0, new_height / (nv)h, 0 },
689 { 0, 0, 1 }
690 };
691
692 int old_repeat_mode = repeat; 817 int old_repeat_mode = repeat;
693 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 818 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
694 819
695 rxvt_img *img = transform (matrix); 820 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
696 821
697 repeat = old_repeat_mode; 822 repeat = old_repeat_mode;
698 img->repeat = repeat; 823 img->repeat = repeat;
699 824
700 return img; 825 return img;
701} 826}
702 827
703rxvt_img * 828rxvt_img *
704rxvt_img::rotate (int cx, int cy, nv phi) 829rxvt_img::rotate (int cx, int cy, nv phi)
705{ 830{
706 nv s = sin (phi); 831#if 0
707 nv c = cos (phi);
708
709 nv matrix[3][3] = {
710 { c, -s, cx - c * cx + s * cy + 200 }, 832 { c, -s, cx - c * cx + s * cy },
711 { s, c, cy - s * cx - c * cy }, 833 { s, c, cy - s * cx - c * cy },
712 { 0, 0, 1 } 834 { 0, 0, 1 }
713 //{ c, -s, 0 }, 835#endif
714 //{ s, c, 0 },
715 //{ 0, 0, 1 }
716 };
717 836
718 //move (-cx, -cy); 837 move (-cx, -cy);
719 rxvt_img *img = transform (matrix); 838 rxvt_img *img = transform (mat3x3::rotate (phi));
720 //move ( cx, cy); 839 move ( cx, cy);
721 //img->move (cx, cy); 840 img->move (cx, cy);
722 841
723 return img; 842 return img;
724} 843}
725 844
726rxvt_img * 845rxvt_img *

Diff Legend

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