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.189 by root, Sun Jun 10 10:29:26 2012 UTC vs.
Revision 1.198 by root, Thu Jun 14 18:59:39 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 *
… …
343 PERL_SYS_TERM (); 379 PERL_SYS_TERM ();
344 } 380 }
345} 381}
346 382
347void 383void
348rxvt_perl_interp::init (rxvt_term *term) 384rxvt_perl_interp::init ()
349{ 385{
350 if (!perl) 386 if (!perl)
351 { 387 {
352 rxvt_push_locale (""); // perl init destroys current locale 388 rxvt_push_locale (""); // perl init destroys current locale
353 389
… …
383 } 419 }
384 } 420 }
385 421
386 rxvt_pop_locale (); 422 rxvt_pop_locale ();
387 } 423 }
424}
425
426void
427rxvt_perl_interp::init (rxvt_term *term)
428{
429 init ();
388 430
389 if (perl && !term->perl.self) 431 if (perl && !term->perl.self)
390 { 432 {
391 // runs outside of perls ENV 433 // runs outside of perls ENV
392 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 434 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
393 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 435 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
394 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0); 436 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
395 } 437 }
438}
439
440void
441rxvt_perl_interp::eval (const char *str)
442{
443 eval_pv (str, 1);
396} 444}
397 445
398void 446void
399rxvt_perl_interp::usage (rxvt_term *term, int type) 447rxvt_perl_interp::usage (rxvt_term *term, int type)
400{ 448{
… …
863 const_iv (PictStandardA1), 911 const_iv (PictStandardA1),
864 const_iv (RepeatNone), 912 const_iv (RepeatNone),
865 const_iv (RepeatNormal), 913 const_iv (RepeatNormal),
866 const_iv (RepeatPad), 914 const_iv (RepeatPad),
867 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),
868#endif 972#endif
869# if 0 973# if 0
870 const_iv (XIMForwardChar), 974 const_iv (XIMForwardChar),
871 const_iv (XIMBackwardChar), 975 const_iv (XIMBackwardChar),
872 const_iv (XIMForwardWord), 976 const_iv (XIMForwardWord),
… …
2032} 2136}
2033 2137
2034############################################################################# 2138#############################################################################
2035# fancy bg bloatstuff (TODO: should be moved up somewhere) 2139# fancy bg bloatstuff (TODO: should be moved up somewhere)
2036 2140
2037# TODO: ugly 2141bool
2142rxvt_term::has_render ()
2143 CODE:
2144 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2145 OUTPUT:
2146 RETVAL
2147
2038void 2148void
2039rxvt_term::background_geometry (bool border = false) 2149rxvt_term::background_geometry (bool border = false)
2040 PPCODE: 2150 PPCODE:
2041 EXTEND (SP, 4); 2151 EXTEND (SP, 4);
2042 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0)))); 2152 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
… …
2045 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2155 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2046 2156
2047#if HAVE_IMG 2157#if HAVE_IMG
2048 2158
2049rxvt_img * 2159rxvt_img *
2050rxvt_term::new_img (SV *format, int width = 1, int height = 1) 2160rxvt_term::new_img (SV *format, int x = 0, int y = 0, int width = 1, int height = 1)
2051 CODE: 2161 CODE:
2052 XRenderPictFormat *f = SvOK (format) 2162 XRenderPictFormat *f = SvOK (format)
2053 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2163 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2054 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2164 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2055 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height); 2165 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2056 RETVAL->alloc (); 2166 RETVAL->alloc ();
2057 OUTPUT: 2167 OUTPUT:
2058 RETVAL 2168 RETVAL
2059 2169
2060#if ENABLE_TRANSPARENCY 2170#if ENABLE_TRANSPARENCY
… …
2090 2200
2091void 2201void
2092rxvt_term::set_background (rxvt_img *img, bool border = false) 2202rxvt_term::set_background (rxvt_img *img, bool border = false)
2093 CODE: 2203 CODE:
2094 THIS->bg_destroy (); 2204 THIS->bg_destroy ();
2095 THIS->bg_pixmap = None;
2096 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2205 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2097 2206
2098 if (img) // TODO: cannot be false 2207 if (img) // TODO: cannot be false
2099 { 2208 {
2100 img = img->clone (); // own the img 2209 img = img->clone (); // own the img
… …
2110 ->replace (img); 2219 ->replace (img);
2111 2220
2112 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2221 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2113 ->replace (img); 2222 ->replace (img);
2114 2223
2115 THIS->bg_pixmap = img->steal (); 2224 THIS->bg_img = img;
2116 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2225 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2117 2226
2118 if (!border) 2227 if (!border)
2119 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2228 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2120
2121 delete img;
2122 } 2229 }
2123 2230
2124#endif 2231#endif
2125 2232
2126#endif 2233#endif
… …
2164#if HAVE_IMG 2271#if HAVE_IMG
2165 2272
2166# 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)
2167# 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);
2168 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
2169int 2299int
2170rxvt_img::w () 2300rxvt_img::w ()
2171 CODE: 2301 CODE:
2172 RETVAL = THIS->w; 2302 RETVAL = THIS->w;
2173 OUTPUT: 2303 OUTPUT:
… …
2188 RETVAL 2318 RETVAL
2189 2319
2190void 2320void
2191rxvt_img::fill (SV *c) 2321rxvt_img::fill (SV *c)
2192 INIT: 2322 INIT:
2193 rxvt_color rc; 2323 rgba cc = parse_rgba (c, THIS->s);
2194 parse_color (THIS->s, rc, c);
2195 C_ARGS: rc 2324 C_ARGS: cc
2196 2325
2197void 2326void
2198rxvt_img::DESTROY () 2327rxvt_img::DESTROY ()
2199 CODE: 2328 CODE:
2200 delete THIS; 2329 delete THIS;
… …
2212 2341
2213void 2342void
2214rxvt_img::move (int dx, int dy) 2343rxvt_img::move (int dx, int dy)
2215 2344
2216void 2345void
2217rxvt_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.)
2218 2347
2219void 2348void
2220rxvt_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.)
2221 2350
2222rxvt_img * 2351rxvt_img *
2223rxvt_img::clone () 2352rxvt_img::clone ()
2224 2353
2225rxvt_img * 2354rxvt_img *
… …
2230 2359
2231rxvt_img * 2360rxvt_img *
2232rxvt_img::blur (int rh, int rv) 2361rxvt_img::blur (int rh, int rv)
2233 2362
2234rxvt_img * 2363rxvt_img *
2235rxvt_img::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33) 2364rxvt_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)
2236 INIT: 2365 INIT:
2237 double matrix[9] = { 2366 rxvt_img::nv matrix[3][3] = {
2238 p11, p12, p13, 2367 { p11, p12, p13 },
2239 p21, p22, p23, 2368 { p21, p22, p23 },
2240 p31, p32, p33 2369 { p31, p32, p33 }
2241 }; 2370 };
2242 C_ARGS: new_width, new_height, matrix 2371 C_ARGS: matrix
2243 2372
2244rxvt_img * 2373rxvt_img *
2245rxvt_img::scale (int new_width, int new_height) 2374rxvt_img::scale (int new_width, int new_height)
2246 2375
2247rxvt_img * 2376rxvt_img *
2248rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi) 2377rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2249 2378
2250#endif 2379#endif
2251 2380

Diff Legend

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