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

… …
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include "perlxsi.c" 39#include "perlxsi.c"
40 40
41#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
42# define GRAB_CURSOR THIS->leftptr_cursor
43#else
44# define GRAB_CURSOR None
45#endif
46
41#undef LINENO 47#undef LINENO
42#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
43#undef ROW 49#undef ROW
44#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
45 51
46///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
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}
47 69
48static wchar_t * 70static wchar_t *
49sv2wcs (SV *sv) 71sv2wcs (SV *sv)
50{ 72{
51 STRLEN len; 73 STRLEN len;
… …
390{ 412{
391 if (!perl) 413 if (!perl)
392 { 414 {
393 char *argv[] = { 415 char *argv[] = {
394 "", 416 "",
417 "-T",
395 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 418 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
396 }; 419 };
397 420
398 perl = perl_alloc (); 421 perl = perl_alloc ();
399 perl_construct (perl); 422 perl_construct (perl);
400 423
401 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
402 || perl_run (perl)) 425 || perl_run (perl))
403 { 426 {
404 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
405 428
406 perl_destruct (perl); 429 perl_destruct (perl);
407 perl_free (perl); 430 perl_free (perl);
408 perl = 0; 431 perl = 0;
409 } 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;
410 } 444 }
411} 445}
412 446
413bool 447bool
414rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 448rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
467 case DT_LONG: 501 case DT_LONG:
468 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 502 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
469 break; 503 break;
470 504
471 case DT_STR: 505 case DT_STR:
472 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 506 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
473 break; 507 break;
474 508
475 case DT_STR_LEN: 509 case DT_STR_LEN:
476 { 510 {
477 char *str = va_arg (ap, char *); 511 char *str = va_arg (ap, char *);
478 int len = va_arg (ap, int); 512 int len = va_arg (ap, int);
479 513
480 XPUSHs (sv_2mortal (newSVpvn (str, len))); 514 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
481 } 515 }
482 break; 516 break;
483 517
484 case DT_WCS_LEN: 518 case DT_WCS_LEN:
485 { 519 {
486 wchar_t *wstr = va_arg (ap, wchar_t *); 520 wchar_t *wstr = va_arg (ap, wchar_t *);
487 int wlen = va_arg (ap, int); 521 int wlen = va_arg (ap, int);
488 522
489 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 523 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
490 } 524 }
491 break; 525 break;
492 526
493 case DT_XEVENT: 527 case DT_XEVENT:
494 { 528 {
… …
559 PUTBACK; 593 PUTBACK;
560 FREETMPS; 594 FREETMPS;
561 LEAVE; 595 LEAVE;
562 596
563 if (SvTRUE (ERRSV)) 597 if (SvTRUE (ERRSV))
598 {
564 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 }
565 602
566 if (htype == HOOK_DESTROY) 603 if (htype == HOOK_DESTROY)
567 { 604 {
568 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
569 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
… …
584 621
585PROTOTYPES: ENABLE 622PROTOTYPES: ENABLE
586 623
587BOOT: 624BOOT:
588{ 625{
589 HV *stash = gv_stashpv ("urxvt", 1); 626 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
590# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
591 627
592 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 628 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
593# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 629# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
594# include "hookinc.h" 630# include "hookinc.h"
595# undef def 631# undef def
596 632
597 633 HV *option = get_hv ("urxvt::OPTION", 1);
634# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
635# define nodef(name)
636# include "optinc.h"
637# undef nodef
638# undef def
639
640 HV *stash = gv_stashpv ("urxvt", 1);
641# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
598 export_const_iv (DEFAULT_RSTYLE); 642 export_const_iv (DEFAULT_RSTYLE);
599 export_const_iv (OVERLAY_RSTYLE); 643 export_const_iv (OVERLAY_RSTYLE);
600 export_const_iv (RS_Bold); 644 export_const_iv (RS_Bold);
601 export_const_iv (RS_Italic); 645 export_const_iv (RS_Italic);
602 export_const_iv (RS_Blink); 646 export_const_iv (RS_Blink);
… …
616 export_const_iv (Button2Mask); 660 export_const_iv (Button2Mask);
617 export_const_iv (Button3Mask); 661 export_const_iv (Button3Mask);
618 export_const_iv (Button4Mask); 662 export_const_iv (Button4Mask);
619 export_const_iv (Button5Mask); 663 export_const_iv (Button5Mask);
620 export_const_iv (AnyModifier); 664 export_const_iv (AnyModifier);
621
622 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
623} 665}
624 666
625SV * 667SV *
626new (...) 668new (...)
627 CODE: 669 CODE:
… …
665void 707void
666fatal (const char *msg) 708fatal (const char *msg)
667 CODE: 709 CODE:
668 rxvt_fatal ("%s", msg); 710 rxvt_fatal ("%s", msg);
669 711
712SV *
713untaint (SV *sv)
714 CODE:
715 RETVAL = newSVsv (sv);
716 SvTAINTED_off (RETVAL);
717 OUTPUT:
718 RETVAL
719
670NV 720NV
671NOW () 721NOW ()
672 CODE: 722 CODE:
673 RETVAL = NOW; 723 RETVAL = NOW;
674 OUTPUT: 724 OUTPUT:
… …
730void 780void
731rxvt_term::grab_button (int button, U32 modifiers) 781rxvt_term::grab_button (int button, U32 modifiers)
732 CODE: 782 CODE:
733 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 783 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
734 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 784 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
735 GrabModeSync, GrabModeSync, None, None); 785 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
736 786
737bool 787bool
738rxvt_term::grab (U32 eventtime, int sync = 0) 788rxvt_term::grab (U32 eventtime, int sync = 0)
739 CODE: 789 CODE:
740{ 790{
… …
742 792
743 THIS->perl.grabtime = 0; 793 THIS->perl.grabtime = 0;
744 794
745 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 795 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
746 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 796 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
747 mode, mode, None, None, eventtime)) 797 mode, mode, None, GRAB_CURSOR, eventtime))
748 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 798 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
749 THIS->perl.grabtime = eventtime; 799 THIS->perl.grabtime = eventtime;
750 else 800 else
751 XUngrabPointer (THIS->display->display, eventtime); 801 XUngrabPointer (THIS->display->display, eventtime);
752 802
… …
754} 804}
755 OUTPUT: 805 OUTPUT:
756 RETVAL 806 RETVAL
757 807
758void 808void
759rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 809rxvt_term::allow_events_async ()
760 CODE: 810 CODE:
761 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 811 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
762 812
763void 813void
764rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 814rxvt_term::allow_events_sync ()
765 CODE: 815 CODE:
766 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 816 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
767 817
768void 818void
769rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 819rxvt_term::allow_events_replay ()
770 CODE: 820 CODE:
771 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 821 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
772 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 822 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
773 823
774void 824void
775rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 825rxvt_term::ungrab ()
776 CODE: 826 CODE:
777 THIS->perl.grabtime = 0; 827 ungrab (THIS);
778 XUngrabKeyboard (THIS->display->display, eventtime);
779 XUngrabPointer (THIS->display->display, eventtime);
780 828
781int 829int
782rxvt_term::strwidth (SV *str) 830rxvt_term::strwidth (SV *str)
783 CODE: 831 CODE:
784{ 832{
… …
803 char *mbstr = rxvt_wcstombs (wstr); 851 char *mbstr = rxvt_wcstombs (wstr);
804 rxvt_pop_locale (); 852 rxvt_pop_locale ();
805 853
806 free (wstr); 854 free (wstr);
807 855
808 RETVAL = newSVpv (mbstr, 0); 856 RETVAL = taint_if (newSVpv (mbstr, 0), str);
809 free (mbstr); 857 free (mbstr);
810} 858}
811 OUTPUT: 859 OUTPUT:
812 RETVAL 860 RETVAL
813 861
… …
820 868
821 rxvt_push_locale (THIS->locale); 869 rxvt_push_locale (THIS->locale);
822 wchar_t *wstr = rxvt_mbstowcs (data, len); 870 wchar_t *wstr = rxvt_mbstowcs (data, len);
823 rxvt_pop_locale (); 871 rxvt_pop_locale ();
824 872
825 RETVAL = wcs2sv (wstr); 873 RETVAL = taint_if (wcs2sv (wstr), octets);
826 free (wstr); 874 free (wstr);
827} 875}
828 OUTPUT: 876 OUTPUT:
829 RETVAL 877 RETVAL
830 878
… …
937 wchar_t *wstr = new wchar_t [THIS->ncol]; 985 wchar_t *wstr = new wchar_t [THIS->ncol];
938 986
939 for (int col = 0; col < THIS->ncol; col++) 987 for (int col = 0; col < THIS->ncol; col++)
940 wstr [col] = l.t [col]; 988 wstr [col] = l.t [col];
941 989
942 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 990 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
943 991
944 delete [] wstr; 992 delete [] wstr;
945 } 993 }
946 994
947 if (new_text) 995 if (new_text)
… …
1068 else 1116 else
1069 *r++ = *s; 1117 *r++ = *s;
1070 1118
1071 rxvt_pop_locale (); 1119 rxvt_pop_locale ();
1072 1120
1073 RETVAL = wcs2sv (rstr, r - rstr); 1121 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1074 1122
1075 delete [] rstr; 1123 delete [] rstr;
1076} 1124}
1077 OUTPUT: 1125 OUTPUT:
1078 RETVAL 1126 RETVAL
… …
1104 else if (IS_COMPOSE (*s)) 1152 else if (IS_COMPOSE (*s))
1105 r += rxvt_composite.expand (*s, r); 1153 r += rxvt_composite.expand (*s, r);
1106 else 1154 else
1107 *r++ = *s; 1155 *r++ = *s;
1108 1156
1109 RETVAL = wcs2sv (rstr, r - rstr); 1157 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1110 1158
1111 delete [] rstr; 1159 delete [] rstr;
1112} 1160}
1113 OUTPUT: 1161 OUTPUT:
1114 RETVAL 1162 RETVAL
… …
1136 1184
1137 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1185 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1138 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);
1139 1187
1140 if (GIMME_V != G_VOID) 1188 if (GIMME_V != G_VOID)
1141 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);
1142 1190
1143 if (newval) 1191 if (newval)
1144 { 1192 {
1145 if (SvOK (newval)) 1193 if (SvOK (newval))
1146 { 1194 {
… …
1151 else 1199 else
1152 THIS->rs [index] = 0; 1200 THIS->rs [index] = 0;
1153 } 1201 }
1154} 1202}
1155 1203
1204bool
1205rxvt_term::option (U32 optval, int set = -1)
1206 CODE:
1207{
1208 RETVAL = THIS->options & optval;
1209
1210 if (set >= 0)
1211 {
1212 if (set)
1213 THIS->options |= optval;
1214 else
1215 THIS->options &= ~optval;
1216
1217 switch (optval)
1218 {
1219 case Opt_skipBuiltinGlyphs:
1220 THIS->set_fonts ();
1221 THIS->scr_remap_chars ();
1222 THIS->scr_touch (true);
1223 THIS->want_refresh = 1;
1224 break;
1225
1226 case Opt_cursorUnderline:
1227 THIS->want_refresh = 1;
1228 break;
1229
1230# case Opt_scrollBar_floating:
1231# case Opt_scrollBar_right:
1232# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1233# break;
1234 }
1235 }
1236}
1237 OUTPUT:
1238 RETVAL
1239
1156void 1240void
1157rxvt_term::cur (...) 1241rxvt_term::screen_cur (...)
1158 PROTOTYPE: $;$$ 1242 PROTOTYPE: $;$$
1159 ALIAS: 1243 ALIAS:
1160 screen_cur = 0 1244 screen_cur = 0
1161 selection_beg = 1 1245 selection_beg = 1
1162 selection_end = 2 1246 selection_end = 2
… …
1191void 1275void
1192rxvt_term::selection (SV *newtext = 0) 1276rxvt_term::selection (SV *newtext = 0)
1193 PPCODE: 1277 PPCODE:
1194{ 1278{
1195 if (GIMME_V != G_VOID) 1279 if (GIMME_V != G_VOID)
1280 XPUSHs (THIS->selection.text
1196 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);
1197 1283
1198 if (newtext) 1284 if (newtext)
1199 { 1285 {
1200 free (THIS->selection.text); 1286 free (THIS->selection.text);
1201 1287

Diff Legend

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