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.235 by sf-exg, Tue Feb 17 14:48:59 2015 UTC vs.
Revision 1.246 by root, Mon Jan 20 09:35:12 2020 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;
… …
391 391
392 { 392 {
393 perl_environ = rxvt_environ; 393 perl_environ = rxvt_environ;
394 localise_env set_environ (perl_environ); 394 localise_env set_environ (perl_environ);
395 395
396 char *args[] = { 396 const char *args[] = {
397 "", 397 "",
398 "-e" 398 "-e"
399 "BEGIN {" 399 "BEGIN {"
400 " urxvt->bootstrap;" 400 " urxvt->bootstrap;"
401 " unshift @INC, '" LIBDIR "';" 401 " unshift @INC, '" LIBDIR "';"
402 "}" 402 "}"
403 "" 403 ""
404 "use urxvt;" 404 "use urxvt;",
405 0
405 }; 406 };
406 int argc = ecb_array_length (args); 407 int argc = ecb_array_length (args) - 1;
407 char **argv = args; 408 char **argv = (char **)args;
408 409
409 PERL_SYS_INIT3 (&argc, &argv, &environ); 410 PERL_SYS_INIT3 (&argc, &argv, &environ);
410 perl = perl_alloc (); 411 perl = perl_alloc ();
411 perl_construct (perl); 412 perl_construct (perl);
412 413
… …
1020 const_iv (XIMLineEnd), 1021 const_iv (XIMLineEnd),
1021 const_iv (XIMAbsolutePosition), 1022 const_iv (XIMAbsolutePosition),
1022 const_iv (XIMDontChange), 1023 const_iv (XIMDontChange),
1023# endif 1024# endif
1024# endif 1025# endif
1026
1027 /* DEC private modes */
1028 const_iv (PrivMode_132),
1029 const_iv (PrivMode_132OK),
1030 const_iv (PrivMode_rVideo),
1031 const_iv (PrivMode_relOrigin),
1032 const_iv (PrivMode_Screen),
1033 const_iv (PrivMode_Autowrap),
1034 const_iv (PrivMode_aplCUR),
1035 const_iv (PrivMode_aplKP),
1036 const_iv (PrivMode_HaveBackSpace),
1037 const_iv (PrivMode_BackSpace),
1038 const_iv (PrivMode_ShiftKeys),
1039 const_iv (PrivMode_VisibleCursor),
1040 const_iv (PrivMode_MouseX10),
1041 const_iv (PrivMode_MouseX11),
1042 const_iv (PrivMode_scrollBar),
1043 const_iv (PrivMode_TtyOutputInh),
1044 const_iv (PrivMode_Keypress),
1045 const_iv (PrivMode_smoothScroll),
1046 const_iv (PrivMode_vt52),
1047 const_iv (PrivMode_LFNL),
1048 const_iv (PrivMode_MouseBtnEvent),
1049 const_iv (PrivMode_MouseAnyEvent),
1050 const_iv (PrivMode_BracketPaste),
1051 const_iv (PrivMode_ExtModeMouse),
1052 const_iv (PrivMode_ExtMouseRight),
1053 const_iv (PrivMode_BlinkingCursor),
1054 const_iv (PrivMode_mouse_report),
1055 const_iv (PrivMode_Default),
1025 }; 1056 };
1026 1057
1027 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1058 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
1028 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1059 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1029} 1060}
… …
1387#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1418#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1388#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1419#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1389#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1420#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1390 1421
1391int 1422int
1392rxvt_term::width () 1423rxvt_term::width (int new_value = NO_INIT)
1393 ALIAS: 1424 ALIAS:
1394 width = TERM_OFFSET_width 1425 width = TERM_OFFSET_width
1395 height = TERM_OFFSET_height 1426 height = TERM_OFFSET_height
1396 fwidth = TERM_OFFSET_fwidth 1427 fwidth = TERM_OFFSET_fwidth
1397 fheight = TERM_OFFSET_fheight 1428 fheight = TERM_OFFSET_fheight
… …
1407 saveLines = TERM_OFFSET_saveLines 1438 saveLines = TERM_OFFSET_saveLines
1408 total_rows = TERM_OFFSET_total_rows 1439 total_rows = TERM_OFFSET_total_rows
1409 top_row = TERM_OFFSET_top_row 1440 top_row = TERM_OFFSET_top_row
1410 CODE: 1441 CODE:
1411 RETVAL = *(int *)((char *)THIS + ix); 1442 RETVAL = *(int *)((char *)THIS + ix);
1443 if (items > 1)
1444 *(int *)((char *)THIS + ix) = new_value;
1412 OUTPUT: 1445 OUTPUT:
1413 RETVAL 1446 RETVAL
1414 1447
1415unsigned int 1448unsigned int
1416rxvt_term::ModLevel3Mask () 1449rxvt_term::ModLevel3Mask ()
… …
1418 ModLevel3Mask = 0 1451 ModLevel3Mask = 0
1419 ModMetaMask = 1 1452 ModMetaMask = 1
1420 ModNumLockMask = 2 1453 ModNumLockMask = 2
1421 current_screen = 3 1454 current_screen = 3
1422 hidden_cursor = 4 1455 hidden_cursor = 4
1456 priv_modes = 5
1423 CODE: 1457 CODE:
1424 switch (ix) 1458 switch (ix)
1425 { 1459 {
1426 case 0: RETVAL = THIS->ModLevel3Mask; break; 1460 case 0: RETVAL = THIS->ModLevel3Mask; break;
1427 case 1: RETVAL = THIS->ModMetaMask; break; 1461 case 1: RETVAL = THIS->ModMetaMask; break;
1428 case 2: RETVAL = THIS->ModNumLockMask; break; 1462 case 2: RETVAL = THIS->ModNumLockMask; break;
1429 case 3: RETVAL = THIS->current_screen; break; 1463 case 3: RETVAL = THIS->current_screen; break;
1430#ifdef CURSOR_BLINK 1464#ifdef CURSOR_BLINK
1431 case 4: RETVAL = THIS->hidden_cursor; break; 1465 case 4: RETVAL = THIS->hidden_cursor; break;
1466#else
1467 case 4: RETVAL = 0; break;
1432#endif 1468#endif
1469 case 5: RETVAL = THIS->priv_modes; break;
1433 } 1470 }
1434 OUTPUT: 1471 OUTPUT:
1435 RETVAL 1472 RETVAL
1436 1473
1437char * 1474char *
… …
1795 index += rs->value; 1832 index += rs->value;
1796 } 1833 }
1797 else 1834 else
1798 { 1835 {
1799 --rs; 1836 --rs;
1800 name = ""; 1837 name = (octet_string)"";
1801 } 1838 }
1802 1839
1803 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1840 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1804 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1841 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1805 1842
… …
1862 } 1899 }
1863} 1900}
1864 OUTPUT: 1901 OUTPUT:
1865 RETVAL 1902 RETVAL
1866 1903
1904SV *
1905rxvt_term::lookup_keysym (int keysym, unsigned int state)
1906 CODE:
1907{
1908 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1909 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1910}
1911 OUTPUT:
1912 RETVAL
1913
1867bool 1914bool
1868rxvt_term::bind_action (octet_string keysym, octet_string action) 1915rxvt_term::bind_action (octet_string keysym, octet_string action)
1869 ALIAS: 1916 ALIAS:
1870 parse_keysym = 1 1917 parse_keysym = 1
1871 CODE: 1918 CODE:
… …
2265 RETVAL 2312 RETVAL
2266 2313
2267#endif 2314#endif
2268 2315
2269void 2316void
2270rxvt_term::set_background (rxvt_img *img, bool border = false) 2317rxvt_term::clr_background ()
2271 CODE: 2318 CODE:
2272 delete THIS->bg_img; 2319 delete THIS->bg_img;
2273 THIS->bg_img = 0; 2320 THIS->bg_img = 0;
2321 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2322
2323void
2324rxvt_term::set_background (rxvt_img *img, bool border = false)
2325 CODE:
2326 delete THIS->bg_img;
2274 THIS->bg_flags = 0; 2327 THIS->bg_img = 0;
2328 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2275 2329
2276 if (img) // TODO: cannot be false 2330 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2277 { 2331 {
2278 img = img->clone (); // own the img 2332 img = img->clone (); // own the img
2279 2333
2280 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2334 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2281 img->sub_rect (0, 0, 2335 img->sub_rect (0, 0,
… …
2289 2343
2290 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2344 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2291 ->replace (img); 2345 ->replace (img);
2292 2346
2293 THIS->bg_img = img; 2347 THIS->bg_img = img;
2294 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2295 2348
2296 if (!border) 2349 if (!border)
2297 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2350 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2298 } 2351 }
2299 2352
… …
2376 2429
2377void 2430void
2378rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h) 2431rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2379 PROTOTYPE: $;$$$$ 2432 PROTOTYPE: $;$$$$
2380 INIT: 2433 INIT:
2381 rgba cc = parse_rgba (c, THIS->s); 2434 rxvt_screen screen;
2435 screen.set (THIS->d);
2436 rgba cc = parse_rgba (c, &screen);
2382 C_ARGS: cc, x, y, w, h 2437 C_ARGS: cc, x, y, w, h
2383 2438
2384void 2439void
2385rxvt_img::DESTROY () 2440rxvt_img::DESTROY ()
2386 CODE: 2441 CODE:
… …
2444rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2499rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2445 2500
2446rxvt_img * 2501rxvt_img *
2447rxvt_img::tint (SV *c) 2502rxvt_img::tint (SV *c)
2448 INIT: 2503 INIT:
2449 rgba cc = parse_rgba (c, THIS->s); 2504 rxvt_screen screen;
2505 screen.set (THIS->d);
2506 rgba cc = parse_rgba (c, &screen);
2450 C_ARGS: cc 2507 C_ARGS: cc
2451 2508
2452rxvt_img * 2509rxvt_img *
2453rxvt_img::shade (rxvt_img::nv factor) 2510rxvt_img::shade (rxvt_img::nv factor)
2454 2511

Diff Legend

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