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.205 by root, Mon Jul 2 03:57:53 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,
… …
1813} 1852}
1814 OUTPUT: 1853 OUTPUT:
1815 RETVAL 1854 RETVAL
1816 1855
1817bool 1856bool
1818rxvt_term::parse_keysym (char *keysym, char *str) 1857rxvt_term::bind_action (char *keysym, char *str)
1858 ALIAS:
1859 parse_keysym = 1
1819 CODE: 1860 CODE:
1820 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1861 RETVAL = 0 < THIS->bind_action (keysym, str);
1821 THIS->keyboard->register_done (); 1862 THIS->keyboard->register_done ();
1822 OUTPUT: 1863 OUTPUT:
1823 RETVAL 1864 RETVAL
1824 1865
1825void 1866void
1826rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1867rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1827 CODE: 1868 CODE:
1828 wchar_t *wstr = sv2wcs (str); 1869 wchar_t *wstr = sv2wcs (str);
1829 THIS->keyboard->register_user_translation (keysym, state, wstr); 1870 THIS->keyboard->register_action (keysym, state, wstr);
1830 free (wstr); 1871 free (wstr);
1831 1872
1832void 1873void
1833rxvt_term::screen_cur (...) 1874rxvt_term::screen_cur (...)
1834 PROTOTYPE: $;$$ 1875 PROTOTYPE: $;$$
… …
1877 1918
1878 if (ix) 1919 if (ix)
1879 { 1920 {
1880 THIS->selection.screen = THIS->current_screen; 1921 THIS->selection.screen = THIS->current_screen;
1881 1922
1882 THIS->want_refresh = 1; 1923 THIS->selection_changed ();
1883 THIS->refresh_check (); 1924 THIS->refresh_check ();
1884 } 1925 }
1885 } 1926 }
1886} 1927}
1887 1928
… …
1893 THIS->selection.screen = screen; 1934 THIS->selection.screen = screen;
1894 OUTPUT: 1935 OUTPUT:
1895 RETVAL 1936 RETVAL
1896 1937
1897void 1938void
1939rxvt_term::selection_request (Time tm, int selnum)
1940
1941void
1898rxvt_term::selection_clear (bool clipboard = false) 1942rxvt_term::selection_clear (bool clipboard = false)
1899 1943
1900void 1944void
1901rxvt_term::selection_make (Time eventtime, bool rect = false) 1945rxvt_term::selection_make (Time eventtime, bool rect = false)
1902 CODE: 1946 CODE:
… …
1956{ 2000{
1957 wchar_t *wstr = sv2wcs (string); 2001 wchar_t *wstr = sv2wcs (string);
1958 THIS->scr_add_lines (wstr, wcslen (wstr)); 2002 THIS->scr_add_lines (wstr, wcslen (wstr));
1959 free (wstr); 2003 free (wstr);
1960} 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
1961 2013
1962void 2014void
1963rxvt_term::tt_write (SV *octets) 2015rxvt_term::tt_write (SV *octets)
1964 INIT: 2016 INIT:
1965 STRLEN len; 2017 STRLEN len;
… …
2201 OUTPUT: 2253 OUTPUT:
2202 RETVAL 2254 RETVAL
2203 2255
2204#endif 2256#endif
2205 2257
2206#if HAVE_BG_PIXMAP
2207
2208void 2258void
2209rxvt_term::set_background (rxvt_img *img, bool border = false) 2259rxvt_term::set_background (rxvt_img *img, bool border = false)
2210 CODE: 2260 CODE:
2211 THIS->bg_destroy (); 2261 delete THIS->bg_img;
2212 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;
2213 2264
2214 if (img) // TODO: cannot be false 2265 if (img) // TODO: cannot be false
2215 { 2266 {
2216 img = img->clone (); // own the img 2267 img = img->clone (); // own the img
2217 2268
2218 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2269 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2219 img->sub_rect (0, 0, 2270 img->sub_rect (0, 0,
2220 border ? THIS->vt_width : THIS->szHint.width, 2271 border ? THIS->vt_width : THIS->szHint.width,
2221 border ? THIS->vt_height : THIS->szHint.height) 2272 border ? THIS->vt_height : THIS->szHint.height)
2222 ->replace (img); 2273 ->replace (img);
2223 2274
2224 // just in case, should usually be a nop 2275 // just in case, should usually be a nop
2225 img->reify () 2276 img->reify ()
2226 ->replace (img); 2277 ->replace (img);
2227 2278
… …
2232 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2283 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2233 2284
2234 if (!border) 2285 if (!border)
2235 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2286 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2236 } 2287 }
2237
2238#endif
2239 2288
2240#endif 2289#endif
2241 2290
2242############################################################################# 2291#############################################################################
2243# urxvt::overlay 2292# urxvt::overlay
… …
2388 INIT: 2437 INIT:
2389 rgba cc = parse_rgba (c, THIS->s); 2438 rgba cc = parse_rgba (c, THIS->s);
2390 C_ARGS: cc 2439 C_ARGS: cc
2391 2440
2392rxvt_img * 2441rxvt_img *
2442rxvt_img::shade (rxvt_img::nv factor)
2443
2444rxvt_img *
2393rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2445rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2394 CODE: 2446 CODE:
2395 rxvt_img::nv *vparams = 0; 2447 rxvt_img::nv *vparams = 0;
2396 int nparams = 0; 2448 int nparams = 0;
2397 2449
2398 if (SvOK (params)) 2450 if (SvOK (params))
2399 { 2451 {
2400 // we overlay rxvt_temp_buf, what a hack
2401 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2402
2403 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2452 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2404 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2453 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2405 2454
2406 nparams = av_len ((AV *)SvRV (params)) + 1; 2455 nparams = av_len ((AV *)SvRV (params)) + 1;
2407 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2456 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2408 2457
2409 for (int i = 0; i < nparams; ++i) 2458 for (int i = 0; i < nparams; ++i)
2410 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2459 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2411 } 2460 }
2412 2461
2413 RETVAL = THIS->filter (name, nparams, vparams); 2462 RETVAL = THIS->filter (name, nparams, vparams);
2463 free (vparams);
2414 OUTPUT: 2464 OUTPUT:
2415 RETVAL 2465 RETVAL
2416 2466
2417#endif 2467#endif
2418 2468

Diff Legend

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