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.226 by sf-exg, Wed Sep 3 18:20:37 2014 UTC vs.
Revision 1.255 by root, Sun Nov 21 23:00:48 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-2014,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 3 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.
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
495} 501}
496 502
497static void 503static void
498_keysym_resource_push (rxvt_term *term, const char *k, const char *v) 504_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
499{ 505{
506 unsigned int state;
507
508 if (term->parse_keysym (k, state) == -1)
509 return;
510
500 dSP; 511 dSP;
501 XPUSHs (sv_2mortal (newSVpv (v, 0))); 512 XPUSHs (sv_2mortal (newSVpv (v, 0)));
502 PUTBACK; 513 PUTBACK;
503} 514}
504 515
518 THIS->perl.grabtime = 0; 529 THIS->perl.grabtime = 0;
519 } 530 }
520} 531}
521 532
522bool 533bool
523rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 534rxvt_perl_interp::invoke (rxvt_term *term, int htype, ...)
524{ 535{
525 if (!perl || !term->perl.self) 536 if (!perl || !term->perl.self)
526 return false; 537 return false;
527 538
528 localise_env set_environ (perl_environ); 539 localise_env set_environ (perl_environ);
810 } *civ, const_iv[] = { 821 } *civ, const_iv[] = {
811# define const_iv(name) { # name, (IV)name } 822# define const_iv(name) { # name, (IV)name }
812 const_iv (HOOK_INIT), 823 const_iv (HOOK_INIT),
813 const_iv (HOOK_DESTROY), 824 const_iv (HOOK_DESTROY),
814 const_iv (HOOK_ACTION), 825 const_iv (HOOK_ACTION),
826 const_iv (HOOK_OSC_SEQ),
827 const_iv (HOOK_OSC_SEQ_PERL),
815 828
816 const_iv (NUM_RESOURCES), 829 const_iv (NUM_RESOURCES),
817 const_iv (DEFAULT_RSTYLE), 830 const_iv (DEFAULT_RSTYLE),
818 const_iv (OVERLAY_RSTYLE), 831 const_iv (OVERLAY_RSTYLE),
819 const_iv (Color_Bits), 832 const_iv (Color_Bits),
1015 const_iv (XIMLineEnd), 1028 const_iv (XIMLineEnd),
1016 const_iv (XIMAbsolutePosition), 1029 const_iv (XIMAbsolutePosition),
1017 const_iv (XIMDontChange), 1030 const_iv (XIMDontChange),
1018# endif 1031# endif
1019# endif 1032# endif
1033
1034 /* DEC private modes */
1035 const_iv (PrivMode_132),
1036 const_iv (PrivMode_132OK),
1037 const_iv (PrivMode_rVideo),
1038 const_iv (PrivMode_relOrigin),
1039 const_iv (PrivMode_Screen),
1040 const_iv (PrivMode_Autowrap),
1041 const_iv (PrivMode_aplCUR),
1042 const_iv (PrivMode_aplKP),
1043 const_iv (PrivMode_HaveBackSpace),
1044 const_iv (PrivMode_BackSpace),
1045 const_iv (PrivMode_ShiftKeys),
1046 const_iv (PrivMode_VisibleCursor),
1047 const_iv (PrivMode_MouseX10),
1048 const_iv (PrivMode_MouseX11),
1049 const_iv (PrivMode_scrollBar),
1050 const_iv (PrivMode_TtyOutputInh),
1051 const_iv (PrivMode_Keypress),
1052 const_iv (PrivMode_smoothScroll),
1053 const_iv (PrivMode_vt52),
1054 const_iv (PrivMode_LFNL),
1055 const_iv (PrivMode_MouseBtnEvent),
1056 const_iv (PrivMode_MouseAnyEvent),
1057 const_iv (PrivMode_BracketPaste),
1058 const_iv (PrivMode_ExtMouseUTF8),
1059 const_iv (PrivMode_ExtMouseUrxvt),
1060 const_iv (PrivMode_BlinkingCursor),
1061 const_iv (PrivMode_mouse_report),
1062 const_iv (PrivMode_Default),
1020 }; 1063 };
1021 1064
1022 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1065 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
1023 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1066 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1024} 1067}
1025 1068
1026void 1069void
1027log (const char *msg) 1070log (utf8_string msg)
1028 CODE: 1071 CODE:
1029 rxvt_log ("%s", msg); 1072 rxvt_log ("%s", msg);
1030 1073
1031void 1074void
1032warn (const char *msg) 1075warn (utf8_string msg)
1033 CODE: 1076 CODE:
1034 rxvt_warn ("%s", msg); 1077 rxvt_warn ("%s", msg);
1035 1078
1036void 1079void
1037fatal (const char *msg) 1080fatal (utf8_string msg)
1038 CODE: 1081 CODE:
1039 rxvt_fatal ("%s", msg); 1082 rxvt_fatal ("%s", msg);
1040 1083
1041void 1084void
1042_exit (int status) 1085_exit (int status)
1282rxvt_term::ungrab () 1325rxvt_term::ungrab ()
1283 CODE: 1326 CODE:
1284 ungrab (THIS); 1327 ungrab (THIS);
1285 1328
1286int 1329int
1287rxvt_term::XStringToKeysym (char *string) 1330rxvt_term::XStringToKeysym (octet_string string)
1288 CODE: 1331 CODE:
1289 RETVAL = XStringToKeysym (string); 1332 RETVAL = XStringToKeysym (string);
1290 OUTPUT: RETVAL 1333 OUTPUT: RETVAL
1291 1334
1292char * 1335char *
1302 OUTPUT: RETVAL 1345 OUTPUT: RETVAL
1303 1346
1304int 1347int
1305rxvt_term::XKeycodeToKeysym (int code, int index) 1348rxvt_term::XKeycodeToKeysym (int code, int index)
1306 CODE: 1349 CODE:
1307 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1350 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1308 OUTPUT: RETVAL 1351 OUTPUT: RETVAL
1309 1352
1310int 1353int
1311rxvt_term::strwidth (SV *str) 1354rxvt_term::strwidth (SV *str)
1312 CODE: 1355 CODE:
1331 1374
1332SV * 1375SV *
1333rxvt_term::locale_encode (SV *str) 1376rxvt_term::locale_encode (SV *str)
1334 CODE: 1377 CODE:
1335{ 1378{
1379 if (!SvOK (str))
1380 XSRETURN_UNDEF;
1381
1336 wchar_t *wstr = sv2wcs (str); 1382 wchar_t *wstr = sv2wcs (str);
1337 1383
1338 rxvt_push_locale (THIS->locale); 1384 rxvt_push_locale (THIS->locale);
1339 char *mbstr = rxvt_wcstombs (wstr); 1385 char *mbstr = rxvt_wcstombs (wstr);
1340 rxvt_pop_locale (); 1386 rxvt_pop_locale ();
1349 1395
1350SV * 1396SV *
1351rxvt_term::locale_decode (SV *octets) 1397rxvt_term::locale_decode (SV *octets)
1352 CODE: 1398 CODE:
1353{ 1399{
1400 if (!SvOK (octets))
1401 XSRETURN_UNDEF;
1402
1354 STRLEN len; 1403 STRLEN len;
1355 char *data = SvPVbyte (octets, len); 1404 char *data = SvPVbyte (octets, len);
1356 1405
1357 rxvt_push_locale (THIS->locale); 1406 rxvt_push_locale (THIS->locale);
1358 wchar_t *wstr = rxvt_mbstowcs (data, len); 1407 wchar_t *wstr = rxvt_mbstowcs (data, len);
1382#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1431#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1383#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1432#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1384#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1433#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1385 1434
1386int 1435int
1387rxvt_term::width () 1436rxvt_term::width (int new_value = NO_INIT)
1388 ALIAS: 1437 ALIAS:
1389 width = TERM_OFFSET_width 1438 width = TERM_OFFSET_width
1390 height = TERM_OFFSET_height 1439 height = TERM_OFFSET_height
1391 fwidth = TERM_OFFSET_fwidth 1440 fwidth = TERM_OFFSET_fwidth
1392 fheight = TERM_OFFSET_fheight 1441 fheight = TERM_OFFSET_fheight
1402 saveLines = TERM_OFFSET_saveLines 1451 saveLines = TERM_OFFSET_saveLines
1403 total_rows = TERM_OFFSET_total_rows 1452 total_rows = TERM_OFFSET_total_rows
1404 top_row = TERM_OFFSET_top_row 1453 top_row = TERM_OFFSET_top_row
1405 CODE: 1454 CODE:
1406 RETVAL = *(int *)((char *)THIS + ix); 1455 RETVAL = *(int *)((char *)THIS + ix);
1456 if (items > 1)
1457 *(int *)((char *)THIS + ix) = new_value;
1407 OUTPUT: 1458 OUTPUT:
1408 RETVAL 1459 RETVAL
1409 1460
1410unsigned int 1461unsigned int
1411rxvt_term::ModLevel3Mask () 1462rxvt_term::ModLevel3Mask ()
1413 ModLevel3Mask = 0 1464 ModLevel3Mask = 0
1414 ModMetaMask = 1 1465 ModMetaMask = 1
1415 ModNumLockMask = 2 1466 ModNumLockMask = 2
1416 current_screen = 3 1467 current_screen = 3
1417 hidden_cursor = 4 1468 hidden_cursor = 4
1469 priv_modes = 5
1418 CODE: 1470 CODE:
1419 switch (ix) 1471 switch (ix)
1420 { 1472 {
1421 case 0: RETVAL = THIS->ModLevel3Mask; break; 1473 case 0: RETVAL = THIS->ModLevel3Mask; break;
1422 case 1: RETVAL = THIS->ModMetaMask; break; 1474 case 1: RETVAL = THIS->ModMetaMask; break;
1423 case 2: RETVAL = THIS->ModNumLockMask; break; 1475 case 2: RETVAL = THIS->ModNumLockMask; break;
1424 case 3: RETVAL = THIS->current_screen; break; 1476 case 3: RETVAL = THIS->current_screen; break;
1425#ifdef CURSOR_BLINK 1477#ifdef CURSOR_BLINK
1426 case 4: RETVAL = THIS->hidden_cursor; break; 1478 case 4: RETVAL = THIS->hidden_cursor; break;
1479#else
1480 case 4: RETVAL = 0; break;
1427#endif 1481#endif
1482 case 5: RETVAL = THIS->priv_modes; break;
1428 } 1483 }
1429 OUTPUT: 1484 OUTPUT:
1430 RETVAL 1485 RETVAL
1431 1486
1432char * 1487char *
1515 THIS->rstyle = new_rstyle; 1570 THIS->rstyle = new_rstyle;
1516 OUTPUT: 1571 OUTPUT:
1517 RETVAL 1572 RETVAL
1518 1573
1519int 1574int
1520rxvt_term::view_start (int newval = 1) 1575rxvt_term::view_start (int newval = 0)
1521 PROTOTYPE: $;$ 1576 PROTOTYPE: $;$
1522 CODE: 1577 CODE:
1523{ 1578{
1524 RETVAL = THIS->view_start; 1579 RETVAL = THIS->view_start;
1525 1580 if (items > 1)
1526 if (newval <= 0)
1527 THIS->scr_changeview (max (newval, THIS->top_row)); 1581 THIS->scr_changeview (newval);
1528} 1582}
1529 OUTPUT: 1583 OUTPUT:
1530 RETVAL 1584 RETVAL
1531 1585
1532void 1586void
1567void 1621void
1568rxvt_term::want_refresh () 1622rxvt_term::want_refresh ()
1569 CODE: 1623 CODE:
1570 THIS->want_refresh = 1; 1624 THIS->want_refresh = 1;
1571 THIS->refresh_check (); 1625 THIS->refresh_check ();
1626
1627void
1628rxvt_term::refresh_check ()
1572 1629
1573void 1630void
1574rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1631rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1575 PPCODE: 1632 PPCODE:
1576{ 1633{
1721 *r++ = NOCHAR; 1778 *r++ = NOCHAR;
1722 } 1779 }
1723 1780
1724 rxvt_pop_locale (); 1781 rxvt_pop_locale ();
1725 1782
1783 free (wstr);
1726 RETVAL = wcs2sv (rstr, r - rstr); 1784 RETVAL = wcs2sv (rstr, r - rstr);
1727} 1785}
1728 OUTPUT: 1786 OUTPUT:
1729 RETVAL 1787 RETVAL
1730 1788
1738 // find length 1796 // find length
1739 for (wchar_t *s = wstr; *s; s++) 1797 for (wchar_t *s = wstr; *s; s++)
1740 if (*s == NOCHAR) 1798 if (*s == NOCHAR)
1741 ; 1799 ;
1742 else if (IS_COMPOSE (*s)) 1800 else if (IS_COMPOSE (*s))
1743 dlen += rxvt_composite.expand (*s, 0); 1801 dlen += rxvt_composite.expand (*s);
1744 else 1802 else
1745 dlen++; 1803 dlen++;
1746 1804
1747 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1805 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1748 1806
1754 else if (IS_COMPOSE (*s)) 1812 else if (IS_COMPOSE (*s))
1755 r += rxvt_composite.expand (*s, r); 1813 r += rxvt_composite.expand (*s, r);
1756 else 1814 else
1757 *r++ = *s; 1815 *r++ = *s;
1758 1816
1817 free (wstr);
1759 RETVAL = wcs2sv (rstr, r - rstr); 1818 RETVAL = wcs2sv (rstr, r - rstr);
1760} 1819}
1761 OUTPUT: 1820 OUTPUT:
1762 RETVAL 1821 RETVAL
1763 1822
1764void 1823void
1765rxvt_term::_resource (char *name, int index, SV *newval = 0) 1824rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1766 PPCODE: 1825 PPCODE:
1767{ 1826{
1768 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1827 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1769# define def(name) { # name, Rs_ ## name }, 1828# define def(name) { # name, Rs_ ## name },
1770# define reserve(name,count) 1829# define reserve(name,count)
1785 index += rs->value; 1844 index += rs->value;
1786 } 1845 }
1787 else 1846 else
1788 { 1847 {
1789 --rs; 1848 --rs;
1790 name = ""; 1849 name = (octet_string)"";
1791 } 1850 }
1792 1851
1793 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1852 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1794 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1853 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1795 1854
1808 THIS->rs [index] = 0; 1867 THIS->rs [index] = 0;
1809 } 1868 }
1810} 1869}
1811 1870
1812const char * 1871const char *
1813rxvt_term::x_resource (const char *name) 1872rxvt_term::x_resource (octet_string name)
1814 1873
1815bool 1874bool
1816rxvt_term::option (U8 optval, int set = -1) 1875rxvt_term::option (U8 optval, int set = -1)
1817 CODE: 1876 CODE:
1818{ 1877{
1852 } 1911 }
1853} 1912}
1854 OUTPUT: 1913 OUTPUT:
1855 RETVAL 1914 RETVAL
1856 1915
1916SV *
1917rxvt_term::lookup_keysym (int keysym, unsigned int state)
1918 CODE:
1919{
1920 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1921 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1922}
1923 OUTPUT:
1924 RETVAL
1925
1857bool 1926bool
1858rxvt_term::bind_action (char *keysym, char *str) 1927rxvt_term::bind_action (octet_string keysym, octet_string action)
1859 ALIAS: 1928 ALIAS:
1860 parse_keysym = 1 1929 parse_keysym = 1
1861 CODE: 1930 CODE:
1862 RETVAL = 0 < THIS->bind_action (keysym, str); 1931 RETVAL = 0 < THIS->bind_action (keysym, action);
1863 THIS->keyboard->register_done (); 1932 THIS->keyboard->register_done ();
1864 OUTPUT: 1933 OUTPUT:
1865 RETVAL 1934 RETVAL
1935
1936void
1937rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1938 CODE:
1939 wchar_t *wstr = sv2wcs (str);
1940 THIS->keyboard->register_action (keysym, state, wstr);
1941 free (wstr);
1866 1942
1867void 1943void
1868rxvt_term::screen_cur (...) 1944rxvt_term::screen_cur (...)
1869 PROTOTYPE: $;$$ 1945 PROTOTYPE: $;$$
1870 ALIAS: 1946 ALIAS:
1981 2057
1982void 2058void
1983rxvt_term::scr_bell () 2059rxvt_term::scr_bell ()
1984 2060
1985void 2061void
1986rxvt_term::scr_recolour (bool refresh = true); 2062rxvt_term::scr_recolor (bool refresh = true);
1987 2063
1988void 2064void
1989rxvt_term::scr_change_screen (int screen) 2065rxvt_term::scr_change_screen (int screen)
1990 2066
1991void 2067void
2248 RETVAL 2324 RETVAL
2249 2325
2250#endif 2326#endif
2251 2327
2252void 2328void
2253rxvt_term::set_background (rxvt_img *img, bool border = false) 2329rxvt_term::clr_background ()
2254 CODE: 2330 CODE:
2255 delete THIS->bg_img; 2331 delete THIS->bg_img;
2256 THIS->bg_img = 0; 2332 THIS->bg_img = 0;
2333 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2334
2335void
2336rxvt_term::set_background (rxvt_img *img, bool border = false)
2337 CODE:
2338 delete THIS->bg_img;
2257 THIS->bg_flags = 0; 2339 THIS->bg_img = 0;
2340 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2258 2341
2259 if (img) // TODO: cannot be false 2342 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2260 { 2343 {
2261 img = img->clone (); // own the img 2344 img = img->clone (); // own the img
2262 2345
2263 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2346 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2264 img->sub_rect (0, 0, 2347 img->sub_rect (0, 0,
2272 2355
2273 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2356 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2274 ->replace (img); 2357 ->replace (img);
2275 2358
2276 THIS->bg_img = img; 2359 THIS->bg_img = img;
2277 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2278 2360
2279 if (!border) 2361 if (!border)
2280 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2362 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2281 } 2363 }
2282 2364
2359 2441
2360void 2442void
2361rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h) 2443rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2362 PROTOTYPE: $;$$$$ 2444 PROTOTYPE: $;$$$$
2363 INIT: 2445 INIT:
2364 rgba cc = parse_rgba (c, THIS->s); 2446 rxvt_screen screen;
2447 screen.set (THIS->d);
2448 rgba cc = parse_rgba (c, &screen);
2365 C_ARGS: cc, x, y, w, h 2449 C_ARGS: cc, x, y, w, h
2366 2450
2367void 2451void
2368rxvt_img::DESTROY () 2452rxvt_img::DESTROY ()
2369 CODE: 2453 CODE:
2427rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2511rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2428 2512
2429rxvt_img * 2513rxvt_img *
2430rxvt_img::tint (SV *c) 2514rxvt_img::tint (SV *c)
2431 INIT: 2515 INIT:
2432 rgba cc = parse_rgba (c, THIS->s); 2516 rxvt_screen screen;
2517 screen.set (THIS->d);
2518 rgba cc = parse_rgba (c, &screen);
2433 C_ARGS: cc 2519 C_ARGS: cc
2434 2520
2435rxvt_img * 2521rxvt_img *
2436rxvt_img::shade (rxvt_img::nv factor) 2522rxvt_img::shade (rxvt_img::nv factor)
2437 2523

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines