ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtperl.xs
(Generate patch)

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.192 by root, Tue Jun 12 10:45:53 2012 UTC vs.
Revision 1.195 by root, Thu Jun 14 17:16:05 2012 UTC

… …
61#endif 61#endif
62typedef rxvt_img * urxvt__img; 62typedef rxvt_img * urxvt__img;
63 63
64///////////////////////////////////////////////////////////////////////////// 64/////////////////////////////////////////////////////////////////////////////
65 65
66static void 66static rgba
67parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 67parse_rgba (SV *sv, rxvt_screen *s = 0)
68{ 68{
69 //TODO: support component stuff, 0..1 69 rgba c;
70
71 if (AV *av = (AV *)SvRV (sv))
72 {
73 if (SvTYPE ((SV *)av) != SVt_PVAV)
74 croak ("colour must be either a colour string, or an array,");
75
76 int len = av_len (av) + 1;
77
78 if (len != 1 && len != 3 && len != 4)
79 croak ("component colour array must have 1, 3 or 4 components,");
80
81 c.a = rgba::MAX_CC;
82
83 c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
84
85 if (len >= 3)
86 {
87 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
88 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
89
90 if (len >= 4)
91 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
92 }
93 }
94 else if (s)
95 {
96 rxvt_color rc;
70 c.set (s, SvPVbyte_nolen (sv)); 97 rc.set (s, SvPVbyte_nolen (sv));
98 rc.get (c);
99 }
100 else
101 croak ("unable to parse colour,");
102
103 return c;
71} 104}
72 105
73///////////////////////////////////////////////////////////////////////////// 106/////////////////////////////////////////////////////////////////////////////
74 107
75static wchar_t * 108static wchar_t *
… …
2203 RETVAL 2236 RETVAL
2204 2237
2205void 2238void
2206rxvt_img::fill (SV *c) 2239rxvt_img::fill (SV *c)
2207 INIT: 2240 INIT:
2208 rxvt_color rc; 2241 rgba cc = parse_rgba (c, THIS->s);
2209 parse_color (THIS->s, rc, c);
2210 C_ARGS: rc 2242 C_ARGS: cc
2211 2243
2212void 2244void
2213rxvt_img::DESTROY () 2245rxvt_img::DESTROY ()
2214 CODE: 2246 CODE:
2215 delete THIS; 2247 delete THIS;
… …
2245 2277
2246rxvt_img * 2278rxvt_img *
2247rxvt_img::blur (int rh, int rv) 2279rxvt_img::blur (int rh, int rv)
2248 2280
2249rxvt_img * 2281rxvt_img *
2250rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33, int new_width = 0, int new_height = 0) 2282rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)
2251 INIT: 2283 INIT:
2252 double matrix[9] = { 2284 double matrix[3][3] = {
2253 p11, p12, p13, 2285 { p11, p12, p13 },
2254 p21, p22, p23, 2286 { p21, p22, p23 },
2255 p31, p32, p33 2287 { p31, p32, p33 }
2256 }; 2288 };
2257 C_ARGS: matrix, new_width, new_height 2289 C_ARGS: matrix
2258 2290
2259rxvt_img * 2291rxvt_img *
2260rxvt_img::scale (int new_width, int new_height) 2292rxvt_img::scale (int new_width, int new_height)
2261 2293
2262rxvt_img * 2294rxvt_img *
2263rxvt_img::rotate (int x, int y, NV phi, int new_width = 0, int new_height = 0) 2295rxvt_img::rotate (int x, int y, NV phi)
2264 2296
2265#endif 2297#endif
2266 2298

Diff Legend

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