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.238 by sf-exg, Thu Jul 14 05:33:26 2016 UTC vs.
Revision 1.251 by sf-exg, Wed Jul 14 12:39:57 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;
… …
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 {
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;
1430 case 2: RETVAL = THIS->ModNumLockMask; break; 1467 case 2: RETVAL = THIS->ModNumLockMask; break;
1431 case 3: RETVAL = THIS->current_screen; break; 1468 case 3: RETVAL = THIS->current_screen; 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;
1471#else
1472 case 4: RETVAL = 0; break;
1434#endif 1473#endif
1474 case 5: RETVAL = THIS->priv_modes; break;
1435 } 1475 }
1436 OUTPUT: 1476 OUTPUT:
1437 RETVAL 1477 RETVAL
1438 1478
1439char * 1479char *
… …
1527rxvt_term::view_start (int newval = 1) 1567rxvt_term::view_start (int newval = 1)
1528 PROTOTYPE: $;$ 1568 PROTOTYPE: $;$
1529 CODE: 1569 CODE:
1530{ 1570{
1531 RETVAL = THIS->view_start; 1571 RETVAL = THIS->view_start;
1532 1572 if (items > 1)
1533 if (newval <= 0)
1534 THIS->scr_changeview (max (newval, THIS->top_row)); 1573 THIS->scr_changeview (newval);
1535} 1574}
1536 OUTPUT: 1575 OUTPUT:
1537 RETVAL 1576 RETVAL
1538 1577
1539void 1578void
… …
1749 // find length 1788 // find length
1750 for (wchar_t *s = wstr; *s; s++) 1789 for (wchar_t *s = wstr; *s; s++)
1751 if (*s == NOCHAR) 1790 if (*s == NOCHAR)
1752 ; 1791 ;
1753 else if (IS_COMPOSE (*s)) 1792 else if (IS_COMPOSE (*s))
1754 dlen += rxvt_composite.expand (*s, 0); 1793 dlen += rxvt_composite.expand (*s);
1755 else 1794 else
1756 dlen++; 1795 dlen++;
1757 1796
1758 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1797 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1759 1798
… …
1797 index += rs->value; 1836 index += rs->value;
1798 } 1837 }
1799 else 1838 else
1800 { 1839 {
1801 --rs; 1840 --rs;
1802 name = ""; 1841 name = (octet_string)"";
1803 } 1842 }
1804 1843
1805 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1844 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1806 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);
1807 1846
… …
2277 RETVAL 2316 RETVAL
2278 2317
2279#endif 2318#endif
2280 2319
2281void 2320void
2282rxvt_term::set_background (rxvt_img *img, bool border = false) 2321rxvt_term::clr_background ()
2283 CODE: 2322 CODE:
2284 delete THIS->bg_img; 2323 delete THIS->bg_img;
2285 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;
2286 THIS->bg_flags = 0; 2331 THIS->bg_img = 0;
2332 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2287 2333
2288 if (img) // TODO: cannot be false 2334 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2289 { 2335 {
2290 img = img->clone (); // own the img 2336 img = img->clone (); // own the img
2291 2337
2292 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2338 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2293 img->sub_rect (0, 0, 2339 img->sub_rect (0, 0,
… …
2301 2347
2302 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])
2303 ->replace (img); 2349 ->replace (img);
2304 2350
2305 THIS->bg_img = img; 2351 THIS->bg_img = img;
2306 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2307 2352
2308 if (!border) 2353 if (!border)
2309 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2354 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2310 } 2355 }
2311 2356
… …
2388 2433
2389void 2434void
2390rxvt_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)
2391 PROTOTYPE: $;$$$$ 2436 PROTOTYPE: $;$$$$
2392 INIT: 2437 INIT:
2393 rgba cc = parse_rgba (c, THIS->s); 2438 rxvt_screen screen;
2439 screen.set (THIS->d);
2440 rgba cc = parse_rgba (c, &screen);
2394 C_ARGS: cc, x, y, w, h 2441 C_ARGS: cc, x, y, w, h
2395 2442
2396void 2443void
2397rxvt_img::DESTROY () 2444rxvt_img::DESTROY ()
2398 CODE: 2445 CODE:
… …
2456rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2503rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2457 2504
2458rxvt_img * 2505rxvt_img *
2459rxvt_img::tint (SV *c) 2506rxvt_img::tint (SV *c)
2460 INIT: 2507 INIT:
2461 rgba cc = parse_rgba (c, THIS->s); 2508 rxvt_screen screen;
2509 screen.set (THIS->d);
2510 rgba cc = parse_rgba (c, &screen);
2462 C_ARGS: cc 2511 C_ARGS: cc
2463 2512
2464rxvt_img * 2513rxvt_img *
2465rxvt_img::shade (rxvt_img::nv factor) 2514rxvt_img::shade (rxvt_img::nv factor)
2466 2515

Diff Legend

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