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.208 by sf-exg, Sat Dec 29 15:59:51 2012 UTC vs.
Revision 1.241 by root, Thu Jul 13 10:31:27 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{
… …
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),
… …
985 const_iv (XIMLineEnd), 1020 const_iv (XIMLineEnd),
986 const_iv (XIMAbsolutePosition), 1021 const_iv (XIMAbsolutePosition),
987 const_iv (XIMDontChange), 1022 const_iv (XIMDontChange),
988# endif 1023# endif
989# endif 1024# endif
1025
1026 /* DEC private modes */
1027 const_iv (PrivMode_132),
1028 const_iv (PrivMode_132OK),
1029 const_iv (PrivMode_rVideo),
1030 const_iv (PrivMode_relOrigin),
1031 const_iv (PrivMode_Screen),
1032 const_iv (PrivMode_Autowrap),
1033 const_iv (PrivMode_aplCUR),
1034 const_iv (PrivMode_aplKP),
1035 const_iv (PrivMode_HaveBackSpace),
1036 const_iv (PrivMode_BackSpace),
1037 const_iv (PrivMode_ShiftKeys),
1038 const_iv (PrivMode_VisibleCursor),
1039 const_iv (PrivMode_MouseX10),
1040 const_iv (PrivMode_MouseX11),
1041 const_iv (PrivMode_scrollBar),
1042 const_iv (PrivMode_TtyOutputInh),
1043 const_iv (PrivMode_Keypress),
1044 const_iv (PrivMode_smoothScroll),
1045 const_iv (PrivMode_vt52),
1046 const_iv (PrivMode_LFNL),
1047 const_iv (PrivMode_MouseBtnEvent),
1048 const_iv (PrivMode_MouseAnyEvent),
1049 const_iv (PrivMode_BracketPaste),
1050 const_iv (PrivMode_ExtModeMouse),
1051 const_iv (PrivMode_ExtMouseRight),
1052 const_iv (PrivMode_BlinkingCursor),
1053 const_iv (PrivMode_mouse_report),
1054 const_iv (PrivMode_Default),
990 }; 1055 };
991 1056
992 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1057 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
993 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1058 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
994} 1059}
995 1060
996void 1061void
997log (const char *msg) 1062log (utf8_string msg)
998 CODE: 1063 CODE:
999 rxvt_log ("%s", msg); 1064 rxvt_log ("%s", msg);
1000 1065
1001void 1066void
1002warn (const char *msg) 1067warn (utf8_string msg)
1003 CODE: 1068 CODE:
1004 rxvt_warn ("%s", msg); 1069 rxvt_warn ("%s", msg);
1005 1070
1006void 1071void
1007fatal (const char *msg) 1072fatal (utf8_string msg)
1008 CODE: 1073 CODE:
1009 rxvt_fatal ("%s", msg); 1074 rxvt_fatal ("%s", msg);
1010 1075
1011void 1076void
1012_exit (int status) 1077_exit (int status)
… …
1177void 1242void
1178rxvt_term::put_option_db (octet_string specifier, octet_string value) 1243rxvt_term::put_option_db (octet_string specifier, octet_string value)
1179 CODE: 1244 CODE:
1180 XrmPutStringResource (&THIS->option_db, specifier, value); 1245 XrmPutStringResource (&THIS->option_db, specifier, value);
1181 1246
1247void
1248rxvt_term::_keysym_resources ()
1249 PPCODE:
1250 PUTBACK;
1251 _keysym_resources (THIS);
1252 SPAGAIN;
1253
1182int 1254int
1183rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1255rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1184 CODE: 1256 CODE:
1185 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1257 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1186 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1258 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
1245rxvt_term::ungrab () 1317rxvt_term::ungrab ()
1246 CODE: 1318 CODE:
1247 ungrab (THIS); 1319 ungrab (THIS);
1248 1320
1249int 1321int
1250rxvt_term::XStringToKeysym (char *string) 1322rxvt_term::XStringToKeysym (octet_string string)
1251 CODE: 1323 CODE:
1252 RETVAL = XStringToKeysym (string); 1324 RETVAL = XStringToKeysym (string);
1253 OUTPUT: RETVAL 1325 OUTPUT: RETVAL
1254 1326
1255char * 1327char *
… …
1265 OUTPUT: RETVAL 1337 OUTPUT: RETVAL
1266 1338
1267int 1339int
1268rxvt_term::XKeycodeToKeysym (int code, int index) 1340rxvt_term::XKeycodeToKeysym (int code, int index)
1269 CODE: 1341 CODE:
1270 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1342 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1271 OUTPUT: RETVAL 1343 OUTPUT: RETVAL
1272 1344
1273int 1345int
1274rxvt_term::strwidth (SV *str) 1346rxvt_term::strwidth (SV *str)
1275 CODE: 1347 CODE:
… …
1345#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1417#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1346#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1418#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1347#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1419#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1348 1420
1349int 1421int
1350rxvt_term::width () 1422rxvt_term::width (int new_value = NO_INIT)
1351 ALIAS: 1423 ALIAS:
1352 width = TERM_OFFSET_width 1424 width = TERM_OFFSET_width
1353 height = TERM_OFFSET_height 1425 height = TERM_OFFSET_height
1354 fwidth = TERM_OFFSET_fwidth 1426 fwidth = TERM_OFFSET_fwidth
1355 fheight = TERM_OFFSET_fheight 1427 fheight = TERM_OFFSET_fheight
… …
1365 saveLines = TERM_OFFSET_saveLines 1437 saveLines = TERM_OFFSET_saveLines
1366 total_rows = TERM_OFFSET_total_rows 1438 total_rows = TERM_OFFSET_total_rows
1367 top_row = TERM_OFFSET_top_row 1439 top_row = TERM_OFFSET_top_row
1368 CODE: 1440 CODE:
1369 RETVAL = *(int *)((char *)THIS + ix); 1441 RETVAL = *(int *)((char *)THIS + ix);
1442 if (items > 1)
1443 *(int *)((char *)THIS + ix) = new_value;
1370 OUTPUT: 1444 OUTPUT:
1371 RETVAL 1445 RETVAL
1372 1446
1373unsigned int 1447unsigned int
1374rxvt_term::ModLevel3Mask () 1448rxvt_term::ModLevel3Mask ()
… …
1376 ModLevel3Mask = 0 1450 ModLevel3Mask = 0
1377 ModMetaMask = 1 1451 ModMetaMask = 1
1378 ModNumLockMask = 2 1452 ModNumLockMask = 2
1379 current_screen = 3 1453 current_screen = 3
1380 hidden_cursor = 4 1454 hidden_cursor = 4
1455 priv_modes = 5
1381 CODE: 1456 CODE:
1382 switch (ix) 1457 switch (ix)
1383 { 1458 {
1384 case 0: RETVAL = THIS->ModLevel3Mask; break; 1459 case 0: RETVAL = THIS->ModLevel3Mask; break;
1385 case 1: RETVAL = THIS->ModMetaMask; break; 1460 case 1: RETVAL = THIS->ModMetaMask; break;
1386 case 2: RETVAL = THIS->ModNumLockMask; break; 1461 case 2: RETVAL = THIS->ModNumLockMask; break;
1387 case 3: RETVAL = THIS->current_screen; break; 1462 case 3: RETVAL = THIS->current_screen; break;
1388#ifdef CURSOR_BLINK 1463#ifdef CURSOR_BLINK
1389 case 4: RETVAL = THIS->hidden_cursor; break; 1464 case 4: RETVAL = THIS->hidden_cursor; break;
1465#else
1466 case 4: RETVAL = 0; break;
1390#endif 1467#endif
1468 case 5: RETVAL = THIS->priv_modes; break;
1391 } 1469 }
1392 OUTPUT: 1470 OUTPUT:
1393 RETVAL 1471 RETVAL
1394 1472
1395char * 1473char *
… …
1530void 1608void
1531rxvt_term::want_refresh () 1609rxvt_term::want_refresh ()
1532 CODE: 1610 CODE:
1533 THIS->want_refresh = 1; 1611 THIS->want_refresh = 1;
1534 THIS->refresh_check (); 1612 THIS->refresh_check ();
1613
1614void
1615rxvt_term::refresh_check ()
1535 1616
1536void 1617void
1537rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1618rxvt_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: 1619 PPCODE:
1539{ 1620{
… …
1684 *r++ = NOCHAR; 1765 *r++ = NOCHAR;
1685 } 1766 }
1686 1767
1687 rxvt_pop_locale (); 1768 rxvt_pop_locale ();
1688 1769
1770 free (wstr);
1689 RETVAL = wcs2sv (rstr, r - rstr); 1771 RETVAL = wcs2sv (rstr, r - rstr);
1690} 1772}
1691 OUTPUT: 1773 OUTPUT:
1692 RETVAL 1774 RETVAL
1693 1775
… …
1717 else if (IS_COMPOSE (*s)) 1799 else if (IS_COMPOSE (*s))
1718 r += rxvt_composite.expand (*s, r); 1800 r += rxvt_composite.expand (*s, r);
1719 else 1801 else
1720 *r++ = *s; 1802 *r++ = *s;
1721 1803
1804 free (wstr);
1722 RETVAL = wcs2sv (rstr, r - rstr); 1805 RETVAL = wcs2sv (rstr, r - rstr);
1723} 1806}
1724 OUTPUT: 1807 OUTPUT:
1725 RETVAL 1808 RETVAL
1726 1809
1727void 1810void
1728rxvt_term::_resource (char *name, int index, SV *newval = 0) 1811rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1729 PPCODE: 1812 PPCODE:
1730{ 1813{
1731 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1814 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1732# define def(name) { # name, Rs_ ## name }, 1815# define def(name) { # name, Rs_ ## name },
1733# define reserve(name,count) 1816# define reserve(name,count)
… …
1771 THIS->rs [index] = 0; 1854 THIS->rs [index] = 0;
1772 } 1855 }
1773} 1856}
1774 1857
1775const char * 1858const char *
1776rxvt_term::x_resource (const char *name) 1859rxvt_term::x_resource (octet_string name)
1777 1860
1778bool 1861bool
1779rxvt_term::option (U8 optval, int set = -1) 1862rxvt_term::option (U8 optval, int set = -1)
1780 CODE: 1863 CODE:
1781{ 1864{
… …
1800 THIS->cursor_blink_reset (); 1883 THIS->cursor_blink_reset ();
1801 break; 1884 break;
1802#endif 1885#endif
1803 1886
1804 case Opt_cursorUnderline: 1887 case Opt_cursorUnderline:
1888 THIS->cursor_type = set ? 1 : 0;
1805 THIS->want_refresh = 1; 1889 THIS->want_refresh = 1;
1806 THIS->refresh_check (); 1890 THIS->refresh_check ();
1807 break; 1891 break;
1808 1892
1809# case Opt_scrollBar_floating: 1893# case Opt_scrollBar_floating:
… …
1814 } 1898 }
1815} 1899}
1816 OUTPUT: 1900 OUTPUT:
1817 RETVAL 1901 RETVAL
1818 1902
1903SV *
1904rxvt_term::lookup_keysym (int keysym, unsigned int state)
1905 CODE:
1906{
1907 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1908 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1909}
1910 OUTPUT:
1911 RETVAL
1912
1819bool 1913bool
1820rxvt_term::parse_keysym (char *keysym, char *str) 1914rxvt_term::bind_action (octet_string keysym, octet_string action)
1915 ALIAS:
1916 parse_keysym = 1
1821 CODE: 1917 CODE:
1822 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1918 RETVAL = 0 < THIS->bind_action (keysym, action);
1823 THIS->keyboard->register_done (); 1919 THIS->keyboard->register_done ();
1824 OUTPUT: 1920 OUTPUT:
1825 RETVAL 1921 RETVAL
1826 1922
1827void 1923void
1828rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1924rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1829 CODE: 1925 CODE:
1830 wchar_t *wstr = sv2wcs (str); 1926 wchar_t *wstr = sv2wcs (str);
1831 THIS->keyboard->register_user_translation (keysym, state, wstr); 1927 THIS->keyboard->register_action (keysym, state, wstr);
1832 free (wstr); 1928 free (wstr);
1833 1929
1834void 1930void
1835rxvt_term::screen_cur (...) 1931rxvt_term::screen_cur (...)
1836 PROTOTYPE: $;$$ 1932 PROTOTYPE: $;$$
… …
1879 1975
1880 if (ix) 1976 if (ix)
1881 { 1977 {
1882 THIS->selection.screen = THIS->current_screen; 1978 THIS->selection.screen = THIS->current_screen;
1883 1979
1884 THIS->want_refresh = 1; 1980 THIS->selection_changed ();
1885 THIS->refresh_check (); 1981 THIS->refresh_check ();
1886 } 1982 }
1887 } 1983 }
1888} 1984}
1889 1985
… …
1895 THIS->selection.screen = screen; 1991 THIS->selection.screen = screen;
1896 OUTPUT: 1992 OUTPUT:
1897 RETVAL 1993 RETVAL
1898 1994
1899void 1995void
1996rxvt_term::selection_request (Time tm, int selnum)
1997
1998void
1900rxvt_term::selection_clear (bool clipboard = false) 1999rxvt_term::selection_clear (bool clipboard = false)
1901 2000
1902void 2001void
1903rxvt_term::selection_make (Time eventtime, bool rect = false) 2002rxvt_term::selection_make (Time eventtime, bool rect = false)
1904 CODE: 2003 CODE:
… …
1945 2044
1946void 2045void
1947rxvt_term::scr_bell () 2046rxvt_term::scr_bell ()
1948 2047
1949void 2048void
1950rxvt_term::scr_recolour (bool refresh = true); 2049rxvt_term::scr_recolor (bool refresh = true);
1951 2050
1952void 2051void
1953rxvt_term::scr_change_screen (int screen) 2052rxvt_term::scr_change_screen (int screen)
1954 2053
1955void 2054void
… …
1958{ 2057{
1959 wchar_t *wstr = sv2wcs (string); 2058 wchar_t *wstr = sv2wcs (string);
1960 THIS->scr_add_lines (wstr, wcslen (wstr)); 2059 THIS->scr_add_lines (wstr, wcslen (wstr));
1961 free (wstr); 2060 free (wstr);
1962} 2061}
2062
2063void
2064rxvt_term::tt_write_user_input (SV *octets)
2065 INIT:
2066 STRLEN len;
2067 char *str = SvPVbyte (octets, len);
2068 C_ARGS:
2069 str, len
1963 2070
1964void 2071void
1965rxvt_term::tt_write (SV *octets) 2072rxvt_term::tt_write (SV *octets)
1966 INIT: 2073 INIT:
1967 STRLEN len; 2074 STRLEN len;
… …
2206#endif 2313#endif
2207 2314
2208void 2315void
2209rxvt_term::set_background (rxvt_img *img, bool border = false) 2316rxvt_term::set_background (rxvt_img *img, bool border = false)
2210 CODE: 2317 CODE:
2211#if HAVE_BG_PIXMAP 2318 delete THIS->bg_img;
2212 THIS->bg_destroy (); 2319 THIS->bg_img = 0;
2213#endif 2320 THIS->bg_flags = 0;
2214 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
2215 2321
2216 if (img) // TODO: cannot be false 2322 if (img) // TODO: cannot be false
2217 { 2323 {
2218 img = img->clone (); // own the img 2324 img = img->clone (); // own the img
2219 2325
… …
2229 2335
2230 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2336 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2231 ->replace (img); 2337 ->replace (img);
2232 2338
2233 THIS->bg_img = img; 2339 THIS->bg_img = img;
2234 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2340 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2235 2341
2236 if (!border) 2342 if (!border)
2237 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2343 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2238 } 2344 }
2239 2345
… …
2388 INIT: 2494 INIT:
2389 rgba cc = parse_rgba (c, THIS->s); 2495 rgba cc = parse_rgba (c, THIS->s);
2390 C_ARGS: cc 2496 C_ARGS: cc
2391 2497
2392rxvt_img * 2498rxvt_img *
2499rxvt_img::shade (rxvt_img::nv factor)
2500
2501rxvt_img *
2393rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2502rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2394 CODE: 2503 CODE:
2395 rxvt_img::nv *vparams = 0; 2504 rxvt_img::nv *vparams = 0;
2396 int nparams = 0; 2505 int nparams = 0;
2397 2506
2398 if (SvOK (params)) 2507 if (SvOK (params))
2399 { 2508 {
2400 // we overlay rxvt_temp_buf, what a hack
2401 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2402
2403 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2509 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2404 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2510 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2405 2511
2406 nparams = av_len ((AV *)SvRV (params)) + 1; 2512 nparams = av_len ((AV *)SvRV (params)) + 1;
2407 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2513 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2408 2514
2409 for (int i = 0; i < nparams; ++i) 2515 for (int i = 0; i < nparams; ++i)
2410 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2516 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2411 } 2517 }
2412 2518
2413 RETVAL = THIS->filter (name, nparams, vparams); 2519 RETVAL = THIS->filter (name, nparams, vparams);
2520 free (vparams);
2414 OUTPUT: 2521 OUTPUT:
2415 RETVAL 2522 RETVAL
2416 2523
2417#endif 2524#endif
2418 2525

Diff Legend

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