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.201 by sf-exg, Fri Jun 29 13:41:43 2012 UTC vs.
Revision 1.240 by root, Thu Jun 22 23:46: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
… …
57typedef int render_repeat_mode; 57typedef int render_repeat_mode;
58 58
59#if HAVE_PIXBUF 59#if HAVE_PIXBUF
60typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif 61#endif
62#if HAVE_IMG
62typedef rxvt_img * urxvt__img; 63typedef rxvt_img * urxvt__img;
63typedef rxvt_img::nv rxvt_img__nv; 64typedef rxvt_img::nv rxvt_img__nv;
64 65
65///////////////////////////////////////////////////////////////////////////// 66/////////////////////////////////////////////////////////////////////////////
66 67
… …
105 106
106 return c; 107 return c;
107} 108}
108 109
109///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
110 112
111static wchar_t * 113static wchar_t *
112sv2wcs (SV *sv) 114sv2wcs (SV *sv)
113{ 115{
114 STRLEN len; 116 STRLEN len;
… …
289 break; 291 break;
290 292
291 for (; i < AvFILL (overlay_av); i++) 293 for (; i < AvFILL (overlay_av); i++)
292 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)));
293 295
294 av_pop (overlay_av); 296 SvREFCNT_dec (av_pop (overlay_av));
295 297
296 SvREFCNT_dec (overlay_av); 298 SvREFCNT_dec (overlay_av);
297 overlay_av = 0; 299 overlay_av = 0;
298 300
299 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
… …
488 490
489 FREETMPS; 491 FREETMPS;
490 LEAVE; 492 LEAVE;
491 493
492 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);
493} 514}
494 515
495static void 516static void
496ungrab (rxvt_term *THIS) 517ungrab (rxvt_term *THIS)
497{ 518{
… …
791 static const struct { 812 static const struct {
792 const char *name; 813 const char *name;
793 IV iv; 814 IV iv;
794 } *civ, const_iv[] = { 815 } *civ, const_iv[] = {
795# 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
796 const_iv (NUM_RESOURCES), 821 const_iv (NUM_RESOURCES),
797 const_iv (DEFAULT_RSTYLE), 822 const_iv (DEFAULT_RSTYLE),
798 const_iv (OVERLAY_RSTYLE), 823 const_iv (OVERLAY_RSTYLE),
799 const_iv (Color_Bits), 824 const_iv (Color_Bits),
800 const_iv (RS_bgShift), const_iv (RS_bgMask), 825 const_iv (RS_bgShift), const_iv (RS_bgMask),
… …
810 const_iv (RS_Bold), 835 const_iv (RS_Bold),
811 const_iv (RS_Italic), 836 const_iv (RS_Italic),
812 const_iv (RS_Blink), 837 const_iv (RS_Blink),
813 const_iv (RS_RVid), 838 const_iv (RS_RVid),
814 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),
815 852
816 const_iv (CurrentTime), 853 const_iv (CurrentTime),
817 const_iv (ShiftMask), 854 const_iv (ShiftMask),
818 const_iv (LockMask), 855 const_iv (LockMask),
819 const_iv (ControlMask), 856 const_iv (ControlMask),
… …
990 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--)
991 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1028 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
992} 1029}
993 1030
994void 1031void
995log (const char *msg) 1032log (utf8_string msg)
996 CODE: 1033 CODE:
997 rxvt_log ("%s", msg); 1034 rxvt_log ("%s", msg);
998 1035
999void 1036void
1000warn (const char *msg) 1037warn (utf8_string msg)
1001 CODE: 1038 CODE:
1002 rxvt_warn ("%s", msg); 1039 rxvt_warn ("%s", msg);
1003 1040
1004void 1041void
1005fatal (const char *msg) 1042fatal (utf8_string msg)
1006 CODE: 1043 CODE:
1007 rxvt_fatal ("%s", msg); 1044 rxvt_fatal ("%s", msg);
1008 1045
1009void 1046void
1010_exit (int status) 1047_exit (int status)
… …
1175void 1212void
1176rxvt_term::put_option_db (octet_string specifier, octet_string value) 1213rxvt_term::put_option_db (octet_string specifier, octet_string value)
1177 CODE: 1214 CODE:
1178 XrmPutStringResource (&THIS->option_db, specifier, value); 1215 XrmPutStringResource (&THIS->option_db, specifier, value);
1179 1216
1217void
1218rxvt_term::_keysym_resources ()
1219 PPCODE:
1220 PUTBACK;
1221 _keysym_resources (THIS);
1222 SPAGAIN;
1223
1180int 1224int
1181rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1225rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1182 CODE: 1226 CODE:
1183 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1227 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1184 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1228 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
1243rxvt_term::ungrab () 1287rxvt_term::ungrab ()
1244 CODE: 1288 CODE:
1245 ungrab (THIS); 1289 ungrab (THIS);
1246 1290
1247int 1291int
1248rxvt_term::XStringToKeysym (char *string) 1292rxvt_term::XStringToKeysym (octet_string string)
1249 CODE: 1293 CODE:
1250 RETVAL = XStringToKeysym (string); 1294 RETVAL = XStringToKeysym (string);
1251 OUTPUT: RETVAL 1295 OUTPUT: RETVAL
1252 1296
1253char * 1297char *
… …
1263 OUTPUT: RETVAL 1307 OUTPUT: RETVAL
1264 1308
1265int 1309int
1266rxvt_term::XKeycodeToKeysym (int code, int index) 1310rxvt_term::XKeycodeToKeysym (int code, int index)
1267 CODE: 1311 CODE:
1268 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1312 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1269 OUTPUT: RETVAL 1313 OUTPUT: RETVAL
1270 1314
1271int 1315int
1272rxvt_term::strwidth (SV *str) 1316rxvt_term::strwidth (SV *str)
1273 CODE: 1317 CODE:
… …
1343#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1387#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1344#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1388#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1345#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1389#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1346 1390
1347int 1391int
1348rxvt_term::width () 1392rxvt_term::width (int new_value = NO_INIT)
1349 ALIAS: 1393 ALIAS:
1350 width = TERM_OFFSET_width 1394 width = TERM_OFFSET_width
1351 height = TERM_OFFSET_height 1395 height = TERM_OFFSET_height
1352 fwidth = TERM_OFFSET_fwidth 1396 fwidth = TERM_OFFSET_fwidth
1353 fheight = TERM_OFFSET_fheight 1397 fheight = TERM_OFFSET_fheight
… …
1363 saveLines = TERM_OFFSET_saveLines 1407 saveLines = TERM_OFFSET_saveLines
1364 total_rows = TERM_OFFSET_total_rows 1408 total_rows = TERM_OFFSET_total_rows
1365 top_row = TERM_OFFSET_top_row 1409 top_row = TERM_OFFSET_top_row
1366 CODE: 1410 CODE:
1367 RETVAL = *(int *)((char *)THIS + ix); 1411 RETVAL = *(int *)((char *)THIS + ix);
1412 if (items > 1)
1413 *(int *)((char *)THIS + ix) = new_value;
1368 OUTPUT: 1414 OUTPUT:
1369 RETVAL 1415 RETVAL
1370 1416
1371unsigned int 1417unsigned int
1372rxvt_term::ModLevel3Mask () 1418rxvt_term::ModLevel3Mask ()
… …
1383 case 1: RETVAL = THIS->ModMetaMask; break; 1429 case 1: RETVAL = THIS->ModMetaMask; break;
1384 case 2: RETVAL = THIS->ModNumLockMask; break; 1430 case 2: RETVAL = THIS->ModNumLockMask; break;
1385 case 3: RETVAL = THIS->current_screen; break; 1431 case 3: RETVAL = THIS->current_screen; break;
1386#ifdef CURSOR_BLINK 1432#ifdef CURSOR_BLINK
1387 case 4: RETVAL = THIS->hidden_cursor; break; 1433 case 4: RETVAL = THIS->hidden_cursor; break;
1434#else
1435 case 4: RETVAL = 0; break;
1388#endif 1436#endif
1389 } 1437 }
1390 OUTPUT: 1438 OUTPUT:
1391 RETVAL 1439 RETVAL
1392 1440
… …
1454 CODE: 1502 CODE:
1455 RETVAL = THIS->parent_y; 1503 RETVAL = THIS->parent_y;
1456 OUTPUT: 1504 OUTPUT:
1457 RETVAL 1505 RETVAL
1458 1506
1507Window
1508rxvt_term::vt ()
1509 CODE:
1510 RETVAL = THIS->vt;
1511 OUTPUT:
1512 RETVAL
1513
1459void 1514void
1460rxvt_term::vt_emask_add (U32 emask) 1515rxvt_term::vt_emask_add (U32 emask)
1461 CODE: 1516 CODE:
1462 THIS->vt_emask_perl |= emask; 1517 THIS->vt_emask_perl |= emask;
1463 THIS->vt_select_input (); 1518 THIS->vt_select_input ();
… …
1521void 1576void
1522rxvt_term::want_refresh () 1577rxvt_term::want_refresh ()
1523 CODE: 1578 CODE:
1524 THIS->want_refresh = 1; 1579 THIS->want_refresh = 1;
1525 THIS->refresh_check (); 1580 THIS->refresh_check ();
1581
1582void
1583rxvt_term::refresh_check ()
1526 1584
1527void 1585void
1528rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1586rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1529 PPCODE: 1587 PPCODE:
1530{ 1588{
… …
1675 *r++ = NOCHAR; 1733 *r++ = NOCHAR;
1676 } 1734 }
1677 1735
1678 rxvt_pop_locale (); 1736 rxvt_pop_locale ();
1679 1737
1738 free (wstr);
1680 RETVAL = wcs2sv (rstr, r - rstr); 1739 RETVAL = wcs2sv (rstr, r - rstr);
1681} 1740}
1682 OUTPUT: 1741 OUTPUT:
1683 RETVAL 1742 RETVAL
1684 1743
… …
1708 else if (IS_COMPOSE (*s)) 1767 else if (IS_COMPOSE (*s))
1709 r += rxvt_composite.expand (*s, r); 1768 r += rxvt_composite.expand (*s, r);
1710 else 1769 else
1711 *r++ = *s; 1770 *r++ = *s;
1712 1771
1772 free (wstr);
1713 RETVAL = wcs2sv (rstr, r - rstr); 1773 RETVAL = wcs2sv (rstr, r - rstr);
1714} 1774}
1715 OUTPUT: 1775 OUTPUT:
1716 RETVAL 1776 RETVAL
1717 1777
1718void 1778void
1719rxvt_term::_resource (char *name, int index, SV *newval = 0) 1779rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1720 PPCODE: 1780 PPCODE:
1721{ 1781{
1722 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1782 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1723# define def(name) { # name, Rs_ ## name }, 1783# define def(name) { # name, Rs_ ## name },
1724# define reserve(name,count) 1784# define reserve(name,count)
… …
1762 THIS->rs [index] = 0; 1822 THIS->rs [index] = 0;
1763 } 1823 }
1764} 1824}
1765 1825
1766const char * 1826const char *
1767rxvt_term::x_resource (const char *name) 1827rxvt_term::x_resource (octet_string name)
1768 1828
1769bool 1829bool
1770rxvt_term::option (U8 optval, int set = -1) 1830rxvt_term::option (U8 optval, int set = -1)
1771 CODE: 1831 CODE:
1772{ 1832{
… …
1791 THIS->cursor_blink_reset (); 1851 THIS->cursor_blink_reset ();
1792 break; 1852 break;
1793#endif 1853#endif
1794 1854
1795 case Opt_cursorUnderline: 1855 case Opt_cursorUnderline:
1856 THIS->cursor_type = set ? 1 : 0;
1796 THIS->want_refresh = 1; 1857 THIS->want_refresh = 1;
1797 THIS->refresh_check (); 1858 THIS->refresh_check ();
1798 break; 1859 break;
1799 1860
1800# case Opt_scrollBar_floating: 1861# case Opt_scrollBar_floating:
… …
1805 } 1866 }
1806} 1867}
1807 OUTPUT: 1868 OUTPUT:
1808 RETVAL 1869 RETVAL
1809 1870
1871SV *
1872rxvt_term::lookup_keysym (int keysym, unsigned int state)
1873 CODE:
1874{
1875 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1876 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1877}
1878 OUTPUT:
1879 RETVAL
1880
1810bool 1881bool
1811rxvt_term::parse_keysym (char *keysym, char *str) 1882rxvt_term::bind_action (octet_string keysym, octet_string action)
1883 ALIAS:
1884 parse_keysym = 1
1812 CODE: 1885 CODE:
1813 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1886 RETVAL = 0 < THIS->bind_action (keysym, action);
1814 THIS->keyboard->register_done (); 1887 THIS->keyboard->register_done ();
1815 OUTPUT: 1888 OUTPUT:
1816 RETVAL 1889 RETVAL
1817 1890
1818void 1891void
1819rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1892rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1820 CODE: 1893 CODE:
1821 wchar_t *wstr = sv2wcs (str); 1894 wchar_t *wstr = sv2wcs (str);
1822 THIS->keyboard->register_user_translation (keysym, state, wstr); 1895 THIS->keyboard->register_action (keysym, state, wstr);
1823 free (wstr); 1896 free (wstr);
1824 1897
1825void 1898void
1826rxvt_term::screen_cur (...) 1899rxvt_term::screen_cur (...)
1827 PROTOTYPE: $;$$ 1900 PROTOTYPE: $;$$
… …
1870 1943
1871 if (ix) 1944 if (ix)
1872 { 1945 {
1873 THIS->selection.screen = THIS->current_screen; 1946 THIS->selection.screen = THIS->current_screen;
1874 1947
1875 THIS->want_refresh = 1; 1948 THIS->selection_changed ();
1876 THIS->refresh_check (); 1949 THIS->refresh_check ();
1877 } 1950 }
1878 } 1951 }
1879} 1952}
1880 1953
… …
1886 THIS->selection.screen = screen; 1959 THIS->selection.screen = screen;
1887 OUTPUT: 1960 OUTPUT:
1888 RETVAL 1961 RETVAL
1889 1962
1890void 1963void
1964rxvt_term::selection_request (Time tm, int selnum)
1965
1966void
1891rxvt_term::selection_clear (bool clipboard = false) 1967rxvt_term::selection_clear (bool clipboard = false)
1892 1968
1893void 1969void
1894rxvt_term::selection_make (Time eventtime, bool rect = false) 1970rxvt_term::selection_make (Time eventtime, bool rect = false)
1895 CODE: 1971 CODE:
… …
1936 2012
1937void 2013void
1938rxvt_term::scr_bell () 2014rxvt_term::scr_bell ()
1939 2015
1940void 2016void
1941rxvt_term::scr_recolour (bool refresh = true); 2017rxvt_term::scr_recolor (bool refresh = true);
1942 2018
1943void 2019void
1944rxvt_term::scr_change_screen (int screen) 2020rxvt_term::scr_change_screen (int screen)
1945 2021
1946void 2022void
… …
1949{ 2025{
1950 wchar_t *wstr = sv2wcs (string); 2026 wchar_t *wstr = sv2wcs (string);
1951 THIS->scr_add_lines (wstr, wcslen (wstr)); 2027 THIS->scr_add_lines (wstr, wcslen (wstr));
1952 free (wstr); 2028 free (wstr);
1953} 2029}
2030
2031void
2032rxvt_term::tt_write_user_input (SV *octets)
2033 INIT:
2034 STRLEN len;
2035 char *str = SvPVbyte (octets, len);
2036 C_ARGS:
2037 str, len
1954 2038
1955void 2039void
1956rxvt_term::tt_write (SV *octets) 2040rxvt_term::tt_write (SV *octets)
1957 INIT: 2041 INIT:
1958 STRLEN len; 2042 STRLEN len;
… …
2194 OUTPUT: 2278 OUTPUT:
2195 RETVAL 2279 RETVAL
2196 2280
2197#endif 2281#endif
2198 2282
2199#if HAVE_BG_PIXMAP
2200
2201void 2283void
2202rxvt_term::set_background (rxvt_img *img, bool border = false) 2284rxvt_term::set_background (rxvt_img *img, bool border = false)
2203 CODE: 2285 CODE:
2204 THIS->bg_destroy (); 2286 delete THIS->bg_img;
2205 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2287 THIS->bg_img = 0;
2288 THIS->bg_flags = 0;
2206 2289
2207 if (img) // TODO: cannot be false 2290 if (img) // TODO: cannot be false
2208 { 2291 {
2209 img = img->clone (); // own the img 2292 img = img->clone (); // own the img
2210 2293
2211 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2294 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2212 img->sub_rect (0, 0, 2295 img->sub_rect (0, 0,
2213 border ? THIS->vt_width : THIS->szHint.width, 2296 border ? THIS->vt_width : THIS->szHint.width,
2214 border ? THIS->vt_height : THIS->szHint.height) 2297 border ? THIS->vt_height : THIS->szHint.height)
2215 ->replace (img); 2298 ->replace (img);
2216 2299
2217 // just in case, should usually be a nop 2300 // just in case, should usually be a nop
2218 img->reify () 2301 img->reify ()
2219 ->replace (img); 2302 ->replace (img);
2220 2303
2221 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2304 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2222 ->replace (img); 2305 ->replace (img);
2223 2306
2224 THIS->bg_img = img; 2307 THIS->bg_img = img;
2225 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2308 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2226 2309
2227 if (!border) 2310 if (!border)
2228 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2311 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2229 } 2312 }
2230
2231#endif
2232 2313
2233#endif 2314#endif
2234 2315
2235############################################################################# 2316#############################################################################
2236# urxvt::overlay 2317# urxvt::overlay
… …
2306 RETVAL = THIS->pm; 2387 RETVAL = THIS->pm;
2307 OUTPUT: 2388 OUTPUT:
2308 RETVAL 2389 RETVAL
2309 2390
2310void 2391void
2311rxvt_img::fill (SV *c) 2392rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2393 PROTOTYPE: $;$$$$
2312 INIT: 2394 INIT:
2313 rgba cc = parse_rgba (c, THIS->s); 2395 rgba cc = parse_rgba (c, THIS->s);
2314 C_ARGS: cc 2396 C_ARGS: cc, x, y, w, h
2315 2397
2316void 2398void
2317rxvt_img::DESTROY () 2399rxvt_img::DESTROY ()
2318 CODE: 2400 CODE:
2319 delete THIS; 2401 delete THIS;
… …
2353rxvt_img * 2435rxvt_img *
2354rxvt_img::sub_rect (int x, int y, int width, int height) 2436rxvt_img::sub_rect (int x, int y, int width, int height)
2355 2437
2356rxvt_img * 2438rxvt_img *
2357rxvt_img::blur (int rh, int rv) 2439rxvt_img::blur (int rh, int rv)
2440
2441rxvt_img *
2442rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2358 2443
2359rxvt_img * 2444rxvt_img *
2360rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33) 2445rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33)
2361 INIT: 2446 INIT:
2362 rxvt_img::nv matrix[3][3] = { 2447 rxvt_img::nv matrix[3][3] = {
… …
2370rxvt_img::scale (int new_width, int new_height) 2455rxvt_img::scale (int new_width, int new_height)
2371 2456
2372rxvt_img * 2457rxvt_img *
2373rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2458rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2374 2459
2375void 2460rxvt_img *
2376rxvt_img::tint (SV *c) 2461rxvt_img::tint (SV *c)
2377 INIT: 2462 INIT:
2378 rgba cc = parse_rgba (c, THIS->s); 2463 rgba cc = parse_rgba (c, THIS->s);
2379 C_ARGS: cc 2464 C_ARGS: cc
2380 2465
2381rxvt_img * 2466rxvt_img *
2467rxvt_img::shade (rxvt_img::nv factor)
2468
2469rxvt_img *
2382rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2470rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2383 CODE: 2471 CODE:
2384 rxvt_img::nv *vparams = 0; 2472 rxvt_img::nv *vparams = 0;
2385 int nparams = 0; 2473 int nparams = 0;
2386 2474
2387 if (SvOK (params)) 2475 if (SvOK (params))
2388 { 2476 {
2389 // we overlay rxvt_temp_buf, what a hack
2390 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2391
2392 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2477 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2393 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2478 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2394 2479
2395 nparams = av_len ((AV *)SvRV (params)) + 1; 2480 nparams = av_len ((AV *)SvRV (params)) + 1;
2396 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2481 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2397 2482
2398 for (int i = 0; i < nparams; ++i) 2483 for (int i = 0; i < nparams; ++i)
2399 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2484 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2400 } 2485 }
2401 2486
2402 RETVAL = THIS->filter (name, nparams, vparams); 2487 RETVAL = THIS->filter (name, nparams, vparams);
2488 free (vparams);
2403 OUTPUT: 2489 OUTPUT:
2404 RETVAL 2490 RETVAL
2405 2491
2406#endif 2492#endif
2407 2493

Diff Legend

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