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.38 by root, Sat Jan 7 21:22:02 2006 UTC vs.
Revision 1.54 by root, Wed Jan 11 00:59:58 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"
41
42#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
43# define GRAB_CURSOR THIS->leftptr_cursor
44#else
45# define GRAB_CURSOR None
46#endif
40 47
41#undef LINENO 48#undef LINENO
42#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)
43#undef ROW 50#undef ROW
44#define ROW(n) THIS->row_buf [LINENO (n)] 51#define ROW(n) THIS->row_buf [LINENO (n)]
45 52
46///////////////////////////////////////////////////////////////////////////// 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}
47 70
48static wchar_t * 71static wchar_t *
49sv2wcs (SV *sv) 72sv2wcs (SV *sv)
50{ 73{
51 STRLEN len; 74 STRLEN len;
390{ 413{
391 if (!perl) 414 if (!perl)
392 { 415 {
393 char *argv[] = { 416 char *argv[] = {
394 "", 417 "",
418 "-T",
395 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 419 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
396 }; 420 };
397 421
398 perl = perl_alloc (); 422 perl = perl_alloc ();
399 perl_construct (perl); 423 perl_construct (perl);
400 424
401 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 425 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
402 || perl_run (perl)) 426 || perl_run (perl))
403 { 427 {
404 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 428 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
405 429
406 perl_destruct (perl); 430 perl_destruct (perl);
407 perl_free (perl); 431 perl_free (perl);
408 perl = 0; 432 perl = 0;
409 } 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;
410 } 445 }
411} 446}
412 447
413bool 448bool
414rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 449rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
425 return false; // perl not initialized for this instance 460 return false; // perl not initialized for this instance
426 else if (htype == HOOK_DESTROY) 461 else if (htype == HOOK_DESTROY)
427 { 462 {
428 // handled later 463 // handled later
429 } 464 }
430 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 465 else
431 { 466 {
432 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)
433
434 if (HvKEYS (hv))
435 { 468 {
469 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
470
471 if (HvKEYS (hv))
472 {
436 hv_iterinit (hv); 473 hv_iterinit (hv);
437 474
438 while (HE *he = hv_iternext (hv)) 475 while (HE *he = hv_iternext (hv))
439 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 476 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
477 }
478
440 } 479 }
480
481 if (!should_invoke [htype])
482 return false;
441 } 483 }
442 else if (!should_invoke [htype])
443 return false;
444 484
445 dSP; 485 dSP;
446 va_list ap; 486 va_list ap;
447 487
448 va_start (ap, htype); 488 va_start (ap, htype);
467 case DT_LONG: 507 case DT_LONG:
468 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
469 break; 509 break;
470 510
471 case DT_STR: 511 case DT_STR:
472 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 512 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
473 break; 513 break;
474 514
475 case DT_STR_LEN: 515 case DT_STR_LEN:
476 { 516 {
477 char *str = va_arg (ap, char *); 517 char *str = va_arg (ap, char *);
478 int len = va_arg (ap, int); 518 int len = va_arg (ap, int);
479 519
480 XPUSHs (sv_2mortal (newSVpvn (str, len))); 520 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
481 } 521 }
482 break; 522 break;
483 523
484 case DT_WCS_LEN: 524 case DT_WCS_LEN:
485 { 525 {
486 wchar_t *wstr = va_arg (ap, wchar_t *); 526 wchar_t *wstr = va_arg (ap, wchar_t *);
487 int wlen = va_arg (ap, int); 527 int wlen = va_arg (ap, int);
488 528
489 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 529 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
490 } 530 }
491 break; 531 break;
492 532
493 case DT_XEVENT: 533 case DT_XEVENT:
494 { 534 {
559 PUTBACK; 599 PUTBACK;
560 FREETMPS; 600 FREETMPS;
561 LEAVE; 601 LEAVE;
562 602
563 if (SvTRUE (ERRSV)) 603 if (SvTRUE (ERRSV))
604 {
564 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 }
565 608
566 if (htype == HOOK_DESTROY) 609 if (htype == HOOK_DESTROY)
567 { 610 {
568 clearSVptr ((SV *)term->perl.self); 611 clearSVptr ((SV *)term->perl.self);
569 SvREFCNT_dec ((SV *)term->perl.self); 612 SvREFCNT_dec ((SV *)term->perl.self);
584 627
585PROTOTYPES: ENABLE 628PROTOTYPES: ENABLE
586 629
587BOOT: 630BOOT:
588{ 631{
589 HV *stash = gv_stashpv ("urxvt", 1); 632 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
590# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name)); 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));
591 636
592 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 637 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
593# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 638# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
594# include "hookinc.h" 639# include "hookinc.h"
595# undef def 640# undef def
596 641
597 642 HV *option = get_hv ("urxvt::OPTION", 1);
643# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
644# define nodef(name)
645# include "optinc.h"
646# undef nodef
647# undef def
648
649 HV *stash = gv_stashpv ("urxvt", 1);
650# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
598 export_const_iv (DEFAULT_RSTYLE); 651 export_const_iv (DEFAULT_RSTYLE);
599 export_const_iv (OVERLAY_RSTYLE); 652 export_const_iv (OVERLAY_RSTYLE);
600 export_const_iv (RS_Bold); 653 export_const_iv (RS_Bold);
601 export_const_iv (RS_Italic); 654 export_const_iv (RS_Italic);
602 export_const_iv (RS_Blink); 655 export_const_iv (RS_Blink);
617 export_const_iv (Button3Mask); 670 export_const_iv (Button3Mask);
618 export_const_iv (Button4Mask); 671 export_const_iv (Button4Mask);
619 export_const_iv (Button5Mask); 672 export_const_iv (Button5Mask);
620 export_const_iv (AnyModifier); 673 export_const_iv (AnyModifier);
621 674
622 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1)); 675 export_const_iv (EVENT_NONE);
676 export_const_iv (EVENT_READ);
677 export_const_iv (EVENT_WRITE);
623} 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);
624 694
625SV * 695SV *
626new (...) 696untaint (SV *sv)
627 CODE: 697 CODE:
628{ 698 RETVAL = newSVsv (sv);
629 stringvec *argv = new stringvec; 699 SvTAINTED_off (RETVAL);
630 bool success; 700 OUTPUT:
631
632 for (int i = 0; i < items ;i++)
633 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
634
635 rxvt_term *term = new rxvt_term;
636
637 term->argv = argv;
638
639 try
640 {
641 if (!term->init (argv->size (), argv->begin ()))
642 term = 0;
643 }
644 catch (const class rxvt_failure_exception &e)
645 {
646 term->destroy ();
647 croak ("exception caught while initializing new terminal instance");
648 }
649
650 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
651}
652 OUTPUT:
653 RETVAL 701 RETVAL
654 702
655void 703bool
656set_should_invoke (int htype, int value) 704safe ()
657 CODE: 705 CODE:
658 rxvt_perl.should_invoke [htype] = value; 706 RETVAL = !rxvt_tainted ();
659 707 OUTPUT:
660void 708 RETVAL
661warn (const char *msg)
662 CODE:
663 rxvt_warn ("%s", msg);
664
665void
666fatal (const char *msg)
667 CODE:
668 rxvt_fatal ("%s", msg);
669 709
670NV 710NV
671NOW () 711NOW ()
672 CODE: 712 CODE:
673 RETVAL = NOW; 713 RETVAL = NOW;
722 OUTPUT: 762 OUTPUT:
723 RETVAL 763 RETVAL
724 764
725MODULE = urxvt PACKAGE = urxvt::term 765MODULE = urxvt PACKAGE = urxvt::term
726 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
810
727void 811void
728rxvt_term::destroy () 812rxvt_term::destroy ()
729 813
730void 814void
731rxvt_term::grab_button (int button, U32 modifiers) 815rxvt_term::grab_button (int button, U32 modifiers)
732 CODE: 816 CODE:
733 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 817 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
734 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 818 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
735 GrabModeSync, GrabModeSync, None, None); 819 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
736 820
737bool 821bool
738rxvt_term::grab (U32 eventtime, int sync = 0) 822rxvt_term::grab (U32 eventtime, int sync = 0)
739 CODE: 823 CODE:
740{ 824{
742 826
743 THIS->perl.grabtime = 0; 827 THIS->perl.grabtime = 0;
744 828
745 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 829 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
746 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 830 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
747 mode, mode, None, None, eventtime)) 831 mode, mode, None, GRAB_CURSOR, eventtime))
748 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 832 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
749 THIS->perl.grabtime = eventtime; 833 THIS->perl.grabtime = eventtime;
750 else 834 else
751 XUngrabPointer (THIS->display->display, eventtime); 835 XUngrabPointer (THIS->display->display, eventtime);
752 836
754} 838}
755 OUTPUT: 839 OUTPUT:
756 RETVAL 840 RETVAL
757 841
758void 842void
759rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 843rxvt_term::allow_events_async ()
760 CODE: 844 CODE:
761 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 845 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
762 846
763void 847void
764rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 848rxvt_term::allow_events_sync ()
765 CODE: 849 CODE:
766 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 850 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
767 851
768void 852void
769rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 853rxvt_term::allow_events_replay ()
770 CODE: 854 CODE:
771 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 855 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
772 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 856 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
773 857
774void 858void
775rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 859rxvt_term::ungrab ()
776 CODE: 860 CODE:
777 THIS->perl.grabtime = 0; 861 ungrab (THIS);
778 XUngrabKeyboard (THIS->display->display, eventtime);
779 XUngrabPointer (THIS->display->display, eventtime);
780 862
781int 863int
782rxvt_term::strwidth (SV *str) 864rxvt_term::strwidth (SV *str)
783 CODE: 865 CODE:
784{ 866{
803 char *mbstr = rxvt_wcstombs (wstr); 885 char *mbstr = rxvt_wcstombs (wstr);
804 rxvt_pop_locale (); 886 rxvt_pop_locale ();
805 887
806 free (wstr); 888 free (wstr);
807 889
808 RETVAL = newSVpv (mbstr, 0); 890 RETVAL = taint_if (newSVpv (mbstr, 0), str);
809 free (mbstr); 891 free (mbstr);
810} 892}
811 OUTPUT: 893 OUTPUT:
812 RETVAL 894 RETVAL
813 895
820 902
821 rxvt_push_locale (THIS->locale); 903 rxvt_push_locale (THIS->locale);
822 wchar_t *wstr = rxvt_mbstowcs (data, len); 904 wchar_t *wstr = rxvt_mbstowcs (data, len);
823 rxvt_pop_locale (); 905 rxvt_pop_locale ();
824 906
825 RETVAL = wcs2sv (wstr); 907 RETVAL = taint_if (wcs2sv (wstr), octets);
826 free (wstr); 908 free (wstr);
827} 909}
828 OUTPUT: 910 OUTPUT:
829 RETVAL 911 RETVAL
830 912
877 case 2: RETVAL = THIS->ModNumLockMask; break; 959 case 2: RETVAL = THIS->ModNumLockMask; break;
878 } 960 }
879 OUTPUT: 961 OUTPUT:
880 RETVAL 962 RETVAL
881 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
882U32 1007U32
883rxvt_term::parent () 1008rxvt_term::parent ()
884 CODE: 1009 CODE:
885 RETVAL = (U32)THIS->parent [0]; 1010 RETVAL = (U32)THIS->parent [0];
886 OUTPUT: 1011 OUTPUT:
937 wchar_t *wstr = new wchar_t [THIS->ncol]; 1062 wchar_t *wstr = new wchar_t [THIS->ncol];
938 1063
939 for (int col = 0; col < THIS->ncol; col++) 1064 for (int col = 0; col < THIS->ncol; col++)
940 wstr [col] = l.t [col]; 1065 wstr [col] = l.t [col];
941 1066
942 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1067 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
943 1068
944 delete [] wstr; 1069 delete [] wstr;
945 } 1070 }
946 1071
947 if (new_text) 1072 if (new_text)
1068 else 1193 else
1069 *r++ = *s; 1194 *r++ = *s;
1070 1195
1071 rxvt_pop_locale (); 1196 rxvt_pop_locale ();
1072 1197
1073 RETVAL = wcs2sv (rstr, r - rstr); 1198 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1074 1199
1075 delete [] rstr; 1200 delete [] rstr;
1076} 1201}
1077 OUTPUT: 1202 OUTPUT:
1078 RETVAL 1203 RETVAL
1104 else if (IS_COMPOSE (*s)) 1229 else if (IS_COMPOSE (*s))
1105 r += rxvt_composite.expand (*s, r); 1230 r += rxvt_composite.expand (*s, r);
1106 else 1231 else
1107 *r++ = *s; 1232 *r++ = *s;
1108 1233
1109 RETVAL = wcs2sv (rstr, r - rstr); 1234 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1110 1235
1111 delete [] rstr; 1236 delete [] rstr;
1112} 1237}
1113 OUTPUT: 1238 OUTPUT:
1114 RETVAL 1239 RETVAL
1136 1261
1137 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1262 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1138 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);
1139 1264
1140 if (GIMME_V != G_VOID) 1265 if (GIMME_V != G_VOID)
1141 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);
1142 1267
1143 if (newval) 1268 if (newval)
1144 { 1269 {
1145 if (SvOK (newval)) 1270 if (SvOK (newval))
1146 { 1271 {
1151 else 1276 else
1152 THIS->rs [index] = 0; 1277 THIS->rs [index] = 0;
1153 } 1278 }
1154} 1279}
1155 1280
1281bool
1282rxvt_term::option (U32 optval, int set = -1)
1283 CODE:
1284{
1285 RETVAL = THIS->options & optval;
1286
1287 if (set >= 0)
1288 {
1289 if (set)
1290 THIS->options |= optval;
1291 else
1292 THIS->options &= ~optval;
1293
1294 switch (optval)
1295 {
1296 case Opt_skipBuiltinGlyphs:
1297 THIS->set_fonts ();
1298 THIS->scr_remap_chars ();
1299 THIS->scr_touch (true);
1300 THIS->want_refresh = 1;
1301 break;
1302
1303 case Opt_cursorUnderline:
1304 THIS->want_refresh = 1;
1305 break;
1306
1307# case Opt_scrollBar_floating:
1308# case Opt_scrollBar_right:
1309# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1310# break;
1311 }
1312 }
1313}
1314 OUTPUT:
1315 RETVAL
1316
1317bool
1318rxvt_term::parse_keysym (char *keysym, char *str)
1319 CODE:
1320 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1321 THIS->keyboard->register_done ();
1322 OUTPUT:
1323 RETVAL
1324
1156void 1325void
1157rxvt_term::cur (...) 1326rxvt_term::screen_cur (...)
1158 PROTOTYPE: $;$$ 1327 PROTOTYPE: $;$$
1159 ALIAS: 1328 ALIAS:
1160 screen_cur = 0 1329 screen_cur = 0
1161 selection_beg = 1 1330 selection_beg = 1
1162 selection_end = 2 1331 selection_end = 2
1183 if (ix) 1352 if (ix)
1184 THIS->want_refresh = 1; 1353 THIS->want_refresh = 1;
1185 } 1354 }
1186} 1355}
1187 1356
1357char
1358rxvt_term::cur_charset ()
1359 CODE:
1360 RETVAL = THIS->charsets [THIS->screen.charset];
1361 OUTPUT:
1362 RETVAL
1363
1188int 1364int
1189rxvt_term::selection_grab (U32 eventtime) 1365rxvt_term::selection_grab (U32 eventtime)
1190 1366
1191void 1367void
1192rxvt_term::selection (SV *newtext = 0) 1368rxvt_term::selection (SV *newtext = 0)
1193 PPCODE: 1369 PPCODE:
1194{ 1370{
1195 if (GIMME_V != G_VOID) 1371 if (GIMME_V != G_VOID)
1372 XPUSHs (THIS->selection.text
1196 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1373 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1374 : &PL_sv_undef);
1197 1375
1198 if (newtext) 1376 if (newtext)
1199 { 1377 {
1200 free (THIS->selection.text); 1378 free (THIS->selection.text);
1201 1379
1202 THIS->selection.text = sv2wcs (newtext); 1380 THIS->selection.text = sv2wcs (newtext);
1203 THIS->selection.len = wcslen (THIS->selection.text); 1381 THIS->selection.len = wcslen (THIS->selection.text);
1204 } 1382 }
1205} 1383}
1384
1385void
1386rxvt_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)
1387
1388void
1389rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1390
1391void
1392rxvt_term::scr_bell ()
1206 1393
1207void 1394void
1208rxvt_term::scr_add_lines (SV *string) 1395rxvt_term::scr_add_lines (SV *string)
1209 CODE: 1396 CODE:
1210{ 1397{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines