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.172 by root, Tue Jun 5 22:46:50 2012 UTC vs.
Revision 1.192 by root, Tue Jun 12 10:45:53 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;
61 63
62///////////////////////////////////////////////////////////////////////////// 64/////////////////////////////////////////////////////////////////////////////
63 65
64static void 66static void
65parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 67parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
66{ 68{
67 //TODO: support component stuff 69 //TODO: support component stuff, 0..1
68 c.set (s, SvPVbyte_nolen (sv)); 70 c.set (s, SvPVbyte_nolen (sv));
69} 71}
70 72
71///////////////////////////////////////////////////////////////////////////// 73/////////////////////////////////////////////////////////////////////////////
72 74
… …
341 PERL_SYS_TERM (); 343 PERL_SYS_TERM ();
342 } 344 }
343} 345}
344 346
345void 347void
346rxvt_perl_interp::init (rxvt_term *term) 348rxvt_perl_interp::init ()
347{ 349{
348 if (!perl) 350 if (!perl)
349 { 351 {
350 rxvt_push_locale (""); // perl init destroys current locale 352 rxvt_push_locale (""); // perl init destroys current locale
351 353
… …
381 } 383 }
382 } 384 }
383 385
384 rxvt_pop_locale (); 386 rxvt_pop_locale ();
385 } 387 }
388}
386 389
387 if (perl) 390void
391rxvt_perl_interp::init (rxvt_term *term)
392{
393 init ();
394
395 if (perl && !term->perl.self)
388 { 396 {
389 // runs outside of perls ENV 397 // runs outside of perls ENV
390 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 398 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); 399 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); 400 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393 } 401 }
394} 402}
395 403
396void 404void
405rxvt_perl_interp::eval (const char *str)
406{
407 eval_pv (str, 1);
408}
409
410void
397rxvt_perl_interp::usage (rxvt_term *term, int type) 411rxvt_perl_interp::usage (rxvt_term *term, int type)
398{ 412{
399 localise_env set_environ (perl_environ); 413 localise_env set_environ (perl_environ);
400 414
401 ENTER; 415 ENTER;
402 SAVETMPS; 416 SAVETMPS;
403 417
404 dSP; 418 dSP;
419 PUSHMARK (SP);
405 EXTEND (SP, 2); 420 EXTEND (SP, 2);
406 PUSHs (sv_2mortal (newSVterm (term))); 421 PUSHs (sv_2mortal (newSVterm (term)));
407 PUSHs (sv_2mortal (newSViv (type))); 422 PUSHs (sv_2mortal (newSViv (type)));
408 PUTBACK; 423 PUTBACK;
409 call_pv ("urxvt::usage", G_VOID | G_DISCARD | G_EVAL); 424 call_pv ("urxvt::usage", G_VOID | G_DISCARD);
410 425
411 FREETMPS; 426 FREETMPS;
412 LEAVE; 427 LEAVE;
413} 428}
414 429
415uint8_t 430uint8_t
416rxvt_perl_interp::resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value) 431rxvt_perl_interp::parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value)
417{ 432{
418 localise_env set_environ (perl_environ); 433 localise_env set_environ (perl_environ);
419 434
420 ENTER; 435 ENTER;
421 SAVETMPS; 436 SAVETMPS;
422 437
423 dSP; 438 dSP;
439 PUSHMARK (SP);
424 EXTEND (SP, 6); 440 EXTEND (SP, 6);
425 PUSHs (sv_2mortal (newSVterm (term))); 441 PUSHs (sv_2mortal (newSVterm (term)));
426 PUSHs (sv_2mortal (newSVpv (name, 0))); 442 PUSHs (sv_2mortal (newSVpv (name, 0)));
427 PUSHs (arg ? &PL_sv_yes : &PL_sv_no); 443 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
428 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no); 444 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
429 PUSHs (flag ? &PL_sv_yes : &PL_sv_no); 445 PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
430 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef); 446 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
431 PUTBACK; 447 PUTBACK;
432 call_pv ("urxvt::resource", G_SCALAR | G_EVAL); 448 call_pv ("urxvt::parse_resource", G_SCALAR);
449 SPAGAIN;
433 450
434 uint8_t ret = POPi; 451 uint8_t ret = POPi;
435 452
436 FREETMPS; 453 FREETMPS;
437 LEAVE; 454 LEAVE;
… …
1061 if (count) 1078 if (count)
1062 THIS->get_window_origin (THIS->parent_x, THIS->parent_y); 1079 THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
1063 } 1080 }
1064 } 1081 }
1065 1082
1083void
1084rxvt_term::put_option_db (octet_string specifier, octet_string value)
1085 CODE:
1086 XrmPutStringResource (&THIS->option_db, specifier, value);
1087
1066int 1088int
1067rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1089rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1068 CODE: 1090 CODE:
1069 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1091 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1070 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1092 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
2022} 2044}
2023 2045
2024############################################################################# 2046#############################################################################
2025# fancy bg bloatstuff (TODO: should be moved up somewhere) 2047# fancy bg bloatstuff (TODO: should be moved up somewhere)
2026 2048
2027# TODO: ugly 2049bool
2050rxvt_term::has_render ()
2051 CODE:
2052 RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
2053 OUTPUT:
2054 RETVAL
2055
2028void 2056void
2029rxvt_term::get_geometry () 2057rxvt_term::background_geometry (bool border = false)
2030 PPCODE: 2058 PPCODE:
2031 EXTEND (SP, 4); 2059 EXTEND (SP, 4);
2032 PUSHs (sv_2mortal (newSViv (THIS->parent_x))); 2060 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2033 PUSHs (sv_2mortal (newSViv (THIS->parent_y))); 2061 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2034 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2062 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2035 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2063 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2036 2064
2037#if HAVE_IMG 2065#if HAVE_IMG
2038 2066
2039rxvt_img * 2067rxvt_img *
2040rxvt_term::new_img (SV *format, int width, int height) 2068rxvt_term::new_img (SV *format, int width = 1, int height = 1)
2041 CODE: 2069 CODE:
2042 XRenderPictFormat *f = SvOK (format) 2070 XRenderPictFormat *f = SvOK (format)
2043 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2071 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2044 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2072 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2045 RETVAL = new rxvt_img (THIS, f, width, height); 2073 RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
2074 RETVAL->alloc ();
2046 OUTPUT: 2075 OUTPUT:
2047 RETVAL 2076 RETVAL
2048 2077
2049#if ENABLE_TRANSPARENCY 2078#if ENABLE_TRANSPARENCY
2050 2079
… …
2076#endif 2105#endif
2077 2106
2078#if HAVE_BG_PIXMAP 2107#if HAVE_BG_PIXMAP
2079 2108
2080void 2109void
2081rxvt_term::set_background (rxvt_img *img) 2110rxvt_term::set_background (rxvt_img *img, bool border = false)
2082 CODE: 2111 CODE:
2083 THIS->bg_destroy (); 2112 THIS->bg_destroy ();
2084 THIS->bg_pixmap = None; 2113 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2085 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH;
2086 2114
2087 if (img) // TODO: cannot be false 2115 if (img) // TODO: cannot be false
2088 { 2116 {
2117 img = img->clone (); // own the img
2118
2119 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2120 img->sub_rect (0, 0,
2121 border ? THIS->vt_width : THIS->szHint.width,
2122 border ? THIS->vt_height : THIS->szHint.height)
2123 ->replace (img);
2124
2125 // just in case, should usually be a nop
2089 img->unshare (); 2126 img->reify ()
2090 //TODO: convetr to visual, possibly precompose with colour 2127 ->replace (img);
2091 THIS->bg_pixmap = img->steal (); 2128
2129 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2130 ->replace (img);
2131
2132 THIS->bg_img = img;
2133 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2134
2135 if (!border)
2092 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2136 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2093 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2094 } 2137 }
2095 2138
2096#endif 2139#endif
2097 2140
2098#endif 2141#endif
… …
2147 2190
2148int 2191int
2149rxvt_img::h () 2192rxvt_img::h ()
2150 CODE: 2193 CODE:
2151 RETVAL = THIS->h; 2194 RETVAL = THIS->h;
2152 OUTPUT:
2153 RETVAL
2154
2155bool
2156rxvt_img::shared ()
2157 CODE:
2158 RETVAL = THIS->shared;
2159 OUTPUT: 2195 OUTPUT:
2160 RETVAL 2196 RETVAL
2161 2197
2162Pixmap 2198Pixmap
2163rxvt_img::pm () 2199rxvt_img::pm ()
… …
2176void 2212void
2177rxvt_img::DESTROY () 2213rxvt_img::DESTROY ()
2178 CODE: 2214 CODE:
2179 delete THIS; 2215 delete THIS;
2180 2216
2217void
2218rxvt_img::unshare ()
2219
2220int
2221rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2222 CODE:
2223 if (items >= 2)
2224 THIS->repeat_mode (repeat);
2225 if (GIMME_V != G_VOID)
2226 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2227
2228void
2229rxvt_img::move (int dx, int dy)
2230
2231void
2232rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2233
2234void
2235rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2236
2237rxvt_img *
2238rxvt_img::clone ()
2239
2240rxvt_img *
2241rxvt_img::reify ()
2242
2243rxvt_img *
2244rxvt_img::sub_rect (int x, int y, int width, int height)
2245
2181rxvt_img * 2246rxvt_img *
2182rxvt_img::blur (int rh, int rv) 2247rxvt_img::blur (int rh, int rv)
2183 2248
2184void
2185rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2186
2187void
2188rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2189
2190void
2191rxvt_img::unshare ()
2192
2193rxvt_img * 2249rxvt_img *
2194rxvt_img::clone () 2250rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33, int new_width = 0, int new_height = 0)
2195
2196rxvt_img *
2197rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2198
2199rxvt_img *
2200rxvt_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)
2201 INIT: 2251 INIT:
2202 double matrix[9] = { 2252 double matrix[9] = {
2203 p11, p12, p13, 2253 p11, p12, p13,
2204 p21, p22, p23, 2254 p21, p22, p23,
2205 p31, p32, p33 2255 p31, p32, p33
2206 }; 2256 };
2207 C_ARGS: new_width, new_height, matrix, repeat 2257 C_ARGS: matrix, new_width, new_height
2208 2258
2209rxvt_img * 2259rxvt_img *
2210rxvt_img::scale (int new_width, int new_height) 2260rxvt_img::scale (int new_width, int new_height)
2211 2261
2212rxvt_img * 2262rxvt_img *
2213rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal) 2263rxvt_img::rotate (int x, int y, NV phi, int new_width = 0, int new_height = 0)
2214 2264
2215#endif 2265#endif
2216 2266

Diff Legend

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