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.173 by root, Wed Jun 6 11:46:11 2012 UTC vs.
Revision 1.206 by root, Sat Jul 7 07:00:17 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
60typedef rxvt_img * urxvt__img; 62typedef rxvt_img * urxvt__img;
63typedef rxvt_img::nv rxvt_img__nv;
61 64
62///////////////////////////////////////////////////////////////////////////// 65/////////////////////////////////////////////////////////////////////////////
63 66
64static void 67static rgba
65parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 68parse_rgba (SV *sv, rxvt_screen *s = 0)
66{ 69{
67 //TODO: support component stuff 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;
68 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;
69} 107}
70 108
71///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
72 110
73static wchar_t * 111static wchar_t *
… …
341 PERL_SYS_TERM (); 379 PERL_SYS_TERM ();
342 } 380 }
343} 381}
344 382
345void 383void
346rxvt_perl_interp::init (rxvt_term *term) 384rxvt_perl_interp::init ()
347{ 385{
348 if (!perl) 386 if (!perl)
349 { 387 {
350 rxvt_push_locale (""); // perl init destroys current locale 388 rxvt_push_locale (""); // perl init destroys current locale
351 389
… …
381 } 419 }
382 } 420 }
383 421
384 rxvt_pop_locale (); 422 rxvt_pop_locale ();
385 } 423 }
424}
386 425
387 if (perl) 426void
427rxvt_perl_interp::init (rxvt_term *term)
428{
429 init ();
430
431 if (perl && !term->perl.self)
388 { 432 {
389 // runs outside of perls ENV 433 // runs outside of perls ENV
390 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 434 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); 435 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); 436 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393 } 437 }
394} 438}
395 439
396void 440void
441rxvt_perl_interp::eval (const char *str)
442{
443 eval_pv (str, 1);
444}
445
446void
397rxvt_perl_interp::usage (rxvt_term *term, int type) 447rxvt_perl_interp::usage (rxvt_term *term, int type)
398{ 448{
399 localise_env set_environ (perl_environ); 449 localise_env set_environ (perl_environ);
400 450
401 ENTER; 451 ENTER;
402 SAVETMPS; 452 SAVETMPS;
403 453
404 dSP; 454 dSP;
455 PUSHMARK (SP);
405 EXTEND (SP, 2); 456 EXTEND (SP, 2);
406 PUSHs (sv_2mortal (newSVterm (term))); 457 PUSHs (sv_2mortal (newSVterm (term)));
407 PUSHs (sv_2mortal (newSViv (type))); 458 PUSHs (sv_2mortal (newSViv (type)));
408 PUTBACK; 459 PUTBACK;
409 call_pv ("urxvt::usage", G_VOID | G_DISCARD); 460 call_pv ("urxvt::usage", G_VOID | G_DISCARD);
… …
419 470
420 ENTER; 471 ENTER;
421 SAVETMPS; 472 SAVETMPS;
422 473
423 dSP; 474 dSP;
475 PUSHMARK (SP);
424 EXTEND (SP, 6); 476 EXTEND (SP, 6);
425 PUSHs (sv_2mortal (newSVterm (term))); 477 PUSHs (sv_2mortal (newSVterm (term)));
426 PUSHs (sv_2mortal (newSVpv (name, 0))); 478 PUSHs (sv_2mortal (newSVpv (name, 0)));
427 PUSHs (arg ? &PL_sv_yes : &PL_sv_no); 479 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
428 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no); 480 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
… …
859 const_iv (PictStandardA1), 911 const_iv (PictStandardA1),
860 const_iv (RepeatNone), 912 const_iv (RepeatNone),
861 const_iv (RepeatNormal), 913 const_iv (RepeatNormal),
862 const_iv (RepeatPad), 914 const_iv (RepeatPad),
863 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),
864#endif 972#endif
865# if 0 973# if 0
866 const_iv (XIMForwardChar), 974 const_iv (XIMForwardChar),
867 const_iv (XIMBackwardChar), 975 const_iv (XIMBackwardChar),
868 const_iv (XIMForwardWord), 976 const_iv (XIMForwardWord),
… …
1346 CODE: 1454 CODE:
1347 RETVAL = THIS->parent_y; 1455 RETVAL = THIS->parent_y;
1348 OUTPUT: 1456 OUTPUT:
1349 RETVAL 1457 RETVAL
1350 1458
1459Window
1460rxvt_term::vt ()
1461 CODE:
1462 RETVAL = THIS->vt;
1463 OUTPUT:
1464 RETVAL
1465
1351void 1466void
1352rxvt_term::vt_emask_add (U32 emask) 1467rxvt_term::vt_emask_add (U32 emask)
1353 CODE: 1468 CODE:
1354 THIS->vt_emask_perl |= emask; 1469 THIS->vt_emask_perl |= emask;
1355 THIS->vt_select_input (); 1470 THIS->vt_select_input ();
… …
2028} 2143}
2029 2144
2030############################################################################# 2145#############################################################################
2031# fancy bg bloatstuff (TODO: should be moved up somewhere) 2146# fancy bg bloatstuff (TODO: should be moved up somewhere)
2032 2147
2033# TODO: ugly 2148bool
2149rxvt_term::has_render ()
2150 CODE:
2151 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2152 OUTPUT:
2153 RETVAL
2154
2034void 2155void
2035rxvt_term::get_geometry () 2156rxvt_term::background_geometry (bool border = false)
2036 PPCODE: 2157 PPCODE:
2037 EXTEND (SP, 4); 2158 EXTEND (SP, 4);
2038 PUSHs (sv_2mortal (newSViv (THIS->parent_x))); 2159 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2039 PUSHs (sv_2mortal (newSViv (THIS->parent_y))); 2160 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2040 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2161 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2041 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2162 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2042 2163
2043#if HAVE_IMG 2164#if HAVE_IMG
2044 2165
2045rxvt_img * 2166rxvt_img *
2046rxvt_term::new_img (SV *format, int width, int height) 2167rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2047 CODE: 2168 CODE:
2048 XRenderPictFormat *f = SvOK (format) 2169 XRenderPictFormat *f = SvOK (format)
2049 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2170 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2050 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2171 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2051 RETVAL = new rxvt_img (THIS, f, width, height); 2172 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2173 RETVAL->alloc ();
2052 OUTPUT: 2174 OUTPUT:
2053 RETVAL 2175 RETVAL
2054 2176
2055#if ENABLE_TRANSPARENCY 2177#if ENABLE_TRANSPARENCY
2056 2178
… …
2082#endif 2204#endif
2083 2205
2084#if HAVE_BG_PIXMAP 2206#if HAVE_BG_PIXMAP
2085 2207
2086void 2208void
2087rxvt_term::set_background (rxvt_img *img) 2209rxvt_term::set_background (rxvt_img *img, bool border = false)
2088 CODE: 2210 CODE:
2089 THIS->bg_destroy (); 2211 THIS->bg_destroy ();
2090 THIS->bg_pixmap = None; 2212 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2091 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
2092 2213
2093 if (img) // TODO: cannot be false 2214 if (img) // TODO: cannot be false
2094 { 2215 {
2216 img = img->clone (); // own the img
2217
2218 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2219 img->sub_rect (0, 0,
2220 border ? THIS->vt_width : THIS->szHint.width,
2221 border ? THIS->vt_height : THIS->szHint.height)
2222 ->replace (img);
2223
2224 // just in case, should usually be a nop
2095 img->unshare (); 2225 img->reify ()
2096 //TODO: convetr to visual, possibly precompose with colour 2226 ->replace (img);
2097 THIS->bg_pixmap = img->steal (); 2227
2228 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2229 ->replace (img);
2230
2231 THIS->bg_img = img;
2232 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2233
2234 if (!border)
2098 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2235 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2099 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2100 } 2236 }
2101 2237
2102#endif 2238#endif
2103 2239
2104#endif 2240#endif
… …
2131 C_ARGS: filename, 0 2267 C_ARGS: filename, 0
2132 2268
2133void 2269void
2134DESTROY (urxvt::pixbuf self) 2270DESTROY (urxvt::pixbuf self)
2135 CODE: 2271 CODE:
2136 gdk_pixbuf_unref (self); 2272 g_object_unref (self);
2137 2273
2138#endif 2274#endif
2139 2275
2140MODULE = urxvt PACKAGE = urxvt::img 2276MODULE = urxvt PACKAGE = urxvt::img
2141 2277
2142#if HAVE_IMG 2278#if HAVE_IMG
2143 2279
2144# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 2280# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
2145# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 2281# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2146 2282
2283void
2284rxvt_img::geometry ()
2285 PPCODE:
2286 EXTEND (SP, 4);
2287 PUSHs (sv_2mortal (newSViv (THIS->x)));
2288 PUSHs (sv_2mortal (newSViv (THIS->y)));
2289 PUSHs (sv_2mortal (newSViv (THIS->w)));
2290 PUSHs (sv_2mortal (newSViv (THIS->h)));
2291
2147int 2292int
2148rxvt_img::w () 2293rxvt_img::x ()
2294 ALIAS:
2295 x = 0
2296 y = 1
2297 w = 2
2298 h = 3
2149 CODE: 2299 CODE:
2150 RETVAL = THIS->w; 2300 switch (ix)
2151 OUTPUT: 2301 {
2152 RETVAL 2302 case 0: RETVAL = THIS->x; break;
2153 2303 case 1: RETVAL = THIS->y; break;
2154int 2304 case 2: RETVAL = THIS->w; break;
2155rxvt_img::h () 2305 case 3: RETVAL = THIS->h; break;
2156 CODE: 2306 }
2157 RETVAL = THIS->h;
2158 OUTPUT:
2159 RETVAL
2160
2161bool
2162rxvt_img::shared ()
2163 CODE:
2164 RETVAL = THIS->shared;
2165 OUTPUT: 2307 OUTPUT:
2166 RETVAL 2308 RETVAL
2167 2309
2168Pixmap 2310Pixmap
2169rxvt_img::pm () 2311rxvt_img::pm ()
… …
2171 RETVAL = THIS->pm; 2313 RETVAL = THIS->pm;
2172 OUTPUT: 2314 OUTPUT:
2173 RETVAL 2315 RETVAL
2174 2316
2175void 2317void
2176rxvt_img::fill (SV *c) 2318rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2319 PROTOTYPE: $;$$$$
2177 INIT: 2320 INIT:
2178 rxvt_color rc; 2321 rgba cc = parse_rgba (c, THIS->s);
2179 parse_color (THIS->s, rc, c); 2322 C_ARGS: cc, x, y, w, h
2180 C_ARGS: rc
2181 2323
2182void 2324void
2183rxvt_img::DESTROY () 2325rxvt_img::DESTROY ()
2184 CODE: 2326 CODE:
2185 delete THIS; 2327 delete THIS;
2328
2329void
2330rxvt_img::add_alpha ()
2331
2332void
2333rxvt_img::unshare ()
2334
2335void
2336rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2337 PPCODE:
2338 if (items >= 2)
2339 THIS->repeat_mode (repeat);
2340 if (GIMME_V != G_VOID)
2341 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2342
2343void
2344rxvt_img::move (int dx, int dy)
2345
2346void
2347rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2348
2349void
2350rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2351
2352void
2353rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2354
2355rxvt_img *
2356rxvt_img::clone ()
2357
2358rxvt_img *
2359rxvt_img::reify ()
2360
2361rxvt_img *
2362rxvt_img::sub_rect (int x, int y, int width, int height)
2186 2363
2187rxvt_img * 2364rxvt_img *
2188rxvt_img::blur (int rh, int rv) 2365rxvt_img::blur (int rh, int rv)
2189 2366
2190void
2191rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2192
2193void
2194rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2195
2196void
2197rxvt_img::unshare ()
2198
2199rxvt_img * 2367rxvt_img *
2200rxvt_img::clone () 2368rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2201 2369
2202rxvt_img * 2370rxvt_img *
2203rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal) 2371rxvt_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)
2204
2205rxvt_img *
2206rxvt_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, render_repeat_mode repeat = RepeatNormal)
2207 INIT: 2372 INIT:
2208 double matrix[9] = { 2373 rxvt_img::nv matrix[3][3] = {
2209 p11, p12, p13, 2374 { p11, p12, p13 },
2210 p21, p22, p23, 2375 { p21, p22, p23 },
2211 p31, p32, p33 2376 { p31, p32, p33 }
2212 }; 2377 };
2213 C_ARGS: new_width, new_height, matrix, repeat 2378 C_ARGS: matrix
2214 2379
2215rxvt_img * 2380rxvt_img *
2216rxvt_img::scale (int new_width, int new_height) 2381rxvt_img::scale (int new_width, int new_height)
2217 2382
2218rxvt_img * 2383rxvt_img *
2219rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal) 2384rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2385
2386rxvt_img *
2387rxvt_img::tint (SV *c)
2388 INIT:
2389 rgba cc = parse_rgba (c, THIS->s);
2390 C_ARGS: cc
2391
2392rxvt_img *
2393rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2394 CODE:
2395 rxvt_img::nv *vparams = 0;
2396 int nparams = 0;
2397
2398 if (SvOK (params))
2399 {
2400 // we overlay rxvt_temp_buf, what a hack
2401 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2402
2403 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2404 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2405
2406 nparams = av_len ((AV *)SvRV (params)) + 1;
2407 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams);
2408
2409 for (int i = 0; i < nparams; ++i)
2410 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2411 }
2412
2413 RETVAL = THIS->filter (name, nparams, vparams);
2414 OUTPUT:
2415 RETVAL
2220 2416
2221#endif 2417#endif
2222 2418

Diff Legend

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