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.41 by root, Sun Jan 8 03:07:05 2006 UTC vs.
Revision 1.55 by root, Wed Jan 11 02:13:56 2006 UTC

29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "iom.h"
34#include "rxvt.h" 35#include "rxvt.h"
35#include "iom.h" 36#include "keyboard.h"
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "rxvtperl.h" 38#include "rxvtperl.h"
38 39
39#include "perlxsi.c" 40#include "perlxsi.c"
40 41
48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 49#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
49#undef ROW 50#undef ROW
50#define ROW(n) THIS->row_buf [LINENO (n)] 51#define ROW(n) THIS->row_buf [LINENO (n)]
51 52
52///////////////////////////////////////////////////////////////////////////// 53/////////////////////////////////////////////////////////////////////////////
54
55static SV *
56taint (SV *sv)
57{
58 SvTAINT (sv);
59 return sv;
60}
61
62static SV *
63taint_if (SV *sv, SV *src)
64{
65 if (SvTAINTED (src))
66 SvTAINT (sv);
67
68 return sv;
69}
53 70
54static wchar_t * 71static wchar_t *
55sv2wcs (SV *sv) 72sv2wcs (SV *sv)
56{ 73{
57 STRLEN len; 74 STRLEN len;
396{ 413{
397 if (!perl) 414 if (!perl)
398 { 415 {
399 char *argv[] = { 416 char *argv[] = {
400 "", 417 "",
418 "-T",
401 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 419 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
402 }; 420 };
403 421
404 perl = perl_alloc (); 422 perl = perl_alloc ();
405 perl_construct (perl); 423 perl_construct (perl);
406 424
407 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 425 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
408 || perl_run (perl)) 426 || perl_run (perl))
409 { 427 {
410 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 428 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
411 429
412 perl_destruct (perl); 430 perl_destruct (perl);
413 perl_free (perl); 431 perl_free (perl);
414 perl = 0; 432 perl = 0;
415 } 433 }
434 }
435}
436
437static void
438ungrab (rxvt_term *THIS)
439{
440 if (THIS->perl.grabtime)
441 {
442 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
443 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
444 THIS->perl.grabtime = 0;
416 } 445 }
417} 446}
418 447
419bool 448bool
420rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 449rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
431 return false; // perl not initialized for this instance 460 return false; // perl not initialized for this instance
432 else if (htype == HOOK_DESTROY) 461 else if (htype == HOOK_DESTROY)
433 { 462 {
434 // handled later 463 // handled later
435 } 464 }
436 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 465 else
437 { 466 {
438 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 467 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
439
440 if (HvKEYS (hv))
441 { 468 {
469 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
470
471 if (HvKEYS (hv))
472 {
442 hv_iterinit (hv); 473 hv_iterinit (hv);
443 474
444 while (HE *he = hv_iternext (hv)) 475 while (HE *he = hv_iternext (hv))
445 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 476 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
477 }
478
446 } 479 }
480
481 if (!should_invoke [htype])
482 return false;
447 } 483 }
448 else if (!should_invoke [htype])
449 return false;
450 484
451 dSP; 485 dSP;
452 va_list ap; 486 va_list ap;
453 487
454 va_start (ap, htype); 488 va_start (ap, htype);
473 case DT_LONG: 507 case DT_LONG:
474 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
475 break; 509 break;
476 510
477 case DT_STR: 511 case DT_STR:
478 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 512 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
479 break; 513 break;
480 514
481 case DT_STR_LEN: 515 case DT_STR_LEN:
482 { 516 {
483 char *str = va_arg (ap, char *); 517 char *str = va_arg (ap, char *);
484 int len = va_arg (ap, int); 518 int len = va_arg (ap, int);
485 519
486 XPUSHs (sv_2mortal (newSVpvn (str, len))); 520 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
487 } 521 }
488 break; 522 break;
489 523
490 case DT_WCS_LEN: 524 case DT_WCS_LEN:
491 { 525 {
492 wchar_t *wstr = va_arg (ap, wchar_t *); 526 wchar_t *wstr = va_arg (ap, wchar_t *);
493 int wlen = va_arg (ap, int); 527 int wlen = va_arg (ap, int);
494 528
495 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 529 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
496 } 530 }
497 break; 531 break;
498 532
499 case DT_XEVENT: 533 case DT_XEVENT:
500 { 534 {
565 PUTBACK; 599 PUTBACK;
566 FREETMPS; 600 FREETMPS;
567 LEAVE; 601 LEAVE;
568 602
569 if (SvTRUE (ERRSV)) 603 if (SvTRUE (ERRSV))
604 {
570 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 605 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
606 ungrab (term); // better lose the grab than the session
607 }
571 608
572 if (htype == HOOK_DESTROY) 609 if (htype == HOOK_DESTROY)
573 { 610 {
574 clearSVptr ((SV *)term->perl.self); 611 clearSVptr ((SV *)term->perl.self);
575 SvREFCNT_dec ((SV *)term->perl.self); 612 SvREFCNT_dec ((SV *)term->perl.self);
590 627
591PROTOTYPES: ENABLE 628PROTOTYPES: ENABLE
592 629
593BOOT: 630BOOT:
594{ 631{
595 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1)); 632 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
633 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
634 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
635 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
596 636
597 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 637 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
598# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 638# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
599# include "hookinc.h" 639# include "hookinc.h"
600# undef def 640# undef def
629 export_const_iv (Button2Mask); 669 export_const_iv (Button2Mask);
630 export_const_iv (Button3Mask); 670 export_const_iv (Button3Mask);
631 export_const_iv (Button4Mask); 671 export_const_iv (Button4Mask);
632 export_const_iv (Button5Mask); 672 export_const_iv (Button5Mask);
633 export_const_iv (AnyModifier); 673 export_const_iv (AnyModifier);
674
675 export_const_iv (EVENT_NONE);
676 export_const_iv (EVENT_READ);
677 export_const_iv (EVENT_WRITE);
634} 678}
679
680void
681set_should_invoke (int htype, int value)
682 CODE:
683 rxvt_perl.should_invoke [htype] = value;
684
685void
686warn (const char *msg)
687 CODE:
688 rxvt_warn ("%s", msg);
689
690void
691fatal (const char *msg)
692 CODE:
693 rxvt_fatal ("%s", msg);
635 694
636SV * 695SV *
637new (...) 696untaint (SV *sv)
638 CODE: 697 CODE:
639{ 698 RETVAL = newSVsv (sv);
640 stringvec *argv = new stringvec; 699 SvTAINTED_off (RETVAL);
641 bool success; 700 OUTPUT:
642
643 for (int i = 0; i < items ;i++)
644 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
645
646 rxvt_term *term = new rxvt_term;
647
648 term->argv = argv;
649
650 try
651 {
652 if (!term->init (argv->size (), argv->begin ()))
653 term = 0;
654 }
655 catch (const class rxvt_failure_exception &e)
656 {
657 term->destroy ();
658 croak ("exception caught while initializing new terminal instance");
659 }
660
661 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
662}
663 OUTPUT:
664 RETVAL 701 RETVAL
665 702
666void 703bool
667set_should_invoke (int htype, int value) 704safe ()
668 CODE: 705 CODE:
669 rxvt_perl.should_invoke [htype] = value; 706 RETVAL = !rxvt_tainted ();
670 707 OUTPUT:
671void 708 RETVAL
672warn (const char *msg)
673 CODE:
674 rxvt_warn ("%s", msg);
675
676void
677fatal (const char *msg)
678 CODE:
679 rxvt_fatal ("%s", msg);
680 709
681NV 710NV
682NOW () 711NOW ()
683 CODE: 712 CODE:
684 RETVAL = NOW; 713 RETVAL = NOW;
732} 761}
733 OUTPUT: 762 OUTPUT:
734 RETVAL 763 RETVAL
735 764
736MODULE = urxvt PACKAGE = urxvt::term 765MODULE = urxvt PACKAGE = urxvt::term
766
767SV *
768_new (...)
769 CODE:
770{
771 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
772 croak ("first argument to urxvt::term->_new must be arrayref");
773
774 rxvt_term *term = new rxvt_term;
775
776 term->argv = new stringvec;
777 term->envv = new stringvec;
778
779 for (int i = 1; i < items; i++)
780 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
781
782 AV *envv = (AV *)SvRV (ST (0));
783 for (int i = av_len (envv) + 1; i--; )
784 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
785
786 term->envv->push_back (0);
787
788 bool success;
789
790 try
791 {
792 success = term->init (term->argv->size (), term->argv->begin ());
793 }
794 catch (const class rxvt_failure_exception &e)
795 {
796 success = false;
797 }
798
799 if (!success)
800 {
801 term->destroy ();
802 croak ("error while initializing new terminal instance");
803 }
804
805 RETVAL = term && term->perl.self
806 ? newSVterm (term) : &PL_sv_undef;
807}
808 OUTPUT:
809 RETVAL
737 810
738void 811void
739rxvt_term::destroy () 812rxvt_term::destroy ()
740 813
741void 814void
765} 838}
766 OUTPUT: 839 OUTPUT:
767 RETVAL 840 RETVAL
768 841
769void 842void
770rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 843rxvt_term::allow_events_async ()
771 CODE: 844 CODE:
772 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 845 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
773 846
774void 847void
775rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 848rxvt_term::allow_events_sync ()
776 CODE: 849 CODE:
777 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 850 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
778 851
779void 852void
780rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 853rxvt_term::allow_events_replay ()
781 CODE: 854 CODE:
782 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 855 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
783 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 856 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
784 857
785void 858void
786rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 859rxvt_term::ungrab ()
787 CODE: 860 CODE:
788 THIS->perl.grabtime = 0; 861 ungrab (THIS);
789 XUngrabKeyboard (THIS->display->display, eventtime);
790 XUngrabPointer (THIS->display->display, eventtime);
791 862
792int 863int
793rxvt_term::strwidth (SV *str) 864rxvt_term::strwidth (SV *str)
794 CODE: 865 CODE:
795{ 866{
814 char *mbstr = rxvt_wcstombs (wstr); 885 char *mbstr = rxvt_wcstombs (wstr);
815 rxvt_pop_locale (); 886 rxvt_pop_locale ();
816 887
817 free (wstr); 888 free (wstr);
818 889
819 RETVAL = newSVpv (mbstr, 0); 890 RETVAL = taint_if (newSVpv (mbstr, 0), str);
820 free (mbstr); 891 free (mbstr);
821} 892}
822 OUTPUT: 893 OUTPUT:
823 RETVAL 894 RETVAL
824 895
831 902
832 rxvt_push_locale (THIS->locale); 903 rxvt_push_locale (THIS->locale);
833 wchar_t *wstr = rxvt_mbstowcs (data, len); 904 wchar_t *wstr = rxvt_mbstowcs (data, len);
834 rxvt_pop_locale (); 905 rxvt_pop_locale ();
835 906
836 RETVAL = wcs2sv (wstr); 907 RETVAL = taint_if (wcs2sv (wstr), octets);
837 free (wstr); 908 free (wstr);
838} 909}
839 OUTPUT: 910 OUTPUT:
840 RETVAL 911 RETVAL
841 912
888 case 2: RETVAL = THIS->ModNumLockMask; break; 959 case 2: RETVAL = THIS->ModNumLockMask; break;
889 } 960 }
890 OUTPUT: 961 OUTPUT:
891 RETVAL 962 RETVAL
892 963
964char *
965rxvt_term::display_id ()
966 ALIAS:
967 display_id = 0
968 locale = 1
969 CODE:
970 switch (ix)
971 {
972 case 0: RETVAL = THIS->display->id; break;
973 case 1: RETVAL = THIS->locale; break;
974 }
975 OUTPUT:
976 RETVAL
977
978SV *
979rxvt_term::_env ()
980 CODE:
981{
982 if (THIS->envv)
983 {
984 AV *av = newAV ();
985
986 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
987 if (*i)
988 av_push (av, newSVpv (*i, 0));
989
990 RETVAL = newRV_noinc ((SV *)av);
991 }
992 else
993 RETVAL = &PL_sv_undef;
994}
995 OUTPUT:
996 RETVAL
997
998int
999rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1000 CODE:
1001 RETVAL = THIS->pty_ev.events;
1002 if (events != EVENT_UNDEF)
1003 THIS->pty_ev.set (events);
1004 OUTPUT:
1005 RETVAL
1006
893U32 1007U32
894rxvt_term::parent () 1008rxvt_term::parent ()
895 CODE: 1009 CODE:
896 RETVAL = (U32)THIS->parent [0]; 1010 RETVAL = (U32)THIS->parent [0];
897 OUTPUT: 1011 OUTPUT:
948 wchar_t *wstr = new wchar_t [THIS->ncol]; 1062 wchar_t *wstr = new wchar_t [THIS->ncol];
949 1063
950 for (int col = 0; col < THIS->ncol; col++) 1064 for (int col = 0; col < THIS->ncol; col++)
951 wstr [col] = l.t [col]; 1065 wstr [col] = l.t [col];
952 1066
953 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1067 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
954 1068
955 delete [] wstr; 1069 delete [] wstr;
956 } 1070 }
957 1071
958 if (new_text) 1072 if (new_text)
1079 else 1193 else
1080 *r++ = *s; 1194 *r++ = *s;
1081 1195
1082 rxvt_pop_locale (); 1196 rxvt_pop_locale ();
1083 1197
1084 RETVAL = wcs2sv (rstr, r - rstr); 1198 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1085 1199
1086 delete [] rstr; 1200 delete [] rstr;
1087} 1201}
1088 OUTPUT: 1202 OUTPUT:
1089 RETVAL 1203 RETVAL
1115 else if (IS_COMPOSE (*s)) 1229 else if (IS_COMPOSE (*s))
1116 r += rxvt_composite.expand (*s, r); 1230 r += rxvt_composite.expand (*s, r);
1117 else 1231 else
1118 *r++ = *s; 1232 *r++ = *s;
1119 1233
1120 RETVAL = wcs2sv (rstr, r - rstr); 1234 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1121 1235
1122 delete [] rstr; 1236 delete [] rstr;
1123} 1237}
1124 OUTPUT: 1238 OUTPUT:
1125 RETVAL 1239 RETVAL
1147 1261
1148 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1262 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1149 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1263 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1150 1264
1151 if (GIMME_V != G_VOID) 1265 if (GIMME_V != G_VOID)
1152 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1266 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1153 1267
1154 if (newval) 1268 if (newval)
1155 { 1269 {
1156 if (SvOK (newval)) 1270 if (SvOK (newval))
1157 { 1271 {
1162 else 1276 else
1163 THIS->rs [index] = 0; 1277 THIS->rs [index] = 0;
1164 } 1278 }
1165} 1279}
1166 1280
1281const char *
1282rxvt_term::x_resource (const char *name)
1283 CLEANUP:
1284 SvTAINTED_on (ST (0));
1285
1167bool 1286bool
1168rxvt_term::option (U32 optval, int set = -1) 1287rxvt_term::option (U32 optval, int set = -1)
1169 CODE: 1288 CODE:
1170{ 1289{
1171 RETVAL = THIS->options & optval; 1290 RETVAL = THIS->options & optval;
1198 } 1317 }
1199} 1318}
1200 OUTPUT: 1319 OUTPUT:
1201 RETVAL 1320 RETVAL
1202 1321
1322bool
1323rxvt_term::parse_keysym (char *keysym, char *str)
1324 CODE:
1325 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1326 THIS->keyboard->register_done ();
1327 OUTPUT:
1328 RETVAL
1329
1203void 1330void
1204rxvt_term::cur (...) 1331rxvt_term::screen_cur (...)
1205 PROTOTYPE: $;$$ 1332 PROTOTYPE: $;$$
1206 ALIAS: 1333 ALIAS:
1207 screen_cur = 0 1334 screen_cur = 0
1208 selection_beg = 1 1335 selection_beg = 1
1209 selection_end = 2 1336 selection_end = 2
1230 if (ix) 1357 if (ix)
1231 THIS->want_refresh = 1; 1358 THIS->want_refresh = 1;
1232 } 1359 }
1233} 1360}
1234 1361
1362char
1363rxvt_term::cur_charset ()
1364 CODE:
1365 RETVAL = THIS->charsets [THIS->screen.charset];
1366 OUTPUT:
1367 RETVAL
1368
1235int 1369int
1236rxvt_term::selection_grab (U32 eventtime) 1370rxvt_term::selection_grab (U32 eventtime)
1237 1371
1238void 1372void
1239rxvt_term::selection (SV *newtext = 0) 1373rxvt_term::selection (SV *newtext = 0)
1240 PPCODE: 1374 PPCODE:
1241{ 1375{
1242 if (GIMME_V != G_VOID) 1376 if (GIMME_V != G_VOID)
1377 XPUSHs (THIS->selection.text
1243 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1378 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1379 : &PL_sv_undef);
1244 1380
1245 if (newtext) 1381 if (newtext)
1246 { 1382 {
1247 free (THIS->selection.text); 1383 free (THIS->selection.text);
1248 1384
1249 THIS->selection.text = sv2wcs (newtext); 1385 THIS->selection.text = sv2wcs (newtext);
1250 THIS->selection.len = wcslen (THIS->selection.text); 1386 THIS->selection.len = wcslen (THIS->selection.text);
1251 } 1387 }
1252} 1388}
1389
1390void
1391rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1392
1393void
1394rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1395
1396void
1397rxvt_term::scr_bell ()
1253 1398
1254void 1399void
1255rxvt_term::scr_add_lines (SV *string) 1400rxvt_term::scr_add_lines (SV *string)
1256 CODE: 1401 CODE:
1257{ 1402{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines