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.248 by sf-exg, Sat May 8 06:16:21 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 {
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
… …
1045 const_iv (PrivMode_vt52), 1050 const_iv (PrivMode_vt52),
1046 const_iv (PrivMode_LFNL), 1051 const_iv (PrivMode_LFNL),
1047 const_iv (PrivMode_MouseBtnEvent), 1052 const_iv (PrivMode_MouseBtnEvent),
1048 const_iv (PrivMode_MouseAnyEvent), 1053 const_iv (PrivMode_MouseAnyEvent),
1049 const_iv (PrivMode_BracketPaste), 1054 const_iv (PrivMode_BracketPaste),
1050 const_iv (PrivMode_ExtModeMouse), 1055 const_iv (PrivMode_ExtMouseUTF8),
1051 const_iv (PrivMode_ExtMouseRight), 1056 const_iv (PrivMode_ExtMouseUrxvt),
1052 const_iv (PrivMode_BlinkingCursor), 1057 const_iv (PrivMode_BlinkingCursor),
1053 const_iv (PrivMode_mouse_report), 1058 const_iv (PrivMode_mouse_report),
1054 const_iv (PrivMode_Default), 1059 const_iv (PrivMode_Default),
1055 }; 1060 };
1056 1061
… …
1831 index += rs->value; 1836 index += rs->value;
1832 } 1837 }
1833 else 1838 else
1834 { 1839 {
1835 --rs; 1840 --rs;
1836 name = ""; 1841 name = (octet_string)"";
1837 } 1842 }
1838 1843
1839 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1844 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1840 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);
1841 1846
… …
2311 RETVAL 2316 RETVAL
2312 2317
2313#endif 2318#endif
2314 2319
2315void 2320void
2316rxvt_term::set_background (rxvt_img *img, bool border = false) 2321rxvt_term::clr_background ()
2317 CODE: 2322 CODE:
2318 delete THIS->bg_img; 2323 delete THIS->bg_img;
2319 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;
2320 THIS->bg_flags = 0; 2331 THIS->bg_img = 0;
2332 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2321 2333
2322 if (img) // TODO: cannot be false 2334 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2323 { 2335 {
2324 img = img->clone (); // own the img 2336 img = img->clone (); // own the img
2325 2337
2326 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2338 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2327 img->sub_rect (0, 0, 2339 img->sub_rect (0, 0,
… …
2335 2347
2336 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])
2337 ->replace (img); 2349 ->replace (img);
2338 2350
2339 THIS->bg_img = img; 2351 THIS->bg_img = img;
2340 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2341 2352
2342 if (!border) 2353 if (!border)
2343 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2354 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2344 } 2355 }
2345 2356
… …
2422 2433
2423void 2434void
2424rxvt_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)
2425 PROTOTYPE: $;$$$$ 2436 PROTOTYPE: $;$$$$
2426 INIT: 2437 INIT:
2427 rgba cc = parse_rgba (c, THIS->s); 2438 rxvt_screen screen;
2439 screen.set (THIS->d);
2440 rgba cc = parse_rgba (c, &screen);
2428 C_ARGS: cc, x, y, w, h 2441 C_ARGS: cc, x, y, w, h
2429 2442
2430void 2443void
2431rxvt_img::DESTROY () 2444rxvt_img::DESTROY ()
2432 CODE: 2445 CODE:
… …
2490rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2503rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2491 2504
2492rxvt_img * 2505rxvt_img *
2493rxvt_img::tint (SV *c) 2506rxvt_img::tint (SV *c)
2494 INIT: 2507 INIT:
2495 rgba cc = parse_rgba (c, THIS->s); 2508 rxvt_screen screen;
2509 screen.set (THIS->d);
2510 rgba cc = parse_rgba (c, &screen);
2496 C_ARGS: cc 2511 C_ARGS: cc
2497 2512
2498rxvt_img * 2513rxvt_img *
2499rxvt_img::shade (rxvt_img::nv factor) 2514rxvt_img::shade (rxvt_img::nv factor)
2500 2515

Diff Legend

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