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.46 by root, Mon Jan 9 01:36:56 2006 UTC

… …
49#undef ROW 49#undef ROW
50#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
51 51
52///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
53 53
54static SV *
55taint (SV *sv)
56{
57 SvTAINT (sv);
58 return sv;
59}
60
61static SV *
62taint_if (SV *sv, SV *src)
63{
64 if (SvTAINTED (src))
65 SvTAINT (sv);
66
67 return sv;
68}
69
54static wchar_t * 70static wchar_t *
55sv2wcs (SV *sv) 71sv2wcs (SV *sv)
56{ 72{
57 STRLEN len; 73 STRLEN len;
58 char *str = SvPVutf8 (sv, len); 74 char *str = SvPVutf8 (sv, len);
… …
396{ 412{
397 if (!perl) 413 if (!perl)
398 { 414 {
399 char *argv[] = { 415 char *argv[] = {
400 "", 416 "",
417 "-T",
401 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 418 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
402 }; 419 };
403 420
404 perl = perl_alloc (); 421 perl = perl_alloc ();
405 perl_construct (perl); 422 perl_construct (perl);
406 423
407 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
408 || perl_run (perl)) 425 || perl_run (perl))
409 { 426 {
410 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
411 428
412 perl_destruct (perl); 429 perl_destruct (perl);
413 perl_free (perl); 430 perl_free (perl);
414 perl = 0; 431 perl = 0;
415 } 432 }
433 }
434}
435
436static void
437ungrab (rxvt_term *THIS)
438{
439 if (THIS->perl.grabtime)
440 {
441 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
442 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
443 THIS->perl.grabtime = 0;
416 } 444 }
417} 445}
418 446
419bool 447bool
420rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 448rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
473 case DT_LONG: 501 case DT_LONG:
474 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 502 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
475 break; 503 break;
476 504
477 case DT_STR: 505 case DT_STR:
478 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 506 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
479 break; 507 break;
480 508
481 case DT_STR_LEN: 509 case DT_STR_LEN:
482 { 510 {
483 char *str = va_arg (ap, char *); 511 char *str = va_arg (ap, char *);
484 int len = va_arg (ap, int); 512 int len = va_arg (ap, int);
485 513
486 XPUSHs (sv_2mortal (newSVpvn (str, len))); 514 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
487 } 515 }
488 break; 516 break;
489 517
490 case DT_WCS_LEN: 518 case DT_WCS_LEN:
491 { 519 {
492 wchar_t *wstr = va_arg (ap, wchar_t *); 520 wchar_t *wstr = va_arg (ap, wchar_t *);
493 int wlen = va_arg (ap, int); 521 int wlen = va_arg (ap, int);
494 522
495 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 523 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
496 } 524 }
497 break; 525 break;
498 526
499 case DT_XEVENT: 527 case DT_XEVENT:
500 { 528 {
… …
565 PUTBACK; 593 PUTBACK;
566 FREETMPS; 594 FREETMPS;
567 LEAVE; 595 LEAVE;
568 596
569 if (SvTRUE (ERRSV)) 597 if (SvTRUE (ERRSV))
598 {
570 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 599 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
600 ungrab (term); // better lose the grab than the session
601 }
571 602
572 if (htype == HOOK_DESTROY) 603 if (htype == HOOK_DESTROY)
573 { 604 {
574 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
575 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
… …
676void 707void
677fatal (const char *msg) 708fatal (const char *msg)
678 CODE: 709 CODE:
679 rxvt_fatal ("%s", msg); 710 rxvt_fatal ("%s", msg);
680 711
712SV *
713untaint (SV *sv)
714 CODE:
715 RETVAL = newSVsv (sv);
716 SvTAINTED_off (RETVAL);
717 OUTPUT:
718 RETVAL
719
681NV 720NV
682NOW () 721NOW ()
683 CODE: 722 CODE:
684 RETVAL = NOW; 723 RETVAL = NOW;
685 OUTPUT: 724 OUTPUT:
… …
765} 804}
766 OUTPUT: 805 OUTPUT:
767 RETVAL 806 RETVAL
768 807
769void 808void
770rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 809rxvt_term::allow_events_async ()
771 CODE: 810 CODE:
772 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 811 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
773 812
774void 813void
775rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 814rxvt_term::allow_events_sync ()
776 CODE: 815 CODE:
777 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 816 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
778 817
779void 818void
780rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 819rxvt_term::allow_events_replay ()
781 CODE: 820 CODE:
782 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 821 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
783 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 822 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
784 823
785void 824void
786rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 825rxvt_term::ungrab ()
787 CODE: 826 CODE:
788 THIS->perl.grabtime = 0; 827 ungrab (THIS);
789 XUngrabKeyboard (THIS->display->display, eventtime);
790 XUngrabPointer (THIS->display->display, eventtime);
791 828
792int 829int
793rxvt_term::strwidth (SV *str) 830rxvt_term::strwidth (SV *str)
794 CODE: 831 CODE:
795{ 832{
… …
814 char *mbstr = rxvt_wcstombs (wstr); 851 char *mbstr = rxvt_wcstombs (wstr);
815 rxvt_pop_locale (); 852 rxvt_pop_locale ();
816 853
817 free (wstr); 854 free (wstr);
818 855
819 RETVAL = newSVpv (mbstr, 0); 856 RETVAL = taint_if (newSVpv (mbstr, 0), str);
820 free (mbstr); 857 free (mbstr);
821} 858}
822 OUTPUT: 859 OUTPUT:
823 RETVAL 860 RETVAL
824 861
… …
831 868
832 rxvt_push_locale (THIS->locale); 869 rxvt_push_locale (THIS->locale);
833 wchar_t *wstr = rxvt_mbstowcs (data, len); 870 wchar_t *wstr = rxvt_mbstowcs (data, len);
834 rxvt_pop_locale (); 871 rxvt_pop_locale ();
835 872
836 RETVAL = wcs2sv (wstr); 873 RETVAL = taint_if (wcs2sv (wstr), octets);
837 free (wstr); 874 free (wstr);
838} 875}
839 OUTPUT: 876 OUTPUT:
840 RETVAL 877 RETVAL
841 878
… …
948 wchar_t *wstr = new wchar_t [THIS->ncol]; 985 wchar_t *wstr = new wchar_t [THIS->ncol];
949 986
950 for (int col = 0; col < THIS->ncol; col++) 987 for (int col = 0; col < THIS->ncol; col++)
951 wstr [col] = l.t [col]; 988 wstr [col] = l.t [col];
952 989
953 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 990 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
954 991
955 delete [] wstr; 992 delete [] wstr;
956 } 993 }
957 994
958 if (new_text) 995 if (new_text)
… …
1079 else 1116 else
1080 *r++ = *s; 1117 *r++ = *s;
1081 1118
1082 rxvt_pop_locale (); 1119 rxvt_pop_locale ();
1083 1120
1084 RETVAL = wcs2sv (rstr, r - rstr); 1121 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1085 1122
1086 delete [] rstr; 1123 delete [] rstr;
1087} 1124}
1088 OUTPUT: 1125 OUTPUT:
1089 RETVAL 1126 RETVAL
… …
1115 else if (IS_COMPOSE (*s)) 1152 else if (IS_COMPOSE (*s))
1116 r += rxvt_composite.expand (*s, r); 1153 r += rxvt_composite.expand (*s, r);
1117 else 1154 else
1118 *r++ = *s; 1155 *r++ = *s;
1119 1156
1120 RETVAL = wcs2sv (rstr, r - rstr); 1157 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1121 1158
1122 delete [] rstr; 1159 delete [] rstr;
1123} 1160}
1124 OUTPUT: 1161 OUTPUT:
1125 RETVAL 1162 RETVAL
… …
1147 1184
1148 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1185 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1149 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1186 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1150 1187
1151 if (GIMME_V != G_VOID) 1188 if (GIMME_V != G_VOID)
1152 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1189 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1153 1190
1154 if (newval) 1191 if (newval)
1155 { 1192 {
1156 if (SvOK (newval)) 1193 if (SvOK (newval))
1157 { 1194 {
… …
1199} 1236}
1200 OUTPUT: 1237 OUTPUT:
1201 RETVAL 1238 RETVAL
1202 1239
1203void 1240void
1204rxvt_term::cur (...) 1241rxvt_term::screen_cur (...)
1205 PROTOTYPE: $;$$ 1242 PROTOTYPE: $;$$
1206 ALIAS: 1243 ALIAS:
1207 screen_cur = 0 1244 screen_cur = 0
1208 selection_beg = 1 1245 selection_beg = 1
1209 selection_end = 2 1246 selection_end = 2
… …
1238void 1275void
1239rxvt_term::selection (SV *newtext = 0) 1276rxvt_term::selection (SV *newtext = 0)
1240 PPCODE: 1277 PPCODE:
1241{ 1278{
1242 if (GIMME_V != G_VOID) 1279 if (GIMME_V != G_VOID)
1280 XPUSHs (THIS->selection.text
1243 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1281 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1282 : &PL_sv_undef);
1244 1283
1245 if (newtext) 1284 if (newtext)
1246 { 1285 {
1247 free (THIS->selection.text); 1286 free (THIS->selection.text);
1248 1287

Diff Legend

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