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.213 by root, Sat Feb 16 17:26:53 2013 UTC vs.
Revision 1.244 by root, Tue Jun 25 03:35:01 2019 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;
… …
391 391
392 { 392 {
393 perl_environ = rxvt_environ; 393 perl_environ = rxvt_environ;
394 localise_env set_environ (perl_environ); 394 localise_env set_environ (perl_environ);
395 395
396 char *args[] = { 396 const char *args[] = {
397 "", 397 "",
398 "-e" 398 "-e"
399 "BEGIN {" 399 "BEGIN {"
400 " urxvt->bootstrap;" 400 " urxvt->bootstrap;"
401 " unshift @INC, '" LIBDIR "';" 401 " unshift @INC, '" LIBDIR "';"
402 "}" 402 "}"
403 "" 403 ""
404 "use urxvt;" 404 "use urxvt;",
405 0
405 }; 406 };
406 int argc = ecb_array_length (args); 407 int argc = ecb_array_length (args) - 1;
407 char **argv = args; 408 char **argv = (char **)args;
408 409
409 PERL_SYS_INIT3 (&argc, &argv, &environ); 410 PERL_SYS_INIT3 (&argc, &argv, &environ);
410 perl = perl_alloc (); 411 perl = perl_alloc ();
411 perl_construct (perl); 412 perl_construct (perl);
412 413
… …
490 491
491 FREETMPS; 492 FREETMPS;
492 LEAVE; 493 LEAVE;
493 494
494 return ret; 495 return ret;
496}
497
498static void
499_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
500{
501 unsigned int state;
502
503 if (term->parse_keysym (k, state) == -1)
504 return;
505
506 dSP;
507 XPUSHs (sv_2mortal (newSVpv (v, 0)));
508 PUTBACK;
509}
510
511static void
512_keysym_resources (rxvt_term *term)
513{
514 term->enumerate_keysym_resources (_keysym_resource_push);
495} 515}
496 516
497static void 517static void
498ungrab (rxvt_term *THIS) 518ungrab (rxvt_term *THIS)
499{ 519{
… …
793 static const struct { 813 static const struct {
794 const char *name; 814 const char *name;
795 IV iv; 815 IV iv;
796 } *civ, const_iv[] = { 816 } *civ, const_iv[] = {
797# define const_iv(name) { # name, (IV)name } 817# define const_iv(name) { # name, (IV)name }
818 const_iv (HOOK_INIT),
819 const_iv (HOOK_DESTROY),
820 const_iv (HOOK_ACTION),
821
798 const_iv (NUM_RESOURCES), 822 const_iv (NUM_RESOURCES),
799 const_iv (DEFAULT_RSTYLE), 823 const_iv (DEFAULT_RSTYLE),
800 const_iv (OVERLAY_RSTYLE), 824 const_iv (OVERLAY_RSTYLE),
801 const_iv (Color_Bits), 825 const_iv (Color_Bits),
802 const_iv (RS_bgShift), const_iv (RS_bgMask), 826 const_iv (RS_bgShift), const_iv (RS_bgMask),
… …
812 const_iv (RS_Bold), 836 const_iv (RS_Bold),
813 const_iv (RS_Italic), 837 const_iv (RS_Italic),
814 const_iv (RS_Blink), 838 const_iv (RS_Blink),
815 const_iv (RS_RVid), 839 const_iv (RS_RVid),
816 const_iv (RS_Uline), 840 const_iv (RS_Uline),
841
842 // TODO: should support all colour constants, create colorinc.h &c
843 const_iv (Color_fg),
844 const_iv (Color_bg),
845#if OFF_FOCUS_FADING
846 const_iv (Color_fade),
847#endif
848 const_iv (Color_pointer_fg),
849 const_iv (Color_pointer_bg),
850 const_iv (Color_border),
851 const_iv (NRS_COLORS),
852 const_iv (TOTAL_COLORS),
817 853
818 const_iv (CurrentTime), 854 const_iv (CurrentTime),
819 const_iv (ShiftMask), 855 const_iv (ShiftMask),
820 const_iv (LockMask), 856 const_iv (LockMask),
821 const_iv (ControlMask), 857 const_iv (ControlMask),
… …
985 const_iv (XIMLineEnd), 1021 const_iv (XIMLineEnd),
986 const_iv (XIMAbsolutePosition), 1022 const_iv (XIMAbsolutePosition),
987 const_iv (XIMDontChange), 1023 const_iv (XIMDontChange),
988# endif 1024# endif
989# endif 1025# endif
1026
1027 /* DEC private modes */
1028 const_iv (PrivMode_132),
1029 const_iv (PrivMode_132OK),
1030 const_iv (PrivMode_rVideo),
1031 const_iv (PrivMode_relOrigin),
1032 const_iv (PrivMode_Screen),
1033 const_iv (PrivMode_Autowrap),
1034 const_iv (PrivMode_aplCUR),
1035 const_iv (PrivMode_aplKP),
1036 const_iv (PrivMode_HaveBackSpace),
1037 const_iv (PrivMode_BackSpace),
1038 const_iv (PrivMode_ShiftKeys),
1039 const_iv (PrivMode_VisibleCursor),
1040 const_iv (PrivMode_MouseX10),
1041 const_iv (PrivMode_MouseX11),
1042 const_iv (PrivMode_scrollBar),
1043 const_iv (PrivMode_TtyOutputInh),
1044 const_iv (PrivMode_Keypress),
1045 const_iv (PrivMode_smoothScroll),
1046 const_iv (PrivMode_vt52),
1047 const_iv (PrivMode_LFNL),
1048 const_iv (PrivMode_MouseBtnEvent),
1049 const_iv (PrivMode_MouseAnyEvent),
1050 const_iv (PrivMode_BracketPaste),
1051 const_iv (PrivMode_ExtModeMouse),
1052 const_iv (PrivMode_ExtMouseRight),
1053 const_iv (PrivMode_BlinkingCursor),
1054 const_iv (PrivMode_mouse_report),
1055 const_iv (PrivMode_Default),
990 }; 1056 };
991 1057
992 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1058 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
993 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1059 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
994} 1060}
995 1061
996void 1062void
997log (const char *msg) 1063log (utf8_string msg)
998 CODE: 1064 CODE:
999 rxvt_log ("%s", msg); 1065 rxvt_log ("%s", msg);
1000 1066
1001void 1067void
1002warn (const char *msg) 1068warn (utf8_string msg)
1003 CODE: 1069 CODE:
1004 rxvt_warn ("%s", msg); 1070 rxvt_warn ("%s", msg);
1005 1071
1006void 1072void
1007fatal (const char *msg) 1073fatal (utf8_string msg)
1008 CODE: 1074 CODE:
1009 rxvt_fatal ("%s", msg); 1075 rxvt_fatal ("%s", msg);
1010 1076
1011void 1077void
1012_exit (int status) 1078_exit (int status)
… …
1177void 1243void
1178rxvt_term::put_option_db (octet_string specifier, octet_string value) 1244rxvt_term::put_option_db (octet_string specifier, octet_string value)
1179 CODE: 1245 CODE:
1180 XrmPutStringResource (&THIS->option_db, specifier, value); 1246 XrmPutStringResource (&THIS->option_db, specifier, value);
1181 1247
1248void
1249rxvt_term::_keysym_resources ()
1250 PPCODE:
1251 PUTBACK;
1252 _keysym_resources (THIS);
1253 SPAGAIN;
1254
1182int 1255int
1183rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1256rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1184 CODE: 1257 CODE:
1185 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1258 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1186 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1259 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
1245rxvt_term::ungrab () 1318rxvt_term::ungrab ()
1246 CODE: 1319 CODE:
1247 ungrab (THIS); 1320 ungrab (THIS);
1248 1321
1249int 1322int
1250rxvt_term::XStringToKeysym (char *string) 1323rxvt_term::XStringToKeysym (octet_string string)
1251 CODE: 1324 CODE:
1252 RETVAL = XStringToKeysym (string); 1325 RETVAL = XStringToKeysym (string);
1253 OUTPUT: RETVAL 1326 OUTPUT: RETVAL
1254 1327
1255char * 1328char *
… …
1265 OUTPUT: RETVAL 1338 OUTPUT: RETVAL
1266 1339
1267int 1340int
1268rxvt_term::XKeycodeToKeysym (int code, int index) 1341rxvt_term::XKeycodeToKeysym (int code, int index)
1269 CODE: 1342 CODE:
1270 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1343 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1271 OUTPUT: RETVAL 1344 OUTPUT: RETVAL
1272 1345
1273int 1346int
1274rxvt_term::strwidth (SV *str) 1347rxvt_term::strwidth (SV *str)
1275 CODE: 1348 CODE:
… …
1345#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1418#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1346#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1419#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1347#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1420#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1348 1421
1349int 1422int
1350rxvt_term::width () 1423rxvt_term::width (int new_value = NO_INIT)
1351 ALIAS: 1424 ALIAS:
1352 width = TERM_OFFSET_width 1425 width = TERM_OFFSET_width
1353 height = TERM_OFFSET_height 1426 height = TERM_OFFSET_height
1354 fwidth = TERM_OFFSET_fwidth 1427 fwidth = TERM_OFFSET_fwidth
1355 fheight = TERM_OFFSET_fheight 1428 fheight = TERM_OFFSET_fheight
… …
1365 saveLines = TERM_OFFSET_saveLines 1438 saveLines = TERM_OFFSET_saveLines
1366 total_rows = TERM_OFFSET_total_rows 1439 total_rows = TERM_OFFSET_total_rows
1367 top_row = TERM_OFFSET_top_row 1440 top_row = TERM_OFFSET_top_row
1368 CODE: 1441 CODE:
1369 RETVAL = *(int *)((char *)THIS + ix); 1442 RETVAL = *(int *)((char *)THIS + ix);
1443 if (items > 1)
1444 *(int *)((char *)THIS + ix) = new_value;
1370 OUTPUT: 1445 OUTPUT:
1371 RETVAL 1446 RETVAL
1372 1447
1373unsigned int 1448unsigned int
1374rxvt_term::ModLevel3Mask () 1449rxvt_term::ModLevel3Mask ()
… …
1376 ModLevel3Mask = 0 1451 ModLevel3Mask = 0
1377 ModMetaMask = 1 1452 ModMetaMask = 1
1378 ModNumLockMask = 2 1453 ModNumLockMask = 2
1379 current_screen = 3 1454 current_screen = 3
1380 hidden_cursor = 4 1455 hidden_cursor = 4
1456 priv_modes = 5
1381 CODE: 1457 CODE:
1382 switch (ix) 1458 switch (ix)
1383 { 1459 {
1384 case 0: RETVAL = THIS->ModLevel3Mask; break; 1460 case 0: RETVAL = THIS->ModLevel3Mask; break;
1385 case 1: RETVAL = THIS->ModMetaMask; break; 1461 case 1: RETVAL = THIS->ModMetaMask; break;
1386 case 2: RETVAL = THIS->ModNumLockMask; break; 1462 case 2: RETVAL = THIS->ModNumLockMask; break;
1387 case 3: RETVAL = THIS->current_screen; break; 1463 case 3: RETVAL = THIS->current_screen; break;
1388#ifdef CURSOR_BLINK 1464#ifdef CURSOR_BLINK
1389 case 4: RETVAL = THIS->hidden_cursor; break; 1465 case 4: RETVAL = THIS->hidden_cursor; break;
1466#else
1467 case 4: RETVAL = 0; break;
1390#endif 1468#endif
1469 case 5: RETVAL = THIS->priv_modes; break;
1391 } 1470 }
1392 OUTPUT: 1471 OUTPUT:
1393 RETVAL 1472 RETVAL
1394 1473
1395char * 1474char *
… …
1530void 1609void
1531rxvt_term::want_refresh () 1610rxvt_term::want_refresh ()
1532 CODE: 1611 CODE:
1533 THIS->want_refresh = 1; 1612 THIS->want_refresh = 1;
1534 THIS->refresh_check (); 1613 THIS->refresh_check ();
1614
1615void
1616rxvt_term::refresh_check ()
1535 1617
1536void 1618void
1537rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1619rxvt_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: 1620 PPCODE:
1539{ 1621{
… …
1684 *r++ = NOCHAR; 1766 *r++ = NOCHAR;
1685 } 1767 }
1686 1768
1687 rxvt_pop_locale (); 1769 rxvt_pop_locale ();
1688 1770
1771 free (wstr);
1689 RETVAL = wcs2sv (rstr, r - rstr); 1772 RETVAL = wcs2sv (rstr, r - rstr);
1690} 1773}
1691 OUTPUT: 1774 OUTPUT:
1692 RETVAL 1775 RETVAL
1693 1776
… …
1717 else if (IS_COMPOSE (*s)) 1800 else if (IS_COMPOSE (*s))
1718 r += rxvt_composite.expand (*s, r); 1801 r += rxvt_composite.expand (*s, r);
1719 else 1802 else
1720 *r++ = *s; 1803 *r++ = *s;
1721 1804
1805 free (wstr);
1722 RETVAL = wcs2sv (rstr, r - rstr); 1806 RETVAL = wcs2sv (rstr, r - rstr);
1723} 1807}
1724 OUTPUT: 1808 OUTPUT:
1725 RETVAL 1809 RETVAL
1726 1810
1727void 1811void
1728rxvt_term::_resource (char *name, int index, SV *newval = 0) 1812rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1729 PPCODE: 1813 PPCODE:
1730{ 1814{
1731 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1815 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1732# define def(name) { # name, Rs_ ## name }, 1816# define def(name) { # name, Rs_ ## name },
1733# define reserve(name,count) 1817# define reserve(name,count)
… …
1748 index += rs->value; 1832 index += rs->value;
1749 } 1833 }
1750 else 1834 else
1751 { 1835 {
1752 --rs; 1836 --rs;
1753 name = ""; 1837 name = (octet_string)"";
1754 } 1838 }
1755 1839
1756 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1840 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1757 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1841 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1758 1842
… …
1771 THIS->rs [index] = 0; 1855 THIS->rs [index] = 0;
1772 } 1856 }
1773} 1857}
1774 1858
1775const char * 1859const char *
1776rxvt_term::x_resource (const char *name) 1860rxvt_term::x_resource (octet_string name)
1777 1861
1778bool 1862bool
1779rxvt_term::option (U8 optval, int set = -1) 1863rxvt_term::option (U8 optval, int set = -1)
1780 CODE: 1864 CODE:
1781{ 1865{
… …
1800 THIS->cursor_blink_reset (); 1884 THIS->cursor_blink_reset ();
1801 break; 1885 break;
1802#endif 1886#endif
1803 1887
1804 case Opt_cursorUnderline: 1888 case Opt_cursorUnderline:
1889 THIS->cursor_type = set ? 1 : 0;
1805 THIS->want_refresh = 1; 1890 THIS->want_refresh = 1;
1806 THIS->refresh_check (); 1891 THIS->refresh_check ();
1807 break; 1892 break;
1808 1893
1809# case Opt_scrollBar_floating: 1894# case Opt_scrollBar_floating:
… …
1814 } 1899 }
1815} 1900}
1816 OUTPUT: 1901 OUTPUT:
1817 RETVAL 1902 RETVAL
1818 1903
1904SV *
1905rxvt_term::lookup_keysym (int keysym, unsigned int state)
1906 CODE:
1907{
1908 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1909 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1910}
1911 OUTPUT:
1912 RETVAL
1913
1819bool 1914bool
1820rxvt_term::parse_keysym (char *keysym, char *str) 1915rxvt_term::bind_action (octet_string keysym, octet_string action)
1916 ALIAS:
1917 parse_keysym = 1
1821 CODE: 1918 CODE:
1822 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1919 RETVAL = 0 < THIS->bind_action (keysym, action);
1823 THIS->keyboard->register_done (); 1920 THIS->keyboard->register_done ();
1824 OUTPUT: 1921 OUTPUT:
1825 RETVAL 1922 RETVAL
1826 1923
1827void 1924void
1828rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1925rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1829 CODE: 1926 CODE:
1830 wchar_t *wstr = sv2wcs (str); 1927 wchar_t *wstr = sv2wcs (str);
1831 THIS->keyboard->register_user_translation (keysym, state, wstr); 1928 THIS->keyboard->register_action (keysym, state, wstr);
1832 free (wstr); 1929 free (wstr);
1833 1930
1834void 1931void
1835rxvt_term::screen_cur (...) 1932rxvt_term::screen_cur (...)
1836 PROTOTYPE: $;$$ 1933 PROTOTYPE: $;$$
… …
1895 THIS->selection.screen = screen; 1992 THIS->selection.screen = screen;
1896 OUTPUT: 1993 OUTPUT:
1897 RETVAL 1994 RETVAL
1898 1995
1899void 1996void
1997rxvt_term::selection_request (Time tm, int selnum)
1998
1999void
1900rxvt_term::selection_clear (bool clipboard = false) 2000rxvt_term::selection_clear (bool clipboard = false)
1901 2001
1902void 2002void
1903rxvt_term::selection_make (Time eventtime, bool rect = false) 2003rxvt_term::selection_make (Time eventtime, bool rect = false)
1904 CODE: 2004 CODE:
… …
1945 2045
1946void 2046void
1947rxvt_term::scr_bell () 2047rxvt_term::scr_bell ()
1948 2048
1949void 2049void
1950rxvt_term::scr_recolour (bool refresh = true); 2050rxvt_term::scr_recolor (bool refresh = true);
1951 2051
1952void 2052void
1953rxvt_term::scr_change_screen (int screen) 2053rxvt_term::scr_change_screen (int screen)
1954 2054
1955void 2055void
… …
1958{ 2058{
1959 wchar_t *wstr = sv2wcs (string); 2059 wchar_t *wstr = sv2wcs (string);
1960 THIS->scr_add_lines (wstr, wcslen (wstr)); 2060 THIS->scr_add_lines (wstr, wcslen (wstr));
1961 free (wstr); 2061 free (wstr);
1962} 2062}
2063
2064void
2065rxvt_term::tt_write_user_input (SV *octets)
2066 INIT:
2067 STRLEN len;
2068 char *str = SvPVbyte (octets, len);
2069 C_ARGS:
2070 str, len
1963 2071
1964void 2072void
1965rxvt_term::tt_write (SV *octets) 2073rxvt_term::tt_write (SV *octets)
1966 INIT: 2074 INIT:
1967 STRLEN len; 2075 STRLEN len;
… …
2228 2336
2229 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2337 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2230 ->replace (img); 2338 ->replace (img);
2231 2339
2232 THIS->bg_img = img; 2340 THIS->bg_img = img;
2233 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2341 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2234 2342
2235 if (!border) 2343 if (!border)
2236 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2344 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2237 } 2345 }
2238 2346
… …
2315 2423
2316void 2424void
2317rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h) 2425rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2318 PROTOTYPE: $;$$$$ 2426 PROTOTYPE: $;$$$$
2319 INIT: 2427 INIT:
2320 rgba cc = parse_rgba (c, THIS->s); 2428 rxvt_screen screen;
2429 screen.set (THIS->d);
2430 rgba cc = parse_rgba (c, &screen);
2321 C_ARGS: cc, x, y, w, h 2431 C_ARGS: cc, x, y, w, h
2322 2432
2323void 2433void
2324rxvt_img::DESTROY () 2434rxvt_img::DESTROY ()
2325 CODE: 2435 CODE:
… …
2383rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2493rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2384 2494
2385rxvt_img * 2495rxvt_img *
2386rxvt_img::tint (SV *c) 2496rxvt_img::tint (SV *c)
2387 INIT: 2497 INIT:
2388 rgba cc = parse_rgba (c, THIS->s); 2498 rxvt_screen screen;
2499 screen.set (THIS->d);
2500 rgba cc = parse_rgba (c, &screen);
2389 C_ARGS: cc 2501 C_ARGS: cc
2390 2502
2391rxvt_img * 2503rxvt_img *
2392rxvt_img::shade (rxvt_img::nv factor) 2504rxvt_img::shade (rxvt_img::nv factor)
2393 2505
… …
2397 rxvt_img::nv *vparams = 0; 2509 rxvt_img::nv *vparams = 0;
2398 int nparams = 0; 2510 int nparams = 0;
2399 2511
2400 if (SvOK (params)) 2512 if (SvOK (params))
2401 { 2513 {
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) 2514 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2406 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2515 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2407 2516
2408 nparams = av_len ((AV *)SvRV (params)) + 1; 2517 nparams = av_len ((AV *)SvRV (params)) + 1;
2409 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2518 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2410 2519
2411 for (int i = 0; i < nparams; ++i) 2520 for (int i = 0; i < nparams; ++i)
2412 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2521 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2413 } 2522 }
2414 2523
2415 RETVAL = THIS->filter (name, nparams, vparams); 2524 RETVAL = THIS->filter (name, nparams, vparams);
2525 free (vparams);
2416 OUTPUT: 2526 OUTPUT:
2417 RETVAL 2527 RETVAL
2418 2528
2419#endif 2529#endif
2420 2530

Diff Legend

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