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.236 by sf-exg, Tue Mar 17 09:23:08 2015 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;
… …
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 {
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
… …
1020 const_iv (XIMLineEnd), 1025 const_iv (XIMLineEnd),
1021 const_iv (XIMAbsolutePosition), 1026 const_iv (XIMAbsolutePosition),
1022 const_iv (XIMDontChange), 1027 const_iv (XIMDontChange),
1023# endif 1028# endif
1024# endif 1029# endif
1030
1031 /* DEC private modes */
1032 const_iv (PrivMode_132),
1033 const_iv (PrivMode_132OK),
1034 const_iv (PrivMode_rVideo),
1035 const_iv (PrivMode_relOrigin),
1036 const_iv (PrivMode_Screen),
1037 const_iv (PrivMode_Autowrap),
1038 const_iv (PrivMode_aplCUR),
1039 const_iv (PrivMode_aplKP),
1040 const_iv (PrivMode_HaveBackSpace),
1041 const_iv (PrivMode_BackSpace),
1042 const_iv (PrivMode_ShiftKeys),
1043 const_iv (PrivMode_VisibleCursor),
1044 const_iv (PrivMode_MouseX10),
1045 const_iv (PrivMode_MouseX11),
1046 const_iv (PrivMode_scrollBar),
1047 const_iv (PrivMode_TtyOutputInh),
1048 const_iv (PrivMode_Keypress),
1049 const_iv (PrivMode_smoothScroll),
1050 const_iv (PrivMode_vt52),
1051 const_iv (PrivMode_LFNL),
1052 const_iv (PrivMode_MouseBtnEvent),
1053 const_iv (PrivMode_MouseAnyEvent),
1054 const_iv (PrivMode_BracketPaste),
1055 const_iv (PrivMode_ExtMouseUTF8),
1056 const_iv (PrivMode_ExtMouseUrxvt),
1057 const_iv (PrivMode_BlinkingCursor),
1058 const_iv (PrivMode_mouse_report),
1059 const_iv (PrivMode_Default),
1025 }; 1060 };
1026 1061
1027 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1062 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
1028 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1063 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1029} 1064}
… …
1387#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1422#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1388#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1423#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1389#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1424#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1390 1425
1391int 1426int
1392rxvt_term::width () 1427rxvt_term::width (int new_value = NO_INIT)
1393 ALIAS: 1428 ALIAS:
1394 width = TERM_OFFSET_width 1429 width = TERM_OFFSET_width
1395 height = TERM_OFFSET_height 1430 height = TERM_OFFSET_height
1396 fwidth = TERM_OFFSET_fwidth 1431 fwidth = TERM_OFFSET_fwidth
1397 fheight = TERM_OFFSET_fheight 1432 fheight = TERM_OFFSET_fheight
… …
1407 saveLines = TERM_OFFSET_saveLines 1442 saveLines = TERM_OFFSET_saveLines
1408 total_rows = TERM_OFFSET_total_rows 1443 total_rows = TERM_OFFSET_total_rows
1409 top_row = TERM_OFFSET_top_row 1444 top_row = TERM_OFFSET_top_row
1410 CODE: 1445 CODE:
1411 RETVAL = *(int *)((char *)THIS + ix); 1446 RETVAL = *(int *)((char *)THIS + ix);
1447 if (items > 1)
1448 *(int *)((char *)THIS + ix) = new_value;
1412 OUTPUT: 1449 OUTPUT:
1413 RETVAL 1450 RETVAL
1414 1451
1415unsigned int 1452unsigned int
1416rxvt_term::ModLevel3Mask () 1453rxvt_term::ModLevel3Mask ()
… …
1418 ModLevel3Mask = 0 1455 ModLevel3Mask = 0
1419 ModMetaMask = 1 1456 ModMetaMask = 1
1420 ModNumLockMask = 2 1457 ModNumLockMask = 2
1421 current_screen = 3 1458 current_screen = 3
1422 hidden_cursor = 4 1459 hidden_cursor = 4
1460 priv_modes = 5
1423 CODE: 1461 CODE:
1424 switch (ix) 1462 switch (ix)
1425 { 1463 {
1426 case 0: RETVAL = THIS->ModLevel3Mask; break; 1464 case 0: RETVAL = THIS->ModLevel3Mask; break;
1427 case 1: RETVAL = THIS->ModMetaMask; break; 1465 case 1: RETVAL = THIS->ModMetaMask; break;
1428 case 2: RETVAL = THIS->ModNumLockMask; break; 1466 case 2: RETVAL = THIS->ModNumLockMask; break;
1429 case 3: RETVAL = THIS->current_screen; break; 1467 case 3: RETVAL = THIS->current_screen; break;
1430#ifdef CURSOR_BLINK 1468#ifdef CURSOR_BLINK
1431 case 4: RETVAL = THIS->hidden_cursor; break; 1469 case 4: RETVAL = THIS->hidden_cursor; break;
1470#else
1471 case 4: RETVAL = 0; break;
1432#endif 1472#endif
1473 case 5: RETVAL = THIS->priv_modes; break;
1433 } 1474 }
1434 OUTPUT: 1475 OUTPUT:
1435 RETVAL 1476 RETVAL
1436 1477
1437char * 1478char *
… …
1795 index += rs->value; 1836 index += rs->value;
1796 } 1837 }
1797 else 1838 else
1798 { 1839 {
1799 --rs; 1840 --rs;
1800 name = ""; 1841 name = (octet_string)"";
1801 } 1842 }
1802 1843
1803 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1844 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1804 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);
1805 1846
… …
2275 RETVAL 2316 RETVAL
2276 2317
2277#endif 2318#endif
2278 2319
2279void 2320void
2280rxvt_term::set_background (rxvt_img *img, bool border = false) 2321rxvt_term::clr_background ()
2281 CODE: 2322 CODE:
2282 delete THIS->bg_img; 2323 delete THIS->bg_img;
2283 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;
2284 THIS->bg_flags = 0; 2331 THIS->bg_img = 0;
2332 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2285 2333
2286 if (img) // TODO: cannot be false 2334 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2287 { 2335 {
2288 img = img->clone (); // own the img 2336 img = img->clone (); // own the img
2289 2337
2290 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2338 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2291 img->sub_rect (0, 0, 2339 img->sub_rect (0, 0,
… …
2299 2347
2300 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])
2301 ->replace (img); 2349 ->replace (img);
2302 2350
2303 THIS->bg_img = img; 2351 THIS->bg_img = img;
2304 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2305 2352
2306 if (!border) 2353 if (!border)
2307 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2354 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2308 } 2355 }
2309 2356
… …
2386 2433
2387void 2434void
2388rxvt_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)
2389 PROTOTYPE: $;$$$$ 2436 PROTOTYPE: $;$$$$
2390 INIT: 2437 INIT:
2391 rgba cc = parse_rgba (c, THIS->s); 2438 rxvt_screen screen;
2439 screen.set (THIS->d);
2440 rgba cc = parse_rgba (c, &screen);
2392 C_ARGS: cc, x, y, w, h 2441 C_ARGS: cc, x, y, w, h
2393 2442
2394void 2443void
2395rxvt_img::DESTROY () 2444rxvt_img::DESTROY ()
2396 CODE: 2445 CODE:
… …
2454rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2503rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2455 2504
2456rxvt_img * 2505rxvt_img *
2457rxvt_img::tint (SV *c) 2506rxvt_img::tint (SV *c)
2458 INIT: 2507 INIT:
2459 rgba cc = parse_rgba (c, THIS->s); 2508 rxvt_screen screen;
2509 screen.set (THIS->d);
2510 rgba cc = parse_rgba (c, &screen);
2460 C_ARGS: cc 2511 C_ARGS: cc
2461 2512
2462rxvt_img * 2513rxvt_img *
2463rxvt_img::shade (rxvt_img::nv factor) 2514rxvt_img::shade (rxvt_img::nv factor)
2464 2515

Diff Legend

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