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.200 by root, Sun Jun 17 21:58:18 2012 UTC vs.
Revision 1.218 by root, Sat Apr 26 20:51:12 2014 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;
… …
791 static const struct { 793 static const struct {
792 const char *name; 794 const char *name;
793 IV iv; 795 IV iv;
794 } *civ, const_iv[] = { 796 } *civ, const_iv[] = {
795# define const_iv(name) { # name, (IV)name } 797# define const_iv(name) { # name, (IV)name }
798 const_iv (HOOK_INIT),
799 const_iv (HOOK_DESTROY),
800 const_iv (HOOK_KEYBOARD_DISPATCH),
801
796 const_iv (NUM_RESOURCES), 802 const_iv (NUM_RESOURCES),
797 const_iv (DEFAULT_RSTYLE), 803 const_iv (DEFAULT_RSTYLE),
798 const_iv (OVERLAY_RSTYLE), 804 const_iv (OVERLAY_RSTYLE),
799 const_iv (Color_Bits), 805 const_iv (Color_Bits),
800 const_iv (RS_bgShift), const_iv (RS_bgMask), 806 const_iv (RS_bgShift), const_iv (RS_bgMask),
… …
810 const_iv (RS_Bold), 816 const_iv (RS_Bold),
811 const_iv (RS_Italic), 817 const_iv (RS_Italic),
812 const_iv (RS_Blink), 818 const_iv (RS_Blink),
813 const_iv (RS_RVid), 819 const_iv (RS_RVid),
814 const_iv (RS_Uline), 820 const_iv (RS_Uline),
821
822 // TODO: should support all colour constants, create colorinc.h &c
823 const_iv (Color_fg),
824 const_iv (Color_bg),
825#if OFF_FOCUS_FADING
826 const_iv (Color_fade),
827#endif
828 const_iv (Color_pointer_fg),
829 const_iv (Color_pointer_bg),
830 const_iv (Color_border),
831 const_iv (NRS_COLORS),
832 const_iv (TOTAL_COLORS),
815 833
816 const_iv (CurrentTime), 834 const_iv (CurrentTime),
817 const_iv (ShiftMask), 835 const_iv (ShiftMask),
818 const_iv (LockMask), 836 const_iv (LockMask),
819 const_iv (ControlMask), 837 const_iv (ControlMask),
… …
1454 CODE: 1472 CODE:
1455 RETVAL = THIS->parent_y; 1473 RETVAL = THIS->parent_y;
1456 OUTPUT: 1474 OUTPUT:
1457 RETVAL 1475 RETVAL
1458 1476
1477Window
1478rxvt_term::vt ()
1479 CODE:
1480 RETVAL = THIS->vt;
1481 OUTPUT:
1482 RETVAL
1483
1459void 1484void
1460rxvt_term::vt_emask_add (U32 emask) 1485rxvt_term::vt_emask_add (U32 emask)
1461 CODE: 1486 CODE:
1462 THIS->vt_emask_perl |= emask; 1487 THIS->vt_emask_perl |= emask;
1463 THIS->vt_select_input (); 1488 THIS->vt_select_input ();
… …
1870 1895
1871 if (ix) 1896 if (ix)
1872 { 1897 {
1873 THIS->selection.screen = THIS->current_screen; 1898 THIS->selection.screen = THIS->current_screen;
1874 1899
1875 THIS->want_refresh = 1; 1900 THIS->selection_changed ();
1876 THIS->refresh_check (); 1901 THIS->refresh_check ();
1877 } 1902 }
1878 } 1903 }
1879} 1904}
1880 1905
… …
1884 RETVAL = THIS->selection.screen; 1909 RETVAL = THIS->selection.screen;
1885 if (screen >= 0) 1910 if (screen >= 0)
1886 THIS->selection.screen = screen; 1911 THIS->selection.screen = screen;
1887 OUTPUT: 1912 OUTPUT:
1888 RETVAL 1913 RETVAL
1914
1915void
1916rxvt_term::selection_request (Time tm, int selnum)
1889 1917
1890void 1918void
1891rxvt_term::selection_clear (bool clipboard = false) 1919rxvt_term::selection_clear (bool clipboard = false)
1892 1920
1893void 1921void
… …
2194 OUTPUT: 2222 OUTPUT:
2195 RETVAL 2223 RETVAL
2196 2224
2197#endif 2225#endif
2198 2226
2199#if HAVE_BG_PIXMAP
2200
2201void 2227void
2202rxvt_term::set_background (rxvt_img *img, bool border = false) 2228rxvt_term::set_background (rxvt_img *img, bool border = false)
2203 CODE: 2229 CODE:
2204 THIS->bg_destroy (); 2230 delete THIS->bg_img;
2205 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2231 THIS->bg_img = 0;
2232 THIS->bg_flags = 0;
2206 2233
2207 if (img) // TODO: cannot be false 2234 if (img) // TODO: cannot be false
2208 { 2235 {
2209 img = img->clone (); // own the img 2236 img = img->clone (); // own the img
2210 2237
2211 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2238 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2212 img->sub_rect (0, 0, 2239 img->sub_rect (0, 0,
2213 border ? THIS->vt_width : THIS->szHint.width, 2240 border ? THIS->vt_width : THIS->szHint.width,
2214 border ? THIS->vt_height : THIS->szHint.height) 2241 border ? THIS->vt_height : THIS->szHint.height)
2215 ->replace (img); 2242 ->replace (img);
2216 2243
2217 // just in case, should usually be a nop 2244 // just in case, should usually be a nop
2218 img->reify () 2245 img->reify ()
2219 ->replace (img); 2246 ->replace (img);
2220 2247
… …
2228 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2255 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2229 } 2256 }
2230 2257
2231#endif 2258#endif
2232 2259
2233#endif
2234
2235############################################################################# 2260#############################################################################
2236# urxvt::overlay 2261# urxvt::overlay
2237############################################################################# 2262#############################################################################
2238 2263
2239MODULE = urxvt PACKAGE = urxvt::overlay 2264MODULE = urxvt PACKAGE = urxvt::overlay
… …
2260 C_ARGS: filename, 0 2285 C_ARGS: filename, 0
2261 2286
2262void 2287void
2263DESTROY (urxvt::pixbuf self) 2288DESTROY (urxvt::pixbuf self)
2264 CODE: 2289 CODE:
2265 gdk_pixbuf_unref (self); 2290 g_object_unref (self);
2266 2291
2267#endif 2292#endif
2268 2293
2269MODULE = urxvt PACKAGE = urxvt::img 2294MODULE = urxvt PACKAGE = urxvt::img
2270 2295
… …
2306 RETVAL = THIS->pm; 2331 RETVAL = THIS->pm;
2307 OUTPUT: 2332 OUTPUT:
2308 RETVAL 2333 RETVAL
2309 2334
2310void 2335void
2311rxvt_img::fill (SV *c) 2336rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2337 PROTOTYPE: $;$$$$
2312 INIT: 2338 INIT:
2313 rgba cc = parse_rgba (c, THIS->s); 2339 rgba cc = parse_rgba (c, THIS->s);
2314 C_ARGS: cc 2340 C_ARGS: cc, x, y, w, h
2315 2341
2316void 2342void
2317rxvt_img::DESTROY () 2343rxvt_img::DESTROY ()
2318 CODE: 2344 CODE:
2319 delete THIS; 2345 delete THIS;
… …
2353rxvt_img * 2379rxvt_img *
2354rxvt_img::sub_rect (int x, int y, int width, int height) 2380rxvt_img::sub_rect (int x, int y, int width, int height)
2355 2381
2356rxvt_img * 2382rxvt_img *
2357rxvt_img::blur (int rh, int rv) 2383rxvt_img::blur (int rh, int rv)
2384
2385rxvt_img *
2386rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2358 2387
2359rxvt_img * 2388rxvt_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) 2389rxvt_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: 2390 INIT:
2362 rxvt_img::nv matrix[3][3] = { 2391 rxvt_img::nv matrix[3][3] = {
… …
2370rxvt_img::scale (int new_width, int new_height) 2399rxvt_img::scale (int new_width, int new_height)
2371 2400
2372rxvt_img * 2401rxvt_img *
2373rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2402rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2374 2403
2375void 2404rxvt_img *
2376rxvt_img::tint (SV *c) 2405rxvt_img::tint (SV *c)
2377 INIT: 2406 INIT:
2378 rgba cc = parse_rgba (c, THIS->s); 2407 rgba cc = parse_rgba (c, THIS->s);
2379 C_ARGS: cc 2408 C_ARGS: cc
2380 2409
2381rxvt_img * 2410rxvt_img *
2411rxvt_img::shade (rxvt_img::nv factor)
2412
2413rxvt_img *
2382rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2414rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2383 CODE: 2415 CODE:
2384 rxvt_img::nv *vparams = 0; 2416 rxvt_img::nv *vparams = 0;
2385 int nparams = 0; 2417 int nparams = 0;
2386 2418
2387 if (SvOK (params)) 2419 if (SvOK (params))
2388 { 2420 {
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) 2421 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2393 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2422 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2394 2423
2395 nparams = av_len ((AV *)SvRV (params)) + 1; 2424 nparams = av_len ((AV *)SvRV (params)) + 1;
2396 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2425 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2397 2426
2398 for (int i = 0; i < nparams; ++i) 2427 for (int i = 0; i < nparams; ++i)
2399 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2428 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2400 } 2429 }
2401 2430
2402 RETVAL = THIS->filter (name, nparams, vparams); 2431 RETVAL = THIS->filter (name, nparams, vparams);
2432 free (vparams);
2403 OUTPUT: 2433 OUTPUT:
2404 RETVAL 2434 RETVAL
2405 2435
2406#endif 2436#endif
2407 2437

Diff Legend

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