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.220 by sf-exg, Fri May 2 20:35:00 2014 UTC vs.
Revision 1.236 by sf-exg, Tue Mar 17 09:23:08 2015 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 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{
… …
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 }
798 const_iv (HOOK_INIT), 817 const_iv (HOOK_INIT),
799 const_iv (HOOK_DESTROY), 818 const_iv (HOOK_DESTROY),
800 const_iv (HOOK_KEYBOARD_DISPATCH), 819 const_iv (HOOK_ACTION),
801 820
802 const_iv (NUM_RESOURCES), 821 const_iv (NUM_RESOURCES),
803 const_iv (DEFAULT_RSTYLE), 822 const_iv (DEFAULT_RSTYLE),
804 const_iv (OVERLAY_RSTYLE), 823 const_iv (OVERLAY_RSTYLE),
805 const_iv (Color_Bits), 824 const_iv (Color_Bits),
… …
1008 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1027 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
1009 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1028 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1010} 1029}
1011 1030
1012void 1031void
1013log (const char *msg) 1032log (utf8_string msg)
1014 CODE: 1033 CODE:
1015 rxvt_log ("%s", msg); 1034 rxvt_log ("%s", msg);
1016 1035
1017void 1036void
1018warn (const char *msg) 1037warn (utf8_string msg)
1019 CODE: 1038 CODE:
1020 rxvt_warn ("%s", msg); 1039 rxvt_warn ("%s", msg);
1021 1040
1022void 1041void
1023fatal (const char *msg) 1042fatal (utf8_string msg)
1024 CODE: 1043 CODE:
1025 rxvt_fatal ("%s", msg); 1044 rxvt_fatal ("%s", msg);
1026 1045
1027void 1046void
1028_exit (int status) 1047_exit (int status)
… …
1193void 1212void
1194rxvt_term::put_option_db (octet_string specifier, octet_string value) 1213rxvt_term::put_option_db (octet_string specifier, octet_string value)
1195 CODE: 1214 CODE:
1196 XrmPutStringResource (&THIS->option_db, specifier, value); 1215 XrmPutStringResource (&THIS->option_db, specifier, value);
1197 1216
1217void
1218rxvt_term::_keysym_resources ()
1219 PPCODE:
1220 PUTBACK;
1221 _keysym_resources (THIS);
1222 SPAGAIN;
1223
1198int 1224int
1199rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1225rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1200 CODE: 1226 CODE:
1201 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1227 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1202 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1228 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
1261rxvt_term::ungrab () 1287rxvt_term::ungrab ()
1262 CODE: 1288 CODE:
1263 ungrab (THIS); 1289 ungrab (THIS);
1264 1290
1265int 1291int
1266rxvt_term::XStringToKeysym (char *string) 1292rxvt_term::XStringToKeysym (octet_string string)
1267 CODE: 1293 CODE:
1268 RETVAL = XStringToKeysym (string); 1294 RETVAL = XStringToKeysym (string);
1269 OUTPUT: RETVAL 1295 OUTPUT: RETVAL
1270 1296
1271char * 1297char *
… …
1281 OUTPUT: RETVAL 1307 OUTPUT: RETVAL
1282 1308
1283int 1309int
1284rxvt_term::XKeycodeToKeysym (int code, int index) 1310rxvt_term::XKeycodeToKeysym (int code, int index)
1285 CODE: 1311 CODE:
1286 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1312 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1287 OUTPUT: RETVAL 1313 OUTPUT: RETVAL
1288 1314
1289int 1315int
1290rxvt_term::strwidth (SV *str) 1316rxvt_term::strwidth (SV *str)
1291 CODE: 1317 CODE:
… …
1548 CODE: 1574 CODE:
1549 THIS->want_refresh = 1; 1575 THIS->want_refresh = 1;
1550 THIS->refresh_check (); 1576 THIS->refresh_check ();
1551 1577
1552void 1578void
1579rxvt_term::refresh_check ()
1580
1581void
1553rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1582rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1554 PPCODE: 1583 PPCODE:
1555{ 1584{
1556 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow)) 1585 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1557 XSRETURN_EMPTY; 1586 XSRETURN_EMPTY;
… …
1700 *r++ = NOCHAR; 1729 *r++ = NOCHAR;
1701 } 1730 }
1702 1731
1703 rxvt_pop_locale (); 1732 rxvt_pop_locale ();
1704 1733
1734 free (wstr);
1705 RETVAL = wcs2sv (rstr, r - rstr); 1735 RETVAL = wcs2sv (rstr, r - rstr);
1706} 1736}
1707 OUTPUT: 1737 OUTPUT:
1708 RETVAL 1738 RETVAL
1709 1739
… …
1733 else if (IS_COMPOSE (*s)) 1763 else if (IS_COMPOSE (*s))
1734 r += rxvt_composite.expand (*s, r); 1764 r += rxvt_composite.expand (*s, r);
1735 else 1765 else
1736 *r++ = *s; 1766 *r++ = *s;
1737 1767
1768 free (wstr);
1738 RETVAL = wcs2sv (rstr, r - rstr); 1769 RETVAL = wcs2sv (rstr, r - rstr);
1739} 1770}
1740 OUTPUT: 1771 OUTPUT:
1741 RETVAL 1772 RETVAL
1742 1773
1743void 1774void
1744rxvt_term::_resource (char *name, int index, SV *newval = 0) 1775rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1745 PPCODE: 1776 PPCODE:
1746{ 1777{
1747 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1778 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1748# define def(name) { # name, Rs_ ## name }, 1779# define def(name) { # name, Rs_ ## name },
1749# define reserve(name,count) 1780# define reserve(name,count)
… …
1787 THIS->rs [index] = 0; 1818 THIS->rs [index] = 0;
1788 } 1819 }
1789} 1820}
1790 1821
1791const char * 1822const char *
1792rxvt_term::x_resource (const char *name) 1823rxvt_term::x_resource (octet_string name)
1793 1824
1794bool 1825bool
1795rxvt_term::option (U8 optval, int set = -1) 1826rxvt_term::option (U8 optval, int set = -1)
1796 CODE: 1827 CODE:
1797{ 1828{
… …
1816 THIS->cursor_blink_reset (); 1847 THIS->cursor_blink_reset ();
1817 break; 1848 break;
1818#endif 1849#endif
1819 1850
1820 case Opt_cursorUnderline: 1851 case Opt_cursorUnderline:
1852 THIS->cursor_type = set ? 1 : 0;
1821 THIS->want_refresh = 1; 1853 THIS->want_refresh = 1;
1822 THIS->refresh_check (); 1854 THIS->refresh_check ();
1823 break; 1855 break;
1824 1856
1825# case Opt_scrollBar_floating: 1857# case Opt_scrollBar_floating:
… …
1830 } 1862 }
1831} 1863}
1832 OUTPUT: 1864 OUTPUT:
1833 RETVAL 1865 RETVAL
1834 1866
1867SV *
1868rxvt_term::lookup_keysym (int keysym, unsigned int state)
1869 CODE:
1870{
1871 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1872 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1873}
1874 OUTPUT:
1875 RETVAL
1876
1835bool 1877bool
1836rxvt_term::bind_action (char *keysym, char *str) 1878rxvt_term::bind_action (octet_string keysym, octet_string action)
1837 ALIAS: 1879 ALIAS:
1838 parse_keysym = 1 1880 parse_keysym = 1
1839 CODE: 1881 CODE:
1840 RETVAL = 0 < THIS->bind_action (keysym, str); 1882 RETVAL = 0 < THIS->bind_action (keysym, action);
1841 THIS->keyboard->register_done (); 1883 THIS->keyboard->register_done ();
1842 OUTPUT: 1884 OUTPUT:
1843 RETVAL 1885 RETVAL
1844 1886
1845void 1887void
… …
1966 2008
1967void 2009void
1968rxvt_term::scr_bell () 2010rxvt_term::scr_bell ()
1969 2011
1970void 2012void
1971rxvt_term::scr_recolour (bool refresh = true); 2013rxvt_term::scr_recolor (bool refresh = true);
1972 2014
1973void 2015void
1974rxvt_term::scr_change_screen (int screen) 2016rxvt_term::scr_change_screen (int screen)
1975 2017
1976void 2018void
… …
1979{ 2021{
1980 wchar_t *wstr = sv2wcs (string); 2022 wchar_t *wstr = sv2wcs (string);
1981 THIS->scr_add_lines (wstr, wcslen (wstr)); 2023 THIS->scr_add_lines (wstr, wcslen (wstr));
1982 free (wstr); 2024 free (wstr);
1983} 2025}
2026
2027void
2028rxvt_term::tt_write_user_input (SV *octets)
2029 INIT:
2030 STRLEN len;
2031 char *str = SvPVbyte (octets, len);
2032 C_ARGS:
2033 str, len
1984 2034
1985void 2035void
1986rxvt_term::tt_write (SV *octets) 2036rxvt_term::tt_write (SV *octets)
1987 INIT: 2037 INIT:
1988 STRLEN len; 2038 STRLEN len;

Diff Legend

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