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.198 by root, Thu Jun 14 18:59:39 2012 UTC vs.
Revision 1.223 by root, Sun May 18 18:09:52 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;
… …
488 490
489 FREETMPS; 491 FREETMPS;
490 LEAVE; 492 LEAVE;
491 493
492 return ret; 494 return ret;
495}
496
497static void
498_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
499{
500 dSP;
501 XPUSHs (sv_2mortal (newSVpv (v, 0)));
502 PUTBACK;
503}
504
505static void
506_keysym_resources (rxvt_term *term)
507{
508 term->enumerate_keysym_resources (_keysym_resource_push);
493} 509}
494 510
495static void 511static void
496ungrab (rxvt_term *THIS) 512ungrab (rxvt_term *THIS)
497{ 513{
… …
791 static const struct { 807 static const struct {
792 const char *name; 808 const char *name;
793 IV iv; 809 IV iv;
794 } *civ, const_iv[] = { 810 } *civ, const_iv[] = {
795# define const_iv(name) { # name, (IV)name } 811# define const_iv(name) { # name, (IV)name }
812 const_iv (HOOK_INIT),
813 const_iv (HOOK_DESTROY),
814 const_iv (HOOK_ACTION),
815
796 const_iv (NUM_RESOURCES), 816 const_iv (NUM_RESOURCES),
797 const_iv (DEFAULT_RSTYLE), 817 const_iv (DEFAULT_RSTYLE),
798 const_iv (OVERLAY_RSTYLE), 818 const_iv (OVERLAY_RSTYLE),
799 const_iv (Color_Bits), 819 const_iv (Color_Bits),
800 const_iv (RS_bgShift), const_iv (RS_bgMask), 820 const_iv (RS_bgShift), const_iv (RS_bgMask),
… …
810 const_iv (RS_Bold), 830 const_iv (RS_Bold),
811 const_iv (RS_Italic), 831 const_iv (RS_Italic),
812 const_iv (RS_Blink), 832 const_iv (RS_Blink),
813 const_iv (RS_RVid), 833 const_iv (RS_RVid),
814 const_iv (RS_Uline), 834 const_iv (RS_Uline),
835
836 // TODO: should support all colour constants, create colorinc.h &c
837 const_iv (Color_fg),
838 const_iv (Color_bg),
839#if OFF_FOCUS_FADING
840 const_iv (Color_fade),
841#endif
842 const_iv (Color_pointer_fg),
843 const_iv (Color_pointer_bg),
844 const_iv (Color_border),
845 const_iv (NRS_COLORS),
846 const_iv (TOTAL_COLORS),
815 847
816 const_iv (CurrentTime), 848 const_iv (CurrentTime),
817 const_iv (ShiftMask), 849 const_iv (ShiftMask),
818 const_iv (LockMask), 850 const_iv (LockMask),
819 const_iv (ControlMask), 851 const_iv (ControlMask),
… …
1175void 1207void
1176rxvt_term::put_option_db (octet_string specifier, octet_string value) 1208rxvt_term::put_option_db (octet_string specifier, octet_string value)
1177 CODE: 1209 CODE:
1178 XrmPutStringResource (&THIS->option_db, specifier, value); 1210 XrmPutStringResource (&THIS->option_db, specifier, value);
1179 1211
1212void
1213rxvt_term::_keysym_resources ()
1214 PPCODE:
1215 PUTBACK;
1216 _keysym_resources (THIS);
1217 SPAGAIN;
1218
1180int 1219int
1181rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1220rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1182 CODE: 1221 CODE:
1183 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1222 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1184 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1223 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
1454 CODE: 1493 CODE:
1455 RETVAL = THIS->parent_y; 1494 RETVAL = THIS->parent_y;
1456 OUTPUT: 1495 OUTPUT:
1457 RETVAL 1496 RETVAL
1458 1497
1498Window
1499rxvt_term::vt ()
1500 CODE:
1501 RETVAL = THIS->vt;
1502 OUTPUT:
1503 RETVAL
1504
1459void 1505void
1460rxvt_term::vt_emask_add (U32 emask) 1506rxvt_term::vt_emask_add (U32 emask)
1461 CODE: 1507 CODE:
1462 THIS->vt_emask_perl |= emask; 1508 THIS->vt_emask_perl |= emask;
1463 THIS->vt_select_input (); 1509 THIS->vt_select_input ();
… …
1806} 1852}
1807 OUTPUT: 1853 OUTPUT:
1808 RETVAL 1854 RETVAL
1809 1855
1810bool 1856bool
1811rxvt_term::parse_keysym (char *keysym, char *str) 1857rxvt_term::bind_action (char *keysym, char *str)
1858 ALIAS:
1859 parse_keysym = 1
1812 CODE: 1860 CODE:
1813 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1861 RETVAL = 0 < THIS->bind_action (keysym, str);
1814 THIS->keyboard->register_done (); 1862 THIS->keyboard->register_done ();
1815 OUTPUT: 1863 OUTPUT:
1816 RETVAL 1864 RETVAL
1817 1865
1818void 1866void
1819rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1867rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1820 CODE: 1868 CODE:
1821 wchar_t *wstr = sv2wcs (str); 1869 wchar_t *wstr = sv2wcs (str);
1822 THIS->keyboard->register_user_translation (keysym, state, wstr); 1870 THIS->keyboard->register_action (keysym, state, wstr);
1823 free (wstr); 1871 free (wstr);
1824 1872
1825void 1873void
1826rxvt_term::screen_cur (...) 1874rxvt_term::screen_cur (...)
1827 PROTOTYPE: $;$$ 1875 PROTOTYPE: $;$$
… …
1870 1918
1871 if (ix) 1919 if (ix)
1872 { 1920 {
1873 THIS->selection.screen = THIS->current_screen; 1921 THIS->selection.screen = THIS->current_screen;
1874 1922
1875 THIS->want_refresh = 1; 1923 THIS->selection_changed ();
1876 THIS->refresh_check (); 1924 THIS->refresh_check ();
1877 } 1925 }
1878 } 1926 }
1879} 1927}
1880 1928
… …
1886 THIS->selection.screen = screen; 1934 THIS->selection.screen = screen;
1887 OUTPUT: 1935 OUTPUT:
1888 RETVAL 1936 RETVAL
1889 1937
1890void 1938void
1939rxvt_term::selection_request (Time tm, int selnum)
1940
1941void
1891rxvt_term::selection_clear (bool clipboard = false) 1942rxvt_term::selection_clear (bool clipboard = false)
1892 1943
1893void 1944void
1894rxvt_term::selection_make (Time eventtime, bool rect = false) 1945rxvt_term::selection_make (Time eventtime, bool rect = false)
1895 CODE: 1946 CODE:
… …
1949{ 2000{
1950 wchar_t *wstr = sv2wcs (string); 2001 wchar_t *wstr = sv2wcs (string);
1951 THIS->scr_add_lines (wstr, wcslen (wstr)); 2002 THIS->scr_add_lines (wstr, wcslen (wstr));
1952 free (wstr); 2003 free (wstr);
1953} 2004}
2005
2006void
2007rxvt_term::tt_write_user_input (SV *octets)
2008 INIT:
2009 STRLEN len;
2010 char *str = SvPVbyte (octets, len);
2011 C_ARGS:
2012 str, len
1954 2013
1955void 2014void
1956rxvt_term::tt_write (SV *octets) 2015rxvt_term::tt_write (SV *octets)
1957 INIT: 2016 INIT:
1958 STRLEN len; 2017 STRLEN len;
… …
2155 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height))); 2214 PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
2156 2215
2157#if HAVE_IMG 2216#if HAVE_IMG
2158 2217
2159rxvt_img * 2218rxvt_img *
2160rxvt_term::new_img (SV *format, int x = 0, int y = 0, int width = 1, int height = 1) 2219rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
2161 CODE: 2220 CODE:
2162 XRenderPictFormat *f = SvOK (format) 2221 XRenderPictFormat *f = SvOK (format)
2163 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format)) 2222 ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
2164 : XRenderFindVisualFormat (THIS->dpy, THIS->visual); 2223 : XRenderFindVisualFormat (THIS->dpy, THIS->visual);
2165 RETVAL = new rxvt_img (THIS, f, x, y, width, height); 2224 RETVAL = new rxvt_img (THIS, f, x, y, width, height);
… …
2194 OUTPUT: 2253 OUTPUT:
2195 RETVAL 2254 RETVAL
2196 2255
2197#endif 2256#endif
2198 2257
2199#if HAVE_BG_PIXMAP
2200
2201void 2258void
2202rxvt_term::set_background (rxvt_img *img, bool border = false) 2259rxvt_term::set_background (rxvt_img *img, bool border = false)
2203 CODE: 2260 CODE:
2204 THIS->bg_destroy (); 2261 delete THIS->bg_img;
2205 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2262 THIS->bg_img = 0;
2263 THIS->bg_flags = 0;
2206 2264
2207 if (img) // TODO: cannot be false 2265 if (img) // TODO: cannot be false
2208 { 2266 {
2209 img = img->clone (); // own the img 2267 img = img->clone (); // own the img
2210 2268
2211 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2269 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2212 img->sub_rect (0, 0, 2270 img->sub_rect (0, 0,
2213 border ? THIS->vt_width : THIS->szHint.width, 2271 border ? THIS->vt_width : THIS->szHint.width,
2214 border ? THIS->vt_height : THIS->szHint.height) 2272 border ? THIS->vt_height : THIS->szHint.height)
2215 ->replace (img); 2273 ->replace (img);
2216 2274
2217 // just in case, should usually be a nop 2275 // just in case, should usually be a nop
2218 img->reify () 2276 img->reify ()
2219 ->replace (img); 2277 ->replace (img);
2220 2278
… …
2228 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2286 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2229 } 2287 }
2230 2288
2231#endif 2289#endif
2232 2290
2233#endif
2234
2235############################################################################# 2291#############################################################################
2236# urxvt::overlay 2292# urxvt::overlay
2237############################################################################# 2293#############################################################################
2238 2294
2239MODULE = urxvt PACKAGE = urxvt::overlay 2295MODULE = urxvt PACKAGE = urxvt::overlay
… …
2260 C_ARGS: filename, 0 2316 C_ARGS: filename, 0
2261 2317
2262void 2318void
2263DESTROY (urxvt::pixbuf self) 2319DESTROY (urxvt::pixbuf self)
2264 CODE: 2320 CODE:
2265 gdk_pixbuf_unref (self); 2321 g_object_unref (self);
2266 2322
2267#endif 2323#endif
2268 2324
2269MODULE = urxvt PACKAGE = urxvt::img 2325MODULE = urxvt PACKAGE = urxvt::img
2270 2326
… …
2282 PUSHs (sv_2mortal (newSViv (THIS->w))); 2338 PUSHs (sv_2mortal (newSViv (THIS->w)));
2283 PUSHs (sv_2mortal (newSViv (THIS->h))); 2339 PUSHs (sv_2mortal (newSViv (THIS->h)));
2284 2340
2285int 2341int
2286rxvt_img::x () 2342rxvt_img::x ()
2343 ALIAS:
2344 x = 0
2345 y = 1
2346 w = 2
2347 h = 3
2287 CODE: 2348 CODE:
2288 RETVAL = THIS->x; 2349 switch (ix)
2289 OUTPUT: 2350 {
2290 RETVAL 2351 case 0: RETVAL = THIS->x; break;
2291 2352 case 1: RETVAL = THIS->y; break;
2292int 2353 case 2: RETVAL = THIS->w; break;
2293rxvt_img::y () 2354 case 3: RETVAL = THIS->h; break;
2294 CODE: 2355 }
2295 RETVAL = THIS->y;
2296 OUTPUT:
2297 RETVAL
2298
2299int
2300rxvt_img::w ()
2301 CODE:
2302 RETVAL = THIS->w;
2303 OUTPUT:
2304 RETVAL
2305
2306int
2307rxvt_img::h ()
2308 CODE:
2309 RETVAL = THIS->h;
2310 OUTPUT: 2356 OUTPUT:
2311 RETVAL 2357 RETVAL
2312 2358
2313Pixmap 2359Pixmap
2314rxvt_img::pm () 2360rxvt_img::pm ()
… …
2316 RETVAL = THIS->pm; 2362 RETVAL = THIS->pm;
2317 OUTPUT: 2363 OUTPUT:
2318 RETVAL 2364 RETVAL
2319 2365
2320void 2366void
2321rxvt_img::fill (SV *c) 2367rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2368 PROTOTYPE: $;$$$$
2322 INIT: 2369 INIT:
2323 rgba cc = parse_rgba (c, THIS->s); 2370 rgba cc = parse_rgba (c, THIS->s);
2324 C_ARGS: cc 2371 C_ARGS: cc, x, y, w, h
2325 2372
2326void 2373void
2327rxvt_img::DESTROY () 2374rxvt_img::DESTROY ()
2328 CODE: 2375 CODE:
2329 delete THIS; 2376 delete THIS;
2330 2377
2331void 2378void
2379rxvt_img::add_alpha ()
2380
2381void
2332rxvt_img::unshare () 2382rxvt_img::unshare ()
2333 2383
2334int 2384void
2335rxvt_img::repeat_mode (render_repeat_mode repeat = 0) 2385rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
2336 CODE: 2386 PPCODE:
2337 if (items >= 2) 2387 if (items >= 2)
2338 THIS->repeat_mode (repeat); 2388 THIS->repeat_mode (repeat);
2339 if (GIMME_V != G_VOID) 2389 if (GIMME_V != G_VOID)
2340 XPUSHs (sv_2mortal (newSViv (THIS->repeat))); 2390 XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
2341 2391
… …
2346rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.) 2396rxvt_img::brightness (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2347 2397
2348void 2398void
2349rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.) 2399rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
2350 2400
2401void
2402rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
2403
2351rxvt_img * 2404rxvt_img *
2352rxvt_img::clone () 2405rxvt_img::clone ()
2353 2406
2354rxvt_img * 2407rxvt_img *
2355rxvt_img::reify () 2408rxvt_img::reify ()
… …
2357rxvt_img * 2410rxvt_img *
2358rxvt_img::sub_rect (int x, int y, int width, int height) 2411rxvt_img::sub_rect (int x, int y, int width, int height)
2359 2412
2360rxvt_img * 2413rxvt_img *
2361rxvt_img::blur (int rh, int rv) 2414rxvt_img::blur (int rh, int rv)
2415
2416rxvt_img *
2417rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2362 2418
2363rxvt_img * 2419rxvt_img *
2364rxvt_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) 2420rxvt_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)
2365 INIT: 2421 INIT:
2366 rxvt_img::nv matrix[3][3] = { 2422 rxvt_img::nv matrix[3][3] = {
… …
2374rxvt_img::scale (int new_width, int new_height) 2430rxvt_img::scale (int new_width, int new_height)
2375 2431
2376rxvt_img * 2432rxvt_img *
2377rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2433rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2378 2434
2435rxvt_img *
2436rxvt_img::tint (SV *c)
2437 INIT:
2438 rgba cc = parse_rgba (c, THIS->s);
2439 C_ARGS: cc
2440
2441rxvt_img *
2442rxvt_img::shade (rxvt_img::nv factor)
2443
2444rxvt_img *
2445rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2446 CODE:
2447 rxvt_img::nv *vparams = 0;
2448 int nparams = 0;
2449
2450 if (SvOK (params))
2451 {
2452 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2453 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2454
2455 nparams = av_len ((AV *)SvRV (params)) + 1;
2456 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2457
2458 for (int i = 0; i < nparams; ++i)
2459 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2460 }
2461
2462 RETVAL = THIS->filter (name, nparams, vparams);
2463 free (vparams);
2464 OUTPUT:
2465 RETVAL
2466
2379#endif 2467#endif
2380 2468

Diff Legend

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