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.180 by root, Thu Jun 7 12:56:27 2012 UTC vs.
Revision 1.185 by root, Thu Jun 7 17:30:33 2012 UTC

… …
382 } 382 }
383 383
384 rxvt_pop_locale (); 384 rxvt_pop_locale ();
385 } 385 }
386 386
387 if (perl) 387 if (perl && !term->perl.self)
388 { 388 {
389 // runs outside of perls ENV 389 // runs outside of perls ENV
390 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 390 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); 391 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); 392 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
… …
2032############################################################################# 2032#############################################################################
2033# fancy bg bloatstuff (TODO: should be moved up somewhere) 2033# fancy bg bloatstuff (TODO: should be moved up somewhere)
2034 2034
2035# TODO: ugly 2035# TODO: ugly
2036void 2036void
2037rxvt_term::get_geometry () 2037rxvt_term::background_geometry (bool border = false)
2038 PPCODE: 2038 PPCODE:
2039 EXTEND (SP, 4); 2039 EXTEND (SP, 4);
2040 PUSHs (sv_2mortal (newSViv (THIS->parent_x))); 2040 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2041 PUSHs (sv_2mortal (newSViv (THIS->parent_y))); 2041 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2042 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2042 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2043 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2043 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2044 2044
2045#if HAVE_IMG 2045#if HAVE_IMG
2046 2046
2047#if 0 2047#if 0
2048 2048
… …
2096 THIS->bg_pixmap = None; 2096 THIS->bg_pixmap = None;
2097 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2097 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2098 2098
2099 if (img) // TODO: cannot be false 2099 if (img) // TODO: cannot be false
2100 { 2100 {
2101 img = img->reify (); 2101 img = img->clone (); // own the img
2102
2103 {
2102 rxvt_img *img2 = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]); 2104 rxvt_img *img2 = img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);
2103 delete img; 2105 delete img;
2106 img = img2;
2107 }
2108
2109 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2110 {
2111 rxvt_img *img2 = img->sub_rect (0, 0,
2112 border ? THIS->vt_width : THIS->szHint.width,
2113 border ? THIS->vt_height : THIS->szHint.height);
2114 delete img;
2115 img = img2;
2116 }
2117
2118 {
2119 // just in case, should usually be a nop
2120 rxvt_img *img2 = img->reify ();
2121 delete img;
2122 img = img2;
2123 }
2124
2104 THIS->bg_pixmap = img2->steal (); 2125 THIS->bg_pixmap = img->steal ();
2105 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2126 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2106 2127
2107 if (!border) 2128 if (!border)
2108 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2129 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2109 2130
2110 THIS->bg_valid_since = ev::now (); // TODO: extra bloat 2131 delete img;
2111 } 2132 }
2112 2133
2113#endif 2134#endif
2114 2135
2115#endif 2136#endif
… …
2189 delete THIS; 2210 delete THIS;
2190 2211
2191void 2212void
2192rxvt_img::unshare () 2213rxvt_img::unshare ()
2193 2214
2194void 2215int
2195rxvt_img::repeat_mode (render_repeat_mode repeat = RepeatNormal) 2216rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2217 CODE:
2218 if (items >= 2)
2219 THIS->repeat_mode (repeat);
2220 if (GIMME_V != G_VOID)
2221 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2196 2222
2197void 2223void
2198rxvt_img::move (int dx, int dy) 2224rxvt_img::move (int dx, int dy)
2199 2225
2200void 2226void

Diff Legend

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