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.57 by root, Thu Jan 12 01:30:53 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;
… …
394void 411void
395rxvt_perl_interp::init () 412rxvt_perl_interp::init ()
396{ 413{
397 if (!perl) 414 if (!perl)
398 { 415 {
416 perl_environ = rxvt_environ;
417 swap (perl_environ, environ);
418
399 char *argv[] = { 419 char *argv[] = {
400 "", 420 "",
421 "-T",
401 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 422 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
402 }; 423 };
403 424
404 perl = perl_alloc (); 425 perl = perl_alloc ();
405 perl_construct (perl); 426 perl_construct (perl);
406 427
407 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 428 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
408 || perl_run (perl)) 429 || perl_run (perl))
409 { 430 {
410 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 431 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
411 432
412 perl_destruct (perl); 433 perl_destruct (perl);
413 perl_free (perl); 434 perl_free (perl);
414 perl = 0; 435 perl = 0;
415 } 436 }
437
438 swap (perl_environ, environ);
439 }
440}
441
442static void
443ungrab (rxvt_term *THIS)
444{
445 if (THIS->perl.grabtime)
446 {
447 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0;
416 } 450 }
417} 451}
418 452
419bool 453bool
420rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
431 return false; // perl not initialized for this instance 465 return false; // perl not initialized for this instance
432 else if (htype == HOOK_DESTROY) 466 else if (htype == HOOK_DESTROY)
433 { 467 {
434 // handled later 468 // handled later
435 } 469 }
436 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 470 else
437 { 471 {
438 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
439
440 if (HvKEYS (hv))
441 { 473 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
475
476 if (HvKEYS (hv))
477 {
442 hv_iterinit (hv); 478 hv_iterinit (hv);
443 479
444 while (HE *he = hv_iternext (hv)) 480 while (HE *he = hv_iternext (hv))
445 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 481 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
482 }
483
446 } 484 }
485
486 if (!should_invoke [htype])
487 return false;
447 } 488 }
448 else if (!should_invoke [htype])
449 return false;
450 489
490 swap (perl_environ, environ);
491
492 try
493 {
451 dSP; 494 dSP;
452 va_list ap; 495 va_list ap;
453 496
454 va_start (ap, htype); 497 va_start (ap, htype);
455 498
456 ENTER; 499 ENTER;
457 SAVETMPS; 500 SAVETMPS;
458 501
459 PUSHMARK (SP); 502 PUSHMARK (SP);
460 503
461 XPUSHs (sv_2mortal (newSVterm (term))); 504 XPUSHs (sv_2mortal (newSVterm (term)));
462 XPUSHs (sv_2mortal (newSViv (htype))); 505 XPUSHs (sv_2mortal (newSViv (htype)));
463 506
464 for (;;) { 507 for (;;) {
465 data_type dt = (data_type)va_arg (ap, int); 508 data_type dt = (data_type)va_arg (ap, int);
466 509
467 switch (dt) 510 switch (dt)
468 { 511 {
469 case DT_INT: 512 case DT_INT:
470 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
471 break; 514 break;
472 515
473 case DT_LONG: 516 case DT_LONG:
474 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
475 break; 518 break;
476 519
477 case DT_STR: 520 case DT_STR:
478 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
479 break; 522 break;
480 523
481 case DT_STR_LEN: 524 case DT_STR_LEN:
482 { 525 {
483 char *str = va_arg (ap, char *); 526 char *str = va_arg (ap, char *);
484 int len = va_arg (ap, int); 527 int len = va_arg (ap, int);
485 528
486 XPUSHs (sv_2mortal (newSVpvn (str, len))); 529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
487 } 530 }
488 break; 531 break;
489 532
490 case DT_WCS_LEN: 533 case DT_WCS_LEN:
491 { 534 {
492 wchar_t *wstr = va_arg (ap, wchar_t *); 535 wchar_t *wstr = va_arg (ap, wchar_t *);
493 int wlen = va_arg (ap, int); 536 int wlen = va_arg (ap, int);
494 537
495 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
496 } 539 }
497 break; 540 break;
498 541
499 case DT_XEVENT: 542 case DT_XEVENT:
500 { 543 {
501 XEvent *xe = va_arg (ap, XEvent *); 544 XEvent *xe = va_arg (ap, XEvent *);
502 HV *hv = newHV (); 545 HV *hv = newHV ();
503 546
504# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 547# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
505# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 548# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
506# undef set 549# undef set
507 550
508 setiv (type, xe->type); 551 setiv (type, xe->type);
509 setiv (send_event, xe->xany.send_event); 552 setiv (send_event, xe->xany.send_event);
510 setiv (serial, xe->xany.serial); 553 setiv (serial, xe->xany.serial);
511 554
512 switch (xe->type) 555 switch (xe->type)
556 {
557 case KeyPress:
558 case KeyRelease:
559 case ButtonPress:
560 case ButtonRelease:
561 case MotionNotify:
562 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state);
570 break;
571 }
572
573 switch (xe->type)
574 {
575 case KeyPress:
576 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode);
578 break;
579
580 case ButtonPress:
581 case ButtonRelease:
582 setiv (button, xe->xbutton.button);
583 break;
584
585 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint);
587 break;
588 }
589
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 }
592 break;
593
594 case DT_END:
513 { 595 {
514 case KeyPress: 596 va_end (ap);
515 case KeyRelease: 597
516 case ButtonPress: 598 PUTBACK;
517 case ButtonRelease: 599 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
518 case MotionNotify: 600 SPAGAIN;
519 setiv (time, xe->xmotion.time); 601
520 setiv (x, xe->xmotion.x); 602 if (count)
521 setiv (y, xe->xmotion.y);
522 setiv (row, xe->xmotion.y / term->fheight);
523 setiv (col, xe->xmotion.x / term->fwidth);
524 setiv (x_root, xe->xmotion.x_root);
525 setiv (y_root, xe->xmotion.y_root);
526 setiv (state, xe->xmotion.state);
527 break; 603 {
604 SV *status = POPs;
605 count = SvTRUE (status);
606 }
607
608 PUTBACK;
609 FREETMPS;
610 LEAVE;
611
612 if (SvTRUE (ERRSV))
613 {
614 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
615 ungrab (term); // better lose the grab than the session
616 }
617
618 if (htype == HOOK_DESTROY)
619 {
620 clearSVptr ((SV *)term->perl.self);
621 SvREFCNT_dec ((SV *)term->perl.self);
622 }
623
624 swap (perl_environ, environ);
625 return count;
528 } 626 }
529 627
530 switch (xe->type)
531 {
532 case KeyPress:
533 case KeyRelease:
534 setiv (keycode, xe->xkey.keycode);
535 break;
536
537 case ButtonPress:
538 case ButtonRelease:
539 setiv (button, xe->xbutton.button);
540 break;
541
542 case MotionNotify:
543 setiv (is_hint, xe->xmotion.is_hint);
544 break;
545 }
546
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
548 }
549 break;
550
551 case DT_END:
552 {
553 va_end (ap);
554
555 PUTBACK;
556 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
557 SPAGAIN;
558
559 if (count)
560 {
561 SV *status = POPs;
562 count = SvTRUE (status);
563 }
564
565 PUTBACK;
566 FREETMPS;
567 LEAVE;
568
569 if (SvTRUE (ERRSV))
570 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
571
572 if (htype == HOOK_DESTROY)
573 {
574 clearSVptr ((SV *)term->perl.self);
575 SvREFCNT_dec ((SV *)term->perl.self);
576 }
577
578 return count;
579 }
580
581 default: 628 default:
582 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 }
583 } 631 }
584 } 632 }
633 catch (...)
634 {
635 swap (perl_environ, environ);
636 throw;
637 }
585} 638}
586 639
587///////////////////////////////////////////////////////////////////////////// 640/////////////////////////////////////////////////////////////////////////////
588 641
589MODULE = urxvt PACKAGE = urxvt 642MODULE = urxvt PACKAGE = urxvt
590 643
591PROTOTYPES: ENABLE 644PROTOTYPES: ENABLE
592 645
593BOOT: 646BOOT:
594{ 647{
595 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1)); 648 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
649 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
650 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
651 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
596 652
597 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 653 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
598# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 654# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
599# include "hookinc.h" 655# include "hookinc.h"
600# undef def 656# undef def
… …
629 export_const_iv (Button2Mask); 685 export_const_iv (Button2Mask);
630 export_const_iv (Button3Mask); 686 export_const_iv (Button3Mask);
631 export_const_iv (Button4Mask); 687 export_const_iv (Button4Mask);
632 export_const_iv (Button5Mask); 688 export_const_iv (Button5Mask);
633 export_const_iv (AnyModifier); 689 export_const_iv (AnyModifier);
690
691 export_const_iv (EVENT_NONE);
692 export_const_iv (EVENT_READ);
693 export_const_iv (EVENT_WRITE);
634} 694}
695
696void
697set_should_invoke (int htype, int value)
698 CODE:
699 rxvt_perl.should_invoke [htype] = value;
700
701void
702warn (const char *msg)
703 CODE:
704 rxvt_warn ("%s", msg);
705
706void
707fatal (const char *msg)
708 CODE:
709 rxvt_fatal ("%s", msg);
635 710
636SV * 711SV *
637new (...) 712untaint (SV *sv)
638 CODE: 713 CODE:
639{ 714 RETVAL = newSVsv (sv);
640 stringvec *argv = new stringvec; 715 SvTAINTED_off (RETVAL);
641 bool success; 716 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 717 RETVAL
665 718
666void 719bool
667set_should_invoke (int htype, int value) 720safe ()
668 CODE: 721 CODE:
669 rxvt_perl.should_invoke [htype] = value; 722 RETVAL = !rxvt_tainted ();
670 723 OUTPUT:
671void 724 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 725
681NV 726NV
682NOW () 727NOW ()
683 CODE: 728 CODE:
684 RETVAL = NOW; 729 RETVAL = NOW;
… …
732} 777}
733 OUTPUT: 778 OUTPUT:
734 RETVAL 779 RETVAL
735 780
736MODULE = urxvt PACKAGE = urxvt::term 781MODULE = urxvt PACKAGE = urxvt::term
782
783SV *
784_new (...)
785 CODE:
786{
787 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
788 croak ("first argument to urxvt::term->_new must be arrayref");
789
790 rxvt_term *term = new rxvt_term;
791
792 term->argv = new stringvec;
793 term->envv = new stringvec;
794
795 for (int i = 1; i < items; i++)
796 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
797
798 AV *envv = (AV *)SvRV (ST (0));
799 for (int i = av_len (envv) + 1; i--; )
800 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
801
802 term->envv->push_back (0);
803
804 bool success;
805
806 try
807 {
808 success = term->init (term->argv->size (), term->argv->begin ());
809 }
810 catch (const class rxvt_failure_exception &e)
811 {
812 success = false;
813 }
814
815 if (!success)
816 {
817 term->destroy ();
818 croak ("error while initializing new terminal instance");
819 }
820
821 RETVAL = term && term->perl.self
822 ? newSVterm (term) : &PL_sv_undef;
823}
824 OUTPUT:
825 RETVAL
737 826
738void 827void
739rxvt_term::destroy () 828rxvt_term::destroy ()
740 829
741void 830void
… …
765} 854}
766 OUTPUT: 855 OUTPUT:
767 RETVAL 856 RETVAL
768 857
769void 858void
770rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 859rxvt_term::allow_events_async ()
771 CODE: 860 CODE:
772 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 861 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
773 862
774void 863void
775rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 864rxvt_term::allow_events_sync ()
776 CODE: 865 CODE:
777 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 866 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
778 867
779void 868void
780rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 869rxvt_term::allow_events_replay ()
781 CODE: 870 CODE:
782 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 871 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
783 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 872 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
784 873
785void 874void
786rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 875rxvt_term::ungrab ()
787 CODE: 876 CODE:
788 THIS->perl.grabtime = 0; 877 ungrab (THIS);
789 XUngrabKeyboard (THIS->display->display, eventtime);
790 XUngrabPointer (THIS->display->display, eventtime);
791 878
792int 879int
793rxvt_term::strwidth (SV *str) 880rxvt_term::strwidth (SV *str)
794 CODE: 881 CODE:
795{ 882{
… …
814 char *mbstr = rxvt_wcstombs (wstr); 901 char *mbstr = rxvt_wcstombs (wstr);
815 rxvt_pop_locale (); 902 rxvt_pop_locale ();
816 903
817 free (wstr); 904 free (wstr);
818 905
819 RETVAL = newSVpv (mbstr, 0); 906 RETVAL = taint_if (newSVpv (mbstr, 0), str);
820 free (mbstr); 907 free (mbstr);
821} 908}
822 OUTPUT: 909 OUTPUT:
823 RETVAL 910 RETVAL
824 911
… …
831 918
832 rxvt_push_locale (THIS->locale); 919 rxvt_push_locale (THIS->locale);
833 wchar_t *wstr = rxvt_mbstowcs (data, len); 920 wchar_t *wstr = rxvt_mbstowcs (data, len);
834 rxvt_pop_locale (); 921 rxvt_pop_locale ();
835 922
836 RETVAL = wcs2sv (wstr); 923 RETVAL = taint_if (wcs2sv (wstr), octets);
837 free (wstr); 924 free (wstr);
838} 925}
839 OUTPUT: 926 OUTPUT:
840 RETVAL 927 RETVAL
841 928
… …
888 case 2: RETVAL = THIS->ModNumLockMask; break; 975 case 2: RETVAL = THIS->ModNumLockMask; break;
889 } 976 }
890 OUTPUT: 977 OUTPUT:
891 RETVAL 978 RETVAL
892 979
980char *
981rxvt_term::display_id ()
982 ALIAS:
983 display_id = 0
984 locale = 1
985 CODE:
986 switch (ix)
987 {
988 case 0: RETVAL = THIS->display->id; break;
989 case 1: RETVAL = THIS->locale; break;
990 }
991 OUTPUT:
992 RETVAL
993
994SV *
995rxvt_term::_env ()
996 CODE:
997{
998 if (THIS->envv)
999 {
1000 AV *av = newAV ();
1001
1002 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1003 if (*i)
1004 av_push (av, newSVpv (*i, 0));
1005
1006 RETVAL = newRV_noinc ((SV *)av);
1007 }
1008 else
1009 RETVAL = &PL_sv_undef;
1010}
1011 OUTPUT:
1012 RETVAL
1013
1014int
1015rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1016 CODE:
1017 RETVAL = THIS->pty_ev.events;
1018 if (events != EVENT_UNDEF)
1019 THIS->pty_ev.set (events);
1020 OUTPUT:
1021 RETVAL
1022
893U32 1023U32
894rxvt_term::parent () 1024rxvt_term::parent ()
895 CODE: 1025 CODE:
896 RETVAL = (U32)THIS->parent [0]; 1026 RETVAL = (U32)THIS->parent [0];
897 OUTPUT: 1027 OUTPUT:
… …
948 wchar_t *wstr = new wchar_t [THIS->ncol]; 1078 wchar_t *wstr = new wchar_t [THIS->ncol];
949 1079
950 for (int col = 0; col < THIS->ncol; col++) 1080 for (int col = 0; col < THIS->ncol; col++)
951 wstr [col] = l.t [col]; 1081 wstr [col] = l.t [col];
952 1082
953 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1083 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
954 1084
955 delete [] wstr; 1085 delete [] wstr;
956 } 1086 }
957 1087
958 if (new_text) 1088 if (new_text)
… …
1079 else 1209 else
1080 *r++ = *s; 1210 *r++ = *s;
1081 1211
1082 rxvt_pop_locale (); 1212 rxvt_pop_locale ();
1083 1213
1084 RETVAL = wcs2sv (rstr, r - rstr); 1214 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1085 1215
1086 delete [] rstr; 1216 delete [] rstr;
1087} 1217}
1088 OUTPUT: 1218 OUTPUT:
1089 RETVAL 1219 RETVAL
… …
1115 else if (IS_COMPOSE (*s)) 1245 else if (IS_COMPOSE (*s))
1116 r += rxvt_composite.expand (*s, r); 1246 r += rxvt_composite.expand (*s, r);
1117 else 1247 else
1118 *r++ = *s; 1248 *r++ = *s;
1119 1249
1120 RETVAL = wcs2sv (rstr, r - rstr); 1250 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1121 1251
1122 delete [] rstr; 1252 delete [] rstr;
1123} 1253}
1124 OUTPUT: 1254 OUTPUT:
1125 RETVAL 1255 RETVAL
… …
1147 1277
1148 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1278 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1149 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1279 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1150 1280
1151 if (GIMME_V != G_VOID) 1281 if (GIMME_V != G_VOID)
1152 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1282 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1153 1283
1154 if (newval) 1284 if (newval)
1155 { 1285 {
1156 if (SvOK (newval)) 1286 if (SvOK (newval))
1157 { 1287 {
… …
1162 else 1292 else
1163 THIS->rs [index] = 0; 1293 THIS->rs [index] = 0;
1164 } 1294 }
1165} 1295}
1166 1296
1297const char *
1298rxvt_term::x_resource (const char *name)
1299 CLEANUP:
1300 SvTAINTED_on (ST (0));
1301
1167bool 1302bool
1168rxvt_term::option (U32 optval, int set = -1) 1303rxvt_term::option (U32 optval, int set = -1)
1169 CODE: 1304 CODE:
1170{ 1305{
1171 RETVAL = THIS->options & optval; 1306 RETVAL = THIS->options & optval;
… …
1198 } 1333 }
1199} 1334}
1200 OUTPUT: 1335 OUTPUT:
1201 RETVAL 1336 RETVAL
1202 1337
1338bool
1339rxvt_term::parse_keysym (char *keysym, char *str)
1340 CODE:
1341 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1342 THIS->keyboard->register_done ();
1343 OUTPUT:
1344 RETVAL
1345
1203void 1346void
1204rxvt_term::cur (...) 1347rxvt_term::screen_cur (...)
1205 PROTOTYPE: $;$$ 1348 PROTOTYPE: $;$$
1206 ALIAS: 1349 ALIAS:
1207 screen_cur = 0 1350 screen_cur = 0
1208 selection_beg = 1 1351 selection_beg = 1
1209 selection_end = 2 1352 selection_end = 2
… …
1230 if (ix) 1373 if (ix)
1231 THIS->want_refresh = 1; 1374 THIS->want_refresh = 1;
1232 } 1375 }
1233} 1376}
1234 1377
1378char
1379rxvt_term::cur_charset ()
1380 CODE:
1381 RETVAL = THIS->charsets [THIS->screen.charset];
1382 OUTPUT:
1383 RETVAL
1384
1235int 1385int
1236rxvt_term::selection_grab (U32 eventtime) 1386rxvt_term::selection_grab (U32 eventtime)
1237 1387
1238void 1388void
1239rxvt_term::selection (SV *newtext = 0) 1389rxvt_term::selection (SV *newtext = 0)
1240 PPCODE: 1390 PPCODE:
1241{ 1391{
1242 if (GIMME_V != G_VOID) 1392 if (GIMME_V != G_VOID)
1393 XPUSHs (THIS->selection.text
1243 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1394 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1395 : &PL_sv_undef);
1244 1396
1245 if (newtext) 1397 if (newtext)
1246 { 1398 {
1247 free (THIS->selection.text); 1399 free (THIS->selection.text);
1248 1400
1249 THIS->selection.text = sv2wcs (newtext); 1401 THIS->selection.text = sv2wcs (newtext);
1250 THIS->selection.len = wcslen (THIS->selection.text); 1402 THIS->selection.len = wcslen (THIS->selection.text);
1251 } 1403 }
1252} 1404}
1405
1406void
1407rxvt_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)
1408
1409void
1410rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1411
1412void
1413rxvt_term::scr_bell ()
1253 1414
1254void 1415void
1255rxvt_term::scr_add_lines (SV *string) 1416rxvt_term::scr_add_lines (SV *string)
1256 CODE: 1417 CODE:
1257{ 1418{

Diff Legend

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