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.170 by root, Tue Jun 5 19:32:29 2012 UTC vs.
Revision 1.188 by sf-exg, Sat Jun 9 17:28:03 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
… …
382 } 384 }
383 385
384 rxvt_pop_locale (); 386 rxvt_pop_locale ();
385 } 387 }
386 388
387 if (perl) 389 if (perl && !term->perl.self)
388 { 390 {
389 // runs outside of perls ENV 391 // runs outside of perls ENV
390 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 392 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); 393 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); 394 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
393 } 395 }
394} 396}
395 397
396void 398void
397rxvt_perl_interp::usage (int type) 399rxvt_perl_interp::usage (rxvt_term *term, int type)
398{ 400{
399 localise_env set_environ (perl_environ); 401 localise_env set_environ (perl_environ);
400 402
401 ENTER; 403 ENTER;
402 SAVETMPS; 404 SAVETMPS;
403 405
404 dSP; 406 dSP;
407 PUSHMARK (SP);
408 EXTEND (SP, 2);
409 PUSHs (sv_2mortal (newSVterm (term)));
405 XPUSHs (sv_2mortal (newSViv (type))); 410 PUSHs (sv_2mortal (newSViv (type)));
406 PUTBACK; 411 PUTBACK;
407 call_pv ("urxvt::usage", G_VOID | G_DISCARD | G_EVAL); 412 call_pv ("urxvt::usage", G_VOID | G_DISCARD);
408 413
409 FREETMPS; 414 FREETMPS;
410 LEAVE; 415 LEAVE;
411} 416}
412 417
413uint8_t 418uint8_t
414rxvt_perl_interp::resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value) 419rxvt_perl_interp::parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value)
415{ 420{
416 localise_env set_environ (perl_environ); 421 localise_env set_environ (perl_environ);
417 422
418 ENTER; 423 ENTER;
419 SAVETMPS; 424 SAVETMPS;
420 425
421 dSP; 426 dSP;
427 PUSHMARK (SP);
422 EXTEND (SP, 6); 428 EXTEND (SP, 6);
423 PUSHs (sv_2mortal (newSVterm (term))); 429 PUSHs (sv_2mortal (newSVterm (term)));
424 PUSHs (sv_2mortal (newSVpv (name, 0))); 430 PUSHs (sv_2mortal (newSVpv (name, 0)));
425 PUSHs (arg ? &PL_sv_yes : &PL_sv_no); 431 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
426 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no); 432 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
427 PUSHs (flag ? &PL_sv_yes : &PL_sv_no); 433 PUSHs (flag ? &PL_sv_yes : &PL_sv_no);
428 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef); 434 PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
429 PUTBACK; 435 PUTBACK;
430 call_pv ("urxvt::resource", G_SCALAR | G_EVAL); 436 call_pv ("urxvt::parse_resource", G_SCALAR);
437 SPAGAIN;
431 438
432 uint8_t ret = POPi; 439 uint8_t ret = POPi;
433 440
434 FREETMPS; 441 FREETMPS;
435 LEAVE; 442 LEAVE;
… …
879 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 886 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
880 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 887 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
881} 888}
882 889
883void 890void
891log (const char *msg)
892 CODE:
893 rxvt_log ("%s", msg);
894
895void
884warn (const char *msg) 896warn (const char *msg)
885 CODE: 897 CODE:
886 rxvt_warn ("%s", msg); 898 rxvt_warn ("%s", msg);
887 899
888void 900void
… …
1053 case HOOK_POSITION_CHANGE: 1065 case HOOK_POSITION_CHANGE:
1054 if (count) 1066 if (count)
1055 THIS->get_window_origin (THIS->parent_x, THIS->parent_y); 1067 THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
1056 } 1068 }
1057 } 1069 }
1070
1071void
1072rxvt_term::put_option_db (octet_string specifier, octet_string value)
1073 CODE:
1074 XrmPutStringResource (&THIS->option_db, specifier, value);
1058 1075
1059int 1076int
1060rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1077rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1061 CODE: 1078 CODE:
1062 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1079 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
… …
2017############################################################################# 2034#############################################################################
2018# fancy bg bloatstuff (TODO: should be moved up somewhere) 2035# fancy bg bloatstuff (TODO: should be moved up somewhere)
2019 2036
2020# TODO: ugly 2037# TODO: ugly
2021void 2038void
2022rxvt_term::get_geometry () 2039rxvt_term::background_geometry (bool border = false)
2023 PPCODE: 2040 PPCODE:
2024 EXTEND (SP, 4); 2041 EXTEND (SP, 4);
2025 PUSHs (sv_2mortal (newSViv (THIS->parent_x))); 2042 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2026 PUSHs (sv_2mortal (newSViv (THIS->parent_y))); 2043 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2027 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2044 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2028 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2045 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2029 2046
2030#if HAVE_IMG 2047#if HAVE_IMG
2048
2049#if 0
2031 2050
2032rxvt_img * 2051rxvt_img *
2033rxvt_term::new_img (SV *format, int width, int height) 2052rxvt_term::new_img (SV *format, int width, int height)
2034 CODE: 2053 CODE:
2035 XRenderPictFormat *f = SvOK (format) 2054 XRenderPictFormat *f = SvOK (format)
… …
2037 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2056 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2038 RETVAL = new rxvt_img (THIS, f, width, height); 2057 RETVAL = new rxvt_img (THIS, f, width, height);
2039 OUTPUT: 2058 OUTPUT:
2040 RETVAL 2059 RETVAL
2041 2060
2061#endif
2062
2042#if ENABLE_TRANSPARENCY 2063#if ENABLE_TRANSPARENCY
2043
2044#if 0
2045 2064
2046rxvt_img * 2065rxvt_img *
2047rxvt_term::new_img_from_root () 2066rxvt_term::new_img_from_root ()
2048 CODE: 2067 CODE:
2049 RETVAL = rxvt_img::new_from_root (THIS); 2068 RETVAL = rxvt_img::new_from_root (THIS);
2050 OUTPUT: 2069 OUTPUT:
2051 RETVAL 2070 RETVAL
2052 2071
2053#endif 2072#endif
2054 2073
2055#endif
2056
2057#if HAVE_PIXBUF 2074#if HAVE_PIXBUF
2058 2075
2059rxvt_img * 2076rxvt_img *
2060rxvt_term::new_img_from_file (octet_string filename) 2077rxvt_term::new_img_from_file (octet_string filename)
2061 CODE: 2078 CODE:
… …
2073#endif 2090#endif
2074 2091
2075#if HAVE_BG_PIXMAP 2092#if HAVE_BG_PIXMAP
2076 2093
2077void 2094void
2078rxvt_term::set_background (rxvt_img *img) 2095rxvt_term::set_background (rxvt_img *img, bool border = false)
2079 CODE: 2096 CODE:
2080 THIS->bg_destroy (); 2097 THIS->bg_destroy ();
2081 THIS->bg_pixmap = None; 2098 THIS->bg_pixmap = None;
2082 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH; 2099 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2083 2100
2084 if (img) // TODO: cannot be false 2101 if (img) // TODO: cannot be false
2085 { 2102 {
2103 img = img->clone (); // own the img
2104
2105 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2106 img->sub_rect (0, 0,
2107 border ? THIS->vt_width : THIS->szHint.width,
2108 border ? THIS->vt_height : THIS->szHint.height)
2109 ->replace (img);
2110
2111 // just in case, should usually be a nop
2086 img->unshare (); 2112 img->reify ()
2113 ->replace (img);
2114
2115 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2116 ->replace (img);
2117
2087 THIS->bg_pixmap = img->steal (); 2118 THIS->bg_pixmap = img->steal ();
2119 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2120
2121 if (!border)
2088 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2122 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2089 THIS->bg_valid_since = ev::now (); // TODO: extra bloat 2123
2124 delete img;
2090 } 2125 }
2091 2126
2092#endif 2127#endif
2093 2128
2094#endif 2129#endif
… …
2143 2178
2144int 2179int
2145rxvt_img::h () 2180rxvt_img::h ()
2146 CODE: 2181 CODE:
2147 RETVAL = THIS->h; 2182 RETVAL = THIS->h;
2148 OUTPUT:
2149 RETVAL
2150
2151bool
2152rxvt_img::shared ()
2153 CODE:
2154 RETVAL = THIS->shared;
2155 OUTPUT: 2183 OUTPUT:
2156 RETVAL 2184 RETVAL
2157 2185
2158Pixmap 2186Pixmap
2159rxvt_img::pm () 2187rxvt_img::pm ()
… …
2172void 2200void
2173rxvt_img::DESTROY () 2201rxvt_img::DESTROY ()
2174 CODE: 2202 CODE:
2175 delete THIS; 2203 delete THIS;
2176 2204
2205void
2206rxvt_img::unshare ()
2207
2208int
2209rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2210 CODE:
2211 if (items >= 2)
2212 THIS->repeat_mode (repeat);
2213 if (GIMME_V != G_VOID)
2214 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2215
2216void
2217rxvt_img::move (int dx, int dy)
2218
2219void
2220rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2221
2222void
2223rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2224
2225rxvt_img *
2226rxvt_img::clone ()
2227
2228rxvt_img *
2229rxvt_img::reify ()
2230
2231rxvt_img *
2232rxvt_img::sub_rect (int x, int y, int width, int height)
2233
2177rxvt_img * 2234rxvt_img *
2178rxvt_img::blur (int rh, int rv) 2235rxvt_img::blur (int rh, int rv)
2179 2236
2180void
2181rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2182
2183void
2184rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2185
2186void
2187rxvt_img::unshare ()
2188
2189rxvt_img * 2237rxvt_img *
2190rxvt_img::clone ()
2191
2192rxvt_img *
2193rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2194
2195rxvt_img *
2196rxvt_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) 2238rxvt_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)
2197 INIT: 2239 INIT:
2198 double matrix[9] = { 2240 double matrix[9] = {
2199 p11, p12, p13, 2241 p11, p12, p13,
2200 p21, p22, p23, 2242 p21, p22, p23,
2201 p31, p32, p33 2243 p31, p32, p33
2202 }; 2244 };
2203 C_ARGS: new_width, new_height, matrix, repeat 2245 C_ARGS: new_width, new_height, matrix
2204 2246
2205rxvt_img * 2247rxvt_img *
2206rxvt_img::scale (int new_width, int new_height) 2248rxvt_img::scale (int new_width, int new_height)
2207 2249
2208rxvt_img * 2250rxvt_img *
2209rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal) 2251rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
2210 2252
2211#endif 2253#endif
2212 2254

Diff Legend

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