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.241 by root, Thu Jul 13 10:31:27 2017 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 "';"
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
815 } *civ, const_iv[] = { 821 } *civ, const_iv[] = {
816# define const_iv(name) { # name, (IV)name } 822# define const_iv(name) { # name, (IV)name }
817 const_iv (HOOK_INIT), 823 const_iv (HOOK_INIT),
818 const_iv (HOOK_DESTROY), 824 const_iv (HOOK_DESTROY),
819 const_iv (HOOK_ACTION), 825 const_iv (HOOK_ACTION),
826 const_iv (HOOK_OSC_SEQ),
827 const_iv (HOOK_OSC_SEQ_PERL),
820 828
821 const_iv (NUM_RESOURCES), 829 const_iv (NUM_RESOURCES),
822 const_iv (DEFAULT_RSTYLE), 830 const_iv (DEFAULT_RSTYLE),
823 const_iv (OVERLAY_RSTYLE), 831 const_iv (OVERLAY_RSTYLE),
824 const_iv (Color_Bits), 832 const_iv (Color_Bits),
1045 const_iv (PrivMode_vt52), 1053 const_iv (PrivMode_vt52),
1046 const_iv (PrivMode_LFNL), 1054 const_iv (PrivMode_LFNL),
1047 const_iv (PrivMode_MouseBtnEvent), 1055 const_iv (PrivMode_MouseBtnEvent),
1048 const_iv (PrivMode_MouseAnyEvent), 1056 const_iv (PrivMode_MouseAnyEvent),
1049 const_iv (PrivMode_BracketPaste), 1057 const_iv (PrivMode_BracketPaste),
1050 const_iv (PrivMode_ExtModeMouse), 1058 const_iv (PrivMode_ExtMouseUTF8),
1051 const_iv (PrivMode_ExtMouseRight), 1059 const_iv (PrivMode_ExtMouseUrxvt),
1052 const_iv (PrivMode_BlinkingCursor), 1060 const_iv (PrivMode_BlinkingCursor),
1053 const_iv (PrivMode_mouse_report), 1061 const_iv (PrivMode_mouse_report),
1054 const_iv (PrivMode_Default), 1062 const_iv (PrivMode_Default),
1055 }; 1063 };
1056 1064
1366 1374
1367SV * 1375SV *
1368rxvt_term::locale_encode (SV *str) 1376rxvt_term::locale_encode (SV *str)
1369 CODE: 1377 CODE:
1370{ 1378{
1379 if (!SvOK (str))
1380 XSRETURN_UNDEF;
1381
1371 wchar_t *wstr = sv2wcs (str); 1382 wchar_t *wstr = sv2wcs (str);
1372 1383
1373 rxvt_push_locale (THIS->locale); 1384 rxvt_push_locale (THIS->locale);
1374 char *mbstr = rxvt_wcstombs (wstr); 1385 char *mbstr = rxvt_wcstombs (wstr);
1375 rxvt_pop_locale (); 1386 rxvt_pop_locale ();
1384 1395
1385SV * 1396SV *
1386rxvt_term::locale_decode (SV *octets) 1397rxvt_term::locale_decode (SV *octets)
1387 CODE: 1398 CODE:
1388{ 1399{
1400 if (!SvOK (octets))
1401 XSRETURN_UNDEF;
1402
1389 STRLEN len; 1403 STRLEN len;
1390 char *data = SvPVbyte (octets, len); 1404 char *data = SvPVbyte (octets, len);
1391 1405
1392 rxvt_push_locale (THIS->locale); 1406 rxvt_push_locale (THIS->locale);
1393 wchar_t *wstr = rxvt_mbstowcs (data, len); 1407 wchar_t *wstr = rxvt_mbstowcs (data, len);
1556 THIS->rstyle = new_rstyle; 1570 THIS->rstyle = new_rstyle;
1557 OUTPUT: 1571 OUTPUT:
1558 RETVAL 1572 RETVAL
1559 1573
1560int 1574int
1561rxvt_term::view_start (int newval = 1) 1575rxvt_term::view_start (int newval = 0)
1562 PROTOTYPE: $;$ 1576 PROTOTYPE: $;$
1563 CODE: 1577 CODE:
1564{ 1578{
1565 RETVAL = THIS->view_start; 1579 RETVAL = THIS->view_start;
1566 1580 if (items > 1)
1567 if (newval <= 0)
1568 THIS->scr_changeview (max (newval, THIS->top_row)); 1581 THIS->scr_changeview (newval);
1569} 1582}
1570 OUTPUT: 1583 OUTPUT:
1571 RETVAL 1584 RETVAL
1572 1585
1573void 1586void
1783 // find length 1796 // find length
1784 for (wchar_t *s = wstr; *s; s++) 1797 for (wchar_t *s = wstr; *s; s++)
1785 if (*s == NOCHAR) 1798 if (*s == NOCHAR)
1786 ; 1799 ;
1787 else if (IS_COMPOSE (*s)) 1800 else if (IS_COMPOSE (*s))
1788 dlen += rxvt_composite.expand (*s, 0); 1801 dlen += rxvt_composite.expand (*s);
1789 else 1802 else
1790 dlen++; 1803 dlen++;
1791 1804
1792 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1805 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1793 1806
1831 index += rs->value; 1844 index += rs->value;
1832 } 1845 }
1833 else 1846 else
1834 { 1847 {
1835 --rs; 1848 --rs;
1836 name = ""; 1849 name = (octet_string)"";
1837 } 1850 }
1838 1851
1839 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1852 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1840 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);
1841 1854
2311 RETVAL 2324 RETVAL
2312 2325
2313#endif 2326#endif
2314 2327
2315void 2328void
2316rxvt_term::set_background (rxvt_img *img, bool border = false) 2329rxvt_term::clr_background ()
2317 CODE: 2330 CODE:
2318 delete THIS->bg_img; 2331 delete THIS->bg_img;
2319 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;
2320 THIS->bg_flags = 0; 2339 THIS->bg_img = 0;
2340 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2321 2341
2322 if (img) // TODO: cannot be false 2342 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2323 { 2343 {
2324 img = img->clone (); // own the img 2344 img = img->clone (); // own the img
2325 2345
2326 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2346 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2327 img->sub_rect (0, 0, 2347 img->sub_rect (0, 0,
2335 2355
2336 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])
2337 ->replace (img); 2357 ->replace (img);
2338 2358
2339 THIS->bg_img = img; 2359 THIS->bg_img = img;
2340 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2341 2360
2342 if (!border) 2361 if (!border)
2343 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2362 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2344 } 2363 }
2345 2364
2422 2441
2423void 2442void
2424rxvt_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)
2425 PROTOTYPE: $;$$$$ 2444 PROTOTYPE: $;$$$$
2426 INIT: 2445 INIT:
2427 rgba cc = parse_rgba (c, THIS->s); 2446 rxvt_screen screen;
2447 screen.set (THIS->d);
2448 rgba cc = parse_rgba (c, &screen);
2428 C_ARGS: cc, x, y, w, h 2449 C_ARGS: cc, x, y, w, h
2429 2450
2430void 2451void
2431rxvt_img::DESTROY () 2452rxvt_img::DESTROY ()
2432 CODE: 2453 CODE:
2490rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2511rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2491 2512
2492rxvt_img * 2513rxvt_img *
2493rxvt_img::tint (SV *c) 2514rxvt_img::tint (SV *c)
2494 INIT: 2515 INIT:
2495 rgba cc = parse_rgba (c, THIS->s); 2516 rxvt_screen screen;
2517 screen.set (THIS->d);
2518 rgba cc = parse_rgba (c, &screen);
2496 C_ARGS: cc 2519 C_ARGS: cc
2497 2520
2498rxvt_img * 2521rxvt_img *
2499rxvt_img::shade (rxvt_img::nv factor) 2522rxvt_img::shade (rxvt_img::nv factor)
2500 2523

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines