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.189 by root, Sun Jun 10 10:29:26 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
65parse_color (rxvt_screen *s, rxvt_color &c, SV *sv) 67parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
66{ 68{
67 //TODO: support component stuff 69 //TODO: support component stuff, 0..1
68 c.set (s, SvPVbyte_nolen (sv)); 70 c.set (s, SvPVbyte_nolen (sv));
69} 71}
70 72
71///////////////////////////////////////////////////////////////////////////// 73/////////////////////////////////////////////////////////////////////////////
72 74
… …
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
2046 2048
2047rxvt_img * 2049rxvt_img *
2048rxvt_term::new_img (SV *format, int width, int height) 2050rxvt_term::new_img (SV *format, int width = 1, int height = 1)
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, 0, 0, width, height);
2056 RETVAL->alloc ();
2054 OUTPUT: 2057 OUTPUT:
2055 RETVAL 2058 RETVAL
2056 2059
2057#if ENABLE_TRANSPARENCY 2060#if ENABLE_TRANSPARENCY
2058 2061
… …
2084#endif 2087#endif
2085 2088
2086#if HAVE_BG_PIXMAP 2089#if HAVE_BG_PIXMAP
2087 2090
2088void 2091void
2089rxvt_term::set_background (rxvt_img *img) 2092rxvt_term::set_background (rxvt_img *img, bool border = false)
2090 CODE: 2093 CODE:
2091 THIS->bg_destroy (); 2094 THIS->bg_destroy ();
2092 THIS->bg_pixmap = None; 2095 THIS->bg_pixmap = None;
2093 THIS->bg_flags &= ~rxvt_term::BG_NEEDS_REFRESH; 2096 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2094 2097
2095 if (img) // TODO: cannot be false 2098 if (img) // TODO: cannot be false
2096 { 2099 {
2100 img = img->clone (); // own the img
2101
2102 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2103 img->sub_rect (0, 0,
2104 border ? THIS->vt_width : THIS->szHint.width,
2105 border ? THIS->vt_height : THIS->szHint.height)
2106 ->replace (img);
2107
2108 // just in case, should usually be a nop
2109 img->reify ()
2110 ->replace (img);
2111
2097 img = img->convert_to (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]); 2112 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2113 ->replace (img);
2114
2098 THIS->bg_pixmap = img->steal (); 2115 THIS->bg_pixmap = img->steal ();
2116 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2117
2118 if (!border)
2099 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2119 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2100 THIS->bg_valid_since = ev::now (); // TODO: extra bloat 2120
2101 delete img; 2121 delete img;
2102 } 2122 }
2103 2123
2104#endif 2124#endif
2105 2125
… …
2180 delete THIS; 2200 delete THIS;
2181 2201
2182void 2202void
2183rxvt_img::unshare () 2203rxvt_img::unshare ()
2184 2204
2185void 2205int
2186rxvt_img::repeat_mode (render_repeat_mode repeat = RepeatNormal) 2206rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2207 CODE:
2208 if (items >= 2)
2209 THIS->repeat_mode (repeat);
2210 if (GIMME_V != G_VOID)
2211 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2187 2212
2188void 2213void
2189rxvt_img::move (int dx, int dy) 2214rxvt_img::move (int dx, int dy)
2190 2215
2191void 2216void
… …
2194void 2219void
2195rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.) 2220rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2196 2221
2197rxvt_img * 2222rxvt_img *
2198rxvt_img::clone () 2223rxvt_img::clone ()
2224
2225rxvt_img *
2226rxvt_img::reify ()
2199 2227
2200rxvt_img * 2228rxvt_img *
2201rxvt_img::sub_rect (int x, int y, int width, int height) 2229rxvt_img::sub_rect (int x, int y, int width, int height)
2202 2230
2203rxvt_img * 2231rxvt_img *

Diff Legend

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