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.173 by root, Wed Jun 6 11:46:11 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);
… …
400 402
401 ENTER; 403 ENTER;
402 SAVETMPS; 404 SAVETMPS;
403 405
404 dSP; 406 dSP;
407 PUSHMARK (SP);
405 EXTEND (SP, 2); 408 EXTEND (SP, 2);
406 PUSHs (sv_2mortal (newSVterm (term))); 409 PUSHs (sv_2mortal (newSVterm (term)));
407 PUSHs (sv_2mortal (newSViv (type))); 410 PUSHs (sv_2mortal (newSViv (type)));
408 PUTBACK; 411 PUTBACK;
409 call_pv ("urxvt::usage", G_VOID | G_DISCARD); 412 call_pv ("urxvt::usage", G_VOID | G_DISCARD);
… …
419 422
420 ENTER; 423 ENTER;
421 SAVETMPS; 424 SAVETMPS;
422 425
423 dSP; 426 dSP;
427 PUSHMARK (SP);
424 EXTEND (SP, 6); 428 EXTEND (SP, 6);
425 PUSHs (sv_2mortal (newSVterm (term))); 429 PUSHs (sv_2mortal (newSVterm (term)));
426 PUSHs (sv_2mortal (newSVpv (name, 0))); 430 PUSHs (sv_2mortal (newSVpv (name, 0)));
427 PUSHs (arg ? &PL_sv_yes : &PL_sv_no); 431 PUSHs (arg ? &PL_sv_yes : &PL_sv_no);
428 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no); 432 PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
… …
2030############################################################################# 2034#############################################################################
2031# fancy bg bloatstuff (TODO: should be moved up somewhere) 2035# fancy bg bloatstuff (TODO: should be moved up somewhere)
2032 2036
2033# TODO: ugly 2037# TODO: ugly
2034void 2038void
2035rxvt_term::get_geometry () 2039rxvt_term::background_geometry (bool border = false)
2036 PPCODE: 2040 PPCODE:
2037 EXTEND (SP, 4); 2041 EXTEND (SP, 4);
2038 PUSHs (sv_2mortal (newSViv (THIS->parent_x))); 2042 PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
2039 PUSHs (sv_2mortal (newSViv (THIS->parent_y))); 2043 PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
2040 PUSHs (sv_2mortal (newSViv (THIS->szHint.width))); 2044 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width : THIS->szHint.width )));
2041 PUSHs (sv_2mortal (newSViv (THIS->szHint.height))); 2045 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2042 2046
2043#if HAVE_IMG 2047#if HAVE_IMG
2048
2049#if 0
2044 2050
2045rxvt_img * 2051rxvt_img *
2046rxvt_term::new_img (SV *format, int width, int height) 2052rxvt_term::new_img (SV *format, int width, int height)
2047 CODE: 2053 CODE:
2048 XRenderPictFormat *f = SvOK (format) 2054 XRenderPictFormat *f = SvOK (format)
… …
2050 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2056 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2051 RETVAL = new rxvt_img (THIS, f, width, height); 2057 RETVAL = new rxvt_img (THIS, f, width, height);
2052 OUTPUT: 2058 OUTPUT:
2053 RETVAL 2059 RETVAL
2054 2060
2061#endif
2062
2055#if ENABLE_TRANSPARENCY 2063#if ENABLE_TRANSPARENCY
2056 2064
2057rxvt_img * 2065rxvt_img *
2058rxvt_term::new_img_from_root () 2066rxvt_term::new_img_from_root ()
2059 CODE: 2067 CODE:
… …
2082#endif 2090#endif
2083 2091
2084#if HAVE_BG_PIXMAP 2092#if HAVE_BG_PIXMAP
2085 2093
2086void 2094void
2087rxvt_term::set_background (rxvt_img *img) 2095rxvt_term::set_background (rxvt_img *img, bool border = false)
2088 CODE: 2096 CODE:
2089 THIS->bg_destroy (); 2097 THIS->bg_destroy ();
2090 THIS->bg_pixmap = None; 2098 THIS->bg_pixmap = None;
2091 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);
2092 2100
2093 if (img) // TODO: cannot be false 2101 if (img) // TODO: cannot be false
2094 { 2102 {
2103 img = img->clone (); // own the img
2104
2105 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
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);
2110
2111 // just in case, should usually be a nop
2095 img->unshare (); 2112 img->reify ()
2096 //TODO: convetr to visual, possibly precompose with colour 2113 ->replace (img);
2114
2115 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2116 ->replace (img);
2117
2097 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)
2098 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH; 2122 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2099 THIS->bg_valid_since = ev::now (); // TODO: extra bloat 2123
2124 delete img;
2100 } 2125 }
2101 2126
2102#endif 2127#endif
2103 2128
2104#endif 2129#endif
… …
2153 2178
2154int 2179int
2155rxvt_img::h () 2180rxvt_img::h ()
2156 CODE: 2181 CODE:
2157 RETVAL = THIS->h; 2182 RETVAL = THIS->h;
2158 OUTPUT:
2159 RETVAL
2160
2161bool
2162rxvt_img::shared ()
2163 CODE:
2164 RETVAL = THIS->shared;
2165 OUTPUT: 2183 OUTPUT:
2166 RETVAL 2184 RETVAL
2167 2185
2168Pixmap 2186Pixmap
2169rxvt_img::pm () 2187rxvt_img::pm ()
… …
2182void 2200void
2183rxvt_img::DESTROY () 2201rxvt_img::DESTROY ()
2184 CODE: 2202 CODE:
2185 delete THIS; 2203 delete THIS;
2186 2204
2205void
2206rxvt_img::unshare ()
2207
2208int
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)));
2215
2216void
2217rxvt_img::move (int dx, int dy)
2218
2219void
2220rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2221
2222void
2223rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2224
2225rxvt_img *
2226rxvt_img::clone ()
2227
2228rxvt_img *
2229rxvt_img::reify ()
2230
2231rxvt_img *
2232rxvt_img::sub_rect (int x, int y, int width, int height)
2233
2187rxvt_img * 2234rxvt_img *
2188rxvt_img::blur (int rh, int rv) 2235rxvt_img::blur (int rh, int rv)
2189 2236
2190void
2191rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
2192
2193void
2194rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
2195
2196void
2197rxvt_img::unshare ()
2198
2199rxvt_img * 2237rxvt_img *
2200rxvt_img::clone ()
2201
2202rxvt_img *
2203rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
2204
2205rxvt_img *
2206rxvt_img::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33, render_repeat_mode repeat = RepeatNormal) 2238rxvt_img::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)
2207 INIT: 2239 INIT:
2208 double matrix[9] = { 2240 double matrix[9] = {
2209 p11, p12, p13, 2241 p11, p12, p13,
2210 p21, p22, p23, 2242 p21, p22, p23,
2211 p31, p32, p33 2243 p31, p32, p33
2212 }; 2244 };
2213 C_ARGS: new_width, new_height, matrix, repeat 2245 C_ARGS: new_width, new_height, matrix
2214 2246
2215rxvt_img * 2247rxvt_img *
2216rxvt_img::scale (int new_width, int new_height) 2248rxvt_img::scale (int new_width, int new_height)
2217 2249
2218rxvt_img * 2250rxvt_img *
2219rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal) 2251rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi)
2220 2252
2221#endif 2253#endif
2222 2254

Diff Legend

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