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.202 by sf-exg, Sat Jun 30 09:01:12 2012 UTC vs.
Revision 1.214 by sf-exg, Fri Mar 1 09:33:51 2013 UTC

… …
57typedef int render_repeat_mode; 57typedef int render_repeat_mode;
58 58
59#if HAVE_PIXBUF 59#if HAVE_PIXBUF
60typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif 61#endif
62#if HAVE_IMG
62typedef rxvt_img * urxvt__img; 63typedef rxvt_img * urxvt__img;
63typedef rxvt_img::nv rxvt_img__nv; 64typedef rxvt_img::nv rxvt_img__nv;
64 65
65///////////////////////////////////////////////////////////////////////////// 66/////////////////////////////////////////////////////////////////////////////
66 67
… …
105 106
106 return c; 107 return c;
107} 108}
108 109
109///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
110 112
111static wchar_t * 113static wchar_t *
112sv2wcs (SV *sv) 114sv2wcs (SV *sv)
113{ 115{
114 STRLEN len; 116 STRLEN len;
… …
1877 1879
1878 if (ix) 1880 if (ix)
1879 { 1881 {
1880 THIS->selection.screen = THIS->current_screen; 1882 THIS->selection.screen = THIS->current_screen;
1881 1883
1882 THIS->want_refresh = 1; 1884 THIS->selection_changed ();
1883 THIS->refresh_check (); 1885 THIS->refresh_check ();
1884 } 1886 }
1885 } 1887 }
1886} 1888}
1887 1889
… …
2201 OUTPUT: 2203 OUTPUT:
2202 RETVAL 2204 RETVAL
2203 2205
2204#endif 2206#endif
2205 2207
2206#if HAVE_BG_PIXMAP
2207
2208void 2208void
2209rxvt_term::set_background (rxvt_img *img, bool border = false) 2209rxvt_term::set_background (rxvt_img *img, bool border = false)
2210 CODE: 2210 CODE:
2211 THIS->bg_destroy (); 2211 delete THIS->bg_img;
2212 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2212 THIS->bg_img = 0;
2213 THIS->bg_flags = 0;
2213 2214
2214 if (img) // TODO: cannot be false 2215 if (img) // TODO: cannot be false
2215 { 2216 {
2216 img = img->clone (); // own the img 2217 img = img->clone (); // own the img
2217 2218
2218 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2219 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2219 img->sub_rect (0, 0, 2220 img->sub_rect (0, 0,
2220 border ? THIS->vt_width : THIS->szHint.width, 2221 border ? THIS->vt_width : THIS->szHint.width,
2221 border ? THIS->vt_height : THIS->szHint.height) 2222 border ? THIS->vt_height : THIS->szHint.height)
2222 ->replace (img); 2223 ->replace (img);
2223 2224
2224 // just in case, should usually be a nop 2225 // just in case, should usually be a nop
2225 img->reify () 2226 img->reify ()
2226 ->replace (img); 2227 ->replace (img);
2227 2228
… …
2232 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2233 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2233 2234
2234 if (!border) 2235 if (!border)
2235 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2236 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2236 } 2237 }
2237
2238#endif
2239 2238
2240#endif 2239#endif
2241 2240
2242############################################################################# 2241#############################################################################
2243# urxvt::overlay 2242# urxvt::overlay
… …
2313 RETVAL = THIS->pm; 2312 RETVAL = THIS->pm;
2314 OUTPUT: 2313 OUTPUT:
2315 RETVAL 2314 RETVAL
2316 2315
2317void 2316void
2318rxvt_img::fill (SV *c) 2317rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2318 PROTOTYPE: $;$$$$
2319 INIT: 2319 INIT:
2320 rgba cc = parse_rgba (c, THIS->s); 2320 rgba cc = parse_rgba (c, THIS->s);
2321 C_ARGS: cc 2321 C_ARGS: cc, x, y, w, h
2322 2322
2323void 2323void
2324rxvt_img::DESTROY () 2324rxvt_img::DESTROY ()
2325 CODE: 2325 CODE:
2326 delete THIS; 2326 delete THIS;
… …
2360rxvt_img * 2360rxvt_img *
2361rxvt_img::sub_rect (int x, int y, int width, int height) 2361rxvt_img::sub_rect (int x, int y, int width, int height)
2362 2362
2363rxvt_img * 2363rxvt_img *
2364rxvt_img::blur (int rh, int rv) 2364rxvt_img::blur (int rh, int rv)
2365
2366rxvt_img *
2367rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2365 2368
2366rxvt_img * 2369rxvt_img *
2367rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33) 2370rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33)
2368 INIT: 2371 INIT:
2369 rxvt_img::nv matrix[3][3] = { 2372 rxvt_img::nv matrix[3][3] = {
… …
2377rxvt_img::scale (int new_width, int new_height) 2380rxvt_img::scale (int new_width, int new_height)
2378 2381
2379rxvt_img * 2382rxvt_img *
2380rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2383rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2381 2384
2382void 2385rxvt_img *
2383rxvt_img::tint (SV *c) 2386rxvt_img::tint (SV *c)
2384 INIT: 2387 INIT:
2385 rgba cc = parse_rgba (c, THIS->s); 2388 rgba cc = parse_rgba (c, THIS->s);
2386 C_ARGS: cc 2389 C_ARGS: cc
2387 2390
2388rxvt_img * 2391rxvt_img *
2392rxvt_img::shade (rxvt_img::nv factor)
2393
2394rxvt_img *
2389rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2395rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2390 CODE: 2396 CODE:
2391 rxvt_img::nv *vparams = 0; 2397 rxvt_img::nv *vparams = 0;
2392 int nparams = 0; 2398 int nparams = 0;
2393 2399
2394 if (SvOK (params)) 2400 if (SvOK (params))
2395 { 2401 {
2396 // we overlay rxvt_temp_buf, what a hack
2397 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2398
2399 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2402 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2400 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2403 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2401 2404
2402 nparams = av_len ((AV *)SvRV (params)) + 1; 2405 nparams = av_len ((AV *)SvRV (params)) + 1;
2403 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2406 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2404 2407
2405 for (int i = 0; i < nparams; ++i) 2408 for (int i = 0; i < nparams; ++i)
2406 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2409 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2407 } 2410 }
2408 2411
2409 RETVAL = THIS->filter (name, nparams, vparams); 2412 RETVAL = THIS->filter (name, nparams, vparams);
2413 free (vparams);
2410 OUTPUT: 2414 OUTPUT:
2411 RETVAL 2415 RETVAL
2412 2416
2413#endif 2417#endif
2414 2418

Diff Legend

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