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.226 by sf-exg, Wed Sep 3 18:20:37 2014 UTC vs.
Revision 1.243 by root, Mon Dec 24 07:55:33 2018 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;
… …
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 = 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);
… …
495} 496}
496 497
497static void 498static void
498_keysym_resource_push (rxvt_term *term, const char *k, const char *v) 499_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
499{ 500{
501 unsigned int state;
502
503 if (term->parse_keysym (k, state) == -1)
504 return;
505
500 dSP; 506 dSP;
501 XPUSHs (sv_2mortal (newSVpv (v, 0))); 507 XPUSHs (sv_2mortal (newSVpv (v, 0)));
502 PUTBACK; 508 PUTBACK;
503} 509}
504 510
… …
1015 const_iv (XIMLineEnd), 1021 const_iv (XIMLineEnd),
1016 const_iv (XIMAbsolutePosition), 1022 const_iv (XIMAbsolutePosition),
1017 const_iv (XIMDontChange), 1023 const_iv (XIMDontChange),
1018# endif 1024# endif
1019# 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),
1020 }; 1056 };
1021 1057
1022 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--)
1023 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1059 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1024} 1060}
1025 1061
1026void 1062void
1027log (const char *msg) 1063log (utf8_string msg)
1028 CODE: 1064 CODE:
1029 rxvt_log ("%s", msg); 1065 rxvt_log ("%s", msg);
1030 1066
1031void 1067void
1032warn (const char *msg) 1068warn (utf8_string msg)
1033 CODE: 1069 CODE:
1034 rxvt_warn ("%s", msg); 1070 rxvt_warn ("%s", msg);
1035 1071
1036void 1072void
1037fatal (const char *msg) 1073fatal (utf8_string msg)
1038 CODE: 1074 CODE:
1039 rxvt_fatal ("%s", msg); 1075 rxvt_fatal ("%s", msg);
1040 1076
1041void 1077void
1042_exit (int status) 1078_exit (int status)
… …
1282rxvt_term::ungrab () 1318rxvt_term::ungrab ()
1283 CODE: 1319 CODE:
1284 ungrab (THIS); 1320 ungrab (THIS);
1285 1321
1286int 1322int
1287rxvt_term::XStringToKeysym (char *string) 1323rxvt_term::XStringToKeysym (octet_string string)
1288 CODE: 1324 CODE:
1289 RETVAL = XStringToKeysym (string); 1325 RETVAL = XStringToKeysym (string);
1290 OUTPUT: RETVAL 1326 OUTPUT: RETVAL
1291 1327
1292char * 1328char *
… …
1302 OUTPUT: RETVAL 1338 OUTPUT: RETVAL
1303 1339
1304int 1340int
1305rxvt_term::XKeycodeToKeysym (int code, int index) 1341rxvt_term::XKeycodeToKeysym (int code, int index)
1306 CODE: 1342 CODE:
1307 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1343 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1308 OUTPUT: RETVAL 1344 OUTPUT: RETVAL
1309 1345
1310int 1346int
1311rxvt_term::strwidth (SV *str) 1347rxvt_term::strwidth (SV *str)
1312 CODE: 1348 CODE:
… …
1382#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1418#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1383#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1419#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1384#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1420#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1385 1421
1386int 1422int
1387rxvt_term::width () 1423rxvt_term::width (int new_value = NO_INIT)
1388 ALIAS: 1424 ALIAS:
1389 width = TERM_OFFSET_width 1425 width = TERM_OFFSET_width
1390 height = TERM_OFFSET_height 1426 height = TERM_OFFSET_height
1391 fwidth = TERM_OFFSET_fwidth 1427 fwidth = TERM_OFFSET_fwidth
1392 fheight = TERM_OFFSET_fheight 1428 fheight = TERM_OFFSET_fheight
… …
1402 saveLines = TERM_OFFSET_saveLines 1438 saveLines = TERM_OFFSET_saveLines
1403 total_rows = TERM_OFFSET_total_rows 1439 total_rows = TERM_OFFSET_total_rows
1404 top_row = TERM_OFFSET_top_row 1440 top_row = TERM_OFFSET_top_row
1405 CODE: 1441 CODE:
1406 RETVAL = *(int *)((char *)THIS + ix); 1442 RETVAL = *(int *)((char *)THIS + ix);
1443 if (items > 1)
1444 *(int *)((char *)THIS + ix) = new_value;
1407 OUTPUT: 1445 OUTPUT:
1408 RETVAL 1446 RETVAL
1409 1447
1410unsigned int 1448unsigned int
1411rxvt_term::ModLevel3Mask () 1449rxvt_term::ModLevel3Mask ()
… …
1413 ModLevel3Mask = 0 1451 ModLevel3Mask = 0
1414 ModMetaMask = 1 1452 ModMetaMask = 1
1415 ModNumLockMask = 2 1453 ModNumLockMask = 2
1416 current_screen = 3 1454 current_screen = 3
1417 hidden_cursor = 4 1455 hidden_cursor = 4
1456 priv_modes = 5
1418 CODE: 1457 CODE:
1419 switch (ix) 1458 switch (ix)
1420 { 1459 {
1421 case 0: RETVAL = THIS->ModLevel3Mask; break; 1460 case 0: RETVAL = THIS->ModLevel3Mask; break;
1422 case 1: RETVAL = THIS->ModMetaMask; break; 1461 case 1: RETVAL = THIS->ModMetaMask; break;
1423 case 2: RETVAL = THIS->ModNumLockMask; break; 1462 case 2: RETVAL = THIS->ModNumLockMask; break;
1424 case 3: RETVAL = THIS->current_screen; break; 1463 case 3: RETVAL = THIS->current_screen; break;
1425#ifdef CURSOR_BLINK 1464#ifdef CURSOR_BLINK
1426 case 4: RETVAL = THIS->hidden_cursor; break; 1465 case 4: RETVAL = THIS->hidden_cursor; break;
1466#else
1467 case 4: RETVAL = 0; break;
1427#endif 1468#endif
1469 case 5: RETVAL = THIS->priv_modes; break;
1428 } 1470 }
1429 OUTPUT: 1471 OUTPUT:
1430 RETVAL 1472 RETVAL
1431 1473
1432char * 1474char *
… …
1567void 1609void
1568rxvt_term::want_refresh () 1610rxvt_term::want_refresh ()
1569 CODE: 1611 CODE:
1570 THIS->want_refresh = 1; 1612 THIS->want_refresh = 1;
1571 THIS->refresh_check (); 1613 THIS->refresh_check ();
1614
1615void
1616rxvt_term::refresh_check ()
1572 1617
1573void 1618void
1574rxvt_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)
1575 PPCODE: 1620 PPCODE:
1576{ 1621{
… …
1721 *r++ = NOCHAR; 1766 *r++ = NOCHAR;
1722 } 1767 }
1723 1768
1724 rxvt_pop_locale (); 1769 rxvt_pop_locale ();
1725 1770
1771 free (wstr);
1726 RETVAL = wcs2sv (rstr, r - rstr); 1772 RETVAL = wcs2sv (rstr, r - rstr);
1727} 1773}
1728 OUTPUT: 1774 OUTPUT:
1729 RETVAL 1775 RETVAL
1730 1776
… …
1754 else if (IS_COMPOSE (*s)) 1800 else if (IS_COMPOSE (*s))
1755 r += rxvt_composite.expand (*s, r); 1801 r += rxvt_composite.expand (*s, r);
1756 else 1802 else
1757 *r++ = *s; 1803 *r++ = *s;
1758 1804
1805 free (wstr);
1759 RETVAL = wcs2sv (rstr, r - rstr); 1806 RETVAL = wcs2sv (rstr, r - rstr);
1760} 1807}
1761 OUTPUT: 1808 OUTPUT:
1762 RETVAL 1809 RETVAL
1763 1810
1764void 1811void
1765rxvt_term::_resource (char *name, int index, SV *newval = 0) 1812rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1766 PPCODE: 1813 PPCODE:
1767{ 1814{
1768 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1815 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1769# define def(name) { # name, Rs_ ## name }, 1816# define def(name) { # name, Rs_ ## name },
1770# define reserve(name,count) 1817# define reserve(name,count)
… …
1808 THIS->rs [index] = 0; 1855 THIS->rs [index] = 0;
1809 } 1856 }
1810} 1857}
1811 1858
1812const char * 1859const char *
1813rxvt_term::x_resource (const char *name) 1860rxvt_term::x_resource (octet_string name)
1814 1861
1815bool 1862bool
1816rxvt_term::option (U8 optval, int set = -1) 1863rxvt_term::option (U8 optval, int set = -1)
1817 CODE: 1864 CODE:
1818{ 1865{
… …
1852 } 1899 }
1853} 1900}
1854 OUTPUT: 1901 OUTPUT:
1855 RETVAL 1902 RETVAL
1856 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
1857bool 1914bool
1858rxvt_term::bind_action (char *keysym, char *str) 1915rxvt_term::bind_action (octet_string keysym, octet_string action)
1859 ALIAS: 1916 ALIAS:
1860 parse_keysym = 1 1917 parse_keysym = 1
1861 CODE: 1918 CODE:
1862 RETVAL = 0 < THIS->bind_action (keysym, str); 1919 RETVAL = 0 < THIS->bind_action (keysym, action);
1863 THIS->keyboard->register_done (); 1920 THIS->keyboard->register_done ();
1864 OUTPUT: 1921 OUTPUT:
1865 RETVAL 1922 RETVAL
1923
1924void
1925rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1926 CODE:
1927 wchar_t *wstr = sv2wcs (str);
1928 THIS->keyboard->register_action (keysym, state, wstr);
1929 free (wstr);
1866 1930
1867void 1931void
1868rxvt_term::screen_cur (...) 1932rxvt_term::screen_cur (...)
1869 PROTOTYPE: $;$$ 1933 PROTOTYPE: $;$$
1870 ALIAS: 1934 ALIAS:
… …
1981 2045
1982void 2046void
1983rxvt_term::scr_bell () 2047rxvt_term::scr_bell ()
1984 2048
1985void 2049void
1986rxvt_term::scr_recolour (bool refresh = true); 2050rxvt_term::scr_recolor (bool refresh = true);
1987 2051
1988void 2052void
1989rxvt_term::scr_change_screen (int screen) 2053rxvt_term::scr_change_screen (int screen)
1990 2054
1991void 2055void
… …
2272 2336
2273 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2337 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2274 ->replace (img); 2338 ->replace (img);
2275 2339
2276 THIS->bg_img = img; 2340 THIS->bg_img = img;
2277 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER; 2341 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
2278 2342
2279 if (!border) 2343 if (!border)
2280 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2344 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2281 } 2345 }
2282 2346
… …
2359 2423
2360void 2424void
2361rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h) 2425rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2362 PROTOTYPE: $;$$$$ 2426 PROTOTYPE: $;$$$$
2363 INIT: 2427 INIT:
2364 rgba cc = parse_rgba (c, THIS->s); 2428 rxvt_screen screen;
2429 screen.set (THIS->d);
2430 rgba cc = parse_rgba (c, &screen);
2365 C_ARGS: cc, x, y, w, h 2431 C_ARGS: cc, x, y, w, h
2366 2432
2367void 2433void
2368rxvt_img::DESTROY () 2434rxvt_img::DESTROY ()
2369 CODE: 2435 CODE:
… …
2427rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2493rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2428 2494
2429rxvt_img * 2495rxvt_img *
2430rxvt_img::tint (SV *c) 2496rxvt_img::tint (SV *c)
2431 INIT: 2497 INIT:
2432 rgba cc = parse_rgba (c, THIS->s); 2498 rxvt_screen screen;
2499 screen.set (THIS->d);
2500 rgba cc = parse_rgba (c, &screen);
2433 C_ARGS: cc 2501 C_ARGS: cc
2434 2502
2435rxvt_img * 2503rxvt_img *
2436rxvt_img::shade (rxvt_img::nv factor) 2504rxvt_img::shade (rxvt_img::nv factor)
2437 2505

Diff Legend

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