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.212 by sf-exg, Sat Jan 19 10:04:34 2013 UTC vs.
Revision 1.224 by root, Thu May 22 18:54:33 2014 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008,2011 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2005-2014,2011 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
490 490
491 FREETMPS; 491 FREETMPS;
492 LEAVE; 492 LEAVE;
493 493
494 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);
495} 509}
496 510
497static void 511static void
498ungrab (rxvt_term *THIS) 512ungrab (rxvt_term *THIS)
499{ 513{
… …
793 static const struct { 807 static const struct {
794 const char *name; 808 const char *name;
795 IV iv; 809 IV iv;
796 } *civ, const_iv[] = { 810 } *civ, const_iv[] = {
797# 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
798 const_iv (NUM_RESOURCES), 816 const_iv (NUM_RESOURCES),
799 const_iv (DEFAULT_RSTYLE), 817 const_iv (DEFAULT_RSTYLE),
800 const_iv (OVERLAY_RSTYLE), 818 const_iv (OVERLAY_RSTYLE),
801 const_iv (Color_Bits), 819 const_iv (Color_Bits),
802 const_iv (RS_bgShift), const_iv (RS_bgMask), 820 const_iv (RS_bgShift), const_iv (RS_bgMask),
… …
812 const_iv (RS_Bold), 830 const_iv (RS_Bold),
813 const_iv (RS_Italic), 831 const_iv (RS_Italic),
814 const_iv (RS_Blink), 832 const_iv (RS_Blink),
815 const_iv (RS_RVid), 833 const_iv (RS_RVid),
816 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),
817 847
818 const_iv (CurrentTime), 848 const_iv (CurrentTime),
819 const_iv (ShiftMask), 849 const_iv (ShiftMask),
820 const_iv (LockMask), 850 const_iv (LockMask),
821 const_iv (ControlMask), 851 const_iv (ControlMask),
… …
1177void 1207void
1178rxvt_term::put_option_db (octet_string specifier, octet_string value) 1208rxvt_term::put_option_db (octet_string specifier, octet_string value)
1179 CODE: 1209 CODE:
1180 XrmPutStringResource (&THIS->option_db, specifier, value); 1210 XrmPutStringResource (&THIS->option_db, specifier, value);
1181 1211
1212void
1213rxvt_term::_keysym_resources ()
1214 PPCODE:
1215 PUTBACK;
1216 _keysym_resources (THIS);
1217 SPAGAIN;
1218
1182int 1219int
1183rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1220rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1184 CODE: 1221 CODE:
1185 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1222 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1186 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1223 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
1815} 1852}
1816 OUTPUT: 1853 OUTPUT:
1817 RETVAL 1854 RETVAL
1818 1855
1819bool 1856bool
1820rxvt_term::parse_keysym (char *keysym, char *str) 1857rxvt_term::bind_action (char *keysym, char *str)
1858 ALIAS:
1859 parse_keysym = 1
1821 CODE: 1860 CODE:
1822 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1861 RETVAL = 0 < THIS->bind_action (keysym, str);
1823 THIS->keyboard->register_done (); 1862 THIS->keyboard->register_done ();
1824 OUTPUT: 1863 OUTPUT:
1825 RETVAL 1864 RETVAL
1826 1865
1827void 1866void
1828rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1867rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1829 CODE: 1868 CODE:
1830 wchar_t *wstr = sv2wcs (str); 1869 wchar_t *wstr = sv2wcs (str);
1831 THIS->keyboard->register_user_translation (keysym, state, wstr); 1870 THIS->keyboard->register_action (keysym, state, wstr);
1832 free (wstr); 1871 free (wstr);
1833 1872
1834void 1873void
1835rxvt_term::screen_cur (...) 1874rxvt_term::screen_cur (...)
1836 PROTOTYPE: $;$$ 1875 PROTOTYPE: $;$$
… …
1879 1918
1880 if (ix) 1919 if (ix)
1881 { 1920 {
1882 THIS->selection.screen = THIS->current_screen; 1921 THIS->selection.screen = THIS->current_screen;
1883 1922
1884 THIS->want_refresh = 1; 1923 THIS->selection_changed ();
1885 THIS->refresh_check (); 1924 THIS->refresh_check ();
1886 } 1925 }
1887 } 1926 }
1888} 1927}
1889 1928
… …
1895 THIS->selection.screen = screen; 1934 THIS->selection.screen = screen;
1896 OUTPUT: 1935 OUTPUT:
1897 RETVAL 1936 RETVAL
1898 1937
1899void 1938void
1939rxvt_term::selection_request (Time tm, int selnum)
1940
1941void
1900rxvt_term::selection_clear (bool clipboard = false) 1942rxvt_term::selection_clear (bool clipboard = false)
1901 1943
1902void 1944void
1903rxvt_term::selection_make (Time eventtime, bool rect = false) 1945rxvt_term::selection_make (Time eventtime, bool rect = false)
1904 CODE: 1946 CODE:
… …
1958{ 2000{
1959 wchar_t *wstr = sv2wcs (string); 2001 wchar_t *wstr = sv2wcs (string);
1960 THIS->scr_add_lines (wstr, wcslen (wstr)); 2002 THIS->scr_add_lines (wstr, wcslen (wstr));
1961 free (wstr); 2003 free (wstr);
1962} 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
1963 2013
1964void 2014void
1965rxvt_term::tt_write (SV *octets) 2015rxvt_term::tt_write (SV *octets)
1966 INIT: 2016 INIT:
1967 STRLEN len; 2017 STRLEN len;
… …
2397 rxvt_img::nv *vparams = 0; 2447 rxvt_img::nv *vparams = 0;
2398 int nparams = 0; 2448 int nparams = 0;
2399 2449
2400 if (SvOK (params)) 2450 if (SvOK (params))
2401 { 2451 {
2402 // we overlay rxvt_temp_buf, what a hack
2403 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2404
2405 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2452 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2406 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");
2407 2454
2408 nparams = av_len ((AV *)SvRV (params)) + 1; 2455 nparams = av_len ((AV *)SvRV (params)) + 1;
2409 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2456 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2410 2457
2411 for (int i = 0; i < nparams; ++i) 2458 for (int i = 0; i < nparams; ++i)
2412 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2459 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2413 } 2460 }
2414 2461
2415 RETVAL = THIS->filter (name, nparams, vparams); 2462 RETVAL = THIS->filter (name, nparams, vparams);
2463 free (vparams);
2416 OUTPUT: 2464 OUTPUT:
2417 RETVAL 2465 RETVAL
2418 2466
2419#endif 2467#endif
2420 2468

Diff Legend

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