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.56 by root, Thu Jan 12 00:35:39 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 temp_environ temp_environ(rxvt_environ);
417
399 char *argv[] = { 418 char *argv[] = {
400 "", 419 "",
420 "-T",
401 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 421 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
402 }; 422 };
403 423
404 perl = perl_alloc (); 424 perl = perl_alloc ();
405 perl_construct (perl); 425 perl_construct (perl);
406 426
407 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 427 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
408 || perl_run (perl)) 428 || perl_run (perl))
409 { 429 {
410 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 430 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
411 431
412 perl_destruct (perl); 432 perl_destruct (perl);
413 perl_free (perl); 433 perl_free (perl);
414 perl = 0; 434 perl = 0;
415 } 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;
416 } 447 }
417} 448}
418 449
419bool 450bool
420rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 451rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
431 return false; // perl not initialized for this instance 462 return false; // perl not initialized for this instance
432 else if (htype == HOOK_DESTROY) 463 else if (htype == HOOK_DESTROY)
433 { 464 {
434 // handled later 465 // handled later
435 } 466 }
436 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 467 else
437 { 468 {
438 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)
439
440 if (HvKEYS (hv))
441 { 470 {
471 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
472
473 if (HvKEYS (hv))
474 {
442 hv_iterinit (hv); 475 hv_iterinit (hv);
443 476
444 while (HE *he = hv_iternext (hv)) 477 while (HE *he = hv_iternext (hv))
445 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 478 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
479 }
480
446 } 481 }
482
483 if (!should_invoke [htype])
484 return false;
447 } 485 }
448 else if (!should_invoke [htype]) 486
449 return false; 487 temp_environ temp_environ(rxvt_environ);
450 488
451 dSP; 489 dSP;
452 va_list ap; 490 va_list ap;
453 491
454 va_start (ap, htype); 492 va_start (ap, htype);
473 case DT_LONG: 511 case DT_LONG:
474 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 512 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
475 break; 513 break;
476 514
477 case DT_STR: 515 case DT_STR:
478 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 516 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
479 break; 517 break;
480 518
481 case DT_STR_LEN: 519 case DT_STR_LEN:
482 { 520 {
483 char *str = va_arg (ap, char *); 521 char *str = va_arg (ap, char *);
484 int len = va_arg (ap, int); 522 int len = va_arg (ap, int);
485 523
486 XPUSHs (sv_2mortal (newSVpvn (str, len))); 524 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
487 } 525 }
488 break; 526 break;
489 527
490 case DT_WCS_LEN: 528 case DT_WCS_LEN:
491 { 529 {
492 wchar_t *wstr = va_arg (ap, wchar_t *); 530 wchar_t *wstr = va_arg (ap, wchar_t *);
493 int wlen = va_arg (ap, int); 531 int wlen = va_arg (ap, int);
494 532
495 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 533 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
496 } 534 }
497 break; 535 break;
498 536
499 case DT_XEVENT: 537 case DT_XEVENT:
500 { 538 {
565 PUTBACK; 603 PUTBACK;
566 FREETMPS; 604 FREETMPS;
567 LEAVE; 605 LEAVE;
568 606
569 if (SvTRUE (ERRSV)) 607 if (SvTRUE (ERRSV))
608 {
570 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 }
571 612
572 if (htype == HOOK_DESTROY) 613 if (htype == HOOK_DESTROY)
573 { 614 {
574 clearSVptr ((SV *)term->perl.self); 615 clearSVptr ((SV *)term->perl.self);
575 SvREFCNT_dec ((SV *)term->perl.self); 616 SvREFCNT_dec ((SV *)term->perl.self);
590 631
591PROTOTYPES: ENABLE 632PROTOTYPES: ENABLE
592 633
593BOOT: 634BOOT:
594{ 635{
595 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1)); 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));
596 640
597 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 641 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
598# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 642# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
599# include "hookinc.h" 643# include "hookinc.h"
600# undef def 644# undef def
629 export_const_iv (Button2Mask); 673 export_const_iv (Button2Mask);
630 export_const_iv (Button3Mask); 674 export_const_iv (Button3Mask);
631 export_const_iv (Button4Mask); 675 export_const_iv (Button4Mask);
632 export_const_iv (Button5Mask); 676 export_const_iv (Button5Mask);
633 export_const_iv (AnyModifier); 677 export_const_iv (AnyModifier);
678
679 export_const_iv (EVENT_NONE);
680 export_const_iv (EVENT_READ);
681 export_const_iv (EVENT_WRITE);
634} 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);
635 698
636SV * 699SV *
637new (...) 700untaint (SV *sv)
638 CODE: 701 CODE:
639{ 702 RETVAL = newSVsv (sv);
640 stringvec *argv = new stringvec; 703 SvTAINTED_off (RETVAL);
641 bool success; 704 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 705 RETVAL
665 706
666void 707bool
667set_should_invoke (int htype, int value) 708safe ()
668 CODE: 709 CODE:
669 rxvt_perl.should_invoke [htype] = value; 710 RETVAL = !rxvt_tainted ();
670 711 OUTPUT:
671void 712 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 713
681NV 714NV
682NOW () 715NOW ()
683 CODE: 716 CODE:
684 RETVAL = NOW; 717 RETVAL = NOW;
732} 765}
733 OUTPUT: 766 OUTPUT:
734 RETVAL 767 RETVAL
735 768
736MODULE = urxvt PACKAGE = urxvt::term 769MODULE = urxvt PACKAGE = urxvt::term
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
737 814
738void 815void
739rxvt_term::destroy () 816rxvt_term::destroy ()
740 817
741void 818void
765} 842}
766 OUTPUT: 843 OUTPUT:
767 RETVAL 844 RETVAL
768 845
769void 846void
770rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 847rxvt_term::allow_events_async ()
771 CODE: 848 CODE:
772 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 849 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
773 850
774void 851void
775rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 852rxvt_term::allow_events_sync ()
776 CODE: 853 CODE:
777 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 854 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
778 855
779void 856void
780rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 857rxvt_term::allow_events_replay ()
781 CODE: 858 CODE:
782 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 859 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
783 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 860 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
784 861
785void 862void
786rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 863rxvt_term::ungrab ()
787 CODE: 864 CODE:
788 THIS->perl.grabtime = 0; 865 ungrab (THIS);
789 XUngrabKeyboard (THIS->display->display, eventtime);
790 XUngrabPointer (THIS->display->display, eventtime);
791 866
792int 867int
793rxvt_term::strwidth (SV *str) 868rxvt_term::strwidth (SV *str)
794 CODE: 869 CODE:
795{ 870{
814 char *mbstr = rxvt_wcstombs (wstr); 889 char *mbstr = rxvt_wcstombs (wstr);
815 rxvt_pop_locale (); 890 rxvt_pop_locale ();
816 891
817 free (wstr); 892 free (wstr);
818 893
819 RETVAL = newSVpv (mbstr, 0); 894 RETVAL = taint_if (newSVpv (mbstr, 0), str);
820 free (mbstr); 895 free (mbstr);
821} 896}
822 OUTPUT: 897 OUTPUT:
823 RETVAL 898 RETVAL
824 899
831 906
832 rxvt_push_locale (THIS->locale); 907 rxvt_push_locale (THIS->locale);
833 wchar_t *wstr = rxvt_mbstowcs (data, len); 908 wchar_t *wstr = rxvt_mbstowcs (data, len);
834 rxvt_pop_locale (); 909 rxvt_pop_locale ();
835 910
836 RETVAL = wcs2sv (wstr); 911 RETVAL = taint_if (wcs2sv (wstr), octets);
837 free (wstr); 912 free (wstr);
838} 913}
839 OUTPUT: 914 OUTPUT:
840 RETVAL 915 RETVAL
841 916
888 case 2: RETVAL = THIS->ModNumLockMask; break; 963 case 2: RETVAL = THIS->ModNumLockMask; break;
889 } 964 }
890 OUTPUT: 965 OUTPUT:
891 RETVAL 966 RETVAL
892 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
893U32 1011U32
894rxvt_term::parent () 1012rxvt_term::parent ()
895 CODE: 1013 CODE:
896 RETVAL = (U32)THIS->parent [0]; 1014 RETVAL = (U32)THIS->parent [0];
897 OUTPUT: 1015 OUTPUT:
948 wchar_t *wstr = new wchar_t [THIS->ncol]; 1066 wchar_t *wstr = new wchar_t [THIS->ncol];
949 1067
950 for (int col = 0; col < THIS->ncol; col++) 1068 for (int col = 0; col < THIS->ncol; col++)
951 wstr [col] = l.t [col]; 1069 wstr [col] = l.t [col];
952 1070
953 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1071 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
954 1072
955 delete [] wstr; 1073 delete [] wstr;
956 } 1074 }
957 1075
958 if (new_text) 1076 if (new_text)
1079 else 1197 else
1080 *r++ = *s; 1198 *r++ = *s;
1081 1199
1082 rxvt_pop_locale (); 1200 rxvt_pop_locale ();
1083 1201
1084 RETVAL = wcs2sv (rstr, r - rstr); 1202 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1085 1203
1086 delete [] rstr; 1204 delete [] rstr;
1087} 1205}
1088 OUTPUT: 1206 OUTPUT:
1089 RETVAL 1207 RETVAL
1115 else if (IS_COMPOSE (*s)) 1233 else if (IS_COMPOSE (*s))
1116 r += rxvt_composite.expand (*s, r); 1234 r += rxvt_composite.expand (*s, r);
1117 else 1235 else
1118 *r++ = *s; 1236 *r++ = *s;
1119 1237
1120 RETVAL = wcs2sv (rstr, r - rstr); 1238 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1121 1239
1122 delete [] rstr; 1240 delete [] rstr;
1123} 1241}
1124 OUTPUT: 1242 OUTPUT:
1125 RETVAL 1243 RETVAL
1147 1265
1148 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1266 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1149 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);
1150 1268
1151 if (GIMME_V != G_VOID) 1269 if (GIMME_V != G_VOID)
1152 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);
1153 1271
1154 if (newval) 1272 if (newval)
1155 { 1273 {
1156 if (SvOK (newval)) 1274 if (SvOK (newval))
1157 { 1275 {
1162 else 1280 else
1163 THIS->rs [index] = 0; 1281 THIS->rs [index] = 0;
1164 } 1282 }
1165} 1283}
1166 1284
1285const char *
1286rxvt_term::x_resource (const char *name)
1287 CLEANUP:
1288 SvTAINTED_on (ST (0));
1289
1167bool 1290bool
1168rxvt_term::option (U32 optval, int set = -1) 1291rxvt_term::option (U32 optval, int set = -1)
1169 CODE: 1292 CODE:
1170{ 1293{
1171 RETVAL = THIS->options & optval; 1294 RETVAL = THIS->options & optval;
1198 } 1321 }
1199} 1322}
1200 OUTPUT: 1323 OUTPUT:
1201 RETVAL 1324 RETVAL
1202 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
1203void 1334void
1204rxvt_term::cur (...) 1335rxvt_term::screen_cur (...)
1205 PROTOTYPE: $;$$ 1336 PROTOTYPE: $;$$
1206 ALIAS: 1337 ALIAS:
1207 screen_cur = 0 1338 screen_cur = 0
1208 selection_beg = 1 1339 selection_beg = 1
1209 selection_end = 2 1340 selection_end = 2
1230 if (ix) 1361 if (ix)
1231 THIS->want_refresh = 1; 1362 THIS->want_refresh = 1;
1232 } 1363 }
1233} 1364}
1234 1365
1366char
1367rxvt_term::cur_charset ()
1368 CODE:
1369 RETVAL = THIS->charsets [THIS->screen.charset];
1370 OUTPUT:
1371 RETVAL
1372
1235int 1373int
1236rxvt_term::selection_grab (U32 eventtime) 1374rxvt_term::selection_grab (U32 eventtime)
1237 1375
1238void 1376void
1239rxvt_term::selection (SV *newtext = 0) 1377rxvt_term::selection (SV *newtext = 0)
1240 PPCODE: 1378 PPCODE:
1241{ 1379{
1242 if (GIMME_V != G_VOID) 1380 if (GIMME_V != G_VOID)
1381 XPUSHs (THIS->selection.text
1243 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);
1244 1384
1245 if (newtext) 1385 if (newtext)
1246 { 1386 {
1247 free (THIS->selection.text); 1387 free (THIS->selection.text);
1248 1388
1249 THIS->selection.text = sv2wcs (newtext); 1389 THIS->selection.text = sv2wcs (newtext);
1250 THIS->selection.len = wcslen (THIS->selection.text); 1390 THIS->selection.len = wcslen (THIS->selection.text);
1251 } 1391 }
1252} 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 ()
1253 1402
1254void 1403void
1255rxvt_term::scr_add_lines (SV *string) 1404rxvt_term::scr_add_lines (SV *string)
1256 CODE: 1405 CODE:
1257{ 1406{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines