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.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);
… …
2032############################################################################# 2034#############################################################################
2033# fancy bg bloatstuff (TODO: should be moved up somewhere) 2035# fancy bg bloatstuff (TODO: should be moved up somewhere)
2034 2036
2035# TODO: ugly 2037# TODO: ugly
2036void 2038void
2037rxvt_term::get_geometry () 2039rxvt_term::background_geometry (bool border = false)
2038 PPCODE: 2040 PPCODE:
2039 EXTEND (SP, 4); 2041 EXTEND (SP, 4);
2040 PUSHs (sv_2mortal (newSViv (THIS->parent_x))); 2042 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2041 PUSHs (sv_2mortal (newSViv (THIS->parent_y))); 2043 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2042 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2044 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2043 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2045 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2044 2046
2045#if HAVE_IMG 2047#if HAVE_IMG
2048
2049#if 0
2046 2050
2047rxvt_img * 2051rxvt_img *
2048rxvt_term::new_img (SV *format, int width, int height) 2052rxvt_term::new_img (SV *format, int width, int height)
2049 CODE: 2053 CODE:
2050 XRenderPictFormat *f = SvOK (format) 2054 XRenderPictFormat *f = SvOK (format)
… …
2052 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2056 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2053 RETVAL = new rxvt_img (THIS, f, width, height); 2057 RETVAL = new rxvt_img (THIS, f, width, height);
2054 OUTPUT: 2058 OUTPUT:
2055 RETVAL 2059 RETVAL
2056 2060
2061#endif
2062
2057#if ENABLE_TRANSPARENCY 2063#if ENABLE_TRANSPARENCY
2058 2064
2059rxvt_img * 2065rxvt_img *
2060rxvt_term::new_img_from_root () 2066rxvt_term::new_img_from_root ()
2061 CODE: 2067 CODE:
… …
2084#endif 2090#endif
2085 2091
2086#if HAVE_BG_PIXMAP 2092#if HAVE_BG_PIXMAP
2087 2093
2088void 2094void
2089rxvt_term::set_background (rxvt_img *img) 2095rxvt_term::set_background (rxvt_img *img, bool border = false)
2090 CODE: 2096 CODE:
2091 THIS->bg_destroy (); 2097 THIS->bg_destroy ();
2092 THIS->bg_pixmap = None; 2098 THIS->bg_pixmap = None;
2093 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);
2094 2100
2095 if (img) // TODO: cannot be false 2101 if (img) // TODO: cannot be false
2096 { 2102 {
2097 XRenderPictFormat *f = XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2103 img = img->clone (); // own the img
2098 rxvt_img *img2 = 0;
2099 rxvt_img *img3 = 0;
2100 2104
2101 if (f != img->format) 2105 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2102 img = img2 = img->convert_to (f, THIS->pix_colors [Color_bg]); 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);
2103 2110
2111 // just in case, should usually be a nop
2104 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
2105 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)
2106 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2122 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2107 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2108 2123
2109 delete img2; 2124 delete img;
2110 } 2125 }
2111 2126
2112#endif 2127#endif
2113 2128
2114#endif 2129#endif
… …
2163 2178
2164int 2179int
2165rxvt_img::h () 2180rxvt_img::h ()
2166 CODE: 2181 CODE:
2167 RETVAL = THIS->h; 2182 RETVAL = THIS->h;
2168 OUTPUT:
2169 RETVAL
2170
2171bool
2172rxvt_img::shared ()
2173 CODE:
2174 RETVAL = THIS->shared;
2175 OUTPUT: 2183 OUTPUT:
2176 RETVAL 2184 RETVAL
2177 2185
2178Pixmap 2186Pixmap
2179rxvt_img::pm () 2187rxvt_img::pm ()
… …
2195 delete THIS; 2203 delete THIS;
2196 2204
2197void 2205void
2198rxvt_img::unshare () 2206rxvt_img::unshare ()
2199 2207
2200void 2208int
2201rxvt_img::repeat_mode (render_repeat_mode repeat = RepeatNormal) 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)));
2202 2215
2203void 2216void
2204rxvt_img::move (int dx, int dy) 2217rxvt_img::move (int dx, int dy)
2205 2218
2206void 2219void
… …
2209void 2222void
2210rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2223rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2211 2224
2212rxvt_img * 2225rxvt_img *
2213rxvt_img::clone () 2226rxvt_img::clone ()
2227
2228rxvt_img *
2229rxvt_img::reify ()
2214 2230
2215rxvt_img * 2231rxvt_img *
2216rxvt_img::sub_rect (int x, int y, int width, int height) 2232rxvt_img::sub_rect (int x, int y, int width, int height)
2217 2233
2218rxvt_img * 2234rxvt_img *

Diff Legend

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