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.201 by sf-exg, Fri Jun 29 13:41:43 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),
… …
1454 CODE: 1466 CODE:
1455 RETVAL = THIS->parent_y; 1467 RETVAL = THIS->parent_y;
1456 OUTPUT: 1468 OUTPUT:
1457 RETVAL 1469 RETVAL
1458 1470
1471Window
1472rxvt_term::vt ()
1473 CODE:
1474 RETVAL = THIS->vt;
1475 OUTPUT:
1476 RETVAL
1477
1459void 1478void
1460rxvt_term::vt_emask_add (U32 emask) 1479rxvt_term::vt_emask_add (U32 emask)
1461 CODE: 1480 CODE:
1462 THIS->vt_emask_perl |= emask; 1481 THIS->vt_emask_perl |= emask;
1463 THIS->vt_select_input (); 1482 THIS->vt_select_input ();
… …
1870 1889
1871 if (ix) 1890 if (ix)
1872 { 1891 {
1873 THIS->selection.screen = THIS->current_screen; 1892 THIS->selection.screen = THIS->current_screen;
1874 1893
1875 THIS->want_refresh = 1; 1894 THIS->selection_changed ();
1876 THIS->refresh_check (); 1895 THIS->refresh_check ();
1877 } 1896 }
1878 } 1897 }
1879} 1898}
1880 1899
… …
1884 RETVAL = THIS->selection.screen; 1903 RETVAL = THIS->selection.screen;
1885 if (screen >= 0) 1904 if (screen >= 0)
1886 THIS->selection.screen = screen; 1905 THIS->selection.screen = screen;
1887 OUTPUT: 1906 OUTPUT:
1888 RETVAL 1907 RETVAL
1908
1909void
1910rxvt_term::selection_request (Time tm, int selnum)
1889 1911
1890void 1912void
1891rxvt_term::selection_clear (bool clipboard = false) 1913rxvt_term::selection_clear (bool clipboard = false)
1892 1914
1893void 1915void
… …
2194 OUTPUT: 2216 OUTPUT:
2195 RETVAL 2217 RETVAL
2196 2218
2197#endif 2219#endif
2198 2220
2199#if HAVE_BG_PIXMAP
2200
2201void 2221void
2202rxvt_term::set_background (rxvt_img *img, bool border = false) 2222rxvt_term::set_background (rxvt_img *img, bool border = false)
2203 CODE: 2223 CODE:
2204 THIS->bg_destroy (); 2224 delete THIS->bg_img;
2205 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;
2206 2227
2207 if (img) // TODO: cannot be false 2228 if (img) // TODO: cannot be false
2208 { 2229 {
2209 img = img->clone (); // own the img 2230 img = img->clone (); // own the img
2210 2231
2211 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2232 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2212 img->sub_rect (0, 0, 2233 img->sub_rect (0, 0,
2213 border ? THIS->vt_width : THIS->szHint.width, 2234 border ? THIS->vt_width : THIS->szHint.width,
2214 border ? THIS->vt_height : THIS->szHint.height) 2235 border ? THIS->vt_height : THIS->szHint.height)
2215 ->replace (img); 2236 ->replace (img);
2216 2237
2217 // just in case, should usually be a nop 2238 // just in case, should usually be a nop
2218 img->reify () 2239 img->reify ()
2219 ->replace (img); 2240 ->replace (img);
2220 2241
… …
2225 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;
2226 2247
2227 if (!border) 2248 if (!border)
2228 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2249 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2229 } 2250 }
2230
2231#endif
2232 2251
2233#endif 2252#endif
2234 2253
2235############################################################################# 2254#############################################################################
2236# urxvt::overlay 2255# urxvt::overlay
… …
2306 RETVAL = THIS->pm; 2325 RETVAL = THIS->pm;
2307 OUTPUT: 2326 OUTPUT:
2308 RETVAL 2327 RETVAL
2309 2328
2310void 2329void
2311rxvt_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: $;$$$$
2312 INIT: 2332 INIT:
2313 rgba cc = parse_rgba (c, THIS->s); 2333 rgba cc = parse_rgba (c, THIS->s);
2314 C_ARGS: cc 2334 C_ARGS: cc, x, y, w, h
2315 2335
2316void 2336void
2317rxvt_img::DESTROY () 2337rxvt_img::DESTROY ()
2318 CODE: 2338 CODE:
2319 delete THIS; 2339 delete THIS;
… …
2353rxvt_img * 2373rxvt_img *
2354rxvt_img::sub_rect (int x, int y, int width, int height) 2374rxvt_img::sub_rect (int x, int y, int width, int height)
2355 2375
2356rxvt_img * 2376rxvt_img *
2357rxvt_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)
2358 2381
2359rxvt_img * 2382rxvt_img *
2360rxvt_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)
2361 INIT: 2384 INIT:
2362 rxvt_img::nv matrix[3][3] = { 2385 rxvt_img::nv matrix[3][3] = {
… …
2370rxvt_img::scale (int new_width, int new_height) 2393rxvt_img::scale (int new_width, int new_height)
2371 2394
2372rxvt_img * 2395rxvt_img *
2373rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2396rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2374 2397
2375void 2398rxvt_img *
2376rxvt_img::tint (SV *c) 2399rxvt_img::tint (SV *c)
2377 INIT: 2400 INIT:
2378 rgba cc = parse_rgba (c, THIS->s); 2401 rgba cc = parse_rgba (c, THIS->s);
2379 C_ARGS: cc 2402 C_ARGS: cc
2380 2403
2381rxvt_img * 2404rxvt_img *
2405rxvt_img::shade (rxvt_img::nv factor)
2406
2407rxvt_img *
2382rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2408rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2383 CODE: 2409 CODE:
2384 rxvt_img::nv *vparams = 0; 2410 rxvt_img::nv *vparams = 0;
2385 int nparams = 0; 2411 int nparams = 0;
2386 2412
2387 if (SvOK (params)) 2413 if (SvOK (params))
2388 { 2414 {
2389 // we overlay rxvt_temp_buf, what a hack
2390 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2391
2392 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2415 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2393 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");
2394 2417
2395 nparams = av_len ((AV *)SvRV (params)) + 1; 2418 nparams = av_len ((AV *)SvRV (params)) + 1;
2396 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2419 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2397 2420
2398 for (int i = 0; i < nparams; ++i) 2421 for (int i = 0; i < nparams; ++i)
2399 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2422 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2400 } 2423 }
2401 2424
2402 RETVAL = THIS->filter (name, nparams, vparams); 2425 RETVAL = THIS->filter (name, nparams, vparams);
2426 free (vparams);
2403 OUTPUT: 2427 OUTPUT:
2404 RETVAL 2428 RETVAL
2405 2429
2406#endif 2430#endif
2407 2431

Diff Legend

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