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.196 by root, Thu Jun 14 18:13:19 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 rgba 67static rgba
67parse_rgba (SV *sv, rxvt_screen *s = 0) 68parse_rgba (SV *sv, rxvt_screen *s = 0)
68{ 69{
69 rgba c; 70 rgba c;
70 71
71 if (AV *av = (AV *)SvRV (sv)) 72 if (SvROK (sv))
72 { 73 {
74 AV *av = (AV *)SvRV (sv);
75
73 if (SvTYPE ((SV *)av) != SVt_PVAV) 76 if (SvTYPE ((SV *)av) != SVt_PVAV)
74 croak ("colour must be either a colour string, or an array,"); 77 croak ("colour must be either a colour string, or an array,");
75 78
76 int len = av_len (av) + 1; 79 int len = av_len (av) + 1;
77 80
… …
908 const_iv (PictStandardA1), 911 const_iv (PictStandardA1),
909 const_iv (RepeatNone), 912 const_iv (RepeatNone),
910 const_iv (RepeatNormal), 913 const_iv (RepeatNormal),
911 const_iv (RepeatPad), 914 const_iv (RepeatPad),
912 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),
913#endif 972#endif
914# if 0 973# if 0
915 const_iv (XIMForwardChar), 974 const_iv (XIMForwardChar),
916 const_iv (XIMBackwardChar), 975 const_iv (XIMBackwardChar),
917 const_iv (XIMForwardWord), 976 const_iv (XIMForwardWord),
… …
2096 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2155 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2097 2156
2098#if HAVE_IMG 2157#if HAVE_IMG
2099 2158
2100rxvt_img * 2159rxvt_img *
2101rxvt_term::new_img (SV *format, int x = 0, int y = 0, 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)
2102 CODE: 2161 CODE:
2103 XRenderPictFormat *f = SvOK (format) 2162 XRenderPictFormat *f = SvOK (format)
2104 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2163 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2105 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2164 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2106 RETVAL = new rxvt_img (THIS, f, x, y, width, height); 2165 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
… …
2282 2341
2283void 2342void
2284rxvt_img::move (int dx, int dy) 2343rxvt_img::move (int dx, int dy)
2285 2344
2286void 2345void
2287rxvt_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.)
2288 2347
2289void 2348void
2290rxvt_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.);
2291 2353
2292rxvt_img * 2354rxvt_img *
2293rxvt_img::clone () 2355rxvt_img::clone ()
2294 2356
2295rxvt_img * 2357rxvt_img *
… …
2300 2362
2301rxvt_img * 2363rxvt_img *
2302rxvt_img::blur (int rh, int rv) 2364rxvt_img::blur (int rh, int rv)
2303 2365
2304rxvt_img * 2366rxvt_img *
2305rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33) 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)
2306 INIT: 2368 INIT:
2307 double matrix[3][3] = { 2369 rxvt_img::nv matrix[3][3] = {
2308 { p11, p12, p13 }, 2370 { p11, p12, p13 },
2309 { p21, p22, p23 }, 2371 { p21, p22, p23 },
2310 { p31, p32, p33 } 2372 { p31, p32, p33 }
2311 }; 2373 };
2312 C_ARGS: matrix 2374 C_ARGS: matrix
2313 2375
2314rxvt_img * 2376rxvt_img *
2315rxvt_img::scale (int new_width, int new_height) 2377rxvt_img::scale (int new_width, int new_height)
2316 2378
2317rxvt_img * 2379rxvt_img *
2318rxvt_img::rotate (int x, int y, NV phi) 2380rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2319 2381
2320#endif 2382#endif
2321 2383

Diff Legend

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