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.36 by root, Sat Jan 7 19:29:17 2006 UTC vs.
Revision 1.56 by root, Thu Jan 12 00:35:39 2006 UTC

… …
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28 28
29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef>
31#include <cstdarg> 32#include <cstdarg>
32 33
34#include "iom.h"
33#include "rxvt.h" 35#include "rxvt.h"
34#include "iom.h" 36#include "keyboard.h"
35#include "rxvtutil.h" 37#include "rxvtutil.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include "perlxsi.c" 40#include "perlxsi.c"
41
42#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
43# define GRAB_CURSOR THIS->leftptr_cursor
44#else
45# define GRAB_CURSOR None
46#endif
39 47
40#undef LINENO 48#undef LINENO
41#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)
42#undef ROW 50#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 51#define ROW(n) THIS->row_buf [LINENO (n)]
44 52
45///////////////////////////////////////////////////////////////////////////// 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}
46 70
47static wchar_t * 71static wchar_t *
48sv2wcs (SV *sv) 72sv2wcs (SV *sv)
49{ 73{
50 STRLEN len; 74 STRLEN len;
… …
387void 411void
388rxvt_perl_interp::init () 412rxvt_perl_interp::init ()
389{ 413{
390 if (!perl) 414 if (!perl)
391 { 415 {
416 temp_environ temp_environ(rxvt_environ);
417
392 char *argv[] = { 418 char *argv[] = {
393 "", 419 "",
420 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 421 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 422 };
396 423
397 perl = perl_alloc (); 424 perl = perl_alloc ();
398 perl_construct (perl); 425 perl_construct (perl);
399 426
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 427 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 428 || perl_run (perl))
402 { 429 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 430 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 431
405 perl_destruct (perl); 432 perl_destruct (perl);
406 perl_free (perl); 433 perl_free (perl);
407 perl = 0; 434 perl = 0;
408 } 435 }
436 }
437}
438
439static void
440ungrab (rxvt_term *THIS)
441{
442 if (THIS->perl.grabtime)
443 {
444 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
445 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
446 THIS->perl.grabtime = 0;
409 } 447 }
410} 448}
411 449
412bool 450bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 451rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
424 return false; // perl not initialized for this instance 462 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 463 else if (htype == HOOK_DESTROY)
426 { 464 {
427 // handled later 465 // handled later
428 } 466 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 467 else
430 { 468 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 469 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
432
433 if (HvKEYS (hv))
434 { 470 {
471 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
472
473 if (HvKEYS (hv))
474 {
435 hv_iterinit (hv); 475 hv_iterinit (hv);
436 476
437 while (HE *he = hv_iternext (hv)) 477 while (HE *he = hv_iternext (hv))
438 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 478 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
479 }
480
439 } 481 }
482
483 if (!should_invoke [htype])
484 return false;
440 } 485 }
441 else if (!should_invoke [htype]) 486
442 return false; 487 temp_environ temp_environ(rxvt_environ);
443 488
444 dSP; 489 dSP;
445 va_list ap; 490 va_list ap;
446 491
447 va_start (ap, htype); 492 va_start (ap, htype);
… …
466 case DT_LONG: 511 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 512 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 513 break;
469 514
470 case DT_STR: 515 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 516 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 517 break;
473 518
474 case DT_STR_LEN: 519 case DT_STR_LEN:
475 { 520 {
476 char *str = va_arg (ap, char *); 521 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int); 522 int len = va_arg (ap, int);
478 523
479 XPUSHs (sv_2mortal (newSVpvn (str, len))); 524 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
480 } 525 }
481 break; 526 break;
482 527
483 case DT_WCS_LEN: 528 case DT_WCS_LEN:
484 { 529 {
485 wchar_t *wstr = va_arg (ap, wchar_t *); 530 wchar_t *wstr = va_arg (ap, wchar_t *);
486 int wlen = va_arg (ap, int); 531 int wlen = va_arg (ap, int);
487 532
488 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 533 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
489 } 534 }
490 break; 535 break;
491 536
492 case DT_XEVENT: 537 case DT_XEVENT:
493 { 538 {
… …
558 PUTBACK; 603 PUTBACK;
559 FREETMPS; 604 FREETMPS;
560 LEAVE; 605 LEAVE;
561 606
562 if (SvTRUE (ERRSV)) 607 if (SvTRUE (ERRSV))
608 {
563 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 609 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
610 ungrab (term); // better lose the grab than the session
611 }
564 612
565 if (htype == HOOK_DESTROY) 613 if (htype == HOOK_DESTROY)
566 { 614 {
567 clearSVptr ((SV *)term->perl.self); 615 clearSVptr ((SV *)term->perl.self);
568 SvREFCNT_dec ((SV *)term->perl.self); 616 SvREFCNT_dec ((SV *)term->perl.self);
… …
583 631
584PROTOTYPES: ENABLE 632PROTOTYPES: ENABLE
585 633
586BOOT: 634BOOT:
587{ 635{
588# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 636 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
637 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
638 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
639 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
640
589 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 641 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
590# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 642# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
591# include "hookinc.h" 643# include "hookinc.h"
592# undef def 644# undef def
593 645
646 HV *option = get_hv ("urxvt::OPTION", 1);
647# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
648# define nodef(name)
649# include "optinc.h"
650# undef nodef
651# undef def
652
653 HV *stash = gv_stashpv ("urxvt", 1);
654# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
594 export_const (DEFAULT_RSTYLE); 655 export_const_iv (DEFAULT_RSTYLE);
595 export_const (OVERLAY_RSTYLE); 656 export_const_iv (OVERLAY_RSTYLE);
596 export_const (RS_Bold); 657 export_const_iv (RS_Bold);
597 export_const (RS_Italic); 658 export_const_iv (RS_Italic);
598 export_const (RS_Blink); 659 export_const_iv (RS_Blink);
599 export_const (RS_RVid); 660 export_const_iv (RS_RVid);
600 export_const (RS_Uline); 661 export_const_iv (RS_Uline);
662
601 export_const (CurrentTime); 663 export_const_iv (CurrentTime);
664 export_const_iv (ShiftMask);
665 export_const_iv (LockMask);
666 export_const_iv (ControlMask);
667 export_const_iv (Mod1Mask);
668 export_const_iv (Mod2Mask);
669 export_const_iv (Mod3Mask);
670 export_const_iv (Mod4Mask);
671 export_const_iv (Mod5Mask);
672 export_const_iv (Button1Mask);
673 export_const_iv (Button2Mask);
674 export_const_iv (Button3Mask);
675 export_const_iv (Button4Mask);
676 export_const_iv (Button5Mask);
677 export_const_iv (AnyModifier);
602 678
603 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 679 export_const_iv (EVENT_NONE);
680 export_const_iv (EVENT_READ);
681 export_const_iv (EVENT_WRITE);
604} 682}
683
684void
685set_should_invoke (int htype, int value)
686 CODE:
687 rxvt_perl.should_invoke [htype] = value;
688
689void
690warn (const char *msg)
691 CODE:
692 rxvt_warn ("%s", msg);
693
694void
695fatal (const char *msg)
696 CODE:
697 rxvt_fatal ("%s", msg);
605 698
606SV * 699SV *
607new (...) 700untaint (SV *sv)
608 CODE: 701 CODE:
609{ 702 RETVAL = newSVsv (sv);
610 stringvec *argv = new stringvec; 703 SvTAINTED_off (RETVAL);
611 bool success; 704 OUTPUT:
612
613 for (int i = 0; i < items ;i++)
614 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
615
616 rxvt_term *term = new rxvt_term;
617
618 term->argv = argv;
619
620 try
621 {
622 if (!term->init (argv->size (), argv->begin ()))
623 term = 0;
624 }
625 catch (const class rxvt_failure_exception &e)
626 {
627 term->destroy ();
628 croak ("exception caught while initializing new terminal instance");
629 }
630
631 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
632}
633 OUTPUT:
634 RETVAL 705 RETVAL
635 706
636void 707bool
637set_should_invoke (int htype, int value) 708safe ()
638 CODE: 709 CODE:
639 rxvt_perl.should_invoke [htype] = value; 710 RETVAL = !rxvt_tainted ();
640 711 OUTPUT:
641void 712 RETVAL
642warn (const char *msg)
643 CODE:
644 rxvt_warn ("%s", msg);
645
646void
647fatal (const char *msg)
648 CODE:
649 rxvt_fatal ("%s", msg);
650 713
651NV 714NV
652NOW () 715NOW ()
653 CODE: 716 CODE:
654 RETVAL = NOW; 717 RETVAL = NOW;
… …
703 OUTPUT: 766 OUTPUT:
704 RETVAL 767 RETVAL
705 768
706MODULE = urxvt PACKAGE = urxvt::term 769MODULE = urxvt PACKAGE = urxvt::term
707 770
771SV *
772_new (...)
773 CODE:
774{
775 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
776 croak ("first argument to urxvt::term->_new must be arrayref");
777
778 rxvt_term *term = new rxvt_term;
779
780 term->argv = new stringvec;
781 term->envv = new stringvec;
782
783 for (int i = 1; i < items; i++)
784 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
785
786 AV *envv = (AV *)SvRV (ST (0));
787 for (int i = av_len (envv) + 1; i--; )
788 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
789
790 term->envv->push_back (0);
791
792 bool success;
793
794 try
795 {
796 success = term->init (term->argv->size (), term->argv->begin ());
797 }
798 catch (const class rxvt_failure_exception &e)
799 {
800 success = false;
801 }
802
803 if (!success)
804 {
805 term->destroy ();
806 croak ("error while initializing new terminal instance");
807 }
808
809 RETVAL = term && term->perl.self
810 ? newSVterm (term) : &PL_sv_undef;
811}
812 OUTPUT:
813 RETVAL
814
708void 815void
709rxvt_term::destroy () 816rxvt_term::destroy ()
710 817
711void 818void
712rxvt_term::grab_button (int button, U32 modifiers) 819rxvt_term::grab_button (int button, U32 modifiers)
713 CODE: 820 CODE:
714 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 821 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
715 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 822 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
716 GrabModeSync, GrabModeSync, None, None); 823 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
717 824
718bool 825bool
719rxvt_term::grab (U32 eventtime, int sync = 0) 826rxvt_term::grab (U32 eventtime, int sync = 0)
720 CODE: 827 CODE:
721{ 828{
… …
723 830
724 THIS->perl.grabtime = 0; 831 THIS->perl.grabtime = 0;
725 832
726 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 833 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
727 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 834 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
728 mode, mode, None, None, eventtime)) 835 mode, mode, None, GRAB_CURSOR, eventtime))
729 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 836 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
730 THIS->perl.grabtime = eventtime; 837 THIS->perl.grabtime = eventtime;
731 else 838 else
732 XUngrabPointer (THIS->display->display, eventtime); 839 XUngrabPointer (THIS->display->display, eventtime);
733 840
… …
735} 842}
736 OUTPUT: 843 OUTPUT:
737 RETVAL 844 RETVAL
738 845
739void 846void
740rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 847rxvt_term::allow_events_async ()
741 CODE: 848 CODE:
742 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 849 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
743 850
744void 851void
745rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 852rxvt_term::allow_events_sync ()
746 CODE: 853 CODE:
747 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 854 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
748 855
749void 856void
750rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 857rxvt_term::allow_events_replay ()
751 CODE: 858 CODE:
752 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 859 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
753 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 860 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
754 861
755void 862void
756rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 863rxvt_term::ungrab ()
757 CODE: 864 CODE:
758 THIS->perl.grabtime = 0; 865 ungrab (THIS);
759 XUngrabKeyboard (THIS->display->display, eventtime);
760 XUngrabPointer (THIS->display->display, eventtime);
761 866
762int 867int
763rxvt_term::strwidth (SV *str) 868rxvt_term::strwidth (SV *str)
764 CODE: 869 CODE:
765{ 870{
… …
784 char *mbstr = rxvt_wcstombs (wstr); 889 char *mbstr = rxvt_wcstombs (wstr);
785 rxvt_pop_locale (); 890 rxvt_pop_locale ();
786 891
787 free (wstr); 892 free (wstr);
788 893
789 RETVAL = newSVpv (mbstr, 0); 894 RETVAL = taint_if (newSVpv (mbstr, 0), str);
790 free (mbstr); 895 free (mbstr);
791} 896}
792 OUTPUT: 897 OUTPUT:
793 RETVAL 898 RETVAL
794 899
… …
801 906
802 rxvt_push_locale (THIS->locale); 907 rxvt_push_locale (THIS->locale);
803 wchar_t *wstr = rxvt_mbstowcs (data, len); 908 wchar_t *wstr = rxvt_mbstowcs (data, len);
804 rxvt_pop_locale (); 909 rxvt_pop_locale ();
805 910
806 RETVAL = wcs2sv (wstr); 911 RETVAL = taint_if (wcs2sv (wstr), octets);
807 free (wstr); 912 free (wstr);
808} 913}
809 OUTPUT: 914 OUTPUT:
810 RETVAL 915 RETVAL
811 916
812# very portable, especially on objects as opposed to pods 917#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
813#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
814 918
815#define TERM_OFFSET_width TERM_OFFSET(width) 919#define TERM_OFFSET_width TERM_OFFSET(width)
816#define TERM_OFFSET_height TERM_OFFSET(height) 920#define TERM_OFFSET_height TERM_OFFSET(height)
817#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 921#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
818#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 922#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
843 CODE: 947 CODE:
844 RETVAL = *(int *)((char *)THIS + ix); 948 RETVAL = *(int *)((char *)THIS + ix);
845 OUTPUT: 949 OUTPUT:
846 RETVAL 950 RETVAL
847 951
952unsigned int
953rxvt_term::ModLevel3Mask ()
954 ALIAS:
955 ModLevel3Mask = 0
956 ModMetaMask = 1
957 ModNumLockMask = 2
958 CODE:
959 switch (ix)
960 {
961 case 0: RETVAL = THIS->ModLevel3Mask; break;
962 case 1: RETVAL = THIS->ModMetaMask; break;
963 case 2: RETVAL = THIS->ModNumLockMask; break;
964 }
965 OUTPUT:
966 RETVAL
967
968char *
969rxvt_term::display_id ()
970 ALIAS:
971 display_id = 0
972 locale = 1
973 CODE:
974 switch (ix)
975 {
976 case 0: RETVAL = THIS->display->id; break;
977 case 1: RETVAL = THIS->locale; break;
978 }
979 OUTPUT:
980 RETVAL
981
982SV *
983rxvt_term::_env ()
984 CODE:
985{
986 if (THIS->envv)
987 {
988 AV *av = newAV ();
989
990 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
991 if (*i)
992 av_push (av, newSVpv (*i, 0));
993
994 RETVAL = newRV_noinc ((SV *)av);
995 }
996 else
997 RETVAL = &PL_sv_undef;
998}
999 OUTPUT:
1000 RETVAL
1001
1002int
1003rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1004 CODE:
1005 RETVAL = THIS->pty_ev.events;
1006 if (events != EVENT_UNDEF)
1007 THIS->pty_ev.set (events);
1008 OUTPUT:
1009 RETVAL
1010
848U32 1011U32
849rxvt_term::parent () 1012rxvt_term::parent ()
850 CODE: 1013 CODE:
851 RETVAL = (U32)THIS->parent [0]; 1014 RETVAL = (U32)THIS->parent [0];
852 OUTPUT: 1015 OUTPUT:
… …
903 wchar_t *wstr = new wchar_t [THIS->ncol]; 1066 wchar_t *wstr = new wchar_t [THIS->ncol];
904 1067
905 for (int col = 0; col < THIS->ncol; col++) 1068 for (int col = 0; col < THIS->ncol; col++)
906 wstr [col] = l.t [col]; 1069 wstr [col] = l.t [col];
907 1070
908 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1071 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
909 1072
910 delete [] wstr; 1073 delete [] wstr;
911 } 1074 }
912 1075
913 if (new_text) 1076 if (new_text)
… …
1034 else 1197 else
1035 *r++ = *s; 1198 *r++ = *s;
1036 1199
1037 rxvt_pop_locale (); 1200 rxvt_pop_locale ();
1038 1201
1039 RETVAL = wcs2sv (rstr, r - rstr); 1202 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1040 1203
1041 delete [] rstr; 1204 delete [] rstr;
1042} 1205}
1043 OUTPUT: 1206 OUTPUT:
1044 RETVAL 1207 RETVAL
… …
1070 else if (IS_COMPOSE (*s)) 1233 else if (IS_COMPOSE (*s))
1071 r += rxvt_composite.expand (*s, r); 1234 r += rxvt_composite.expand (*s, r);
1072 else 1235 else
1073 *r++ = *s; 1236 *r++ = *s;
1074 1237
1075 RETVAL = wcs2sv (rstr, r - rstr); 1238 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1076 1239
1077 delete [] rstr; 1240 delete [] rstr;
1078} 1241}
1079 OUTPUT: 1242 OUTPUT:
1080 RETVAL 1243 RETVAL
… …
1102 1265
1103 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1266 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1104 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1267 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1105 1268
1106 if (GIMME_V != G_VOID) 1269 if (GIMME_V != G_VOID)
1107 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1270 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1108 1271
1109 if (newval) 1272 if (newval)
1110 { 1273 {
1111 if (SvOK (newval)) 1274 if (SvOK (newval))
1112 { 1275 {
… …
1117 else 1280 else
1118 THIS->rs [index] = 0; 1281 THIS->rs [index] = 0;
1119 } 1282 }
1120} 1283}
1121 1284
1285const char *
1286rxvt_term::x_resource (const char *name)
1287 CLEANUP:
1288 SvTAINTED_on (ST (0));
1289
1290bool
1291rxvt_term::option (U32 optval, int set = -1)
1292 CODE:
1293{
1294 RETVAL = THIS->options & optval;
1295
1296 if (set >= 0)
1297 {
1298 if (set)
1299 THIS->options |= optval;
1300 else
1301 THIS->options &= ~optval;
1302
1303 switch (optval)
1304 {
1305 case Opt_skipBuiltinGlyphs:
1306 THIS->set_fonts ();
1307 THIS->scr_remap_chars ();
1308 THIS->scr_touch (true);
1309 THIS->want_refresh = 1;
1310 break;
1311
1312 case Opt_cursorUnderline:
1313 THIS->want_refresh = 1;
1314 break;
1315
1316# case Opt_scrollBar_floating:
1317# case Opt_scrollBar_right:
1318# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1319# break;
1320 }
1321 }
1322}
1323 OUTPUT:
1324 RETVAL
1325
1326bool
1327rxvt_term::parse_keysym (char *keysym, char *str)
1328 CODE:
1329 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1330 THIS->keyboard->register_done ();
1331 OUTPUT:
1332 RETVAL
1333
1122void 1334void
1123rxvt_term::cur (...) 1335rxvt_term::screen_cur (...)
1124 PROTOTYPE: $;$$ 1336 PROTOTYPE: $;$$
1125 ALIAS: 1337 ALIAS:
1126 screen_cur = 0 1338 screen_cur = 0
1127 selection_beg = 1 1339 selection_beg = 1
1128 selection_end = 2 1340 selection_end = 2
… …
1149 if (ix) 1361 if (ix)
1150 THIS->want_refresh = 1; 1362 THIS->want_refresh = 1;
1151 } 1363 }
1152} 1364}
1153 1365
1366char
1367rxvt_term::cur_charset ()
1368 CODE:
1369 RETVAL = THIS->charsets [THIS->screen.charset];
1370 OUTPUT:
1371 RETVAL
1372
1154int 1373int
1155rxvt_term::selection_grab (U32 eventtime) 1374rxvt_term::selection_grab (U32 eventtime)
1156 1375
1157void 1376void
1158rxvt_term::selection (SV *newtext = 0) 1377rxvt_term::selection (SV *newtext = 0)
1159 PPCODE: 1378 PPCODE:
1160{ 1379{
1161 if (GIMME_V != G_VOID) 1380 if (GIMME_V != G_VOID)
1381 XPUSHs (THIS->selection.text
1162 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1382 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1383 : &PL_sv_undef);
1163 1384
1164 if (newtext) 1385 if (newtext)
1165 { 1386 {
1166 free (THIS->selection.text); 1387 free (THIS->selection.text);
1167 1388
1168 THIS->selection.text = sv2wcs (newtext); 1389 THIS->selection.text = sv2wcs (newtext);
1169 THIS->selection.len = wcslen (THIS->selection.text); 1390 THIS->selection.len = wcslen (THIS->selection.text);
1170 } 1391 }
1171} 1392}
1393
1394void
1395rxvt_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)
1396
1397void
1398rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1399
1400void
1401rxvt_term::scr_bell ()
1172 1402
1173void 1403void
1174rxvt_term::scr_add_lines (SV *string) 1404rxvt_term::scr_add_lines (SV *string)
1175 CODE: 1405 CODE:
1176{ 1406{

Diff Legend

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