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.218 by root, Sat Apr 26 20:51:12 2014 UTC vs.
Revision 1.239 by sf-exg, Wed Apr 12 19:43:38 2017 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
… …
291 break; 291 break;
292 292
293 for (; i < AvFILL (overlay_av); i++) 293 for (; i < AvFILL (overlay_av); i++)
294 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); 294 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
295 295
296 av_pop (overlay_av); 296 SvREFCNT_dec (av_pop (overlay_av));
297 297
298 SvREFCNT_dec (overlay_av); 298 SvREFCNT_dec (overlay_av);
299 overlay_av = 0; 299 overlay_av = 0;
300 300
301 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
… …
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:
… …
1361#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1387#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1362#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1388#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1363#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1389#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1364 1390
1365int 1391int
1366rxvt_term::width () 1392rxvt_term::width (int new_value = NO_INIT)
1367 ALIAS: 1393 ALIAS:
1368 width = TERM_OFFSET_width 1394 width = TERM_OFFSET_width
1369 height = TERM_OFFSET_height 1395 height = TERM_OFFSET_height
1370 fwidth = TERM_OFFSET_fwidth 1396 fwidth = TERM_OFFSET_fwidth
1371 fheight = TERM_OFFSET_fheight 1397 fheight = TERM_OFFSET_fheight
… …
1381 saveLines = TERM_OFFSET_saveLines 1407 saveLines = TERM_OFFSET_saveLines
1382 total_rows = TERM_OFFSET_total_rows 1408 total_rows = TERM_OFFSET_total_rows
1383 top_row = TERM_OFFSET_top_row 1409 top_row = TERM_OFFSET_top_row
1384 CODE: 1410 CODE:
1385 RETVAL = *(int *)((char *)THIS + ix); 1411 RETVAL = *(int *)((char *)THIS + ix);
1412 if (items > 1)
1413 *(int *)((char *)THIS + ix) = new_value;
1386 OUTPUT: 1414 OUTPUT:
1387 RETVAL 1415 RETVAL
1388 1416
1389unsigned int 1417unsigned int
1390rxvt_term::ModLevel3Mask () 1418rxvt_term::ModLevel3Mask ()
… …
1548 CODE: 1576 CODE:
1549 THIS->want_refresh = 1; 1577 THIS->want_refresh = 1;
1550 THIS->refresh_check (); 1578 THIS->refresh_check ();
1551 1579
1552void 1580void
1581rxvt_term::refresh_check ()
1582
1583void
1553rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1584rxvt_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: 1585 PPCODE:
1555{ 1586{
1556 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow)) 1587 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1557 XSRETURN_EMPTY; 1588 XSRETURN_EMPTY;
… …
1700 *r++ = NOCHAR; 1731 *r++ = NOCHAR;
1701 } 1732 }
1702 1733
1703 rxvt_pop_locale (); 1734 rxvt_pop_locale ();
1704 1735
1736 free (wstr);
1705 RETVAL = wcs2sv (rstr, r - rstr); 1737 RETVAL = wcs2sv (rstr, r - rstr);
1706} 1738}
1707 OUTPUT: 1739 OUTPUT:
1708 RETVAL 1740 RETVAL
1709 1741
… …
1733 else if (IS_COMPOSE (*s)) 1765 else if (IS_COMPOSE (*s))
1734 r += rxvt_composite.expand (*s, r); 1766 r += rxvt_composite.expand (*s, r);
1735 else 1767 else
1736 *r++ = *s; 1768 *r++ = *s;
1737 1769
1770 free (wstr);
1738 RETVAL = wcs2sv (rstr, r - rstr); 1771 RETVAL = wcs2sv (rstr, r - rstr);
1739} 1772}
1740 OUTPUT: 1773 OUTPUT:
1741 RETVAL 1774 RETVAL
1742 1775
1743void 1776void
1744rxvt_term::_resource (char *name, int index, SV *newval = 0) 1777rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1745 PPCODE: 1778 PPCODE:
1746{ 1779{
1747 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1780 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1748# define def(name) { # name, Rs_ ## name }, 1781# define def(name) { # name, Rs_ ## name },
1749# define reserve(name,count) 1782# define reserve(name,count)
… …
1787 THIS->rs [index] = 0; 1820 THIS->rs [index] = 0;
1788 } 1821 }
1789} 1822}
1790 1823
1791const char * 1824const char *
1792rxvt_term::x_resource (const char *name) 1825rxvt_term::x_resource (octet_string name)
1793 1826
1794bool 1827bool
1795rxvt_term::option (U8 optval, int set = -1) 1828rxvt_term::option (U8 optval, int set = -1)
1796 CODE: 1829 CODE:
1797{ 1830{
… …
1816 THIS->cursor_blink_reset (); 1849 THIS->cursor_blink_reset ();
1817 break; 1850 break;
1818#endif 1851#endif
1819 1852
1820 case Opt_cursorUnderline: 1853 case Opt_cursorUnderline:
1854 THIS->cursor_type = set ? 1 : 0;
1821 THIS->want_refresh = 1; 1855 THIS->want_refresh = 1;
1822 THIS->refresh_check (); 1856 THIS->refresh_check ();
1823 break; 1857 break;
1824 1858
1825# case Opt_scrollBar_floating: 1859# case Opt_scrollBar_floating:
… …
1830 } 1864 }
1831} 1865}
1832 OUTPUT: 1866 OUTPUT:
1833 RETVAL 1867 RETVAL
1834 1868
1869SV *
1870rxvt_term::lookup_keysym (int keysym, unsigned int state)
1871 CODE:
1872{
1873 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1874 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1875}
1876 OUTPUT:
1877 RETVAL
1878
1835bool 1879bool
1836rxvt_term::parse_keysym (char *keysym, char *str) 1880rxvt_term::bind_action (octet_string keysym, octet_string action)
1881 ALIAS:
1882 parse_keysym = 1
1837 CODE: 1883 CODE:
1838 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1884 RETVAL = 0 < THIS->bind_action (keysym, action);
1839 THIS->keyboard->register_done (); 1885 THIS->keyboard->register_done ();
1840 OUTPUT: 1886 OUTPUT:
1841 RETVAL 1887 RETVAL
1842 1888
1843void 1889void
1844rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1890rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1845 CODE: 1891 CODE:
1846 wchar_t *wstr = sv2wcs (str); 1892 wchar_t *wstr = sv2wcs (str);
1847 THIS->keyboard->register_user_translation (keysym, state, wstr); 1893 THIS->keyboard->register_action (keysym, state, wstr);
1848 free (wstr); 1894 free (wstr);
1849 1895
1850void 1896void
1851rxvt_term::screen_cur (...) 1897rxvt_term::screen_cur (...)
1852 PROTOTYPE: $;$$ 1898 PROTOTYPE: $;$$
… …
1964 2010
1965void 2011void
1966rxvt_term::scr_bell () 2012rxvt_term::scr_bell ()
1967 2013
1968void 2014void
1969rxvt_term::scr_recolour (bool refresh = true); 2015rxvt_term::scr_recolor (bool refresh = true);
1970 2016
1971void 2017void
1972rxvt_term::scr_change_screen (int screen) 2018rxvt_term::scr_change_screen (int screen)
1973 2019
1974void 2020void
… …
1977{ 2023{
1978 wchar_t *wstr = sv2wcs (string); 2024 wchar_t *wstr = sv2wcs (string);
1979 THIS->scr_add_lines (wstr, wcslen (wstr)); 2025 THIS->scr_add_lines (wstr, wcslen (wstr));
1980 free (wstr); 2026 free (wstr);
1981} 2027}
2028
2029void
2030rxvt_term::tt_write_user_input (SV *octets)
2031 INIT:
2032 STRLEN len;
2033 char *str = SvPVbyte (octets, len);
2034 C_ARGS:
2035 str, len
1982 2036
1983void 2037void
1984rxvt_term::tt_write (SV *octets) 2038rxvt_term::tt_write (SV *octets)
1985 INIT: 2039 INIT:
1986 STRLEN len; 2040 STRLEN len;
… …
2247 2301
2248 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2302 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2249 ->replace (img); 2303 ->replace (img);
2250 2304
2251 THIS->bg_img = img; 2305 THIS->bg_img = img;
2252 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2306 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2253 2307
2254 if (!border) 2308 if (!border)
2255 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2309 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2256 } 2310 }
2257 2311

Diff Legend

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