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.176 by root, Wed Jun 6 22:01:44 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
2047#if 0
2046 2048
2047rxvt_img * 2049rxvt_img *
2048rxvt_term::new_img (SV *format, int width, int height) 2050rxvt_term::new_img (SV *format, int width, int height)
2049 CODE: 2051 CODE:
2050 XRenderPictFormat *f = SvOK (format) 2052 XRenderPictFormat *f = SvOK (format)
… …
2052 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2054 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2053 RETVAL = new rxvt_img (THIS, f, width, height); 2055 RETVAL = new rxvt_img (THIS, f, width, height);
2054 OUTPUT: 2056 OUTPUT:
2055 RETVAL 2057 RETVAL
2056 2058
2059#endif
2060
2057#if ENABLE_TRANSPARENCY 2061#if ENABLE_TRANSPARENCY
2058 2062
2059rxvt_img * 2063rxvt_img *
2060rxvt_term::new_img_from_root () 2064rxvt_term::new_img_from_root ()
2061 CODE: 2065 CODE:
… …
2084#endif 2088#endif
2085 2089
2086#if HAVE_BG_PIXMAP 2090#if HAVE_BG_PIXMAP
2087 2091
2088void 2092void
2089rxvt_term::set_background (rxvt_img *img) 2093rxvt_term::set_background (rxvt_img *img, bool border = false)
2090 CODE: 2094 CODE:
2091 THIS->bg_destroy (); 2095 THIS->bg_destroy ();
2092 THIS->bg_pixmap = None; 2096 THIS->bg_pixmap = None;
2093 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH; 2097 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2094 2098
2095 if (img) // TODO: cannot be false 2099 if (img) // TODO: cannot be false
2096 { 2100 {
2097 XRenderPictFormat *f = XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2101 img = img->clone (); // own the img
2102
2103 {
2104 rxvt_img *img2 = img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);
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
2098 rxvt_img *img2 = 0; 2120 rxvt_img *img2 = img->reify ();
2099 rxvt_img *img3 = 0; 2121 delete img;
2122 img = img2;
2123 }
2100 2124
2101 if (f != img->format)
2102 img = img2 = img->convert_to (f, THIS->pix_colors [Color_bg]);
2103
2104 img->unshare ();
2105 THIS->bg_pixmap = img->steal (); 2125 THIS->bg_pixmap = img->steal ();
2126 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2127
2128 if (!border)
2106 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2129 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2107 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2108 2130
2109 delete img2; 2131 delete img;
2110 } 2132 }
2111 2133
2112#endif 2134#endif
2113 2135
2114#endif 2136#endif
… …
2163 2185
2164int 2186int
2165rxvt_img::h () 2187rxvt_img::h ()
2166 CODE: 2188 CODE:
2167 RETVAL = THIS->h; 2189 RETVAL = THIS->h;
2168 OUTPUT:
2169 RETVAL
2170
2171bool
2172rxvt_img::shared ()
2173 CODE:
2174 RETVAL = THIS->shared;
2175 OUTPUT: 2190 OUTPUT:
2176 RETVAL 2191 RETVAL
2177 2192
2178Pixmap 2193Pixmap
2179rxvt_img::pm () 2194rxvt_img::pm ()
… …
2195 delete THIS; 2210 delete THIS;
2196 2211
2197void 2212void
2198rxvt_img::unshare () 2213rxvt_img::unshare ()
2199 2214
2200void 2215int
2201rxvt_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)));
2202 2222
2203void 2223void
2204rxvt_img::move (int dx, int dy) 2224rxvt_img::move (int dx, int dy)
2205 2225
2206void 2226void
… …
2209void 2229void
2210rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2230rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2211 2231
2212rxvt_img * 2232rxvt_img *
2213rxvt_img::clone () 2233rxvt_img::clone ()
2234
2235rxvt_img *
2236rxvt_img::reify ()
2214 2237
2215rxvt_img * 2238rxvt_img *
2216rxvt_img::sub_rect (int x, int y, int width, int height) 2239rxvt_img::sub_rect (int x, int y, int width, int height)
2217 2240
2218rxvt_img * 2241rxvt_img *

Diff Legend

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