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.218 by root, Sat Apr 26 20:51:12 2014 UTC vs.
Revision 1.250 by root, Thu Jun 17 00:49:20 2021 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
… …
82 if (len != 1 && len != 3 && len != 4) 82 if (len != 1 && len != 3 && len != 4)
83 croak ("component colour array must have 1, 3 or 4 components,"); 83 croak ("component colour array must have 1, 3 or 4 components,");
84 84
85 c.a = rgba::MAX_CC; 85 c.a = rgba::MAX_CC;
86 86
87 c.r = c.g = c.b = float_to_component (SvIV (*av_fetch (av, 0, 0))); 87 c.r = c.g = c.b = float_to_component (SvNV (*av_fetch (av, 0, 0)));
88 88
89 if (len >= 3) 89 if (len >= 3)
90 { 90 {
91 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0))); 91 c.g = float_to_component (SvNV (*av_fetch (av, 1, 0)));
92 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0))); 92 c.b = float_to_component (SvNV (*av_fetch (av, 2, 0)));
93 93
94 if (len >= 4) 94 if (len >= 4)
95 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0))); 95 c.a = float_to_component (SvNV (*av_fetch (av, 3, 0)));
96 } 96 }
97 } 97 }
98 else if (s) 98 else if (s)
99 { 99 {
100 rxvt_color rc; 100 rxvt_color rc;
… …
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;
… …
370 370
371struct rxvt_perl_interp rxvt_perl; 371struct rxvt_perl_interp rxvt_perl;
372 372
373static PerlInterpreter *perl; 373static PerlInterpreter *perl;
374 374
375#if 0 /* we are not a library anymore, so doing this is just not worth it */
376/*THINK/TODO: this has the side effect of, of course, not calling destructors. */
377/* but therse are not guaranteed anyway... */
375rxvt_perl_interp::~rxvt_perl_interp () 378rxvt_perl_interp::~rxvt_perl_interp ()
376{ 379{
377 if (perl) 380 if (perl)
378 { 381 {
382 localise_env set_environ (perl_environ);
379 perl_destruct (perl); 383 perl_destruct (perl);
380 perl_free (perl); 384 perl_free (perl);
381 PERL_SYS_TERM (); 385 PERL_SYS_TERM ();
382 } 386 }
383} 387}
388#endif
384 389
385void 390void
386rxvt_perl_interp::init () 391rxvt_perl_interp::init ()
387{ 392{
388 if (!perl) 393 if (!perl)
… …
391 396
392 { 397 {
393 perl_environ = rxvt_environ; 398 perl_environ = rxvt_environ;
394 localise_env set_environ (perl_environ); 399 localise_env set_environ (perl_environ);
395 400
396 char *args[] = { 401 const char *args[] = {
397 "", 402 "",
398 "-e" 403 "-e"
399 "BEGIN {" 404 "BEGIN {"
400 " urxvt->bootstrap;" 405 " urxvt->bootstrap;"
401 " unshift @INC, '" LIBDIR "';" 406 " unshift @INC, '" LIBDIR "';"
402 "}" 407 "}"
403 "" 408 ""
404 "use urxvt;" 409 "use urxvt;",
410 0
405 }; 411 };
406 int argc = ecb_array_length (args); 412 int argc = ecb_array_length (args) - 1;
407 char **argv = args; 413 char **argv = (char **)args;
408 414
409 PERL_SYS_INIT3 (&argc, &argv, &environ); 415 PERL_SYS_INIT3 (&argc, &argv, &environ);
410 perl = perl_alloc (); 416 perl = perl_alloc ();
411 perl_construct (perl); 417 perl_construct (perl);
412 418
… …
490 496
491 FREETMPS; 497 FREETMPS;
492 LEAVE; 498 LEAVE;
493 499
494 return ret; 500 return ret;
501}
502
503static void
504_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
505{
506 unsigned int state;
507
508 if (term->parse_keysym (k, state) == -1)
509 return;
510
511 dSP;
512 XPUSHs (sv_2mortal (newSVpv (v, 0)));
513 PUTBACK;
514}
515
516static void
517_keysym_resources (rxvt_term *term)
518{
519 term->enumerate_keysym_resources (_keysym_resource_push);
495} 520}
496 521
497static void 522static void
498ungrab (rxvt_term *THIS) 523ungrab (rxvt_term *THIS)
499{ 524{
… …
795 IV iv; 820 IV iv;
796 } *civ, const_iv[] = { 821 } *civ, const_iv[] = {
797# define const_iv(name) { # name, (IV)name } 822# define const_iv(name) { # name, (IV)name }
798 const_iv (HOOK_INIT), 823 const_iv (HOOK_INIT),
799 const_iv (HOOK_DESTROY), 824 const_iv (HOOK_DESTROY),
800 const_iv (HOOK_KEYBOARD_DISPATCH), 825 const_iv (HOOK_ACTION),
801 826
802 const_iv (NUM_RESOURCES), 827 const_iv (NUM_RESOURCES),
803 const_iv (DEFAULT_RSTYLE), 828 const_iv (DEFAULT_RSTYLE),
804 const_iv (OVERLAY_RSTYLE), 829 const_iv (OVERLAY_RSTYLE),
805 const_iv (Color_Bits), 830 const_iv (Color_Bits),
… …
1001 const_iv (XIMLineEnd), 1026 const_iv (XIMLineEnd),
1002 const_iv (XIMAbsolutePosition), 1027 const_iv (XIMAbsolutePosition),
1003 const_iv (XIMDontChange), 1028 const_iv (XIMDontChange),
1004# endif 1029# endif
1005# endif 1030# endif
1031
1032 /* DEC private modes */
1033 const_iv (PrivMode_132),
1034 const_iv (PrivMode_132OK),
1035 const_iv (PrivMode_rVideo),
1036 const_iv (PrivMode_relOrigin),
1037 const_iv (PrivMode_Screen),
1038 const_iv (PrivMode_Autowrap),
1039 const_iv (PrivMode_aplCUR),
1040 const_iv (PrivMode_aplKP),
1041 const_iv (PrivMode_HaveBackSpace),
1042 const_iv (PrivMode_BackSpace),
1043 const_iv (PrivMode_ShiftKeys),
1044 const_iv (PrivMode_VisibleCursor),
1045 const_iv (PrivMode_MouseX10),
1046 const_iv (PrivMode_MouseX11),
1047 const_iv (PrivMode_scrollBar),
1048 const_iv (PrivMode_TtyOutputInh),
1049 const_iv (PrivMode_Keypress),
1050 const_iv (PrivMode_smoothScroll),
1051 const_iv (PrivMode_vt52),
1052 const_iv (PrivMode_LFNL),
1053 const_iv (PrivMode_MouseBtnEvent),
1054 const_iv (PrivMode_MouseAnyEvent),
1055 const_iv (PrivMode_BracketPaste),
1056 const_iv (PrivMode_ExtMouseUTF8),
1057 const_iv (PrivMode_ExtMouseUrxvt),
1058 const_iv (PrivMode_BlinkingCursor),
1059 const_iv (PrivMode_mouse_report),
1060 const_iv (PrivMode_Default),
1006 }; 1061 };
1007 1062
1008 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1063 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
1009 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1064 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1010} 1065}
1011 1066
1012void 1067void
1013log (const char *msg) 1068log (utf8_string msg)
1014 CODE: 1069 CODE:
1015 rxvt_log ("%s", msg); 1070 rxvt_log ("%s", msg);
1016 1071
1017void 1072void
1018warn (const char *msg) 1073warn (utf8_string msg)
1019 CODE: 1074 CODE:
1020 rxvt_warn ("%s", msg); 1075 rxvt_warn ("%s", msg);
1021 1076
1022void 1077void
1023fatal (const char *msg) 1078fatal (utf8_string msg)
1024 CODE: 1079 CODE:
1025 rxvt_fatal ("%s", msg); 1080 rxvt_fatal ("%s", msg);
1026 1081
1027void 1082void
1028_exit (int status) 1083_exit (int status)
… …
1193void 1248void
1194rxvt_term::put_option_db (octet_string specifier, octet_string value) 1249rxvt_term::put_option_db (octet_string specifier, octet_string value)
1195 CODE: 1250 CODE:
1196 XrmPutStringResource (&THIS->option_db, specifier, value); 1251 XrmPutStringResource (&THIS->option_db, specifier, value);
1197 1252
1253void
1254rxvt_term::_keysym_resources ()
1255 PPCODE:
1256 PUTBACK;
1257 _keysym_resources (THIS);
1258 SPAGAIN;
1259
1198int 1260int
1199rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1261rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1200 CODE: 1262 CODE:
1201 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1263 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1202 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1264 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
… …
1261rxvt_term::ungrab () 1323rxvt_term::ungrab ()
1262 CODE: 1324 CODE:
1263 ungrab (THIS); 1325 ungrab (THIS);
1264 1326
1265int 1327int
1266rxvt_term::XStringToKeysym (char *string) 1328rxvt_term::XStringToKeysym (octet_string string)
1267 CODE: 1329 CODE:
1268 RETVAL = XStringToKeysym (string); 1330 RETVAL = XStringToKeysym (string);
1269 OUTPUT: RETVAL 1331 OUTPUT: RETVAL
1270 1332
1271char * 1333char *
… …
1281 OUTPUT: RETVAL 1343 OUTPUT: RETVAL
1282 1344
1283int 1345int
1284rxvt_term::XKeycodeToKeysym (int code, int index) 1346rxvt_term::XKeycodeToKeysym (int code, int index)
1285 CODE: 1347 CODE:
1286 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1348 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1287 OUTPUT: RETVAL 1349 OUTPUT: RETVAL
1288 1350
1289int 1351int
1290rxvt_term::strwidth (SV *str) 1352rxvt_term::strwidth (SV *str)
1291 CODE: 1353 CODE:
… …
1361#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1423#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1362#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1424#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1363#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1425#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1364 1426
1365int 1427int
1366rxvt_term::width () 1428rxvt_term::width (int new_value = NO_INIT)
1367 ALIAS: 1429 ALIAS:
1368 width = TERM_OFFSET_width 1430 width = TERM_OFFSET_width
1369 height = TERM_OFFSET_height 1431 height = TERM_OFFSET_height
1370 fwidth = TERM_OFFSET_fwidth 1432 fwidth = TERM_OFFSET_fwidth
1371 fheight = TERM_OFFSET_fheight 1433 fheight = TERM_OFFSET_fheight
… …
1381 saveLines = TERM_OFFSET_saveLines 1443 saveLines = TERM_OFFSET_saveLines
1382 total_rows = TERM_OFFSET_total_rows 1444 total_rows = TERM_OFFSET_total_rows
1383 top_row = TERM_OFFSET_top_row 1445 top_row = TERM_OFFSET_top_row
1384 CODE: 1446 CODE:
1385 RETVAL = *(int *)((char *)THIS + ix); 1447 RETVAL = *(int *)((char *)THIS + ix);
1448 if (items > 1)
1449 *(int *)((char *)THIS + ix) = new_value;
1386 OUTPUT: 1450 OUTPUT:
1387 RETVAL 1451 RETVAL
1388 1452
1389unsigned int 1453unsigned int
1390rxvt_term::ModLevel3Mask () 1454rxvt_term::ModLevel3Mask ()
… …
1392 ModLevel3Mask = 0 1456 ModLevel3Mask = 0
1393 ModMetaMask = 1 1457 ModMetaMask = 1
1394 ModNumLockMask = 2 1458 ModNumLockMask = 2
1395 current_screen = 3 1459 current_screen = 3
1396 hidden_cursor = 4 1460 hidden_cursor = 4
1461 priv_modes = 5
1397 CODE: 1462 CODE:
1398 switch (ix) 1463 switch (ix)
1399 { 1464 {
1400 case 0: RETVAL = THIS->ModLevel3Mask; break; 1465 case 0: RETVAL = THIS->ModLevel3Mask; break;
1401 case 1: RETVAL = THIS->ModMetaMask; break; 1466 case 1: RETVAL = THIS->ModMetaMask; break;
1402 case 2: RETVAL = THIS->ModNumLockMask; break; 1467 case 2: RETVAL = THIS->ModNumLockMask; break;
1403 case 3: RETVAL = THIS->current_screen; break; 1468 case 3: RETVAL = THIS->current_screen; break;
1404#ifdef CURSOR_BLINK 1469#ifdef CURSOR_BLINK
1405 case 4: RETVAL = THIS->hidden_cursor; break; 1470 case 4: RETVAL = THIS->hidden_cursor; break;
1471#else
1472 case 4: RETVAL = 0; break;
1406#endif 1473#endif
1474 case 5: RETVAL = THIS->priv_modes; break;
1407 } 1475 }
1408 OUTPUT: 1476 OUTPUT:
1409 RETVAL 1477 RETVAL
1410 1478
1411char * 1479char *
… …
1546void 1614void
1547rxvt_term::want_refresh () 1615rxvt_term::want_refresh ()
1548 CODE: 1616 CODE:
1549 THIS->want_refresh = 1; 1617 THIS->want_refresh = 1;
1550 THIS->refresh_check (); 1618 THIS->refresh_check ();
1619
1620void
1621rxvt_term::refresh_check ()
1551 1622
1552void 1623void
1553rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1624rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1554 PPCODE: 1625 PPCODE:
1555{ 1626{
… …
1700 *r++ = NOCHAR; 1771 *r++ = NOCHAR;
1701 } 1772 }
1702 1773
1703 rxvt_pop_locale (); 1774 rxvt_pop_locale ();
1704 1775
1776 free (wstr);
1705 RETVAL = wcs2sv (rstr, r - rstr); 1777 RETVAL = wcs2sv (rstr, r - rstr);
1706} 1778}
1707 OUTPUT: 1779 OUTPUT:
1708 RETVAL 1780 RETVAL
1709 1781
… …
1717 // find length 1789 // find length
1718 for (wchar_t *s = wstr; *s; s++) 1790 for (wchar_t *s = wstr; *s; s++)
1719 if (*s == NOCHAR) 1791 if (*s == NOCHAR)
1720 ; 1792 ;
1721 else if (IS_COMPOSE (*s)) 1793 else if (IS_COMPOSE (*s))
1722 dlen += rxvt_composite.expand (*s, 0); 1794 dlen += rxvt_composite.expand (*s);
1723 else 1795 else
1724 dlen++; 1796 dlen++;
1725 1797
1726 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1798 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1727 1799
… …
1733 else if (IS_COMPOSE (*s)) 1805 else if (IS_COMPOSE (*s))
1734 r += rxvt_composite.expand (*s, r); 1806 r += rxvt_composite.expand (*s, r);
1735 else 1807 else
1736 *r++ = *s; 1808 *r++ = *s;
1737 1809
1810 free (wstr);
1738 RETVAL = wcs2sv (rstr, r - rstr); 1811 RETVAL = wcs2sv (rstr, r - rstr);
1739} 1812}
1740 OUTPUT: 1813 OUTPUT:
1741 RETVAL 1814 RETVAL
1742 1815
1743void 1816void
1744rxvt_term::_resource (char *name, int index, SV *newval = 0) 1817rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1745 PPCODE: 1818 PPCODE:
1746{ 1819{
1747 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1820 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1748# define def(name) { # name, Rs_ ## name }, 1821# define def(name) { # name, Rs_ ## name },
1749# define reserve(name,count) 1822# define reserve(name,count)
… …
1764 index += rs->value; 1837 index += rs->value;
1765 } 1838 }
1766 else 1839 else
1767 { 1840 {
1768 --rs; 1841 --rs;
1769 name = ""; 1842 name = (octet_string)"";
1770 } 1843 }
1771 1844
1772 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1845 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1773 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1846 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1774 1847
… …
1787 THIS->rs [index] = 0; 1860 THIS->rs [index] = 0;
1788 } 1861 }
1789} 1862}
1790 1863
1791const char * 1864const char *
1792rxvt_term::x_resource (const char *name) 1865rxvt_term::x_resource (octet_string name)
1793 1866
1794bool 1867bool
1795rxvt_term::option (U8 optval, int set = -1) 1868rxvt_term::option (U8 optval, int set = -1)
1796 CODE: 1869 CODE:
1797{ 1870{
… …
1816 THIS->cursor_blink_reset (); 1889 THIS->cursor_blink_reset ();
1817 break; 1890 break;
1818#endif 1891#endif
1819 1892
1820 case Opt_cursorUnderline: 1893 case Opt_cursorUnderline:
1894 THIS->cursor_type = set ? 1 : 0;
1821 THIS->want_refresh = 1; 1895 THIS->want_refresh = 1;
1822 THIS->refresh_check (); 1896 THIS->refresh_check ();
1823 break; 1897 break;
1824 1898
1825# case Opt_scrollBar_floating: 1899# case Opt_scrollBar_floating:
… …
1830 } 1904 }
1831} 1905}
1832 OUTPUT: 1906 OUTPUT:
1833 RETVAL 1907 RETVAL
1834 1908
1909SV *
1910rxvt_term::lookup_keysym (int keysym, unsigned int state)
1911 CODE:
1912{
1913 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1914 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1915}
1916 OUTPUT:
1917 RETVAL
1918
1835bool 1919bool
1836rxvt_term::parse_keysym (char *keysym, char *str) 1920rxvt_term::bind_action (octet_string keysym, octet_string action)
1921 ALIAS:
1922 parse_keysym = 1
1837 CODE: 1923 CODE:
1838 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1924 RETVAL = 0 < THIS->bind_action (keysym, action);
1839 THIS->keyboard->register_done (); 1925 THIS->keyboard->register_done ();
1840 OUTPUT: 1926 OUTPUT:
1841 RETVAL 1927 RETVAL
1842 1928
1843void 1929void
1844rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1930rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1845 CODE: 1931 CODE:
1846 wchar_t *wstr = sv2wcs (str); 1932 wchar_t *wstr = sv2wcs (str);
1847 THIS->keyboard->register_user_translation (keysym, state, wstr); 1933 THIS->keyboard->register_action (keysym, state, wstr);
1848 free (wstr); 1934 free (wstr);
1849 1935
1850void 1936void
1851rxvt_term::screen_cur (...) 1937rxvt_term::screen_cur (...)
1852 PROTOTYPE: $;$$ 1938 PROTOTYPE: $;$$
… …
1964 2050
1965void 2051void
1966rxvt_term::scr_bell () 2052rxvt_term::scr_bell ()
1967 2053
1968void 2054void
1969rxvt_term::scr_recolour (bool refresh = true); 2055rxvt_term::scr_recolor (bool refresh = true);
1970 2056
1971void 2057void
1972rxvt_term::scr_change_screen (int screen) 2058rxvt_term::scr_change_screen (int screen)
1973 2059
1974void 2060void
… …
1977{ 2063{
1978 wchar_t *wstr = sv2wcs (string); 2064 wchar_t *wstr = sv2wcs (string);
1979 THIS->scr_add_lines (wstr, wcslen (wstr)); 2065 THIS->scr_add_lines (wstr, wcslen (wstr));
1980 free (wstr); 2066 free (wstr);
1981} 2067}
2068
2069void
2070rxvt_term::tt_write_user_input (SV *octets)
2071 INIT:
2072 STRLEN len;
2073 char *str = SvPVbyte (octets, len);
2074 C_ARGS:
2075 str, len
1982 2076
1983void 2077void
1984rxvt_term::tt_write (SV *octets) 2078rxvt_term::tt_write (SV *octets)
1985 INIT: 2079 INIT:
1986 STRLEN len; 2080 STRLEN len;
… …
2223 RETVAL 2317 RETVAL
2224 2318
2225#endif 2319#endif
2226 2320
2227void 2321void
2228rxvt_term::set_background (rxvt_img *img, bool border = false) 2322rxvt_term::clr_background ()
2229 CODE: 2323 CODE:
2230 delete THIS->bg_img; 2324 delete THIS->bg_img;
2231 THIS->bg_img = 0; 2325 THIS->bg_img = 0;
2326 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2327
2328void
2329rxvt_term::set_background (rxvt_img *img, bool border = false)
2330 CODE:
2331 delete THIS->bg_img;
2232 THIS->bg_flags = 0; 2332 THIS->bg_img = 0;
2333 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2233 2334
2234 if (img) // TODO: cannot be false 2335 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2235 { 2336 {
2236 img = img->clone (); // own the img 2337 img = img->clone (); // own the img
2237 2338
2238 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2339 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2239 img->sub_rect (0, 0, 2340 img->sub_rect (0, 0,
… …
2247 2348
2248 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2349 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2249 ->replace (img); 2350 ->replace (img);
2250 2351
2251 THIS->bg_img = img; 2352 THIS->bg_img = img;
2252 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2253 2353
2254 if (!border) 2354 if (!border)
2255 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2355 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2256 } 2356 }
2257 2357
… …
2334 2434
2335void 2435void
2336rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h) 2436rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2337 PROTOTYPE: $;$$$$ 2437 PROTOTYPE: $;$$$$
2338 INIT: 2438 INIT:
2339 rgba cc = parse_rgba (c, THIS->s); 2439 rxvt_screen screen;
2440 screen.set (THIS->d);
2441 rgba cc = parse_rgba (c, &screen);
2340 C_ARGS: cc, x, y, w, h 2442 C_ARGS: cc, x, y, w, h
2341 2443
2342void 2444void
2343rxvt_img::DESTROY () 2445rxvt_img::DESTROY ()
2344 CODE: 2446 CODE:
… …
2402rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2504rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2403 2505
2404rxvt_img * 2506rxvt_img *
2405rxvt_img::tint (SV *c) 2507rxvt_img::tint (SV *c)
2406 INIT: 2508 INIT:
2407 rgba cc = parse_rgba (c, THIS->s); 2509 rxvt_screen screen;
2510 screen.set (THIS->d);
2511 rgba cc = parse_rgba (c, &screen);
2408 C_ARGS: cc 2512 C_ARGS: cc
2409 2513
2410rxvt_img * 2514rxvt_img *
2411rxvt_img::shade (rxvt_img::nv factor) 2515rxvt_img::shade (rxvt_img::nv factor)
2412 2516

Diff Legend

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