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.199 by root, Thu Jun 14 19:31:17 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 (SvROK (sv))
73 {
74 AV *av = (AV *)SvRV (sv);
75
76 if (SvTYPE ((SV *)av) != SVt_PVAV)
77 croak ("colour must be either a colour string, or an array,");
78
79 int len = av_len (av) + 1;
80
81 if (len != 1 && len != 3 && len != 4)
82 croak ("component colour array must have 1, 3 or 4 components,");
83
84 c.a = rgba::MAX_CC;
85
86 c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
87
88 if (len >= 3)
89 {
90 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
91 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
92
93 if (len >= 4)
94 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
95 }
96 }
97 else if (s)
98 {
99 rxvt_color rc;
70 c.set (s, SvPVbyte_nolen (sv)); 100 rc.set (s, SvPVbyte_nolen (sv));
101 rc.get (c);
102 }
103 else
104 croak ("unable to parse colour,");
105
106 return c;
71} 107}
72 108
73///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
74 110
75static wchar_t * 111static wchar_t *
… …
875 const_iv (PictStandardA1), 911 const_iv (PictStandardA1),
876 const_iv (RepeatNone), 912 const_iv (RepeatNone),
877 const_iv (RepeatNormal), 913 const_iv (RepeatNormal),
878 const_iv (RepeatPad), 914 const_iv (RepeatPad),
879 const_iv (RepeatReflect), 915 const_iv (RepeatReflect),
916 // all versions
917 const_iv (PictOpClear),
918 const_iv (PictOpSrc),
919 const_iv (PictOpDst),
920 const_iv (PictOpOver),
921 const_iv (PictOpOverReverse),
922 const_iv (PictOpIn),
923 const_iv (PictOpInReverse),
924 const_iv (PictOpOut),
925 const_iv (PictOpOutReverse),
926 const_iv (PictOpAtop),
927 const_iv (PictOpAtopReverse),
928 const_iv (PictOpXor),
929 const_iv (PictOpAdd),
930 const_iv (PictOpSaturate),
931 // 0.2+
932 const_iv (PictOpDisjointClear),
933 const_iv (PictOpDisjointSrc),
934 const_iv (PictOpDisjointDst),
935 const_iv (PictOpDisjointOver),
936 const_iv (PictOpDisjointOverReverse),
937 const_iv (PictOpDisjointIn),
938 const_iv (PictOpDisjointInReverse),
939 const_iv (PictOpDisjointOut),
940 const_iv (PictOpDisjointOutReverse),
941 const_iv (PictOpDisjointAtop),
942 const_iv (PictOpDisjointAtopReverse),
943 const_iv (PictOpDisjointXor),
944 const_iv (PictOpConjointClear),
945 const_iv (PictOpConjointSrc),
946 const_iv (PictOpConjointDst),
947 const_iv (PictOpConjointOver),
948 const_iv (PictOpConjointOverReverse),
949 const_iv (PictOpConjointIn),
950 const_iv (PictOpConjointInReverse),
951 const_iv (PictOpConjointOut),
952 const_iv (PictOpConjointOutReverse),
953 const_iv (PictOpConjointAtop),
954 const_iv (PictOpConjointAtopReverse),
955 const_iv (PictOpConjointXor),
956 // 0.11+
957 const_iv (PictOpMultiply),
958 const_iv (PictOpScreen),
959 const_iv (PictOpOverlay),
960 const_iv (PictOpDarken),
961 const_iv (PictOpLighten),
962 const_iv (PictOpColorDodge),
963 const_iv (PictOpColorBurn),
964 const_iv (PictOpHardLight),
965 const_iv (PictOpSoftLight),
966 const_iv (PictOpDifference),
967 const_iv (PictOpExclusion),
968 const_iv (PictOpHSLHue),
969 const_iv (PictOpHSLSaturation),
970 const_iv (PictOpHSLColor),
971 const_iv (PictOpHSLLuminosity),
880#endif 972#endif
881# if 0 973# if 0
882 const_iv (XIMForwardChar), 974 const_iv (XIMForwardChar),
883 const_iv (XIMBackwardChar), 975 const_iv (XIMBackwardChar),
884 const_iv (XIMForwardWord), 976 const_iv (XIMForwardWord),
… …
2063 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2155 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2064 2156
2065#if HAVE_IMG 2157#if HAVE_IMG
2066 2158
2067rxvt_img * 2159rxvt_img *
2068rxvt_term::new_img (SV *format, int width = 1, int height = 1) 2160rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2069 CODE: 2161 CODE:
2070 XRenderPictFormat *f = SvOK (format) 2162 XRenderPictFormat *f = SvOK (format)
2071 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2163 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2072 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2164 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2073 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height); 2165 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2074 RETVAL->alloc (); 2166 RETVAL->alloc ();
2075 OUTPUT: 2167 OUTPUT:
2076 RETVAL 2168 RETVAL
2077 2169
2078#if ENABLE_TRANSPARENCY 2170#if ENABLE_TRANSPARENCY
… …
2179#if HAVE_IMG 2271#if HAVE_IMG
2180 2272
2181# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 2273# 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); 2274# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2183 2275
2276void
2277rxvt_img::geometry ()
2278 PPCODE:
2279 EXTEND (SP, 4);
2280 PUSHs (sv_2mortal (newSViv (THIS->x)));
2281 PUSHs (sv_2mortal (newSViv (THIS->y)));
2282 PUSHs (sv_2mortal (newSViv (THIS->w)));
2283 PUSHs (sv_2mortal (newSViv (THIS->h)));
2284
2285int
2286rxvt_img::x ()
2287 CODE:
2288 RETVAL = THIS->x;
2289 OUTPUT:
2290 RETVAL
2291
2292int
2293rxvt_img::y ()
2294 CODE:
2295 RETVAL = THIS->y;
2296 OUTPUT:
2297 RETVAL
2298
2184int 2299int
2185rxvt_img::w () 2300rxvt_img::w ()
2186 CODE: 2301 CODE:
2187 RETVAL = THIS->w; 2302 RETVAL = THIS->w;
2188 OUTPUT: 2303 OUTPUT:
… …
2203 RETVAL 2318 RETVAL
2204 2319
2205void 2320void
2206rxvt_img::fill (SV *c) 2321rxvt_img::fill (SV *c)
2207 INIT: 2322 INIT:
2208 rxvt_color rc; 2323 rgba cc = parse_rgba (c, THIS->s);
2209 parse_color (THIS->s, rc, c);
2210 C_ARGS: rc 2324 C_ARGS: cc
2211 2325
2212void 2326void
2213rxvt_img::DESTROY () 2327rxvt_img::DESTROY ()
2214 CODE: 2328 CODE:
2215 delete THIS; 2329 delete THIS;
… …
2227 2341
2228void 2342void
2229rxvt_img::move (int dx, int dy) 2343rxvt_img::move (int dx, int dy)
2230 2344
2231void 2345void
2232rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.) 2346rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2233 2347
2234void 2348void
2235rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2349rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2350
2351void
2352rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2236 2353
2237rxvt_img * 2354rxvt_img *
2238rxvt_img::clone () 2355rxvt_img::clone ()
2239 2356
2240rxvt_img * 2357rxvt_img *
… …
2245 2362
2246rxvt_img * 2363rxvt_img *
2247rxvt_img::blur (int rh, int rv) 2364rxvt_img::blur (int rh, int rv)
2248 2365
2249rxvt_img * 2366rxvt_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) 2367rxvt_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: 2368 INIT:
2252 double matrix[9] = { 2369 rxvt_img::nv matrix[3][3] = {
2253 p11, p12, p13, 2370 { p11, p12, p13 },
2254 p21, p22, p23, 2371 { p21, p22, p23 },
2255 p31, p32, p33 2372 { p31, p32, p33 }
2256 }; 2373 };
2257 C_ARGS: matrix, new_width, new_height 2374 C_ARGS: matrix
2258 2375
2259rxvt_img * 2376rxvt_img *
2260rxvt_img::scale (int new_width, int new_height) 2377rxvt_img::scale (int new_width, int new_height)
2261 2378
2262rxvt_img * 2379rxvt_img *
2263rxvt_img::rotate (int x, int y, NV phi, int new_width = 0, int new_height = 0) 2380rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2264 2381
2265#endif 2382#endif
2266 2383

Diff Legend

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