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

Diff Legend

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