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.37 by root, Sat Jan 7 20:23:52 2006 UTC vs.
Revision 1.45 by root, Mon Jan 9 00:34:36 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
33#include "rxvt.h" 34#include "rxvt.h"
34#include "iom.h" 35#include "iom.h"
35#include "rxvtutil.h" 36#include "rxvtutil.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include "perlxsi.c" 39#include "perlxsi.c"
39 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
40#undef LINENO 47#undef LINENO
41#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)
42#undef ROW 49#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
44 51
45///////////////////////////////////////////////////////////////////////////// 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}
46 69
47static wchar_t * 70static wchar_t *
48sv2wcs (SV *sv) 71sv2wcs (SV *sv)
49{ 72{
50 STRLEN len; 73 STRLEN len;
… …
389{ 412{
390 if (!perl) 413 if (!perl)
391 { 414 {
392 char *argv[] = { 415 char *argv[] = {
393 "", 416 "",
417 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 418 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 419 };
396 420
397 perl = perl_alloc (); 421 perl = perl_alloc ();
398 perl_construct (perl); 422 perl_construct (perl);
399 423
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 425 || perl_run (perl))
402 { 426 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 428
405 perl_destruct (perl); 429 perl_destruct (perl);
406 perl_free (perl); 430 perl_free (perl);
407 perl = 0; 431 perl = 0;
408 } 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;
409 } 444 }
410} 445}
411 446
412bool 447bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 448rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
466 case DT_LONG: 501 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 502 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 503 break;
469 504
470 case DT_STR: 505 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 506 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 507 break;
473 508
474 case DT_STR_LEN: 509 case DT_STR_LEN:
475 { 510 {
476 char *str = va_arg (ap, char *); 511 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int); 512 int len = va_arg (ap, int);
478 513
479 XPUSHs (sv_2mortal (newSVpvn (str, len))); 514 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
480 } 515 }
481 break; 516 break;
482 517
483 case DT_WCS_LEN: 518 case DT_WCS_LEN:
484 { 519 {
485 wchar_t *wstr = va_arg (ap, wchar_t *); 520 wchar_t *wstr = va_arg (ap, wchar_t *);
486 int wlen = va_arg (ap, int); 521 int wlen = va_arg (ap, int);
487 522
488 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 523 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
489 } 524 }
490 break; 525 break;
491 526
492 case DT_XEVENT: 527 case DT_XEVENT:
493 { 528 {
… …
558 PUTBACK; 593 PUTBACK;
559 FREETMPS; 594 FREETMPS;
560 LEAVE; 595 LEAVE;
561 596
562 if (SvTRUE (ERRSV)) 597 if (SvTRUE (ERRSV))
598 {
563 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 }
564 602
565 if (htype == HOOK_DESTROY) 603 if (htype == HOOK_DESTROY)
566 { 604 {
567 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
568 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
… …
583 621
584PROTOTYPES: ENABLE 622PROTOTYPES: ENABLE
585 623
586BOOT: 624BOOT:
587{ 625{
588 HV *stash = gv_stashpv ("urxvt", 1); 626 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
589# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
590 627
591 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 628 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
592# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 629# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
593# include "hookinc.h" 630# include "hookinc.h"
594# undef def 631# undef def
595 632
596 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));
597 export_const_iv (DEFAULT_RSTYLE); 642 export_const_iv (DEFAULT_RSTYLE);
598 export_const_iv (OVERLAY_RSTYLE); 643 export_const_iv (OVERLAY_RSTYLE);
599 export_const_iv (RS_Bold); 644 export_const_iv (RS_Bold);
600 export_const_iv (RS_Italic); 645 export_const_iv (RS_Italic);
601 export_const_iv (RS_Blink); 646 export_const_iv (RS_Blink);
602 export_const_iv (RS_RVid); 647 export_const_iv (RS_RVid);
603 export_const_iv (RS_Uline); 648 export_const_iv (RS_Uline);
649
604 export_const_iv (CurrentTime); 650 export_const_iv (CurrentTime);
605 651 export_const_iv (ShiftMask);
606 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1)); 652 export_const_iv (LockMask);
653 export_const_iv (ControlMask);
654 export_const_iv (Mod1Mask);
655 export_const_iv (Mod2Mask);
656 export_const_iv (Mod3Mask);
657 export_const_iv (Mod4Mask);
658 export_const_iv (Mod5Mask);
659 export_const_iv (Button1Mask);
660 export_const_iv (Button2Mask);
661 export_const_iv (Button3Mask);
662 export_const_iv (Button4Mask);
663 export_const_iv (Button5Mask);
664 export_const_iv (AnyModifier);
607} 665}
608 666
609SV * 667SV *
610new (...) 668new (...)
611 CODE: 669 CODE:
… …
649void 707void
650fatal (const char *msg) 708fatal (const char *msg)
651 CODE: 709 CODE:
652 rxvt_fatal ("%s", msg); 710 rxvt_fatal ("%s", msg);
653 711
712SV *
713untaint (SV *sv)
714 CODE:
715 RETVAL = newSVsv (sv);
716 SvTAINTED_off (RETVAL);
717 OUTPUT:
718 RETVAL
719
654NV 720NV
655NOW () 721NOW ()
656 CODE: 722 CODE:
657 RETVAL = NOW; 723 RETVAL = NOW;
658 OUTPUT: 724 OUTPUT:
… …
714void 780void
715rxvt_term::grab_button (int button, U32 modifiers) 781rxvt_term::grab_button (int button, U32 modifiers)
716 CODE: 782 CODE:
717 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 783 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
718 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 784 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
719 GrabModeSync, GrabModeSync, None, None); 785 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
720 786
721bool 787bool
722rxvt_term::grab (U32 eventtime, int sync = 0) 788rxvt_term::grab (U32 eventtime, int sync = 0)
723 CODE: 789 CODE:
724{ 790{
… …
726 792
727 THIS->perl.grabtime = 0; 793 THIS->perl.grabtime = 0;
728 794
729 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 795 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
730 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 796 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
731 mode, mode, None, None, eventtime)) 797 mode, mode, None, GRAB_CURSOR, eventtime))
732 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 798 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
733 THIS->perl.grabtime = eventtime; 799 THIS->perl.grabtime = eventtime;
734 else 800 else
735 XUngrabPointer (THIS->display->display, eventtime); 801 XUngrabPointer (THIS->display->display, eventtime);
736 802
… …
738} 804}
739 OUTPUT: 805 OUTPUT:
740 RETVAL 806 RETVAL
741 807
742void 808void
743rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 809rxvt_term::allow_events_async ()
744 CODE: 810 CODE:
745 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 811 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
746 812
747void 813void
748rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 814rxvt_term::allow_events_sync ()
749 CODE: 815 CODE:
750 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 816 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
751 817
752void 818void
753rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 819rxvt_term::allow_events_replay ()
754 CODE: 820 CODE:
755 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 821 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
756 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 822 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
757 823
758void 824void
759rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 825rxvt_term::ungrab ()
760 CODE: 826 CODE:
761 THIS->perl.grabtime = 0; 827 ungrab (THIS);
762 XUngrabKeyboard (THIS->display->display, eventtime);
763 XUngrabPointer (THIS->display->display, eventtime);
764 828
765int 829int
766rxvt_term::strwidth (SV *str) 830rxvt_term::strwidth (SV *str)
767 CODE: 831 CODE:
768{ 832{
… …
787 char *mbstr = rxvt_wcstombs (wstr); 851 char *mbstr = rxvt_wcstombs (wstr);
788 rxvt_pop_locale (); 852 rxvt_pop_locale ();
789 853
790 free (wstr); 854 free (wstr);
791 855
792 RETVAL = newSVpv (mbstr, 0); 856 RETVAL = taint_if (newSVpv (mbstr, 0), str);
793 free (mbstr); 857 free (mbstr);
794} 858}
795 OUTPUT: 859 OUTPUT:
796 RETVAL 860 RETVAL
797 861
… …
804 868
805 rxvt_push_locale (THIS->locale); 869 rxvt_push_locale (THIS->locale);
806 wchar_t *wstr = rxvt_mbstowcs (data, len); 870 wchar_t *wstr = rxvt_mbstowcs (data, len);
807 rxvt_pop_locale (); 871 rxvt_pop_locale ();
808 872
809 RETVAL = wcs2sv (wstr); 873 RETVAL = taint_if (wcs2sv (wstr), octets);
810 free (wstr); 874 free (wstr);
811} 875}
812 OUTPUT: 876 OUTPUT:
813 RETVAL 877 RETVAL
814 878
815# very portable, especially on objects as opposed to pods 879#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
816#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
817 880
818#define TERM_OFFSET_width TERM_OFFSET(width) 881#define TERM_OFFSET_width TERM_OFFSET(width)
819#define TERM_OFFSET_height TERM_OFFSET(height) 882#define TERM_OFFSET_height TERM_OFFSET(height)
820#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 883#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
821#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 884#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
846 CODE: 909 CODE:
847 RETVAL = *(int *)((char *)THIS + ix); 910 RETVAL = *(int *)((char *)THIS + ix);
848 OUTPUT: 911 OUTPUT:
849 RETVAL 912 RETVAL
850 913
914unsigned int
915rxvt_term::ModLevel3Mask ()
916 ALIAS:
917 ModLevel3Mask = 0
918 ModMetaMask = 1
919 ModNumLockMask = 2
920 CODE:
921 switch (ix)
922 {
923 case 0: RETVAL = THIS->ModLevel3Mask; break;
924 case 1: RETVAL = THIS->ModMetaMask; break;
925 case 2: RETVAL = THIS->ModNumLockMask; break;
926 }
927 OUTPUT:
928 RETVAL
929
851U32 930U32
852rxvt_term::parent () 931rxvt_term::parent ()
853 CODE: 932 CODE:
854 RETVAL = (U32)THIS->parent [0]; 933 RETVAL = (U32)THIS->parent [0];
855 OUTPUT: 934 OUTPUT:
… …
906 wchar_t *wstr = new wchar_t [THIS->ncol]; 985 wchar_t *wstr = new wchar_t [THIS->ncol];
907 986
908 for (int col = 0; col < THIS->ncol; col++) 987 for (int col = 0; col < THIS->ncol; col++)
909 wstr [col] = l.t [col]; 988 wstr [col] = l.t [col];
910 989
911 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 990 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
912 991
913 delete [] wstr; 992 delete [] wstr;
914 } 993 }
915 994
916 if (new_text) 995 if (new_text)
… …
1037 else 1116 else
1038 *r++ = *s; 1117 *r++ = *s;
1039 1118
1040 rxvt_pop_locale (); 1119 rxvt_pop_locale ();
1041 1120
1042 RETVAL = wcs2sv (rstr, r - rstr); 1121 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1043 1122
1044 delete [] rstr; 1123 delete [] rstr;
1045} 1124}
1046 OUTPUT: 1125 OUTPUT:
1047 RETVAL 1126 RETVAL
… …
1073 else if (IS_COMPOSE (*s)) 1152 else if (IS_COMPOSE (*s))
1074 r += rxvt_composite.expand (*s, r); 1153 r += rxvt_composite.expand (*s, r);
1075 else 1154 else
1076 *r++ = *s; 1155 *r++ = *s;
1077 1156
1078 RETVAL = wcs2sv (rstr, r - rstr); 1157 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1079 1158
1080 delete [] rstr; 1159 delete [] rstr;
1081} 1160}
1082 OUTPUT: 1161 OUTPUT:
1083 RETVAL 1162 RETVAL
… …
1105 1184
1106 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1185 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1107 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);
1108 1187
1109 if (GIMME_V != G_VOID) 1188 if (GIMME_V != G_VOID)
1110 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);
1111 1190
1112 if (newval) 1191 if (newval)
1113 { 1192 {
1114 if (SvOK (newval)) 1193 if (SvOK (newval))
1115 { 1194 {
… …
1120 else 1199 else
1121 THIS->rs [index] = 0; 1200 THIS->rs [index] = 0;
1122 } 1201 }
1123} 1202}
1124 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
1125void 1240void
1126rxvt_term::cur (...) 1241rxvt_term::cur (...)
1127 PROTOTYPE: $;$$ 1242 PROTOTYPE: $;$$
1128 ALIAS: 1243 ALIAS:
1129 screen_cur = 0 1244 screen_cur = 0
… …
1160void 1275void
1161rxvt_term::selection (SV *newtext = 0) 1276rxvt_term::selection (SV *newtext = 0)
1162 PPCODE: 1277 PPCODE:
1163{ 1278{
1164 if (GIMME_V != G_VOID) 1279 if (GIMME_V != G_VOID)
1280 XPUSHs (THIS->selection.text
1165 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);
1166 1283
1167 if (newtext) 1284 if (newtext)
1168 { 1285 {
1169 free (THIS->selection.text); 1286 free (THIS->selection.text);
1170 1287

Diff Legend

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