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.229 by sf-exg, Mon Oct 13 17:05:32 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 unsigned int state;
501
502 if (term->parse_keysym (k, state) == -1)
503 return;
504
505 dSP;
506 XPUSHs (sv_2mortal (newSVpv (v, 0)));
507 PUTBACK;
508}
509
510static void
511_keysym_resources (rxvt_term *term)
512{
513 term->enumerate_keysym_resources (_keysym_resource_push);
495} 514}
496 515
497static void 516static void
498ungrab (rxvt_term *THIS) 517ungrab (rxvt_term *THIS)
499{ 518{
… …
793 static const struct { 812 static const struct {
794 const char *name; 813 const char *name;
795 IV iv; 814 IV iv;
796 } *civ, const_iv[] = { 815 } *civ, const_iv[] = {
797# define const_iv(name) { # name, (IV)name } 816# define const_iv(name) { # name, (IV)name }
817 const_iv (HOOK_INIT),
818 const_iv (HOOK_DESTROY),
819 const_iv (HOOK_ACTION),
820
798 const_iv (NUM_RESOURCES), 821 const_iv (NUM_RESOURCES),
799 const_iv (DEFAULT_RSTYLE), 822 const_iv (DEFAULT_RSTYLE),
800 const_iv (OVERLAY_RSTYLE), 823 const_iv (OVERLAY_RSTYLE),
801 const_iv (Color_Bits), 824 const_iv (Color_Bits),
802 const_iv (RS_bgShift), const_iv (RS_bgMask), 825 const_iv (RS_bgShift), const_iv (RS_bgMask),
… …
812 const_iv (RS_Bold), 835 const_iv (RS_Bold),
813 const_iv (RS_Italic), 836 const_iv (RS_Italic),
814 const_iv (RS_Blink), 837 const_iv (RS_Blink),
815 const_iv (RS_RVid), 838 const_iv (RS_RVid),
816 const_iv (RS_Uline), 839 const_iv (RS_Uline),
840
841 // TODO: should support all colour constants, create colorinc.h &c
842 const_iv (Color_fg),
843 const_iv (Color_bg),
844#if OFF_FOCUS_FADING
845 const_iv (Color_fade),
846#endif
847 const_iv (Color_pointer_fg),
848 const_iv (Color_pointer_bg),
849 const_iv (Color_border),
850 const_iv (NRS_COLORS),
851 const_iv (TOTAL_COLORS),
817 852
818 const_iv (CurrentTime), 853 const_iv (CurrentTime),
819 const_iv (ShiftMask), 854 const_iv (ShiftMask),
820 const_iv (LockMask), 855 const_iv (LockMask),
821 const_iv (ControlMask), 856 const_iv (ControlMask),
… …
1177void 1212void
1178rxvt_term::put_option_db (octet_string specifier, octet_string value) 1213rxvt_term::put_option_db (octet_string specifier, octet_string value)
1179 CODE: 1214 CODE:
1180 XrmPutStringResource (&THIS->option_db, specifier, value); 1215 XrmPutStringResource (&THIS->option_db, specifier, value);
1181 1216
1217void
1218rxvt_term::_keysym_resources ()
1219 PPCODE:
1220 PUTBACK;
1221 _keysym_resources (THIS);
1222 SPAGAIN;
1223
1182int 1224int
1183rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1225rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1184 CODE: 1226 CODE:
1185 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1227 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1186 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1228 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
1265 OUTPUT: RETVAL 1307 OUTPUT: RETVAL
1266 1308
1267int 1309int
1268rxvt_term::XKeycodeToKeysym (int code, int index) 1310rxvt_term::XKeycodeToKeysym (int code, int index)
1269 CODE: 1311 CODE:
1270 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1312 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1271 OUTPUT: RETVAL 1313 OUTPUT: RETVAL
1272 1314
1273int 1315int
1274rxvt_term::strwidth (SV *str) 1316rxvt_term::strwidth (SV *str)
1275 CODE: 1317 CODE:
… …
1800 THIS->cursor_blink_reset (); 1842 THIS->cursor_blink_reset ();
1801 break; 1843 break;
1802#endif 1844#endif
1803 1845
1804 case Opt_cursorUnderline: 1846 case Opt_cursorUnderline:
1847 THIS->cursor_type = set ? 1 : 0;
1805 THIS->want_refresh = 1; 1848 THIS->want_refresh = 1;
1806 THIS->refresh_check (); 1849 THIS->refresh_check ();
1807 break; 1850 break;
1808 1851
1809# case Opt_scrollBar_floating: 1852# case Opt_scrollBar_floating:
… …
1815} 1858}
1816 OUTPUT: 1859 OUTPUT:
1817 RETVAL 1860 RETVAL
1818 1861
1819bool 1862bool
1820rxvt_term::parse_keysym (char *keysym, char *str) 1863rxvt_term::bind_action (char *keysym, char *str)
1864 ALIAS:
1865 parse_keysym = 1
1821 CODE: 1866 CODE:
1822 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1867 RETVAL = 0 < THIS->bind_action (keysym, str);
1823 THIS->keyboard->register_done (); 1868 THIS->keyboard->register_done ();
1824 OUTPUT: 1869 OUTPUT:
1825 RETVAL 1870 RETVAL
1826 1871
1827void 1872void
1828rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1873rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1829 CODE: 1874 CODE:
1830 wchar_t *wstr = sv2wcs (str); 1875 wchar_t *wstr = sv2wcs (str);
1831 THIS->keyboard->register_user_translation (keysym, state, wstr); 1876 THIS->keyboard->register_action (keysym, state, wstr);
1832 free (wstr); 1877 free (wstr);
1833 1878
1834void 1879void
1835rxvt_term::screen_cur (...) 1880rxvt_term::screen_cur (...)
1836 PROTOTYPE: $;$$ 1881 PROTOTYPE: $;$$
… …
1879 1924
1880 if (ix) 1925 if (ix)
1881 { 1926 {
1882 THIS->selection.screen = THIS->current_screen; 1927 THIS->selection.screen = THIS->current_screen;
1883 1928
1884 THIS->want_refresh = 1; 1929 THIS->selection_changed ();
1885 THIS->refresh_check (); 1930 THIS->refresh_check ();
1886 } 1931 }
1887 } 1932 }
1888} 1933}
1889 1934
… …
1895 THIS->selection.screen = screen; 1940 THIS->selection.screen = screen;
1896 OUTPUT: 1941 OUTPUT:
1897 RETVAL 1942 RETVAL
1898 1943
1899void 1944void
1945rxvt_term::selection_request (Time tm, int selnum)
1946
1947void
1900rxvt_term::selection_clear (bool clipboard = false) 1948rxvt_term::selection_clear (bool clipboard = false)
1901 1949
1902void 1950void
1903rxvt_term::selection_make (Time eventtime, bool rect = false) 1951rxvt_term::selection_make (Time eventtime, bool rect = false)
1904 CODE: 1952 CODE:
… …
1958{ 2006{
1959 wchar_t *wstr = sv2wcs (string); 2007 wchar_t *wstr = sv2wcs (string);
1960 THIS->scr_add_lines (wstr, wcslen (wstr)); 2008 THIS->scr_add_lines (wstr, wcslen (wstr));
1961 free (wstr); 2009 free (wstr);
1962} 2010}
2011
2012void
2013rxvt_term::tt_write_user_input (SV *octets)
2014 INIT:
2015 STRLEN len;
2016 char *str = SvPVbyte (octets, len);
2017 C_ARGS:
2018 str, len
1963 2019
1964void 2020void
1965rxvt_term::tt_write (SV *octets) 2021rxvt_term::tt_write (SV *octets)
1966 INIT: 2022 INIT:
1967 STRLEN len; 2023 STRLEN len;
… …
2397 rxvt_img::nv *vparams = 0; 2453 rxvt_img::nv *vparams = 0;
2398 int nparams = 0; 2454 int nparams = 0;
2399 2455
2400 if (SvOK (params)) 2456 if (SvOK (params))
2401 { 2457 {
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) 2458 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2406 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2459 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2407 2460
2408 nparams = av_len ((AV *)SvRV (params)) + 1; 2461 nparams = av_len ((AV *)SvRV (params)) + 1;
2409 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2462 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2410 2463
2411 for (int i = 0; i < nparams; ++i) 2464 for (int i = 0; i < nparams; ++i)
2412 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2465 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2413 } 2466 }
2414 2467
2415 RETVAL = THIS->filter (name, nparams, vparams); 2468 RETVAL = THIS->filter (name, nparams, vparams);
2469 free (vparams);
2416 OUTPUT: 2470 OUTPUT:
2417 RETVAL 2471 RETVAL
2418 2472
2419#endif 2473#endif
2420 2474

Diff Legend

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