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.206 by root, Sat Jul 7 07:00:17 2012 UTC vs.
Revision 1.255 by root, Sun Nov 21 23:00:48 2021 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-2008,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 2 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.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57typedef int render_repeat_mode; 57typedef int render_repeat_mode;
58 58
59#if HAVE_PIXBUF 59#if HAVE_PIXBUF
60typedef GdkPixbuf * urxvt__pixbuf; 60typedef GdkPixbuf * urxvt__pixbuf;
61#endif 61#endif
62#if HAVE_IMG
62typedef rxvt_img * urxvt__img; 63typedef rxvt_img * urxvt__img;
63typedef rxvt_img::nv rxvt_img__nv; 64typedef rxvt_img::nv rxvt_img__nv;
64 65
65///////////////////////////////////////////////////////////////////////////// 66/////////////////////////////////////////////////////////////////////////////
66 67
81 if (len != 1 && len != 3 && len != 4) 82 if (len != 1 && len != 3 && len != 4)
82 croak ("component colour array must have 1, 3 or 4 components,"); 83 croak ("component colour array must have 1, 3 or 4 components,");
83 84
84 c.a = rgba::MAX_CC; 85 c.a = rgba::MAX_CC;
85 86
86 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)));
87 88
88 if (len >= 3) 89 if (len >= 3)
89 { 90 {
90 c.g = float_to_component (SvIV (*av_fetch (av, 1, 0))); 91 c.g = float_to_component (SvNV (*av_fetch (av, 1, 0)));
91 c.b = float_to_component (SvIV (*av_fetch (av, 2, 0))); 92 c.b = float_to_component (SvNV (*av_fetch (av, 2, 0)));
92 93
93 if (len >= 4) 94 if (len >= 4)
94 c.a = float_to_component (SvIV (*av_fetch (av, 3, 0))); 95 c.a = float_to_component (SvNV (*av_fetch (av, 3, 0)));
95 } 96 }
96 } 97 }
97 else if (s) 98 else if (s)
98 { 99 {
99 rxvt_color rc; 100 rxvt_color rc;
105 106
106 return c; 107 return c;
107} 108}
108 109
109///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
111#endif
110 112
111static wchar_t * 113static wchar_t *
112sv2wcs (SV *sv) 114sv2wcs (SV *sv)
113{ 115{
114 STRLEN len; 116 STRLEN len;
289 break; 291 break;
290 292
291 for (; i < AvFILL (overlay_av); i++) 293 for (; i < AvFILL (overlay_av); i++)
292 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)));
293 295
294 av_pop (overlay_av); 296 SvREFCNT_dec (av_pop (overlay_av));
295 297
296 SvREFCNT_dec (overlay_av); 298 SvREFCNT_dec (overlay_av);
297 overlay_av = 0; 299 overlay_av = 0;
298 300
299 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
368 370
369struct rxvt_perl_interp rxvt_perl; 371struct rxvt_perl_interp rxvt_perl;
370 372
371static PerlInterpreter *perl; 373static PerlInterpreter *perl;
372 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... */
373rxvt_perl_interp::~rxvt_perl_interp () 378rxvt_perl_interp::~rxvt_perl_interp ()
374{ 379{
375 if (perl) 380 if (perl)
376 { 381 {
382 localise_env set_environ (perl_environ);
377 perl_destruct (perl); 383 perl_destruct (perl);
378 perl_free (perl); 384 perl_free (perl);
379 PERL_SYS_TERM (); 385 PERL_SYS_TERM ();
380 } 386 }
381} 387}
388#endif
382 389
383void 390void
384rxvt_perl_interp::init () 391rxvt_perl_interp::init ()
385{ 392{
386 if (!perl) 393 if (!perl)
389 396
390 { 397 {
391 perl_environ = rxvt_environ; 398 perl_environ = rxvt_environ;
392 localise_env set_environ (perl_environ); 399 localise_env set_environ (perl_environ);
393 400
394 char *args[] = { 401 const char *args[] = {
395 "", 402 "",
396 "-e" 403 "-e"
397 "BEGIN {" 404 "BEGIN {"
398 " urxvt->bootstrap;" 405 " urxvt->bootstrap;"
399 " unshift @INC, '" LIBDIR "';" 406 " unshift @INC, '" LIBDIR "';"
400 "}" 407 "}"
401 "" 408 ""
402 "use urxvt;" 409 "use urxvt;",
410 0
403 }; 411 };
404 int argc = ecb_array_length (args); 412 int argc = ecb_array_length (args) - 1;
405 char **argv = args; 413 char **argv = (char **)args;
406 414
407 PERL_SYS_INIT3 (&argc, &argv, &environ); 415 PERL_SYS_INIT3 (&argc, &argv, &environ);
408 perl = perl_alloc (); 416 perl = perl_alloc ();
409 perl_construct (perl); 417 perl_construct (perl);
410 418
491 499
492 return ret; 500 return ret;
493} 501}
494 502
495static void 503static void
504_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
505{
506 unsigned int state;
507
508 if (term->parse_keysym (k, state) == -1)
509 return;
510
511 dSP;
512 XPUSHs (sv_2mortal (newSVpv (v, 0)));
513 PUTBACK;
514}
515
516static void
517_keysym_resources (rxvt_term *term)
518{
519 term->enumerate_keysym_resources (_keysym_resource_push);
520}
521
522static void
496ungrab (rxvt_term *THIS) 523ungrab (rxvt_term *THIS)
497{ 524{
498 if (THIS->perl.grabtime) 525 if (THIS->perl.grabtime)
499 { 526 {
500 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime); 527 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
502 THIS->perl.grabtime = 0; 529 THIS->perl.grabtime = 0;
503 } 530 }
504} 531}
505 532
506bool 533bool
507rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 534rxvt_perl_interp::invoke (rxvt_term *term, int htype, ...)
508{ 535{
509 if (!perl || !term->perl.self) 536 if (!perl || !term->perl.self)
510 return false; 537 return false;
511 538
512 localise_env set_environ (perl_environ); 539 localise_env set_environ (perl_environ);
791 static const struct { 818 static const struct {
792 const char *name; 819 const char *name;
793 IV iv; 820 IV iv;
794 } *civ, const_iv[] = { 821 } *civ, const_iv[] = {
795# define const_iv(name) { # name, (IV)name } 822# define const_iv(name) { # name, (IV)name }
823 const_iv (HOOK_INIT),
824 const_iv (HOOK_DESTROY),
825 const_iv (HOOK_ACTION),
826 const_iv (HOOK_OSC_SEQ),
827 const_iv (HOOK_OSC_SEQ_PERL),
828
796 const_iv (NUM_RESOURCES), 829 const_iv (NUM_RESOURCES),
797 const_iv (DEFAULT_RSTYLE), 830 const_iv (DEFAULT_RSTYLE),
798 const_iv (OVERLAY_RSTYLE), 831 const_iv (OVERLAY_RSTYLE),
799 const_iv (Color_Bits), 832 const_iv (Color_Bits),
800 const_iv (RS_bgShift), const_iv (RS_bgMask), 833 const_iv (RS_bgShift), const_iv (RS_bgMask),
810 const_iv (RS_Bold), 843 const_iv (RS_Bold),
811 const_iv (RS_Italic), 844 const_iv (RS_Italic),
812 const_iv (RS_Blink), 845 const_iv (RS_Blink),
813 const_iv (RS_RVid), 846 const_iv (RS_RVid),
814 const_iv (RS_Uline), 847 const_iv (RS_Uline),
848
849 // TODO: should support all colour constants, create colorinc.h &c
850 const_iv (Color_fg),
851 const_iv (Color_bg),
852#if OFF_FOCUS_FADING
853 const_iv (Color_fade),
854#endif
855 const_iv (Color_pointer_fg),
856 const_iv (Color_pointer_bg),
857 const_iv (Color_border),
858 const_iv (NRS_COLORS),
859 const_iv (TOTAL_COLORS),
815 860
816 const_iv (CurrentTime), 861 const_iv (CurrentTime),
817 const_iv (ShiftMask), 862 const_iv (ShiftMask),
818 const_iv (LockMask), 863 const_iv (LockMask),
819 const_iv (ControlMask), 864 const_iv (ControlMask),
983 const_iv (XIMLineEnd), 1028 const_iv (XIMLineEnd),
984 const_iv (XIMAbsolutePosition), 1029 const_iv (XIMAbsolutePosition),
985 const_iv (XIMDontChange), 1030 const_iv (XIMDontChange),
986# endif 1031# endif
987# endif 1032# endif
1033
1034 /* DEC private modes */
1035 const_iv (PrivMode_132),
1036 const_iv (PrivMode_132OK),
1037 const_iv (PrivMode_rVideo),
1038 const_iv (PrivMode_relOrigin),
1039 const_iv (PrivMode_Screen),
1040 const_iv (PrivMode_Autowrap),
1041 const_iv (PrivMode_aplCUR),
1042 const_iv (PrivMode_aplKP),
1043 const_iv (PrivMode_HaveBackSpace),
1044 const_iv (PrivMode_BackSpace),
1045 const_iv (PrivMode_ShiftKeys),
1046 const_iv (PrivMode_VisibleCursor),
1047 const_iv (PrivMode_MouseX10),
1048 const_iv (PrivMode_MouseX11),
1049 const_iv (PrivMode_scrollBar),
1050 const_iv (PrivMode_TtyOutputInh),
1051 const_iv (PrivMode_Keypress),
1052 const_iv (PrivMode_smoothScroll),
1053 const_iv (PrivMode_vt52),
1054 const_iv (PrivMode_LFNL),
1055 const_iv (PrivMode_MouseBtnEvent),
1056 const_iv (PrivMode_MouseAnyEvent),
1057 const_iv (PrivMode_BracketPaste),
1058 const_iv (PrivMode_ExtMouseUTF8),
1059 const_iv (PrivMode_ExtMouseUrxvt),
1060 const_iv (PrivMode_BlinkingCursor),
1061 const_iv (PrivMode_mouse_report),
1062 const_iv (PrivMode_Default),
988 }; 1063 };
989 1064
990 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--) 1065 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
991 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1066 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
992} 1067}
993 1068
994void 1069void
995log (const char *msg) 1070log (utf8_string msg)
996 CODE: 1071 CODE:
997 rxvt_log ("%s", msg); 1072 rxvt_log ("%s", msg);
998 1073
999void 1074void
1000warn (const char *msg) 1075warn (utf8_string msg)
1001 CODE: 1076 CODE:
1002 rxvt_warn ("%s", msg); 1077 rxvt_warn ("%s", msg);
1003 1078
1004void 1079void
1005fatal (const char *msg) 1080fatal (utf8_string msg)
1006 CODE: 1081 CODE:
1007 rxvt_fatal ("%s", msg); 1082 rxvt_fatal ("%s", msg);
1008 1083
1009void 1084void
1010_exit (int status) 1085_exit (int status)
1175void 1250void
1176rxvt_term::put_option_db (octet_string specifier, octet_string value) 1251rxvt_term::put_option_db (octet_string specifier, octet_string value)
1177 CODE: 1252 CODE:
1178 XrmPutStringResource (&THIS->option_db, specifier, value); 1253 XrmPutStringResource (&THIS->option_db, specifier, value);
1179 1254
1255void
1256rxvt_term::_keysym_resources ()
1257 PPCODE:
1258 PUTBACK;
1259 _keysym_resources (THIS);
1260 SPAGAIN;
1261
1180int 1262int
1181rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt) 1263rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1182 CODE: 1264 CODE:
1183 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1, 1265 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1184 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1266 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1243rxvt_term::ungrab () 1325rxvt_term::ungrab ()
1244 CODE: 1326 CODE:
1245 ungrab (THIS); 1327 ungrab (THIS);
1246 1328
1247int 1329int
1248rxvt_term::XStringToKeysym (char *string) 1330rxvt_term::XStringToKeysym (octet_string string)
1249 CODE: 1331 CODE:
1250 RETVAL = XStringToKeysym (string); 1332 RETVAL = XStringToKeysym (string);
1251 OUTPUT: RETVAL 1333 OUTPUT: RETVAL
1252 1334
1253char * 1335char *
1263 OUTPUT: RETVAL 1345 OUTPUT: RETVAL
1264 1346
1265int 1347int
1266rxvt_term::XKeycodeToKeysym (int code, int index) 1348rxvt_term::XKeycodeToKeysym (int code, int index)
1267 CODE: 1349 CODE:
1268 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index); 1350 RETVAL = rxvt_XKeycodeToKeysym (THIS->dpy, code, index);
1269 OUTPUT: RETVAL 1351 OUTPUT: RETVAL
1270 1352
1271int 1353int
1272rxvt_term::strwidth (SV *str) 1354rxvt_term::strwidth (SV *str)
1273 CODE: 1355 CODE:
1292 1374
1293SV * 1375SV *
1294rxvt_term::locale_encode (SV *str) 1376rxvt_term::locale_encode (SV *str)
1295 CODE: 1377 CODE:
1296{ 1378{
1379 if (!SvOK (str))
1380 XSRETURN_UNDEF;
1381
1297 wchar_t *wstr = sv2wcs (str); 1382 wchar_t *wstr = sv2wcs (str);
1298 1383
1299 rxvt_push_locale (THIS->locale); 1384 rxvt_push_locale (THIS->locale);
1300 char *mbstr = rxvt_wcstombs (wstr); 1385 char *mbstr = rxvt_wcstombs (wstr);
1301 rxvt_pop_locale (); 1386 rxvt_pop_locale ();
1310 1395
1311SV * 1396SV *
1312rxvt_term::locale_decode (SV *octets) 1397rxvt_term::locale_decode (SV *octets)
1313 CODE: 1398 CODE:
1314{ 1399{
1400 if (!SvOK (octets))
1401 XSRETURN_UNDEF;
1402
1315 STRLEN len; 1403 STRLEN len;
1316 char *data = SvPVbyte (octets, len); 1404 char *data = SvPVbyte (octets, len);
1317 1405
1318 rxvt_push_locale (THIS->locale); 1406 rxvt_push_locale (THIS->locale);
1319 wchar_t *wstr = rxvt_mbstowcs (data, len); 1407 wchar_t *wstr = rxvt_mbstowcs (data, len);
1343#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1431#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1344#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1432#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1345#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1433#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1346 1434
1347int 1435int
1348rxvt_term::width () 1436rxvt_term::width (int new_value = NO_INIT)
1349 ALIAS: 1437 ALIAS:
1350 width = TERM_OFFSET_width 1438 width = TERM_OFFSET_width
1351 height = TERM_OFFSET_height 1439 height = TERM_OFFSET_height
1352 fwidth = TERM_OFFSET_fwidth 1440 fwidth = TERM_OFFSET_fwidth
1353 fheight = TERM_OFFSET_fheight 1441 fheight = TERM_OFFSET_fheight
1363 saveLines = TERM_OFFSET_saveLines 1451 saveLines = TERM_OFFSET_saveLines
1364 total_rows = TERM_OFFSET_total_rows 1452 total_rows = TERM_OFFSET_total_rows
1365 top_row = TERM_OFFSET_top_row 1453 top_row = TERM_OFFSET_top_row
1366 CODE: 1454 CODE:
1367 RETVAL = *(int *)((char *)THIS + ix); 1455 RETVAL = *(int *)((char *)THIS + ix);
1456 if (items > 1)
1457 *(int *)((char *)THIS + ix) = new_value;
1368 OUTPUT: 1458 OUTPUT:
1369 RETVAL 1459 RETVAL
1370 1460
1371unsigned int 1461unsigned int
1372rxvt_term::ModLevel3Mask () 1462rxvt_term::ModLevel3Mask ()
1374 ModLevel3Mask = 0 1464 ModLevel3Mask = 0
1375 ModMetaMask = 1 1465 ModMetaMask = 1
1376 ModNumLockMask = 2 1466 ModNumLockMask = 2
1377 current_screen = 3 1467 current_screen = 3
1378 hidden_cursor = 4 1468 hidden_cursor = 4
1469 priv_modes = 5
1379 CODE: 1470 CODE:
1380 switch (ix) 1471 switch (ix)
1381 { 1472 {
1382 case 0: RETVAL = THIS->ModLevel3Mask; break; 1473 case 0: RETVAL = THIS->ModLevel3Mask; break;
1383 case 1: RETVAL = THIS->ModMetaMask; break; 1474 case 1: RETVAL = THIS->ModMetaMask; break;
1384 case 2: RETVAL = THIS->ModNumLockMask; break; 1475 case 2: RETVAL = THIS->ModNumLockMask; break;
1385 case 3: RETVAL = THIS->current_screen; break; 1476 case 3: RETVAL = THIS->current_screen; break;
1386#ifdef CURSOR_BLINK 1477#ifdef CURSOR_BLINK
1387 case 4: RETVAL = THIS->hidden_cursor; break; 1478 case 4: RETVAL = THIS->hidden_cursor; break;
1479#else
1480 case 4: RETVAL = 0; break;
1388#endif 1481#endif
1482 case 5: RETVAL = THIS->priv_modes; break;
1389 } 1483 }
1390 OUTPUT: 1484 OUTPUT:
1391 RETVAL 1485 RETVAL
1392 1486
1393char * 1487char *
1476 THIS->rstyle = new_rstyle; 1570 THIS->rstyle = new_rstyle;
1477 OUTPUT: 1571 OUTPUT:
1478 RETVAL 1572 RETVAL
1479 1573
1480int 1574int
1481rxvt_term::view_start (int newval = 1) 1575rxvt_term::view_start (int newval = 0)
1482 PROTOTYPE: $;$ 1576 PROTOTYPE: $;$
1483 CODE: 1577 CODE:
1484{ 1578{
1485 RETVAL = THIS->view_start; 1579 RETVAL = THIS->view_start;
1486 1580 if (items > 1)
1487 if (newval <= 0)
1488 THIS->scr_changeview (max (newval, THIS->top_row)); 1581 THIS->scr_changeview (newval);
1489} 1582}
1490 OUTPUT: 1583 OUTPUT:
1491 RETVAL 1584 RETVAL
1492 1585
1493void 1586void
1528void 1621void
1529rxvt_term::want_refresh () 1622rxvt_term::want_refresh ()
1530 CODE: 1623 CODE:
1531 THIS->want_refresh = 1; 1624 THIS->want_refresh = 1;
1532 THIS->refresh_check (); 1625 THIS->refresh_check ();
1626
1627void
1628rxvt_term::refresh_check ()
1533 1629
1534void 1630void
1535rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1631rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1536 PPCODE: 1632 PPCODE:
1537{ 1633{
1682 *r++ = NOCHAR; 1778 *r++ = NOCHAR;
1683 } 1779 }
1684 1780
1685 rxvt_pop_locale (); 1781 rxvt_pop_locale ();
1686 1782
1783 free (wstr);
1687 RETVAL = wcs2sv (rstr, r - rstr); 1784 RETVAL = wcs2sv (rstr, r - rstr);
1688} 1785}
1689 OUTPUT: 1786 OUTPUT:
1690 RETVAL 1787 RETVAL
1691 1788
1699 // find length 1796 // find length
1700 for (wchar_t *s = wstr; *s; s++) 1797 for (wchar_t *s = wstr; *s; s++)
1701 if (*s == NOCHAR) 1798 if (*s == NOCHAR)
1702 ; 1799 ;
1703 else if (IS_COMPOSE (*s)) 1800 else if (IS_COMPOSE (*s))
1704 dlen += rxvt_composite.expand (*s, 0); 1801 dlen += rxvt_composite.expand (*s);
1705 else 1802 else
1706 dlen++; 1803 dlen++;
1707 1804
1708 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen); 1805 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1709 1806
1715 else if (IS_COMPOSE (*s)) 1812 else if (IS_COMPOSE (*s))
1716 r += rxvt_composite.expand (*s, r); 1813 r += rxvt_composite.expand (*s, r);
1717 else 1814 else
1718 *r++ = *s; 1815 *r++ = *s;
1719 1816
1817 free (wstr);
1720 RETVAL = wcs2sv (rstr, r - rstr); 1818 RETVAL = wcs2sv (rstr, r - rstr);
1721} 1819}
1722 OUTPUT: 1820 OUTPUT:
1723 RETVAL 1821 RETVAL
1724 1822
1725void 1823void
1726rxvt_term::_resource (char *name, int index, SV *newval = 0) 1824rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
1727 PPCODE: 1825 PPCODE:
1728{ 1826{
1729 static const struct resval { const char *name; int value; } *rs, rslist [] = { 1827 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1730# define def(name) { # name, Rs_ ## name }, 1828# define def(name) { # name, Rs_ ## name },
1731# define reserve(name,count) 1829# define reserve(name,count)
1746 index += rs->value; 1844 index += rs->value;
1747 } 1845 }
1748 else 1846 else
1749 { 1847 {
1750 --rs; 1848 --rs;
1751 name = ""; 1849 name = (octet_string)"";
1752 } 1850 }
1753 1851
1754 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1852 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1755 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1853 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1756 1854
1769 THIS->rs [index] = 0; 1867 THIS->rs [index] = 0;
1770 } 1868 }
1771} 1869}
1772 1870
1773const char * 1871const char *
1774rxvt_term::x_resource (const char *name) 1872rxvt_term::x_resource (octet_string name)
1775 1873
1776bool 1874bool
1777rxvt_term::option (U8 optval, int set = -1) 1875rxvt_term::option (U8 optval, int set = -1)
1778 CODE: 1876 CODE:
1779{ 1877{
1798 THIS->cursor_blink_reset (); 1896 THIS->cursor_blink_reset ();
1799 break; 1897 break;
1800#endif 1898#endif
1801 1899
1802 case Opt_cursorUnderline: 1900 case Opt_cursorUnderline:
1901 THIS->cursor_type = set ? 1 : 0;
1803 THIS->want_refresh = 1; 1902 THIS->want_refresh = 1;
1804 THIS->refresh_check (); 1903 THIS->refresh_check ();
1805 break; 1904 break;
1806 1905
1807# case Opt_scrollBar_floating: 1906# case Opt_scrollBar_floating:
1812 } 1911 }
1813} 1912}
1814 OUTPUT: 1913 OUTPUT:
1815 RETVAL 1914 RETVAL
1816 1915
1916SV *
1917rxvt_term::lookup_keysym (int keysym, unsigned int state)
1918 CODE:
1919{
1920 keysym_t *key = THIS->keyboard->lookup_keysym (THIS, keysym, state);
1921 RETVAL = key ? sv_2mortal (newSVpv (key->str, 0)) : &PL_sv_undef;
1922}
1923 OUTPUT:
1924 RETVAL
1925
1817bool 1926bool
1818rxvt_term::parse_keysym (char *keysym, char *str) 1927rxvt_term::bind_action (octet_string keysym, octet_string action)
1928 ALIAS:
1929 parse_keysym = 1
1819 CODE: 1930 CODE:
1820 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1931 RETVAL = 0 < THIS->bind_action (keysym, action);
1821 THIS->keyboard->register_done (); 1932 THIS->keyboard->register_done ();
1822 OUTPUT: 1933 OUTPUT:
1823 RETVAL 1934 RETVAL
1824 1935
1825void 1936void
1826rxvt_term::register_command (int keysym, unsigned int state, SV *str) 1937rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1827 CODE: 1938 CODE:
1828 wchar_t *wstr = sv2wcs (str); 1939 wchar_t *wstr = sv2wcs (str);
1829 THIS->keyboard->register_user_translation (keysym, state, wstr); 1940 THIS->keyboard->register_action (keysym, state, wstr);
1830 free (wstr); 1941 free (wstr);
1831 1942
1832void 1943void
1833rxvt_term::screen_cur (...) 1944rxvt_term::screen_cur (...)
1834 PROTOTYPE: $;$$ 1945 PROTOTYPE: $;$$
1877 1988
1878 if (ix) 1989 if (ix)
1879 { 1990 {
1880 THIS->selection.screen = THIS->current_screen; 1991 THIS->selection.screen = THIS->current_screen;
1881 1992
1882 THIS->want_refresh = 1; 1993 THIS->selection_changed ();
1883 THIS->refresh_check (); 1994 THIS->refresh_check ();
1884 } 1995 }
1885 } 1996 }
1886} 1997}
1887 1998
1893 THIS->selection.screen = screen; 2004 THIS->selection.screen = screen;
1894 OUTPUT: 2005 OUTPUT:
1895 RETVAL 2006 RETVAL
1896 2007
1897void 2008void
2009rxvt_term::selection_request (Time tm, int selnum)
2010
2011void
1898rxvt_term::selection_clear (bool clipboard = false) 2012rxvt_term::selection_clear (bool clipboard = false)
1899 2013
1900void 2014void
1901rxvt_term::selection_make (Time eventtime, bool rect = false) 2015rxvt_term::selection_make (Time eventtime, bool rect = false)
1902 CODE: 2016 CODE:
1943 2057
1944void 2058void
1945rxvt_term::scr_bell () 2059rxvt_term::scr_bell ()
1946 2060
1947void 2061void
1948rxvt_term::scr_recolour (bool refresh = true); 2062rxvt_term::scr_recolor (bool refresh = true);
1949 2063
1950void 2064void
1951rxvt_term::scr_change_screen (int screen) 2065rxvt_term::scr_change_screen (int screen)
1952 2066
1953void 2067void
1956{ 2070{
1957 wchar_t *wstr = sv2wcs (string); 2071 wchar_t *wstr = sv2wcs (string);
1958 THIS->scr_add_lines (wstr, wcslen (wstr)); 2072 THIS->scr_add_lines (wstr, wcslen (wstr));
1959 free (wstr); 2073 free (wstr);
1960} 2074}
2075
2076void
2077rxvt_term::tt_write_user_input (SV *octets)
2078 INIT:
2079 STRLEN len;
2080 char *str = SvPVbyte (octets, len);
2081 C_ARGS:
2082 str, len
1961 2083
1962void 2084void
1963rxvt_term::tt_write (SV *octets) 2085rxvt_term::tt_write (SV *octets)
1964 INIT: 2086 INIT:
1965 STRLEN len; 2087 STRLEN len;
2201 OUTPUT: 2323 OUTPUT:
2202 RETVAL 2324 RETVAL
2203 2325
2204#endif 2326#endif
2205 2327
2206#if HAVE_BG_PIXMAP 2328void
2329rxvt_term::clr_background ()
2330 CODE:
2331 delete THIS->bg_img;
2332 THIS->bg_img = 0;
2333 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2207 2334
2208void 2335void
2209rxvt_term::set_background (rxvt_img *img, bool border = false) 2336rxvt_term::set_background (rxvt_img *img, bool border = false)
2210 CODE: 2337 CODE:
2211 THIS->bg_destroy (); 2338 delete THIS->bg_img;
2212 THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT); 2339 THIS->bg_img = 0;
2340 THIS->bg_flags = rxvt_term::BG_NEEDS_REFRESH;
2213 2341
2214 if (img) // TODO: cannot be false 2342 //if (img) // TODO: cannot be false, maybe allow and get rid of clr_background?
2215 { 2343 {
2216 img = img->clone (); // own the img 2344 img = img->clone (); // own the img
2217 2345
2218 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap 2346 if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
2219 img->sub_rect (0, 0, 2347 img->sub_rect (0, 0,
2227 2355
2228 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg]) 2356 img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
2229 ->replace (img); 2357 ->replace (img);
2230 2358
2231 THIS->bg_img = img; 2359 THIS->bg_img = img;
2232 THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
2233 2360
2234 if (!border) 2361 if (!border)
2235 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT; 2362 THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
2236 } 2363 }
2237
2238#endif
2239 2364
2240#endif 2365#endif
2241 2366
2242############################################################################# 2367#############################################################################
2243# urxvt::overlay 2368# urxvt::overlay
2316 2441
2317void 2442void
2318rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h) 2443rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
2319 PROTOTYPE: $;$$$$ 2444 PROTOTYPE: $;$$$$
2320 INIT: 2445 INIT:
2321 rgba cc = parse_rgba (c, THIS->s); 2446 rxvt_screen screen;
2447 screen.set (THIS->d);
2448 rgba cc = parse_rgba (c, &screen);
2322 C_ARGS: cc, x, y, w, h 2449 C_ARGS: cc, x, y, w, h
2323 2450
2324void 2451void
2325rxvt_img::DESTROY () 2452rxvt_img::DESTROY ()
2326 CODE: 2453 CODE:
2384rxvt_img::rotate (int x, int y, rxvt_img::nv phi) 2511rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
2385 2512
2386rxvt_img * 2513rxvt_img *
2387rxvt_img::tint (SV *c) 2514rxvt_img::tint (SV *c)
2388 INIT: 2515 INIT:
2389 rgba cc = parse_rgba (c, THIS->s); 2516 rxvt_screen screen;
2517 screen.set (THIS->d);
2518 rgba cc = parse_rgba (c, &screen);
2390 C_ARGS: cc 2519 C_ARGS: cc
2520
2521rxvt_img *
2522rxvt_img::shade (rxvt_img::nv factor)
2391 2523
2392rxvt_img * 2524rxvt_img *
2393rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef) 2525rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
2394 CODE: 2526 CODE:
2395 rxvt_img::nv *vparams = 0; 2527 rxvt_img::nv *vparams = 0;
2396 int nparams = 0; 2528 int nparams = 0;
2397 2529
2398 if (SvOK (params)) 2530 if (SvOK (params))
2399 { 2531 {
2400 // we overlay rxvt_temp_buf, what a hack
2401 assert (sizeof (rxvt_img::nv) >= sizeof (int));
2402
2403 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV) 2532 if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
2404 croak ("rxvt_img::filter: params must be an array reference with parameter values"); 2533 croak ("rxvt_img::filter: params must be an array reference with parameter values");
2405 2534
2406 nparams = av_len ((AV *)SvRV (params)) + 1; 2535 nparams = av_len ((AV *)SvRV (params)) + 1;
2407 vparams = rxvt_temp_buf<rxvt_img::nv> (nparams); 2536 vparams = (rxvt_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
2408 2537
2409 for (int i = 0; i < nparams; ++i) 2538 for (int i = 0; i < nparams; ++i)
2410 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1)); 2539 vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
2411 } 2540 }
2412 2541
2413 RETVAL = THIS->filter (name, nparams, vparams); 2542 RETVAL = THIS->filter (name, nparams, vparams);
2543 free (vparams);
2414 OUTPUT: 2544 OUTPUT:
2415 RETVAL 2545 RETVAL
2416 2546
2417#endif 2547#endif
2418 2548

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines