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.197 by root, Thu Jun 14 18:19:11 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 (AV *av = (AV *)SvRV (sv))
73 {
74 if (SvTYPE ((SV *)av) != SVt_PVAV)
75 croak ("colour must be either a colour string, or an array,");
76
77 int len = av_len (av) + 1;
78
79 if (len != 1 && len != 3 && len != 4)
80 croak ("component colour array must have 1, 3 or 4 components,");
81
82 c.a = rgba::MAX_CC;
83
84 c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0)));
85
86 if (len >= 3)
87 {
88 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0)));
89 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0)));
90
91 if (len >= 4)
92 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0)));
93 }
94 }
95 else if (s)
96 {
97 rxvt_color rc;
68 c.set (s, SvPVbyte_nolen (sv)); 98 rc.set (s, SvPVbyte_nolen (sv));
99 rc.get (c);
100 }
101 else
102 croak ("unable to parse colour,");
103
104 return c;
69} 105}
70 106
71///////////////////////////////////////////////////////////////////////////// 107/////////////////////////////////////////////////////////////////////////////
72 108
73static wchar_t * 109static wchar_t *
… …
341 PERL_SYS_TERM (); 377 PERL_SYS_TERM ();
342 } 378 }
343} 379}
344 380
345void 381void
346rxvt_perl_interp::init (rxvt_term *term) 382rxvt_perl_interp::init ()
347{ 383{
348 if (!perl) 384 if (!perl)
349 { 385 {
350 rxvt_push_locale (""); // perl init destroys current locale 386 rxvt_push_locale (""); // perl init destroys current locale
351 387
… …
381 } 417 }
382 } 418 }
383 419
384 rxvt_pop_locale (); 420 rxvt_pop_locale ();
385 } 421 }
422}
386 423
387 if (perl) 424void
425rxvt_perl_interp::init (rxvt_term *term)
426{
427 init ();
428
429 if (perl && !term->perl.self)
388 { 430 {
389 // runs outside of perls ENV 431 // runs outside of perls ENV
390 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 432 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); 433 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); 434 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393 } 435 }
394} 436}
395 437
396void 438void
439rxvt_perl_interp::eval (const char *str)
440{
441 eval_pv (str, 1);
442}
443
444void
397rxvt_perl_interp::usage (rxvt_term *term, int type) 445rxvt_perl_interp::usage (rxvt_term *term, int type)
398{ 446{
399 localise_env set_environ (perl_environ); 447 localise_env set_environ (perl_environ);
400 448
401 ENTER; 449 ENTER;
402 SAVETMPS; 450 SAVETMPS;
403 451
404 dSP; 452 dSP;
453 PUSHMARK (SP);
405 EXTEND (SP, 2); 454 EXTEND (SP, 2);
406 PUSHs (sv_2mortal (newSVterm (term))); 455 PUSHs (sv_2mortal (newSVterm (term)));
407 PUSHs (sv_2mortal (newSViv (type))); 456 PUSHs (sv_2mortal (newSViv (type)));
408 PUTBACK; 457 PUTBACK;
409 call_pv ("urxvt::usage", G_VOID | G_DISCARD); 458 call_pv ("urxvt::usage", G_VOID | G_DISCARD);
… …
419 468
420 ENTER; 469 ENTER;
421 SAVETMPS; 470 SAVETMPS;
422 471
423 dSP; 472 dSP;
473 PUSHMARK (SP);
424 EXTEND (SP, 6); 474 EXTEND (SP, 6);
425 PUSHs (sv_2mortal (newSVterm (term))); 475 PUSHs (sv_2mortal (newSVterm (term)));
426 PUSHs (sv_2mortal (newSVpv (name, 0))); 476 PUSHs (sv_2mortal (newSVpv (name, 0)));
427 PUSHs (arg ? &PL_sv_yes : &PL_sv_no); 477 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
428 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no); 478 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
… …
2028} 2078}
2029 2079
2030############################################################################# 2080#############################################################################
2031# fancy bg bloatstuff (TODO: should be moved up somewhere) 2081# fancy bg bloatstuff (TODO: should be moved up somewhere)
2032 2082
2033# TODO: ugly 2083bool
2084rxvt_term::has_render ()
2085 CODE:
2086 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2087 OUTPUT:
2088 RETVAL
2089
2034void 2090void
2035rxvt_term::get_geometry () 2091rxvt_term::background_geometry (bool border = false)
2036 PPCODE: 2092 PPCODE:
2037 EXTEND (SP, 4); 2093 EXTEND (SP, 4);
2038 PUSHs (sv_2mortal (newSViv (THIS->parent_x))); 2094 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2039 PUSHs (sv_2mortal (newSViv (THIS->parent_y))); 2095 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2040 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2096 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2041 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2097 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2042 2098
2043#if HAVE_IMG 2099#if HAVE_IMG
2044 2100
2045rxvt_img * 2101rxvt_img *
2046rxvt_term::new_img (SV *format, int width, int height) 2102rxvt_term::new_img (SV *format, int x = 0, int y = 0, int width = 1, int height = 1)
2047 CODE: 2103 CODE:
2048 XRenderPictFormat *f = SvOK (format) 2104 XRenderPictFormat *f = SvOK (format)
2049 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2105 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2050 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2106 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2051 RETVAL = new rxvt_img (THIS, f, width, height); 2107 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
2108 RETVAL->alloc ();
2052 OUTPUT: 2109 OUTPUT:
2053 RETVAL 2110 RETVAL
2054 2111
2055#if ENABLE_TRANSPARENCY 2112#if ENABLE_TRANSPARENCY
2056 2113
… …
2082#endif 2139#endif
2083 2140
2084#if HAVE_BG_PIXMAP 2141#if HAVE_BG_PIXMAP
2085 2142
2086void 2143void
2087rxvt_term::set_background (rxvt_img *img) 2144rxvt_term::set_background (rxvt_img *img, bool border = false)
2088 CODE: 2145 CODE:
2089 THIS->bg_destroy (); 2146 THIS->bg_destroy ();
2090 THIS->bg_pixmap = None; 2147 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 2148
2093 if (img) // TODO: cannot be false 2149 if (img) // TODO: cannot be false
2094 { 2150 {
2151 img = img->clone (); // own the img
2152
2153 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2154 img->sub_rect (0, 0,
2155 border ? THIS->vt_width : THIS->szHint.width,
2156 border ? THIS->vt_height : THIS->szHint.height)
2157 ->replace (img);
2158
2159 // just in case, should usually be a nop
2095 img->unshare (); 2160 img->reify ()
2096 //TODO: convetr to visual, possibly precompose with colour 2161 ->replace (img);
2097 THIS->bg_pixmap = img->steal (); 2162
2163 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2164 ->replace (img);
2165
2166 THIS->bg_img = img;
2167 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2168
2169 if (!border)
2098 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2170 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2099 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2100 } 2171 }
2101 2172
2102#endif 2173#endif
2103 2174
2104#endif 2175#endif
… …
2142#if HAVE_IMG 2213#if HAVE_IMG
2143 2214
2144# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 2215# 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); 2216# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
2146 2217
2218void
2219rxvt_img::geometry ()
2220 PPCODE:
2221 EXTEND (SP, 4);
2222 PUSHs (sv_2mortal (newSViv (THIS->x)));
2223 PUSHs (sv_2mortal (newSViv (THIS->y)));
2224 PUSHs (sv_2mortal (newSViv (THIS->w)));
2225 PUSHs (sv_2mortal (newSViv (THIS->h)));
2226
2227int
2228rxvt_img::x ()
2229 CODE:
2230 RETVAL = THIS->x;
2231 OUTPUT:
2232 RETVAL
2233
2234int
2235rxvt_img::y ()
2236 CODE:
2237 RETVAL = THIS->y;
2238 OUTPUT:
2239 RETVAL
2240
2147int 2241int
2148rxvt_img::w () 2242rxvt_img::w ()
2149 CODE: 2243 CODE:
2150 RETVAL = THIS->w; 2244 RETVAL = THIS->w;
2151 OUTPUT: 2245 OUTPUT:
… …
2153 2247
2154int 2248int
2155rxvt_img::h () 2249rxvt_img::h ()
2156 CODE: 2250 CODE:
2157 RETVAL = THIS->h; 2251 RETVAL = THIS->h;
2158 OUTPUT:
2159 RETVAL
2160
2161bool
2162rxvt_img::shared ()
2163 CODE:
2164 RETVAL = THIS->shared;
2165 OUTPUT: 2252 OUTPUT:
2166 RETVAL 2253 RETVAL
2167 2254
2168Pixmap 2255Pixmap
2169rxvt_img::pm () 2256rxvt_img::pm ()
… …
2173 RETVAL 2260 RETVAL
2174 2261
2175void 2262void
2176rxvt_img::fill (SV *c) 2263rxvt_img::fill (SV *c)
2177 INIT: 2264 INIT:
2178 rxvt_color rc; 2265 rgba cc = parse_rgba (c, THIS->s);
2179 parse_color (THIS->s, rc, c);
2180 C_ARGS: rc 2266 C_ARGS: cc
2181 2267
2182void 2268void
2183rxvt_img::DESTROY () 2269rxvt_img::DESTROY ()
2184 CODE: 2270 CODE:
2185 delete THIS; 2271 delete THIS;
2272
2273void
2274rxvt_img::unshare ()
2275
2276int
2277rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2278 CODE:
2279 if (items >= 2)
2280 THIS->repeat_mode (repeat);
2281 if (GIMME_V != G_VOID)
2282 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2283
2284void
2285rxvt_img::move (int dx, int dy)
2286
2287void
2288rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2289
2290void
2291rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2292
2293rxvt_img *
2294rxvt_img::clone ()
2295
2296rxvt_img *
2297rxvt_img::reify ()
2298
2299rxvt_img *
2300rxvt_img::sub_rect (int x, int y, int width, int height)
2186 2301
2187rxvt_img * 2302rxvt_img *
2188rxvt_img::blur (int rh, int rv) 2303rxvt_img::blur (int rh, int rv)
2189 2304
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 * 2305rxvt_img *
2200rxvt_img::clone () 2306rxvt_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)
2201
2202rxvt_img *
2203rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
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: 2307 INIT:
2208 double matrix[9] = { 2308 rxvt_img::nv matrix[3][3] = {
2209 p11, p12, p13, 2309 { p11, p12, p13 },
2210 p21, p22, p23, 2310 { p21, p22, p23 },
2211 p31, p32, p33 2311 { p31, p32, p33 }
2212 }; 2312 };
2213 C_ARGS: new_width, new_height, matrix, repeat 2313 C_ARGS: matrix
2214 2314
2215rxvt_img * 2315rxvt_img *
2216rxvt_img::scale (int new_width, int new_height) 2316rxvt_img::scale (int new_width, int new_height)
2217 2317
2218rxvt_img * 2318rxvt_img *
2219rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal) 2319rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2220 2320
2221#endif 2321#endif
2222 2322

Diff Legend

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