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.202 by sf-exg, Sat Jun 30 09:01:12 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
… …
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),
… …
983 const_iv (XIMLineEnd), 1020 const_iv (XIMLineEnd),
984 const_iv (XIMAbsolutePosition), 1021 const_iv (XIMAbsolutePosition),
985 const_iv (XIMDontChange), 1022 const_iv (XIMDontChange),
986# endif 1023# endif
987# 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),
988 }; 1055 };
989 1056
990 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--)
991 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1058 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
992} 1059}
993 1060
994void 1061void
995log (const char *msg) 1062log (utf8_string msg)
996 CODE: 1063 CODE:
997 rxvt_log ("%s", msg); 1064 rxvt_log ("%s", msg);
998 1065
999void 1066void
1000warn (const char *msg) 1067warn (utf8_string msg)
1001 CODE: 1068 CODE:
1002 rxvt_warn ("%s", msg); 1069 rxvt_warn ("%s", msg);
1003 1070
1004void 1071void
1005fatal (const char *msg) 1072fatal (utf8_string msg)
1006 CODE: 1073 CODE:
1007 rxvt_fatal ("%s", msg); 1074 rxvt_fatal ("%s", msg);
1008 1075
1009void 1076void
1010_exit (int status) 1077_exit (int status)
… …
1175void 1242void
1176rxvt_term::put_option_db (octet_string specifier, octet_string value) 1243rxvt_term::put_option_db (octet_string specifier, octet_string value)
1177 CODE: 1244 CODE:
1178 XrmPutStringResource (&THIS->option_db, specifier, value); 1245 XrmPutStringResource (&THIS->option_db, specifier, value);
1179 1246
1247void
1248rxvt_term::_keysym_resources ()
1249 PPCODE:
1250 PUTBACK;
1251 _keysym_resources (THIS);
1252 SPAGAIN;
1253
1180int 1254int
1181rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1255rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1182 CODE: 1256 CODE:
1183 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1257 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1184 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1258 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
1243rxvt_term::ungrab () 1317rxvt_term::ungrab ()
1244 CODE: 1318 CODE:
1245 ungrab (THIS); 1319 ungrab (THIS);
1246 1320
1247int 1321int
1248rxvt_term::XStringToKeysym (char *string) 1322rxvt_term::XStringToKeysym (octet_string string)
1249 CODE: 1323 CODE:
1250 RETVAL = XStringToKeysym (string); 1324 RETVAL = XStringToKeysym (string);
1251 OUTPUT: RETVAL 1325 OUTPUT: RETVAL
1252 1326
1253char * 1327char *
… …
1263 OUTPUT: RETVAL 1337 OUTPUT: RETVAL
1264 1338
1265int 1339int
1266rxvt_term::XKeycodeToKeysym (int code, int index) 1340rxvt_term::XKeycodeToKeysym (int code, int index)
1267 CODE: 1341 CODE:
1268 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1342 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1269 OUTPUT: RETVAL 1343 OUTPUT: RETVAL
1270 1344
1271int 1345int
1272rxvt_term::strwidth (SV *str) 1346rxvt_term::strwidth (SV *str)
1273 CODE: 1347 CODE:
… …
1343#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1417#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1344#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1418#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1345#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1419#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1346 1420
1347int 1421int
1348rxvt_term::width () 1422rxvt_term::width (int new_value = NO_INIT)
1349 ALIAS: 1423 ALIAS:
1350 width = TERM_OFFSET_width 1424 width = TERM_OFFSET_width
1351 height = TERM_OFFSET_height 1425 height = TERM_OFFSET_height
1352 fwidth = TERM_OFFSET_fwidth 1426 fwidth = TERM_OFFSET_fwidth
1353 fheight = TERM_OFFSET_fheight 1427 fheight = TERM_OFFSET_fheight
… …
1363 saveLines = TERM_OFFSET_saveLines 1437 saveLines = TERM_OFFSET_saveLines
1364 total_rows = TERM_OFFSET_total_rows 1438 total_rows = TERM_OFFSET_total_rows
1365 top_row = TERM_OFFSET_top_row 1439 top_row = TERM_OFFSET_top_row
1366 CODE: 1440 CODE:
1367 RETVAL = *(int *)((char *)THIS + ix); 1441 RETVAL = *(int *)((char *)THIS + ix);
1442 if (items > 1)
1443 *(int *)((char *)THIS + ix) = new_value;
1368 OUTPUT: 1444 OUTPUT:
1369 RETVAL 1445 RETVAL
1370 1446
1371unsigned int 1447unsigned int
1372rxvt_term::ModLevel3Mask () 1448rxvt_term::ModLevel3Mask ()
… …
1374 ModLevel3Mask = 0 1450 ModLevel3Mask = 0
1375 ModMetaMask = 1 1451 ModMetaMask = 1
1376 ModNumLockMask = 2 1452 ModNumLockMask = 2
1377 current_screen = 3 1453 current_screen = 3
1378 hidden_cursor = 4 1454 hidden_cursor = 4
1455 priv_modes = 5
1379 CODE: 1456 CODE:
1380 switch (ix) 1457 switch (ix)
1381 { 1458 {
1382 case 0: RETVAL = THIS->ModLevel3Mask; break; 1459 case 0: RETVAL = THIS->ModLevel3Mask; break;
1383 case 1: RETVAL = THIS->ModMetaMask; break; 1460 case 1: RETVAL = THIS->ModMetaMask; break;
1384 case 2: RETVAL = THIS->ModNumLockMask; break; 1461 case 2: RETVAL = THIS->ModNumLockMask; break;
1385 case 3: RETVAL = THIS->current_screen; break; 1462 case 3: RETVAL = THIS->current_screen; break;
1386#ifdef CURSOR_BLINK 1463#ifdef CURSOR_BLINK
1387 case 4: RETVAL = THIS->hidden_cursor; break; 1464 case 4: RETVAL = THIS->hidden_cursor; break;
1465#else
1466 case 4: RETVAL = 0; break;
1388#endif 1467#endif
1468 case 5: RETVAL = THIS->priv_modes; break;
1389 } 1469 }
1390 OUTPUT: 1470 OUTPUT:
1391 RETVAL 1471 RETVAL
1392 1472
1393char * 1473char *
… …
1528void 1608void
1529rxvt_term::want_refresh () 1609rxvt_term::want_refresh ()
1530 CODE: 1610 CODE:
1531 THIS->want_refresh = 1; 1611 THIS->want_refresh = 1;
1532 THIS->refresh_check (); 1612 THIS->refresh_check ();
1613
1614void
1615rxvt_term::refresh_check ()
1533 1616
1534void 1617void
1535rxvt_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)
1536 PPCODE: 1619 PPCODE:
1537{ 1620{
… …
1682 *r++ = NOCHAR; 1765 *r++ = NOCHAR;
1683 } 1766 }
1684 1767
1685 rxvt_pop_locale (); 1768 rxvt_pop_locale ();
1686 1769
1770 free (wstr);
1687 RETVAL = wcs2sv (rstr, r - rstr); 1771 RETVAL = wcs2sv (rstr, r - rstr);
1688} 1772}
1689 OUTPUT: 1773 OUTPUT:
1690 RETVAL 1774 RETVAL
1691 1775
… …
1715 else if (IS_COMPOSE (*s)) 1799 else if (IS_COMPOSE (*s))
1716 r += rxvt_composite.expand (*s, r); 1800 r += rxvt_composite.expand (*s, r);
1717 else 1801 else
1718 *r++ = *s; 1802 *r++ = *s;
1719 1803
1804 free (wstr);
1720 RETVAL = wcs2sv (rstr, r - rstr); 1805 RETVAL = wcs2sv (rstr, r - rstr);
1721} 1806}
1722 OUTPUT: 1807 OUTPUT:
1723 RETVAL 1808 RETVAL
1724 1809
1725void 1810void
1726rxvt_term::_resource (char *name, int index, SV *newval = 0) 1811rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1727 PPCODE: 1812 PPCODE:
1728{ 1813{
1729 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1814 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1730# define def(name) { # name, Rs_ ## name }, 1815# define def(name) { # name, Rs_ ## name },
1731# define reserve(name,count) 1816# define reserve(name,count)
… …
1769 THIS->rs [index] = 0; 1854 THIS->rs [index] = 0;
1770 } 1855 }
1771} 1856}
1772 1857
1773const char * 1858const char *
1774rxvt_term::x_resource (const char *name) 1859rxvt_term::x_resource (octet_string name)
1775 1860
1776bool 1861bool
1777rxvt_term::option (U8 optval, int set = -1) 1862rxvt_term::option (U8 optval, int set = -1)
1778 CODE: 1863 CODE:
1779{ 1864{
… …
1798 THIS->cursor_blink_reset (); 1883 THIS->cursor_blink_reset ();
1799 break; 1884 break;
1800#endif 1885#endif
1801 1886
1802 case Opt_cursorUnderline: 1887 case Opt_cursorUnderline:
1888 THIS->cursor_type = set ? 1 : 0;
1803 THIS->want_refresh = 1; 1889 THIS->want_refresh = 1;
1804 THIS->refresh_check (); 1890 THIS->refresh_check ();
1805 break; 1891 break;
1806 1892
1807# case Opt_scrollBar_floating: 1893# case Opt_scrollBar_floating:
… …
1812 } 1898 }
1813} 1899}
1814 OUTPUT: 1900 OUTPUT:
1815 RETVAL 1901 RETVAL
1816 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
1817bool 1913bool
1818rxvt_term::parse_keysym (char *keysym, char *str) 1914rxvt_term::bind_action (octet_string keysym, octet_string action)
1915 ALIAS:
1916 parse_keysym = 1
1819 CODE: 1917 CODE:
1820 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1918 RETVAL = 0 < THIS->bind_action (keysym, action);
1821 THIS->keyboard->register_done (); 1919 THIS->keyboard->register_done ();
1822 OUTPUT: 1920 OUTPUT:
1823 RETVAL 1921 RETVAL
1824 1922
1825void 1923void
1826rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1924rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1827 CODE: 1925 CODE:
1828 wchar_t *wstr = sv2wcs (str); 1926 wchar_t *wstr = sv2wcs (str);
1829 THIS->keyboard->register_user_translation (keysym, state, wstr); 1927 THIS->keyboard->register_action (keysym, state, wstr);
1830 free (wstr); 1928 free (wstr);
1831 1929
1832void 1930void
1833rxvt_term::screen_cur (...) 1931rxvt_term::screen_cur (...)
1834 PROTOTYPE: $;$$ 1932 PROTOTYPE: $;$$
… …
1877 1975
1878 if (ix) 1976 if (ix)
1879 { 1977 {
1880 THIS->selection.screen = THIS->current_screen; 1978 THIS->selection.screen = THIS->current_screen;
1881 1979
1882 THIS->want_refresh = 1; 1980 THIS->selection_changed ();
1883 THIS->refresh_check (); 1981 THIS->refresh_check ();
1884 } 1982 }
1885 } 1983 }
1886} 1984}
1887 1985
… …
1893 THIS->selection.screen = screen; 1991 THIS->selection.screen = screen;
1894 OUTPUT: 1992 OUTPUT:
1895 RETVAL 1993 RETVAL
1896 1994
1897void 1995void
1996rxvt_term::selection_request (Time tm, int selnum)
1997
1998void
1898rxvt_term::selection_clear (bool clipboard = false) 1999rxvt_term::selection_clear (bool clipboard = false)
1899 2000
1900void 2001void
1901rxvt_term::selection_make (Time eventtime, bool rect = false) 2002rxvt_term::selection_make (Time eventtime, bool rect = false)
1902 CODE: 2003 CODE:
… …
1943 2044
1944void 2045void
1945rxvt_term::scr_bell () 2046rxvt_term::scr_bell ()
1946 2047
1947void 2048void
1948rxvt_term::scr_recolour (bool refresh = true); 2049rxvt_term::scr_recolor (bool refresh = true);
1949 2050
1950void 2051void
1951rxvt_term::scr_change_screen (int screen) 2052rxvt_term::scr_change_screen (int screen)
1952 2053
1953void 2054void
… …
1956{ 2057{
1957 wchar_t *wstr = sv2wcs (string); 2058 wchar_t *wstr = sv2wcs (string);
1958 THIS->scr_add_lines (wstr, wcslen (wstr)); 2059 THIS->scr_add_lines (wstr, wcslen (wstr));
1959 free (wstr); 2060 free (wstr);
1960} 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
1961 2070
1962void 2071void
1963rxvt_term::tt_write (SV *octets) 2072rxvt_term::tt_write (SV *octets)
1964 INIT: 2073 INIT:
1965 STRLEN len; 2074 STRLEN len;
… …
2201 OUTPUT: 2310 OUTPUT:
2202 RETVAL 2311 RETVAL
2203 2312
2204#endif 2313#endif
2205 2314
2206#if HAVE_BG_PIXMAP
2207
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 THIS->bg_destroy (); 2318 delete THIS->bg_img;
2212 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2319 THIS->bg_img = 0;
2320 THIS->bg_flags = 0;
2213 2321
2214 if (img) // TODO: cannot be false 2322 if (img) // TODO: cannot be false
2215 { 2323 {
2216 img = img->clone (); // own the img 2324 img = img->clone (); // own the img
2217 2325
2218 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2326 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2219 img->sub_rect (0, 0, 2327 img->sub_rect (0, 0,
2220 border ? THIS->vt_width : THIS->szHint.width, 2328 border ? THIS->vt_width : THIS->szHint.width,
2221 border ? THIS->vt_height : THIS->szHint.height) 2329 border ? THIS->vt_height : THIS->szHint.height)
2222 ->replace (img); 2330 ->replace (img);
2223 2331
2224 // just in case, should usually be a nop 2332 // just in case, should usually be a nop
2225 img->reify () 2333 img->reify ()
2226 ->replace (img); 2334 ->replace (img);
2227 2335
2228 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])
2229 ->replace (img); 2337 ->replace (img);
2230 2338
2231 THIS->bg_img = img; 2339 THIS->bg_img = img;
2232 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2340 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2233 2341
2234 if (!border) 2342 if (!border)
2235 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2343 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2236 } 2344 }
2237
2238#endif
2239 2345
2240#endif 2346#endif
2241 2347
2242############################################################################# 2348#############################################################################
2243# urxvt::overlay 2349# urxvt::overlay
… …
2313 RETVAL = THIS->pm; 2419 RETVAL = THIS->pm;
2314 OUTPUT: 2420 OUTPUT:
2315 RETVAL 2421 RETVAL
2316 2422
2317void 2423void
2318rxvt_img::fill (SV *c) 2424rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2425 PROTOTYPE: $;$$$$
2319 INIT: 2426 INIT:
2320 rgba cc = parse_rgba (c, THIS->s); 2427 rgba cc = parse_rgba (c, THIS->s);
2321 C_ARGS: cc 2428 C_ARGS: cc, x, y, w, h
2322 2429
2323void 2430void
2324rxvt_img::DESTROY () 2431rxvt_img::DESTROY ()
2325 CODE: 2432 CODE:
2326 delete THIS; 2433 delete THIS;
… …
2360rxvt_img * 2467rxvt_img *
2361rxvt_img::sub_rect (int x, int y, int width, int height) 2468rxvt_img::sub_rect (int x, int y, int width, int height)
2362 2469
2363rxvt_img * 2470rxvt_img *
2364rxvt_img::blur (int rh, int rv) 2471rxvt_img::blur (int rh, int rv)
2472
2473rxvt_img *
2474rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
2365 2475
2366rxvt_img * 2476rxvt_img *
2367rxvt_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) 2477rxvt_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)
2368 INIT: 2478 INIT:
2369 rxvt_img::nv matrix[3][3] = { 2479 rxvt_img::nv matrix[3][3] = {
… …
2377rxvt_img::scale (int new_width, int new_height) 2487rxvt_img::scale (int new_width, int new_height)
2378 2488
2379rxvt_img * 2489rxvt_img *
2380rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2490rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2381 2491
2382void 2492rxvt_img *
2383rxvt_img::tint (SV *c) 2493rxvt_img::tint (SV *c)
2384 INIT: 2494 INIT:
2385 rgba cc = parse_rgba (c, THIS->s); 2495 rgba cc = parse_rgba (c, THIS->s);
2386 C_ARGS: cc 2496 C_ARGS: cc
2387 2497
2388rxvt_img * 2498rxvt_img *
2499rxvt_img::shade (rxvt_img::nv factor)
2500
2501rxvt_img *
2389rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2502rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2390 CODE: 2503 CODE:
2391 rxvt_img::nv *vparams = 0; 2504 rxvt_img::nv *vparams = 0;
2392 int nparams = 0; 2505 int nparams = 0;
2393 2506
2394 if (SvOK (params)) 2507 if (SvOK (params))
2395 { 2508 {
2396 // we overlay rxvt_temp_buf, what a hack
2397 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2398
2399 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2509 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2400 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");
2401 2511
2402 nparams = av_len ((AV *)SvRV (params)) + 1; 2512 nparams = av_len ((AV *)SvRV (params)) + 1;
2403 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2513 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2404 2514
2405 for (int i = 0; i < nparams; ++i) 2515 for (int i = 0; i < nparams; ++i)
2406 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2516 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2407 } 2517 }
2408 2518
2409 RETVAL = THIS->filter (name, nparams, vparams); 2519 RETVAL = THIS->filter (name, nparams, vparams);
2520 free (vparams);
2410 OUTPUT: 2521 OUTPUT:
2411 RETVAL 2522 RETVAL
2412 2523
2413#endif 2524#endif
2414 2525

Diff Legend

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