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.243 by root, Mon Dec 24 07:55:33 2018 UTC vs.
Revision 1.254 by root, Sun Nov 21 15:15:02 2021 UTC

… …
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;
… …
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 "';"
… …
403 "" 408 ""
404 "use urxvt;", 409 "use urxvt;",
405 0 410 0
406 }; 411 };
407 int argc = ecb_array_length (args) - 1; 412 int argc = ecb_array_length (args) - 1;
408 char **argv = args; 413 char **argv = (char **)args;
409 414
410 PERL_SYS_INIT3 (&argc, &argv, &environ); 415 PERL_SYS_INIT3 (&argc, &argv, &environ);
411 perl = perl_alloc (); 416 perl = perl_alloc ();
412 perl_construct (perl); 417 perl_construct (perl);
413 418
… …
816 } *civ, const_iv[] = { 821 } *civ, const_iv[] = {
817# define const_iv(name) { # name, (IV)name } 822# define const_iv(name) { # name, (IV)name }
818 const_iv (HOOK_INIT), 823 const_iv (HOOK_INIT),
819 const_iv (HOOK_DESTROY), 824 const_iv (HOOK_DESTROY),
820 const_iv (HOOK_ACTION), 825 const_iv (HOOK_ACTION),
826 const_iv (HOOK_OSC_SEQ),
827 const_iv (HOOK_OSC_SEQ_PERL),
821 828
822 const_iv (NUM_RESOURCES), 829 const_iv (NUM_RESOURCES),
823 const_iv (DEFAULT_RSTYLE), 830 const_iv (DEFAULT_RSTYLE),
824 const_iv (OVERLAY_RSTYLE), 831 const_iv (OVERLAY_RSTYLE),
825 const_iv (Color_Bits), 832 const_iv (Color_Bits),
… …
1046 const_iv (PrivMode_vt52), 1053 const_iv (PrivMode_vt52),
1047 const_iv (PrivMode_LFNL), 1054 const_iv (PrivMode_LFNL),
1048 const_iv (PrivMode_MouseBtnEvent), 1055 const_iv (PrivMode_MouseBtnEvent),
1049 const_iv (PrivMode_MouseAnyEvent), 1056 const_iv (PrivMode_MouseAnyEvent),
1050 const_iv (PrivMode_BracketPaste), 1057 const_iv (PrivMode_BracketPaste),
1051 const_iv (PrivMode_ExtModeMouse), 1058 const_iv (PrivMode_ExtMouseUTF8),
1052 const_iv (PrivMode_ExtMouseRight), 1059 const_iv (PrivMode_ExtMouseUrxvt),
1053 const_iv (PrivMode_BlinkingCursor), 1060 const_iv (PrivMode_BlinkingCursor),
1054 const_iv (PrivMode_mouse_report), 1061 const_iv (PrivMode_mouse_report),
1055 const_iv (PrivMode_Default), 1062 const_iv (PrivMode_Default),
1056 }; 1063 };
1057 1064
… …
1367 1374
1368SV * 1375SV *
1369rxvt_term::locale_encode (SV *str) 1376rxvt_term::locale_encode (SV *str)
1370 CODE: 1377 CODE:
1371{ 1378{
1379 if (!SvOK (str))
1380 XSRETURN_UNDEF;
1381
1372 wchar_t *wstr = sv2wcs (str); 1382 wchar_t *wstr = sv2wcs (str);
1373 1383
1374 rxvt_push_locale (THIS->locale); 1384 rxvt_push_locale (THIS->locale);
1375 char *mbstr = rxvt_wcstombs (wstr); 1385 char *mbstr = rxvt_wcstombs (wstr);
1376 rxvt_pop_locale (); 1386 rxvt_pop_locale ();
… …
1385 1395
1386SV * 1396SV *
1387rxvt_term::locale_decode (SV *octets) 1397rxvt_term::locale_decode (SV *octets)
1388 CODE: 1398 CODE:
1389{ 1399{
1400 if (!SvOK (octets))
1401 XSRETURN_UNDEF;
1402
1390 STRLEN len; 1403 STRLEN len;
1391 char *data = SvPVbyte (octets, len); 1404 char *data = SvPVbyte (octets, len);
1392 1405
1393 rxvt_push_locale (THIS->locale); 1406 rxvt_push_locale (THIS->locale);
1394 wchar_t *wstr = rxvt_mbstowcs (data, len); 1407 wchar_t *wstr = rxvt_mbstowcs (data, len);
… …
1557 THIS->rstyle = new_rstyle; 1570 THIS->rstyle = new_rstyle;
1558 OUTPUT: 1571 OUTPUT:
1559 RETVAL 1572 RETVAL
1560 1573
1561int 1574int
1562rxvt_term::view_start (int newval = 1) 1575rxvt_term::view_start (int newval = 0)
1563 PROTOTYPE: $;$ 1576 PROTOTYPE: $;$
1564 CODE: 1577 CODE:
1565{ 1578{
1566 RETVAL = THIS->view_start; 1579 RETVAL = THIS->view_start;
1567 1580 if (items > 1)
1568 if (newval <= 0)
1569 THIS->scr_changeview (max (newval, THIS->top_row)); 1581 THIS->scr_changeview (newval);
1570} 1582}
1571 OUTPUT: 1583 OUTPUT:
1572 RETVAL 1584 RETVAL
1573 1585
1574void 1586void
… …
1784 // find length 1796 // find length
1785 for (wchar_t *s = wstr; *s; s++) 1797 for (wchar_t *s = wstr; *s; s++)
1786 if (*s == NOCHAR) 1798 if (*s == NOCHAR)
1787 ; 1799 ;
1788 else if (IS_COMPOSE (*s)) 1800 else if (IS_COMPOSE (*s))
1789 dlen += rxvt_composite.expand (*s, 0); 1801 dlen += rxvt_composite.expand (*s);
1790 else 1802 else
1791 dlen++; 1803 dlen++;
1792 1804
1793 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1805 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1794 1806
… …
1832 index += rs->value; 1844 index += rs->value;
1833 } 1845 }
1834 else 1846 else
1835 { 1847 {
1836 --rs; 1848 --rs;
1837 name = ""; 1849 name = (octet_string)"";
1838 } 1850 }
1839 1851
1840 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1852 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1841 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);
1842 1854
… …
2312 RETVAL 2324 RETVAL
2313 2325
2314#endif 2326#endif
2315 2327
2316void 2328void
2317rxvt_term::set_background (rxvt_img *img, bool border = false) 2329rxvt_term::clr_background ()
2318 CODE: 2330 CODE:
2319 delete THIS->bg_img; 2331 delete THIS->bg_img;
2320 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;
2321 THIS->bg_flags = 0; 2339 THIS->bg_img = 0;
2340 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2322 2341
2323 if (img) // TODO: cannot be false 2342 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2324 { 2343 {
2325 img = img->clone (); // own the img 2344 img = img->clone (); // own the img
2326 2345
2327 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2346 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2328 img->sub_rect (0, 0, 2347 img->sub_rect (0, 0,
… …
2336 2355
2337 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])
2338 ->replace (img); 2357 ->replace (img);
2339 2358
2340 THIS->bg_img = img; 2359 THIS->bg_img = img;
2341 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2342 2360
2343 if (!border) 2361 if (!border)
2344 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2362 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2345 } 2363 }
2346 2364

Diff Legend

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