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.197 by root, Thu Jun 14 18:19:11 2012 UTC

… …
58 58
59#if HAVE_PIXBUF 59#if HAVE_PIXBUF
60typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif 61#endif
62typedef rxvt_img * urxvt__img; 62typedef rxvt_img * urxvt__img;
63typedef rxvt_img::nv rxvt_img__nv;
63 64
64///////////////////////////////////////////////////////////////////////////// 65/////////////////////////////////////////////////////////////////////////////
65 66
66static void 67static rgba
67parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 68parse_rgba (SV *sv, rxvt_screen *s = 0)
68{ 69{
69 //TODO: support component stuff, 0..1 70 rgba c;
71
72 if (AV *av = (AV *)SvRV (sv))
73 {
74 if (SvTYPE ((SV *)av) != SVt_PVAV)
75 croak ("colour must be either a colour string, or an array,");
76
77 int len = av_len (av) + 1;
78
79 if (len != 1 && len != 3 && len != 4)
80 croak ("component colour array must have 1, 3 or 4 components,");
81
82 c.a = rgba::MAX_CC;
83
84 c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
85
86 if (len >= 3)
87 {
88 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
89 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
90
91 if (len >= 4)
92 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
93 }
94 }
95 else if (s)
96 {
97 rxvt_color rc;
70 c.set (s, SvPVbyte_nolen (sv)); 98 rc.set (s, SvPVbyte_nolen (sv));
99 rc.get (c);
100 }
101 else
102 croak ("unable to parse colour,");
103
104 return c;
71} 105}
72 106
73///////////////////////////////////////////////////////////////////////////// 107/////////////////////////////////////////////////////////////////////////////
74 108
75static wchar_t * 109static wchar_t *
… …
2063 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2097 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2064 2098
2065#if HAVE_IMG 2099#if HAVE_IMG
2066 2100
2067rxvt_img * 2101rxvt_img *
2068rxvt_term::new_img (SV *format, int width = 1, int height = 1) 2102rxvt_term::new_img (SV *format, int x = 0, int y = 0, int width = 1, int height = 1)
2069 CODE: 2103 CODE:
2070 XRenderPictFormat *f = SvOK (format) 2104 XRenderPictFormat *f = SvOK (format)
2071 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2105 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2072 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2106 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2073 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height); 2107 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2074 RETVAL->alloc (); 2108 RETVAL->alloc ();
2075 OUTPUT: 2109 OUTPUT:
2076 RETVAL 2110 RETVAL
2077 2111
2078#if ENABLE_TRANSPARENCY 2112#if ENABLE_TRANSPARENCY
… …
2179#if HAVE_IMG 2213#if HAVE_IMG
2180 2214
2181# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 2215# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
2182# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 2216# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2183 2217
2218void
2219rxvt_img::geometry ()
2220 PPCODE:
2221 EXTEND (SP, 4);
2222 PUSHs (sv_2mortal (newSViv (THIS->x)));
2223 PUSHs (sv_2mortal (newSViv (THIS->y)));
2224 PUSHs (sv_2mortal (newSViv (THIS->w)));
2225 PUSHs (sv_2mortal (newSViv (THIS->h)));
2226
2227int
2228rxvt_img::x ()
2229 CODE:
2230 RETVAL = THIS->x;
2231 OUTPUT:
2232 RETVAL
2233
2234int
2235rxvt_img::y ()
2236 CODE:
2237 RETVAL = THIS->y;
2238 OUTPUT:
2239 RETVAL
2240
2184int 2241int
2185rxvt_img::w () 2242rxvt_img::w ()
2186 CODE: 2243 CODE:
2187 RETVAL = THIS->w; 2244 RETVAL = THIS->w;
2188 OUTPUT: 2245 OUTPUT:
… …
2203 RETVAL 2260 RETVAL
2204 2261
2205void 2262void
2206rxvt_img::fill (SV *c) 2263rxvt_img::fill (SV *c)
2207 INIT: 2264 INIT:
2208 rxvt_color rc; 2265 rgba cc = parse_rgba (c, THIS->s);
2209 parse_color (THIS->s, rc, c);
2210 C_ARGS: rc 2266 C_ARGS: cc
2211 2267
2212void 2268void
2213rxvt_img::DESTROY () 2269rxvt_img::DESTROY ()
2214 CODE: 2270 CODE:
2215 delete THIS; 2271 delete THIS;
… …
2227 2283
2228void 2284void
2229rxvt_img::move (int dx, int dy) 2285rxvt_img::move (int dx, int dy)
2230 2286
2231void 2287void
2232rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.) 2288rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2233 2289
2234void 2290void
2235rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2291rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2236 2292
2237rxvt_img * 2293rxvt_img *
2238rxvt_img::clone () 2294rxvt_img::clone ()
2239 2295
2240rxvt_img * 2296rxvt_img *
… …
2245 2301
2246rxvt_img * 2302rxvt_img *
2247rxvt_img::blur (int rh, int rv) 2303rxvt_img::blur (int rh, int rv)
2248 2304
2249rxvt_img * 2305rxvt_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) 2306rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33)
2251 INIT: 2307 INIT:
2252 double matrix[9] = { 2308 rxvt_img::nv matrix[3][3] = {
2253 p11, p12, p13, 2309 { p11, p12, p13 },
2254 p21, p22, p23, 2310 { p21, p22, p23 },
2255 p31, p32, p33 2311 { p31, p32, p33 }
2256 }; 2312 };
2257 C_ARGS: matrix, new_width, new_height 2313 C_ARGS: matrix
2258 2314
2259rxvt_img * 2315rxvt_img *
2260rxvt_img::scale (int new_width, int new_height) 2316rxvt_img::scale (int new_width, int new_height)
2261 2317
2262rxvt_img * 2318rxvt_img *
2263rxvt_img::rotate (int x, int y, NV phi, int new_width = 0, int new_height = 0) 2319rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2264 2320
2265#endif 2321#endif
2266 2322

Diff Legend

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