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.92 by root, Fri Jun 15 18:05:15 2012 UTC vs.
Revision 1.95 by root, Fri Jun 15 18:36:26 2012 UTC

… …
5 5
6#if HAVE_IMG 6#if HAVE_IMG
7 7
8typedef rxvt_img::nv nv; 8typedef rxvt_img::nv nv;
9 9
10namespace
11{
12
10struct mat3x3 13 struct mat3x3
11{ 14 {
12 nv v[3][3]; 15 nv v[3][3];
13 16
14 mat3x3 () 17 mat3x3 ()
15 { 18 {
19 }
20
21 mat3x3 (const nv *matrix)
22 {
23 memcpy (v, matrix, sizeof (v));
24 }
25
26 mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
27 {
28 v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
29 v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
30 v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
31 }
32
33 mat3x3 invert ();
34
35 nv *operator [](int i) { return &v[i][0]; }
36 const nv *operator [](int i) const { return &v[i][0]; }
37
38 operator const nv * () const { return &v[0][0]; }
39 operator nv * () { return &v[0][0]; }
40
41 // quite inefficient, hopefully gcc pulls the w calc out of any loops
42 nv apply1 (int i, nv x, nv y)
43 {
44 mat3x3 &m = *this;
45
46 nv v = m[i][0] * x + m[i][1] * y + m[i][2];
47 nv w = m[2][0] * x + m[2][1] * y + m[2][2];
48
49 return v * (1. / w);
50 }
51
52 static mat3x3 translate (nv x, nv y);
53 static mat3x3 scale (nv s, nv t);
54 static mat3x3 rotate (nv phi);
55 };
56
57 mat3x3
58 mat3x3::invert ()
59 {
60 mat3x3 &m = *this;
61 mat3x3 inv;
62
63 nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
64 nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
65 nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
66
67 nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
68
69 inv[0][0] = invdet * s0;
70 inv[0][1] = invdet * s1;
71 inv[0][2] = invdet * s2;
72
73 inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
74 inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
75 inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
76
77 inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
78 inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
79 inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
80
81 return inv;
16 } 82 }
17 83
18 mat3x3 (nv matrix[3][3]) 84 static mat3x3
85 operator *(const mat3x3 &a, const mat3x3 &b)
19 { 86 {
20 memcpy (v, matrix, sizeof (v)); 87 mat3x3 r;
88
89 for (int i = 0; i < 3; ++i)
90 for (int j = 0; j < 3; ++j)
91 r[i][j] = a[i][0] * b[0][j]
92 + a[i][1] * b[1][j]
93 + a[i][2] * b[2][j];
94
95 return r;
21 } 96 }
22 97
23 mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33) 98 mat3x3
99 mat3x3::translate (nv x, nv y)
24 { 100 {
25 v[0][0] = v11; v[0][1] = v12; v[0][2] = v13; 101 return mat3x3 (
26 v[1][0] = v21; v[1][1] = v22; v[1][2] = v23; 102 1, 0, x,
27 v[2][0] = v31; v[2][1] = v32; v[2][2] = v33; 103 0, 1, y,
104 0, 0, 1
105 );
28 } 106 }
29 107
30 mat3x3 invert (); 108 mat3x3
31 109 mat3x3::scale (nv s, nv t)
32 nv *operator [](int i) { return &v[i][0]; }
33 const nv *operator [](int i) const { return &v[i][0]; }
34
35 // quite inefficient, hopefully gcc pulls the w calc out of any loops
36 nv apply1 (int i, nv x, nv y)
37 { 110 {
38 mat3x3 &m = *this; 111 return mat3x3 (
39 112 s, 0, 0,
40 nv v = m[i][0] * x + m[i][1] * y + m[i][2]; 113 0, t, 0,
41 nv w = m[2][0] * x + m[2][1] * y + m[2][2]; 114 0, 0, 1
42 115 );
43 return v * (1. / w);
44 } 116 }
45 117
46 static mat3x3 translate (nv x, nv y); 118 // clockwise
47};
48
49mat3x3 119 mat3x3
50mat3x3::invert () 120 mat3x3::rotate (nv phi)
51{ 121 {
52 mat3x3 &m = *this; 122 nv s = sin (phi);
53 mat3x3 inv; 123 nv c = cos (phi);
54 124
55 nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
56 nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
57 nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
58
59 nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
60
61 inv[0][0] = invdet * s0;
62 inv[0][1] = invdet * s1;
63 inv[0][2] = invdet * s2;
64
65 inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
66 inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
67 inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
68
69 inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
70 inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
71 inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
72
73 return inv;
74}
75
76static mat3x3
77operator *(const mat3x3 &a, const mat3x3 &b)
78{
79 mat3x3 r;
80
81 for (int i = 0; i < 3; ++i)
82 for (int j = 0; j < 3; ++j)
83 r[i][j] = a[i][0] * b[0][j]
84 + a[i][1] * b[1][j]
85 + a[i][2] * b[2][j];
86
87 return r;
88}
89
90mat3x3
91mat3x3::translate (nv x, nv y)
92{
93 return mat3x3 ( 125 return mat3x3 (
94 1, 0, x, 126 c, -s, 0,
95 0, 1, y, 127 s, c, 0,
96 0, 0, 1 128 0, 0, 1
97 ); 129 );
130 }
131
98} 132}
99 133
100#if 0 134#if 0
101struct pict 135struct pict
102{ 136{
… …
689 723
690 return img; 724 return img;
691} 725}
692 726
693rxvt_img * 727rxvt_img *
694rxvt_img::transform (nv matrix[3][3]) 728rxvt_img::transform (const nv matrix[3][3])
695{ 729{
730 return transform (mat3x3 (&matrix[0][0]));
731}
732
733rxvt_img *
734rxvt_img::transform (const nv *matrix)
735{
736 mat3x3 m (matrix);
737
696 // calculate new pixel bounding box coordinates 738 // calculate new pixel bounding box coordinates
697 nv r[2], rmin[2], rmax[2]; 739 nv r[2], rmin[2], rmax[2];
698
699 mat3x3 m (matrix);
700 740
701 for (int i = 0; i < 2; ++i) 741 for (int i = 0; i < 2; ++i)
702 { 742 {
703 nv v; 743 nv v;
704 744
… …
736 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 776 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
737 777
738 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 778 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
739 XRenderSetPictureTransform (dpy, src, &xfrm); 779 XRenderSetPictureTransform (dpy, src, &xfrm);
740 XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height); 780 XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
741#if 1
742 {
743 XRenderColor rc = { 65535,0,0,65535 };
744 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, new_width, new_height);
745 }{
746 XRenderColor rc = { 0,0,0,65535 };
747 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 1, 1, new_width - 2, new_height - 2);
748 }
749 XRenderComposite (dpy, PictOpOver, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
750#endif
751 781
752 XRenderFreePicture (dpy, src); 782 XRenderFreePicture (dpy, src);
753 XRenderFreePicture (dpy, dst); 783 XRenderFreePicture (dpy, dst);
754 784
755 return img; 785 return img;
… …
759rxvt_img::scale (int new_width, int new_height) 789rxvt_img::scale (int new_width, int new_height)
760{ 790{
761 if (w == new_width && h == new_height) 791 if (w == new_width && h == new_height)
762 return clone (); 792 return clone ();
763 793
764 nv matrix[3][3] = {
765 { new_width / (nv)w, 0, 0 },
766 { 0, new_height / (nv)h, 0 },
767 { 0, 0, 1 }
768 };
769
770 int old_repeat_mode = repeat; 794 int old_repeat_mode = repeat;
771 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 795 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
772 796
773 rxvt_img *img = transform (matrix); 797 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
774 798
775 repeat = old_repeat_mode; 799 repeat = old_repeat_mode;
776 img->repeat = repeat; 800 img->repeat = repeat;
777 801
778 return img; 802 return img;
779} 803}
780 804
781rxvt_img * 805rxvt_img *
782rxvt_img::rotate (int cx, int cy, nv phi) 806rxvt_img::rotate (int cx, int cy, nv phi)
783{ 807{
784 nv s = sin (phi);
785 nv c = cos (phi);
786
787 nv matrix[3][3] = {
788#if 0 808#if 0
789 { c, -s, cx - c * cx + s * cy }, 809 { c, -s, cx - c * cx + s * cy },
790 { s, c, cy - s * cx - c * cy }, 810 { s, c, cy - s * cx - c * cy },
791 { 0, 0, 1 } 811 { 0, 0, 1 }
792#else
793 { c, -s, 0 },
794 { s, c, 0 },
795 { 0, 0, 1 }
796#endif 812#endif
797 };
798 813
799 move (-cx, -cy); 814 move (-cx, -cy);
800 rxvt_img *img = transform (matrix); 815 rxvt_img *img = transform (mat3x3::rotate (phi));
801 move ( cx, cy); 816 move ( cx, cy);
802 img->move (cx, cy); 817 img->move (cx, cy);
803 818
804 return img; 819 return img;
805} 820}

Diff Legend

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