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.240 by root, Thu Jun 22 23:46:38 2017 UTC vs.
Revision 1.249 by root, Sun May 9 17:11:10 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
… …
1020 const_iv (XIMLineEnd), 1026 const_iv (XIMLineEnd),
1021 const_iv (XIMAbsolutePosition), 1027 const_iv (XIMAbsolutePosition),
1022 const_iv (XIMDontChange), 1028 const_iv (XIMDontChange),
1023# endif 1029# endif
1024# 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),
1025 }; 1061 };
1026 1062
1027 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--)
1028 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1064 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1029} 1065}
… …
1420 ModLevel3Mask = 0 1456 ModLevel3Mask = 0
1421 ModMetaMask = 1 1457 ModMetaMask = 1
1422 ModNumLockMask = 2 1458 ModNumLockMask = 2
1423 current_screen = 3 1459 current_screen = 3
1424 hidden_cursor = 4 1460 hidden_cursor = 4
1461 priv_modes = 5
1425 CODE: 1462 CODE:
1426 switch (ix) 1463 switch (ix)
1427 { 1464 {
1428 case 0: RETVAL = THIS->ModLevel3Mask; break; 1465 case 0: RETVAL = THIS->ModLevel3Mask; break;
1429 case 1: RETVAL = THIS->ModMetaMask; break; 1466 case 1: RETVAL = THIS->ModMetaMask; break;
… …
1432#ifdef CURSOR_BLINK 1469#ifdef CURSOR_BLINK
1433 case 4: RETVAL = THIS->hidden_cursor; break; 1470 case 4: RETVAL = THIS->hidden_cursor; break;
1434#else 1471#else
1435 case 4: RETVAL = 0; break; 1472 case 4: RETVAL = 0; break;
1436#endif 1473#endif
1474 case 5: RETVAL = THIS->priv_modes; break;
1437 } 1475 }
1438 OUTPUT: 1476 OUTPUT:
1439 RETVAL 1477 RETVAL
1440 1478
1441char * 1479char *
… …
1799 index += rs->value; 1837 index += rs->value;
1800 } 1838 }
1801 else 1839 else
1802 { 1840 {
1803 --rs; 1841 --rs;
1804 name = ""; 1842 name = (octet_string)"";
1805 } 1843 }
1806 1844
1807 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1845 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1808 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);
1809 1847
… …
2279 RETVAL 2317 RETVAL
2280 2318
2281#endif 2319#endif
2282 2320
2283void 2321void
2284rxvt_term::set_background (rxvt_img *img, bool border = false) 2322rxvt_term::clr_background ()
2285 CODE: 2323 CODE:
2286 delete THIS->bg_img; 2324 delete THIS->bg_img;
2287 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;
2288 THIS->bg_flags = 0; 2332 THIS->bg_img = 0;
2333 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2289 2334
2290 if (img) // TODO: cannot be false 2335 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2291 { 2336 {
2292 img = img->clone (); // own the img 2337 img = img->clone (); // own the img
2293 2338
2294 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2339 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2295 img->sub_rect (0, 0, 2340 img->sub_rect (0, 0,
… …
2303 2348
2304 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])
2305 ->replace (img); 2350 ->replace (img);
2306 2351
2307 THIS->bg_img = img; 2352 THIS->bg_img = img;
2308 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2309 2353
2310 if (!border) 2354 if (!border)
2311 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2355 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2312 } 2356 }
2313 2357
… …
2390 2434
2391void 2435void
2392rxvt_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)
2393 PROTOTYPE: $;$$$$ 2437 PROTOTYPE: $;$$$$
2394 INIT: 2438 INIT:
2395 rgba cc = parse_rgba (c, THIS->s); 2439 rxvt_screen screen;
2440 screen.set (THIS->d);
2441 rgba cc = parse_rgba (c, &screen);
2396 C_ARGS: cc, x, y, w, h 2442 C_ARGS: cc, x, y, w, h
2397 2443
2398void 2444void
2399rxvt_img::DESTROY () 2445rxvt_img::DESTROY ()
2400 CODE: 2446 CODE:
… …
2458rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2504rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2459 2505
2460rxvt_img * 2506rxvt_img *
2461rxvt_img::tint (SV *c) 2507rxvt_img::tint (SV *c)
2462 INIT: 2508 INIT:
2463 rgba cc = parse_rgba (c, THIS->s); 2509 rxvt_screen screen;
2510 screen.set (THIS->d);
2511 rgba cc = parse_rgba (c, &screen);
2464 C_ARGS: cc 2512 C_ARGS: cc
2465 2513
2466rxvt_img * 2514rxvt_img *
2467rxvt_img::shade (rxvt_img::nv factor) 2515rxvt_img::shade (rxvt_img::nv factor)
2468 2516

Diff Legend

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