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.187 by root, Sat Jun 9 10:21:19 2012 UTC vs.
Revision 1.207 by sf-exg, Fri Dec 28 21:19:21 2012 UTC

… …
54typedef char * octet_string; 54typedef char * octet_string;
55typedef char * utf8_string; 55typedef char * utf8_string;
56 56
57typedef int render_repeat_mode; 57typedef int render_repeat_mode;
58 58
59#if HAVE_PIXBUF
59typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif
62#if HAVE_IMG
60typedef rxvt_img * urxvt__img; 63typedef rxvt_img * urxvt__img;
64typedef rxvt_img::nv rxvt_img__nv;
61 65
62///////////////////////////////////////////////////////////////////////////// 66/////////////////////////////////////////////////////////////////////////////
63 67
64static void 68static rgba
65parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 69parse_rgba (SV *sv, rxvt_screen *s = 0)
66{ 70{
67 //TODO: support component stuff 71 rgba c;
72
73 if (SvROK (sv))
74 {
75 AV *av = (AV *)SvRV (sv);
76
77 if (SvTYPE ((SV *)av) != SVt_PVAV)
78 croak ("colour must be either a colour string, or an array,");
79
80 int len = av_len (av) + 1;
81
82 if (len != 1 && len != 3 && len != 4)
83 croak ("component colour array must have 1, 3 or 4 components,");
84
85 c.a = rgba::MAX_CC;
86
87 c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
88
89 if (len >= 3)
90 {
91 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
92 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
93
94 if (len >= 4)
95 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
96 }
97 }
98 else if (s)
99 {
100 rxvt_color rc;
68 c.set (s, SvPVbyte_nolen (sv)); 101 rc.set (s, SvPVbyte_nolen (sv));
102 rc.get (c);
103 }
104 else
105 croak ("unable to parse colour,");
106
107 return c;
69} 108}
70 109
71///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
72 112
73static wchar_t * 113static wchar_t *
74sv2wcs (SV *sv) 114sv2wcs (SV *sv)
75{ 115{
76 STRLEN len; 116 STRLEN len;
… …
341 PERL_SYS_TERM (); 381 PERL_SYS_TERM ();
342 } 382 }
343} 383}
344 384
345void 385void
346rxvt_perl_interp::init (rxvt_term *term) 386rxvt_perl_interp::init ()
347{ 387{
348 if (!perl) 388 if (!perl)
349 { 389 {
350 rxvt_push_locale (""); // perl init destroys current locale 390 rxvt_push_locale (""); // perl init destroys current locale
351 391
… …
381 } 421 }
382 } 422 }
383 423
384 rxvt_pop_locale (); 424 rxvt_pop_locale ();
385 } 425 }
426}
427
428void
429rxvt_perl_interp::init (rxvt_term *term)
430{
431 init ();
386 432
387 if (perl && !term->perl.self) 433 if (perl && !term->perl.self)
388 { 434 {
389 // runs outside of perls ENV 435 // runs outside of perls ENV
390 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 436 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
391 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 437 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
392 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0); 438 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393 } 439 }
440}
441
442void
443rxvt_perl_interp::eval (const char *str)
444{
445 eval_pv (str, 1);
394} 446}
395 447
396void 448void
397rxvt_perl_interp::usage (rxvt_term *term, int type) 449rxvt_perl_interp::usage (rxvt_term *term, int type)
398{ 450{
… …
861 const_iv (PictStandardA1), 913 const_iv (PictStandardA1),
862 const_iv (RepeatNone), 914 const_iv (RepeatNone),
863 const_iv (RepeatNormal), 915 const_iv (RepeatNormal),
864 const_iv (RepeatPad), 916 const_iv (RepeatPad),
865 const_iv (RepeatReflect), 917 const_iv (RepeatReflect),
918 // all versions
919 const_iv (PictOpClear),
920 const_iv (PictOpSrc),
921 const_iv (PictOpDst),
922 const_iv (PictOpOver),
923 const_iv (PictOpOverReverse),
924 const_iv (PictOpIn),
925 const_iv (PictOpInReverse),
926 const_iv (PictOpOut),
927 const_iv (PictOpOutReverse),
928 const_iv (PictOpAtop),
929 const_iv (PictOpAtopReverse),
930 const_iv (PictOpXor),
931 const_iv (PictOpAdd),
932 const_iv (PictOpSaturate),
933 // 0.2+
934 const_iv (PictOpDisjointClear),
935 const_iv (PictOpDisjointSrc),
936 const_iv (PictOpDisjointDst),
937 const_iv (PictOpDisjointOver),
938 const_iv (PictOpDisjointOverReverse),
939 const_iv (PictOpDisjointIn),
940 const_iv (PictOpDisjointInReverse),
941 const_iv (PictOpDisjointOut),
942 const_iv (PictOpDisjointOutReverse),
943 const_iv (PictOpDisjointAtop),
944 const_iv (PictOpDisjointAtopReverse),
945 const_iv (PictOpDisjointXor),
946 const_iv (PictOpConjointClear),
947 const_iv (PictOpConjointSrc),
948 const_iv (PictOpConjointDst),
949 const_iv (PictOpConjointOver),
950 const_iv (PictOpConjointOverReverse),
951 const_iv (PictOpConjointIn),
952 const_iv (PictOpConjointInReverse),
953 const_iv (PictOpConjointOut),
954 const_iv (PictOpConjointOutReverse),
955 const_iv (PictOpConjointAtop),
956 const_iv (PictOpConjointAtopReverse),
957 const_iv (PictOpConjointXor),
958 // 0.11+
959 const_iv (PictOpMultiply),
960 const_iv (PictOpScreen),
961 const_iv (PictOpOverlay),
962 const_iv (PictOpDarken),
963 const_iv (PictOpLighten),
964 const_iv (PictOpColorDodge),
965 const_iv (PictOpColorBurn),
966 const_iv (PictOpHardLight),
967 const_iv (PictOpSoftLight),
968 const_iv (PictOpDifference),
969 const_iv (PictOpExclusion),
970 const_iv (PictOpHSLHue),
971 const_iv (PictOpHSLSaturation),
972 const_iv (PictOpHSLColor),
973 const_iv (PictOpHSLLuminosity),
866#endif 974#endif
867# if 0 975# if 0
868 const_iv (XIMForwardChar), 976 const_iv (XIMForwardChar),
869 const_iv (XIMBackwardChar), 977 const_iv (XIMBackwardChar),
870 const_iv (XIMForwardWord), 978 const_iv (XIMForwardWord),
… …
1348 CODE: 1456 CODE:
1349 RETVAL = THIS->parent_y; 1457 RETVAL = THIS->parent_y;
1350 OUTPUT: 1458 OUTPUT:
1351 RETVAL 1459 RETVAL
1352 1460
1461Window
1462rxvt_term::vt ()
1463 CODE:
1464 RETVAL = THIS->vt;
1465 OUTPUT:
1466 RETVAL
1467
1353void 1468void
1354rxvt_term::vt_emask_add (U32 emask) 1469rxvt_term::vt_emask_add (U32 emask)
1355 CODE: 1470 CODE:
1356 THIS->vt_emask_perl |= emask; 1471 THIS->vt_emask_perl |= emask;
1357 THIS->vt_select_input (); 1472 THIS->vt_select_input ();
… …
2030} 2145}
2031 2146
2032############################################################################# 2147#############################################################################
2033# fancy bg bloatstuff (TODO: should be moved up somewhere) 2148# fancy bg bloatstuff (TODO: should be moved up somewhere)
2034 2149
2035# TODO: ugly 2150bool
2151rxvt_term::has_render ()
2152 CODE:
2153 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2154 OUTPUT:
2155 RETVAL
2156
2036void 2157void
2037rxvt_term::background_geometry (bool border = false) 2158rxvt_term::background_geometry (bool border = false)
2038 PPCODE: 2159 PPCODE:
2039 EXTEND (SP, 4); 2160 EXTEND (SP, 4);
2040 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0)))); 2161 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
… …
2042 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width ))); 2163 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2043 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2164 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2044 2165
2045#if HAVE_IMG 2166#if HAVE_IMG
2046 2167
2047#if 0
2048
2049rxvt_img * 2168rxvt_img *
2050rxvt_term::new_img (SV *format, int width, int height) 2169rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2051 CODE: 2170 CODE:
2052 XRenderPictFormat *f = SvOK (format) 2171 XRenderPictFormat *f = SvOK (format)
2053 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2172 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2054 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2173 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2055 RETVAL = new rxvt_img (THIS, f, width, height); 2174 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2175 RETVAL->alloc ();
2056 OUTPUT: 2176 OUTPUT:
2057 RETVAL 2177 RETVAL
2058
2059#endif
2060 2178
2061#if ENABLE_TRANSPARENCY 2179#if ENABLE_TRANSPARENCY
2062 2180
2063rxvt_img * 2181rxvt_img *
2064rxvt_term::new_img_from_root () 2182rxvt_term::new_img_from_root ()
… …
2091 2209
2092void 2210void
2093rxvt_term::set_background (rxvt_img *img, bool border = false) 2211rxvt_term::set_background (rxvt_img *img, bool border = false)
2094 CODE: 2212 CODE:
2095 THIS->bg_destroy (); 2213 THIS->bg_destroy ();
2096 THIS->bg_pixmap = None;
2097 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2214 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2098 2215
2099 if (img) // TODO: cannot be false 2216 if (img) // TODO: cannot be false
2100 { 2217 {
2101 img = img->clone (); // own the img 2218 img = img->clone (); // own the img
2102 2219
2103 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2220 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2104 img->sub_rect (0, 0, 2221 img->sub_rect (0, 0,
2105 border ? THIS->vt_width : THIS->szHint.width, 2222 border ? THIS->vt_width : THIS->szHint.width,
2106 border ? THIS->vt_height : THIS->szHint.height) 2223 border ? THIS->vt_height : THIS->szHint.height)
2107 ->replace (img); 2224 ->replace (img);
2108 2225
2109 // just in case, should usually be a nop 2226 // just in case, should usually be a nop
2110 img->reify () 2227 img->reify ()
2111 ->replace (img); 2228 ->replace (img);
2112 2229
2113 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2230 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2114 ->replace (img); 2231 ->replace (img);
2115 2232
2116 THIS->bg_pixmap = img->steal (); 2233 THIS->bg_img = img;
2117 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2234 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2118 2235
2119 if (!border) 2236 if (!border)
2120 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2237 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2121
2122 delete img;
2123 } 2238 }
2124 2239
2125#endif 2240#endif
2126 2241
2127#endif 2242#endif
… …
2154 C_ARGS: filename, 0 2269 C_ARGS: filename, 0
2155 2270
2156void 2271void
2157DESTROY (urxvt::pixbuf self) 2272DESTROY (urxvt::pixbuf self)
2158 CODE: 2273 CODE:
2159 gdk_pixbuf_unref (self); 2274 g_object_unref (self);
2160 2275
2161#endif 2276#endif
2162 2277
2163MODULE = urxvt PACKAGE = urxvt::img 2278MODULE = urxvt PACKAGE = urxvt::img
2164 2279
2165#if HAVE_IMG 2280#if HAVE_IMG
2166 2281
2167# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 2282# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
2168# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 2283# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2169 2284
2285void
2286rxvt_img::geometry ()
2287 PPCODE:
2288 EXTEND (SP, 4);
2289 PUSHs (sv_2mortal (newSViv (THIS->x)));
2290 PUSHs (sv_2mortal (newSViv (THIS->y)));
2291 PUSHs (sv_2mortal (newSViv (THIS->w)));
2292 PUSHs (sv_2mortal (newSViv (THIS->h)));
2293
2170int 2294int
2171rxvt_img::w () 2295rxvt_img::x ()
2296 ALIAS:
2297 x = 0
2298 y = 1
2299 w = 2
2300 h = 3
2172 CODE: 2301 CODE:
2173 RETVAL = THIS->w; 2302 switch (ix)
2174 OUTPUT: 2303 {
2175 RETVAL 2304 case 0: RETVAL = THIS->x; break;
2176 2305 case 1: RETVAL = THIS->y; break;
2177int 2306 case 2: RETVAL = THIS->w; break;
2178rxvt_img::h () 2307 case 3: RETVAL = THIS->h; break;
2179 CODE: 2308 }
2180 RETVAL = THIS->h;
2181 OUTPUT: 2309 OUTPUT:
2182 RETVAL 2310 RETVAL
2183 2311
2184Pixmap 2312Pixmap
2185rxvt_img::pm () 2313rxvt_img::pm ()
… …
2187 RETVAL = THIS->pm; 2315 RETVAL = THIS->pm;
2188 OUTPUT: 2316 OUTPUT:
2189 RETVAL 2317 RETVAL
2190 2318
2191void 2319void
2192rxvt_img::fill (SV *c) 2320rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2321 PROTOTYPE: $;$$$$
2193 INIT: 2322 INIT:
2194 rxvt_color rc; 2323 rgba cc = parse_rgba (c, THIS->s);
2195 parse_color (THIS->s, rc, c); 2324 C_ARGS: cc, x, y, w, h
2196 C_ARGS: rc
2197 2325
2198void 2326void
2199rxvt_img::DESTROY () 2327rxvt_img::DESTROY ()
2200 CODE: 2328 CODE:
2201 delete THIS; 2329 delete THIS;
2202 2330
2203void 2331void
2332rxvt_img::add_alpha ()
2333
2334void
2204rxvt_img::unshare () 2335rxvt_img::unshare ()
2205 2336
2206int 2337void
2207rxvt_img::repeat_mode (render_repeat_mode repeat = 0) 2338rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2208 CODE: 2339 PPCODE:
2209 if (items >= 2) 2340 if (items >= 2)
2210 THIS->repeat_mode (repeat); 2341 THIS->repeat_mode (repeat);
2211 if (GIMME_V != G_VOID) 2342 if (GIMME_V != G_VOID)
2212 XPUSHs (sv_2mortal (newSViv (THIS->repeat))); 2343 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2213 2344
2214void 2345void
2215rxvt_img::move (int dx, int dy) 2346rxvt_img::move (int dx, int dy)
2216 2347
2217void 2348void
2218rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.) 2349rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2219 2350
2220void 2351void
2221rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2352rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2353
2354void
2355rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2222 2356
2223rxvt_img * 2357rxvt_img *
2224rxvt_img::clone () 2358rxvt_img::clone ()
2225 2359
2226rxvt_img * 2360rxvt_img *
… …
2231 2365
2232rxvt_img * 2366rxvt_img *
2233rxvt_img::blur (int rh, int rv) 2367rxvt_img::blur (int rh, int rv)
2234 2368
2235rxvt_img * 2369rxvt_img *
2236rxvt_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) 2370rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2371
2372rxvt_img *
2373rxvt_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)
2237 INIT: 2374 INIT:
2238 double matrix[9] = { 2375 rxvt_img::nv matrix[3][3] = {
2239 p11, p12, p13, 2376 { p11, p12, p13 },
2240 p21, p22, p23, 2377 { p21, p22, p23 },
2241 p31, p32, p33 2378 { p31, p32, p33 }
2242 }; 2379 };
2243 C_ARGS: new_width, new_height, matrix 2380 C_ARGS: matrix
2244 2381
2245rxvt_img * 2382rxvt_img *
2246rxvt_img::scale (int new_width, int new_height) 2383rxvt_img::scale (int new_width, int new_height)
2247 2384
2248rxvt_img * 2385rxvt_img *
2249rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi) 2386rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2387
2388rxvt_img *
2389rxvt_img::tint (SV *c)
2390 INIT:
2391 rgba cc = parse_rgba (c, THIS->s);
2392 C_ARGS: cc
2393
2394rxvt_img *
2395rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2396 CODE:
2397 rxvt_img::nv *vparams = 0;
2398 int nparams = 0;
2399
2400 if (SvOK (params))
2401 {
2402 // we overlay rxvt_temp_buf, what a hack
2403 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2404
2405 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2406 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2407
2408 nparams = av_len ((AV *)SvRV (params)) + 1;
2409 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams);
2410
2411 for (int i = 0; i < nparams; ++i)
2412 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2413 }
2414
2415 RETVAL = THIS->filter (name, nparams, vparams);
2416 OUTPUT:
2417 RETVAL
2250 2418
2251#endif 2419#endif
2252 2420

Diff Legend

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