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.193 by root, Tue Jun 12 18:25:57 2012 UTC vs.
Revision 1.194 by root, Thu Jun 14 17:06:57 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
101 return c;
71} 102}
72 103
73///////////////////////////////////////////////////////////////////////////// 104/////////////////////////////////////////////////////////////////////////////
74 105
75static wchar_t * 106static wchar_t *
2203 RETVAL 2234 RETVAL
2204 2235
2205void 2236void
2206rxvt_img::fill (SV *c) 2237rxvt_img::fill (SV *c)
2207 INIT: 2238 INIT:
2208 rxvt_color rc; 2239 rgba cc = parse_rgba (c, THIS->s);
2209 parse_color (THIS->s, rc, c);
2210 C_ARGS: rc 2240 C_ARGS: cc
2211 2241
2212void 2242void
2213rxvt_img::DESTROY () 2243rxvt_img::DESTROY ()
2214 CODE: 2244 CODE:
2215 delete THIS; 2245 delete THIS;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines