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.203 by root, Mon Jul 2 01:35:37 2012 UTC vs.
Revision 1.216 by root, Thu Oct 3 01:11:38 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;
… …
810 const_iv (RS_Bold), 812 const_iv (RS_Bold),
811 const_iv (RS_Italic), 813 const_iv (RS_Italic),
812 const_iv (RS_Blink), 814 const_iv (RS_Blink),
813 const_iv (RS_RVid), 815 const_iv (RS_RVid),
814 const_iv (RS_Uline), 816 const_iv (RS_Uline),
817
818 // TODO: should support all colour constants, create colorinc.h &c
819 const_iv (Color_fg),
820 const_iv (Color_bg),
821 const_iv (Color_fade),
822 const_iv (Color_pointer_fg),
823 const_iv (Color_pointer_bg),
824 const_iv (Color_border),
825 const_iv (NRS_COLORS),
826 const_iv (TOTAL_COLORS),
815 827
816 const_iv (CurrentTime), 828 const_iv (CurrentTime),
817 const_iv (ShiftMask), 829 const_iv (ShiftMask),
818 const_iv (LockMask), 830 const_iv (LockMask),
819 const_iv (ControlMask), 831 const_iv (ControlMask),
… …
1877 1889
1878 if (ix) 1890 if (ix)
1879 { 1891 {
1880 THIS->selection.screen = THIS->current_screen; 1892 THIS->selection.screen = THIS->current_screen;
1881 1893
1882 THIS->want_refresh = 1; 1894 THIS->selection_changed ();
1883 THIS->refresh_check (); 1895 THIS->refresh_check ();
1884 } 1896 }
1885 } 1897 }
1886} 1898}
1887 1899
… …
1891 RETVAL = THIS->selection.screen; 1903 RETVAL = THIS->selection.screen;
1892 if (screen >= 0) 1904 if (screen >= 0)
1893 THIS->selection.screen = screen; 1905 THIS->selection.screen = screen;
1894 OUTPUT: 1906 OUTPUT:
1895 RETVAL 1907 RETVAL
1908
1909void
1910rxvt_term::selection_request (Time tm, int selnum)
1896 1911
1897void 1912void
1898rxvt_term::selection_clear (bool clipboard = false) 1913rxvt_term::selection_clear (bool clipboard = false)
1899 1914
1900void 1915void
… …
2201 OUTPUT: 2216 OUTPUT:
2202 RETVAL 2217 RETVAL
2203 2218
2204#endif 2219#endif
2205 2220
2206#if HAVE_BG_PIXMAP
2207
2208void 2221void
2209rxvt_term::set_background (rxvt_img *img, bool border = false) 2222rxvt_term::set_background (rxvt_img *img, bool border = false)
2210 CODE: 2223 CODE:
2211 THIS->bg_destroy (); 2224 delete THIS->bg_img;
2212 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2225 THIS->bg_img = 0;
2226 THIS->bg_flags = 0;
2213 2227
2214 if (img) // TODO: cannot be false 2228 if (img) // TODO: cannot be false
2215 { 2229 {
2216 img = img->clone (); // own the img 2230 img = img->clone (); // own the img
2217 2231
2218 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2232 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2219 img->sub_rect (0, 0, 2233 img->sub_rect (0, 0,
2220 border ? THIS->vt_width : THIS->szHint.width, 2234 border ? THIS->vt_width : THIS->szHint.width,
2221 border ? THIS->vt_height : THIS->szHint.height) 2235 border ? THIS->vt_height : THIS->szHint.height)
2222 ->replace (img); 2236 ->replace (img);
2223 2237
2224 // just in case, should usually be a nop 2238 // just in case, should usually be a nop
2225 img->reify () 2239 img->reify ()
2226 ->replace (img); 2240 ->replace (img);
2227 2241
… …
2232 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2246 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2233 2247
2234 if (!border) 2248 if (!border)
2235 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2249 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2236 } 2250 }
2237
2238#endif
2239 2251
2240#endif 2252#endif
2241 2253
2242############################################################################# 2254#############################################################################
2243# urxvt::overlay 2255# urxvt::overlay
… …
2313 RETVAL = THIS->pm; 2325 RETVAL = THIS->pm;
2314 OUTPUT: 2326 OUTPUT:
2315 RETVAL 2327 RETVAL
2316 2328
2317void 2329void
2318rxvt_img::fill (SV *c) 2330rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2331 PROTOTYPE: $;$$$$
2319 INIT: 2332 INIT:
2320 rgba cc = parse_rgba (c, THIS->s); 2333 rgba cc = parse_rgba (c, THIS->s);
2321 C_ARGS: cc 2334 C_ARGS: cc, x, y, w, h
2322 2335
2323void 2336void
2324rxvt_img::DESTROY () 2337rxvt_img::DESTROY ()
2325 CODE: 2338 CODE:
2326 delete THIS; 2339 delete THIS;
… …
2360rxvt_img * 2373rxvt_img *
2361rxvt_img::sub_rect (int x, int y, int width, int height) 2374rxvt_img::sub_rect (int x, int y, int width, int height)
2362 2375
2363rxvt_img * 2376rxvt_img *
2364rxvt_img::blur (int rh, int rv) 2377rxvt_img::blur (int rh, int rv)
2378
2379rxvt_img *
2380rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2365 2381
2366rxvt_img * 2382rxvt_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) 2383rxvt_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: 2384 INIT:
2369 rxvt_img::nv matrix[3][3] = { 2385 rxvt_img::nv matrix[3][3] = {
… …
2384 INIT: 2400 INIT:
2385 rgba cc = parse_rgba (c, THIS->s); 2401 rgba cc = parse_rgba (c, THIS->s);
2386 C_ARGS: cc 2402 C_ARGS: cc
2387 2403
2388rxvt_img * 2404rxvt_img *
2405rxvt_img::shade (rxvt_img::nv factor)
2406
2407rxvt_img *
2389rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2408rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2390 CODE: 2409 CODE:
2391 rxvt_img::nv *vparams = 0; 2410 rxvt_img::nv *vparams = 0;
2392 int nparams = 0; 2411 int nparams = 0;
2393 2412
2394 if (SvOK (params)) 2413 if (SvOK (params))
2395 { 2414 {
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) 2415 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2400 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2416 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2401 2417
2402 nparams = av_len ((AV *)SvRV (params)) + 1; 2418 nparams = av_len ((AV *)SvRV (params)) + 1;
2403 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2419 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2404 2420
2405 for (int i = 0; i < nparams; ++i) 2421 for (int i = 0; i < nparams; ++i)
2406 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2422 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2407 } 2423 }
2408 2424
2409 RETVAL = THIS->filter (name, nparams, vparams); 2425 RETVAL = THIS->filter (name, nparams, vparams);
2426 free (vparams);
2410 OUTPUT: 2427 OUTPUT:
2411 RETVAL 2428 RETVAL
2412 2429
2413#endif 2430#endif
2414 2431

Diff Legend

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