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.229 by sf-exg, Mon Oct 13 17:05:32 2014 UTC vs.
Revision 1.245 by root, Tue Sep 17 20:38:14 2019 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2014,2011 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2005-2014 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 3 of the License, or 10 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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}
1030 1061
1031void 1062void
1032log (const char *msg) 1063log (utf8_string msg)
1033 CODE: 1064 CODE:
1034 rxvt_log ("%s", msg); 1065 rxvt_log ("%s", msg);
1035 1066
1036void 1067void
1037warn (const char *msg) 1068warn (utf8_string msg)
1038 CODE: 1069 CODE:
1039 rxvt_warn ("%s", msg); 1070 rxvt_warn ("%s", msg);
1040 1071
1041void 1072void
1042fatal (const char *msg) 1073fatal (utf8_string msg)
1043 CODE: 1074 CODE:
1044 rxvt_fatal ("%s", msg); 1075 rxvt_fatal ("%s", msg);
1045 1076
1046void 1077void
1047_exit (int status) 1078_exit (int status)
… …
1287rxvt_term::ungrab () 1318rxvt_term::ungrab ()
1288 CODE: 1319 CODE:
1289 ungrab (THIS); 1320 ungrab (THIS);
1290 1321
1291int 1322int
1292rxvt_term::XStringToKeysym (char *string) 1323rxvt_term::XStringToKeysym (octet_string string)
1293 CODE: 1324 CODE:
1294 RETVAL = XStringToKeysym (string); 1325 RETVAL = XStringToKeysym (string);
1295 OUTPUT: RETVAL 1326 OUTPUT: RETVAL
1296 1327
1297char * 1328char *
… …
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 *
… …
1572void 1609void
1573rxvt_term::want_refresh () 1610rxvt_term::want_refresh ()
1574 CODE: 1611 CODE:
1575 THIS->want_refresh = 1; 1612 THIS->want_refresh = 1;
1576 THIS->refresh_check (); 1613 THIS->refresh_check ();
1614
1615void
1616rxvt_term::refresh_check ()
1577 1617
1578void 1618void
1579rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1619rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1580 PPCODE: 1620 PPCODE:
1581{ 1621{
… …
1726 *r++ = NOCHAR; 1766 *r++ = NOCHAR;
1727 } 1767 }
1728 1768
1729 rxvt_pop_locale (); 1769 rxvt_pop_locale ();
1730 1770
1771 free (wstr);
1731 RETVAL = wcs2sv (rstr, r - rstr); 1772 RETVAL = wcs2sv (rstr, r - rstr);
1732} 1773}
1733 OUTPUT: 1774 OUTPUT:
1734 RETVAL 1775 RETVAL
1735 1776
… …
1759 else if (IS_COMPOSE (*s)) 1800 else if (IS_COMPOSE (*s))
1760 r += rxvt_composite.expand (*s, r); 1801 r += rxvt_composite.expand (*s, r);
1761 else 1802 else
1762 *r++ = *s; 1803 *r++ = *s;
1763 1804
1805 free (wstr);
1764 RETVAL = wcs2sv (rstr, r - rstr); 1806 RETVAL = wcs2sv (rstr, r - rstr);
1765} 1807}
1766 OUTPUT: 1808 OUTPUT:
1767 RETVAL 1809 RETVAL
1768 1810
1769void 1811void
1770rxvt_term::_resource (char *name, int index, SV *newval = 0) 1812rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1771 PPCODE: 1813 PPCODE:
1772{ 1814{
1773 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1815 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1774# define def(name) { # name, Rs_ ## name }, 1816# define def(name) { # name, Rs_ ## name },
1775# define reserve(name,count) 1817# define reserve(name,count)
… …
1790 index += rs->value; 1832 index += rs->value;
1791 } 1833 }
1792 else 1834 else
1793 { 1835 {
1794 --rs; 1836 --rs;
1795 name = ""; 1837 name = (octet_string)"";
1796 } 1838 }
1797 1839
1798 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1840 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1799 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);
1800 1842
… …
1813 THIS->rs [index] = 0; 1855 THIS->rs [index] = 0;
1814 } 1856 }
1815} 1857}
1816 1858
1817const char * 1859const char *
1818rxvt_term::x_resource (const char *name) 1860rxvt_term::x_resource (octet_string name)
1819 1861
1820bool 1862bool
1821rxvt_term::option (U8 optval, int set = -1) 1863rxvt_term::option (U8 optval, int set = -1)
1822 CODE: 1864 CODE:
1823{ 1865{
… …
1857 } 1899 }
1858} 1900}
1859 OUTPUT: 1901 OUTPUT:
1860 RETVAL 1902 RETVAL
1861 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
1862bool 1914bool
1863rxvt_term::bind_action (char *keysym, char *str) 1915rxvt_term::bind_action (octet_string keysym, octet_string action)
1864 ALIAS: 1916 ALIAS:
1865 parse_keysym = 1 1917 parse_keysym = 1
1866 CODE: 1918 CODE:
1867 RETVAL = 0 < THIS->bind_action (keysym, str); 1919 RETVAL = 0 < THIS->bind_action (keysym, action);
1868 THIS->keyboard->register_done (); 1920 THIS->keyboard->register_done ();
1869 OUTPUT: 1921 OUTPUT:
1870 RETVAL 1922 RETVAL
1871 1923
1872void 1924void
… …
1993 2045
1994void 2046void
1995rxvt_term::scr_bell () 2047rxvt_term::scr_bell ()
1996 2048
1997void 2049void
1998rxvt_term::scr_recolour (bool refresh = true); 2050rxvt_term::scr_recolor (bool refresh = true);
1999 2051
2000void 2052void
2001rxvt_term::scr_change_screen (int screen) 2053rxvt_term::scr_change_screen (int screen)
2002 2054
2003void 2055void
… …
2260 RETVAL 2312 RETVAL
2261 2313
2262#endif 2314#endif
2263 2315
2264void 2316void
2265rxvt_term::set_background (rxvt_img *img, bool border = false) 2317rxvt_term::clr_background ()
2266 CODE: 2318 CODE:
2267 delete THIS->bg_img; 2319 delete THIS->bg_img;
2268 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;
2269 THIS->bg_flags = 0; 2327 THIS->bg_img = 0;
2328 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2270 2329
2271 if (img) // TODO: cannot be false 2330 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2272 { 2331 {
2273 img = img->clone (); // own the img 2332 img = img->clone (); // own the img
2274 2333
2275 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2334 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2276 img->sub_rect (0, 0, 2335 img->sub_rect (0, 0,
… …
2284 2343
2285 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])
2286 ->replace (img); 2345 ->replace (img);
2287 2346
2288 THIS->bg_img = img; 2347 THIS->bg_img = img;
2289 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2290 2348
2291 if (!border) 2349 if (!border)
2292 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2350 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2293 } 2351 }
2294 2352
… …
2371 2429
2372void 2430void
2373rxvt_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)
2374 PROTOTYPE: $;$$$$ 2432 PROTOTYPE: $;$$$$
2375 INIT: 2433 INIT:
2376 rgba cc = parse_rgba (c, THIS->s); 2434 rxvt_screen screen;
2435 screen.set (THIS->d);
2436 rgba cc = parse_rgba (c, &screen);
2377 C_ARGS: cc, x, y, w, h 2437 C_ARGS: cc, x, y, w, h
2378 2438
2379void 2439void
2380rxvt_img::DESTROY () 2440rxvt_img::DESTROY ()
2381 CODE: 2441 CODE:
… …
2439rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2499rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2440 2500
2441rxvt_img * 2501rxvt_img *
2442rxvt_img::tint (SV *c) 2502rxvt_img::tint (SV *c)
2443 INIT: 2503 INIT:
2444 rgba cc = parse_rgba (c, THIS->s); 2504 rxvt_screen screen;
2505 screen.set (THIS->d);
2506 rgba cc = parse_rgba (c, &screen);
2445 C_ARGS: cc 2507 C_ARGS: cc
2446 2508
2447rxvt_img * 2509rxvt_img *
2448rxvt_img::shade (rxvt_img::nv factor) 2510rxvt_img::shade (rxvt_img::nv factor)
2449 2511

Diff Legend

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