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.210 by sf-exg, Sun Dec 30 11:37:07 2012 UTC vs.
Revision 1.234 by sf-exg, Fri Jan 16 20:13:01 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,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),
… …
992 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--)
993 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1028 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
994} 1029}
995 1030
996void 1031void
997log (const char *msg) 1032log (utf8_string msg)
998 CODE: 1033 CODE:
999 rxvt_log ("%s", msg); 1034 rxvt_log ("%s", msg);
1000 1035
1001void 1036void
1002warn (const char *msg) 1037warn (utf8_string msg)
1003 CODE: 1038 CODE:
1004 rxvt_warn ("%s", msg); 1039 rxvt_warn ("%s", msg);
1005 1040
1006void 1041void
1007fatal (const char *msg) 1042fatal (utf8_string msg)
1008 CODE: 1043 CODE:
1009 rxvt_fatal ("%s", msg); 1044 rxvt_fatal ("%s", msg);
1010 1045
1011void 1046void
1012_exit (int status) 1047_exit (int status)
… …
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,
… …
1245rxvt_term::ungrab () 1287rxvt_term::ungrab ()
1246 CODE: 1288 CODE:
1247 ungrab (THIS); 1289 ungrab (THIS);
1248 1290
1249int 1291int
1250rxvt_term::XStringToKeysym (char *string) 1292rxvt_term::XStringToKeysym (octet_string string)
1251 CODE: 1293 CODE:
1252 RETVAL = XStringToKeysym (string); 1294 RETVAL = XStringToKeysym (string);
1253 OUTPUT: RETVAL 1295 OUTPUT: RETVAL
1254 1296
1255char * 1297char *
… …
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:
… …
1532 CODE: 1574 CODE:
1533 THIS->want_refresh = 1; 1575 THIS->want_refresh = 1;
1534 THIS->refresh_check (); 1576 THIS->refresh_check ();
1535 1577
1536void 1578void
1579rxvt_term::refresh_check ()
1580
1581void
1537rxvt_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)
1538 PPCODE: 1583 PPCODE:
1539{ 1584{
1540 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow)) 1585 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1541 XSRETURN_EMPTY; 1586 XSRETURN_EMPTY;
… …
1684 *r++ = NOCHAR; 1729 *r++ = NOCHAR;
1685 } 1730 }
1686 1731
1687 rxvt_pop_locale (); 1732 rxvt_pop_locale ();
1688 1733
1734 free (wstr);
1689 RETVAL = wcs2sv (rstr, r - rstr); 1735 RETVAL = wcs2sv (rstr, r - rstr);
1690} 1736}
1691 OUTPUT: 1737 OUTPUT:
1692 RETVAL 1738 RETVAL
1693 1739
… …
1717 else if (IS_COMPOSE (*s)) 1763 else if (IS_COMPOSE (*s))
1718 r += rxvt_composite.expand (*s, r); 1764 r += rxvt_composite.expand (*s, r);
1719 else 1765 else
1720 *r++ = *s; 1766 *r++ = *s;
1721 1767
1768 free (wstr);
1722 RETVAL = wcs2sv (rstr, r - rstr); 1769 RETVAL = wcs2sv (rstr, r - rstr);
1723} 1770}
1724 OUTPUT: 1771 OUTPUT:
1725 RETVAL 1772 RETVAL
1726 1773
1727void 1774void
1728rxvt_term::_resource (char *name, int index, SV *newval = 0) 1775rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1729 PPCODE: 1776 PPCODE:
1730{ 1777{
1731 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1778 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1732# define def(name) { # name, Rs_ ## name }, 1779# define def(name) { # name, Rs_ ## name },
1733# define reserve(name,count) 1780# define reserve(name,count)
… …
1771 THIS->rs [index] = 0; 1818 THIS->rs [index] = 0;
1772 } 1819 }
1773} 1820}
1774 1821
1775const char * 1822const char *
1776rxvt_term::x_resource (const char *name) 1823rxvt_term::x_resource (octet_string name)
1777 1824
1778bool 1825bool
1779rxvt_term::option (U8 optval, int set = -1) 1826rxvt_term::option (U8 optval, int set = -1)
1780 CODE: 1827 CODE:
1781{ 1828{
… …
1800 THIS->cursor_blink_reset (); 1847 THIS->cursor_blink_reset ();
1801 break; 1848 break;
1802#endif 1849#endif
1803 1850
1804 case Opt_cursorUnderline: 1851 case Opt_cursorUnderline:
1852 THIS->cursor_type = set ? 1 : 0;
1805 THIS->want_refresh = 1; 1853 THIS->want_refresh = 1;
1806 THIS->refresh_check (); 1854 THIS->refresh_check ();
1807 break; 1855 break;
1808 1856
1809# case Opt_scrollBar_floating: 1857# case Opt_scrollBar_floating:
… …
1815} 1863}
1816 OUTPUT: 1864 OUTPUT:
1817 RETVAL 1865 RETVAL
1818 1866
1819bool 1867bool
1820rxvt_term::parse_keysym (char *keysym, char *str) 1868rxvt_term::bind_action (octet_string keysym, octet_string action)
1869 ALIAS:
1870 parse_keysym = 1
1821 CODE: 1871 CODE:
1822 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1872 RETVAL = 0 < THIS->bind_action (keysym, action);
1823 THIS->keyboard->register_done (); 1873 THIS->keyboard->register_done ();
1824 OUTPUT: 1874 OUTPUT:
1825 RETVAL 1875 RETVAL
1826 1876
1827void 1877void
1828rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1878rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1829 CODE: 1879 CODE:
1830 wchar_t *wstr = sv2wcs (str); 1880 wchar_t *wstr = sv2wcs (str);
1831 THIS->keyboard->register_user_translation (keysym, state, wstr); 1881 THIS->keyboard->register_action (keysym, state, wstr);
1832 free (wstr); 1882 free (wstr);
1833 1883
1834void 1884void
1835rxvt_term::screen_cur (...) 1885rxvt_term::screen_cur (...)
1836 PROTOTYPE: $;$$ 1886 PROTOTYPE: $;$$
… …
1879 1929
1880 if (ix) 1930 if (ix)
1881 { 1931 {
1882 THIS->selection.screen = THIS->current_screen; 1932 THIS->selection.screen = THIS->current_screen;
1883 1933
1884 THIS->want_refresh = 1; 1934 THIS->selection_changed ();
1885 THIS->refresh_check (); 1935 THIS->refresh_check ();
1886 } 1936 }
1887 } 1937 }
1888} 1938}
1889 1939
… …
1895 THIS->selection.screen = screen; 1945 THIS->selection.screen = screen;
1896 OUTPUT: 1946 OUTPUT:
1897 RETVAL 1947 RETVAL
1898 1948
1899void 1949void
1950rxvt_term::selection_request (Time tm, int selnum)
1951
1952void
1900rxvt_term::selection_clear (bool clipboard = false) 1953rxvt_term::selection_clear (bool clipboard = false)
1901 1954
1902void 1955void
1903rxvt_term::selection_make (Time eventtime, bool rect = false) 1956rxvt_term::selection_make (Time eventtime, bool rect = false)
1904 CODE: 1957 CODE:
… …
1945 1998
1946void 1999void
1947rxvt_term::scr_bell () 2000rxvt_term::scr_bell ()
1948 2001
1949void 2002void
1950rxvt_term::scr_recolour (bool refresh = true); 2003rxvt_term::scr_recolor (bool refresh = true);
1951 2004
1952void 2005void
1953rxvt_term::scr_change_screen (int screen) 2006rxvt_term::scr_change_screen (int screen)
1954 2007
1955void 2008void
… …
1958{ 2011{
1959 wchar_t *wstr = sv2wcs (string); 2012 wchar_t *wstr = sv2wcs (string);
1960 THIS->scr_add_lines (wstr, wcslen (wstr)); 2013 THIS->scr_add_lines (wstr, wcslen (wstr));
1961 free (wstr); 2014 free (wstr);
1962} 2015}
2016
2017void
2018rxvt_term::tt_write_user_input (SV *octets)
2019 INIT:
2020 STRLEN len;
2021 char *str = SvPVbyte (octets, len);
2022 C_ARGS:
2023 str, len
1963 2024
1964void 2025void
1965rxvt_term::tt_write (SV *octets) 2026rxvt_term::tt_write (SV *octets)
1966 INIT: 2027 INIT:
1967 STRLEN len; 2028 STRLEN len;
… …
2208void 2269void
2209rxvt_term::set_background (rxvt_img *img, bool border = false) 2270rxvt_term::set_background (rxvt_img *img, bool border = false)
2210 CODE: 2271 CODE:
2211 delete THIS->bg_img; 2272 delete THIS->bg_img;
2212 THIS->bg_img = 0; 2273 THIS->bg_img = 0;
2213 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2274 THIS->bg_flags = 0;
2214 2275
2215 if (img) // TODO: cannot be false 2276 if (img) // TODO: cannot be false
2216 { 2277 {
2217 img = img->clone (); // own the img 2278 img = img->clone (); // own the img
2218 2279
… …
2387 INIT: 2448 INIT:
2388 rgba cc = parse_rgba (c, THIS->s); 2449 rgba cc = parse_rgba (c, THIS->s);
2389 C_ARGS: cc 2450 C_ARGS: cc
2390 2451
2391rxvt_img * 2452rxvt_img *
2453rxvt_img::shade (rxvt_img::nv factor)
2454
2455rxvt_img *
2392rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2456rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2393 CODE: 2457 CODE:
2394 rxvt_img::nv *vparams = 0; 2458 rxvt_img::nv *vparams = 0;
2395 int nparams = 0; 2459 int nparams = 0;
2396 2460
2397 if (SvOK (params)) 2461 if (SvOK (params))
2398 { 2462 {
2399 // we overlay rxvt_temp_buf, what a hack
2400 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2401
2402 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2463 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2403 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2464 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2404 2465
2405 nparams = av_len ((AV *)SvRV (params)) + 1; 2466 nparams = av_len ((AV *)SvRV (params)) + 1;
2406 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2467 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2407 2468
2408 for (int i = 0; i < nparams; ++i) 2469 for (int i = 0; i < nparams; ++i)
2409 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2470 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2410 } 2471 }
2411 2472
2412 RETVAL = THIS->filter (name, nparams, vparams); 2473 RETVAL = THIS->filter (name, nparams, vparams);
2474 free (vparams);
2413 OUTPUT: 2475 OUTPUT:
2414 RETVAL 2476 RETVAL
2415 2477
2416#endif 2478#endif
2417 2479

Diff Legend

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