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.177 by root, Thu Jun 7 07:53:12 2012 UTC vs.
Revision 1.180 by root, Thu Jun 7 12:56:27 2012 UTC

… …
2042 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2042 PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));
2043 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2043 PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));
2044 2044
2045#if HAVE_IMG 2045#if HAVE_IMG
2046 2046
2047#if 0
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)
2051 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2053 ? XRenderFindStandardFormat (THIS->dpy, SvIV (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 {
2101 img = img->reify ();
2097 img = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]); 2102 rxvt_img *img2 = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]);
2103 delete img;
2098 THIS->bg_pixmap = img->steal (); 2104 THIS->bg_pixmap = img2->steal ();
2105 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2106
2107 if (!border)
2099 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2108 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2109
2100 THIS->bg_valid_since = ev::now (); // TODO: extra bloat 2110 THIS->bg_valid_since = ev::now (); // TODO: extra bloat
2101 delete img;
2102 } 2111 }
2103 2112
2104#endif 2113#endif
2105 2114
2106#endif 2115#endif
… …
2194void 2203void
2195rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2204rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2196 2205
2197rxvt_img * 2206rxvt_img *
2198rxvt_img::clone () 2207rxvt_img::clone ()
2208
2209rxvt_img *
2210rxvt_img::reify ()
2199 2211
2200rxvt_img * 2212rxvt_img *
2201rxvt_img::sub_rect (int x, int y, int width, int height) 2213rxvt_img::sub_rect (int x, int y, int width, int height)
2202 2214
2203rxvt_img * 2215rxvt_img *

Diff Legend

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