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.33 by root, Fri Jan 6 20:50:58 2006 UTC vs.
Revision 1.42 by root, Sun Jan 8 08:43:11 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/////////////////////////////////////////////////////////////////////////////
46 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
47static wchar_t * 70static wchar_t *
48sv2wcs (SV *sv) 71sv2wcs (SV *sv)
49{ 72{
50 STRLEN len; 73 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 74 char *str = SvPVutf8 (sv, len);
… …
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 124 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 125
103 return (long)mg->mg_ptr; 126 return (long)mg->mg_ptr;
104} 127}
105 128
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 129#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 130#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 131
109///////////////////////////////////////////////////////////////////////////// 132/////////////////////////////////////////////////////////////////////////////
110 133
111struct perl_watcher 134struct perl_watcher
… …
290void 313void
291overlay::show () 314overlay::show ()
292{ 315{
293 char key[33]; sprintf (key, "%32lx", (long)this); 316 char key[33]; sprintf (key, "%32lx", (long)this);
294 317
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 318 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
296 hv_store (hv, key, 32, newSViv ((long)this), 0); 319 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 320}
298 321
299void 322void
300overlay::hide () 323overlay::hide ()
301{ 324{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 325 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 326
304 if (ovs) 327 if (ovs)
305 { 328 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 329 char key[33]; sprintf (key, "%32lx", (long)this);
307 330
… …
383 perl_free (perl); 406 perl_free (perl);
384 } 407 }
385} 408}
386 409
387void 410void
388rxvt_perl_interp::init () 411rxvt_perl_interp::init (bool tainted)
389{ 412{
390 if (!perl) 413 if (!perl)
391 { 414 {
392 char *argv[] = { 415 char *argv[] = {
393 "", 416 "",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 417 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
418 "-T",
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, 2 + !!tainted, 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);
… …
415 if (!perl) 439 if (!perl)
416 return false; 440 return false;
417 441
418 if (htype == HOOK_INIT) // first hook ever called 442 if (htype == HOOK_INIT) // first hook ever called
419 { 443 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 444 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 445 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 446 }
423 else if (!term->self) 447 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 448 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 449 else if (htype == HOOK_DESTROY)
426 { 450 {
427 // handled later 451 // handled later
428 } 452 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 453 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
430 { 454 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 455 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
432 456
433 if (HvKEYS (hv)) 457 if (HvKEYS (hv))
434 { 458 {
435 hv_iterinit (hv); 459 hv_iterinit (hv);
436 460
… …
466 case DT_LONG: 490 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 491 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 492 break;
469 493
470 case DT_STR: 494 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 495 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 496 break;
473 497
474 case DT_STR_LEN: 498 case DT_STR_LEN:
475 { 499 {
476 char *str = va_arg (ap, char *); 500 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int); 501 int len = va_arg (ap, int);
478 502
479 XPUSHs (sv_2mortal (newSVpvn (str, len))); 503 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
480 } 504 }
481 break; 505 break;
482 506
483 case DT_WCS_LEN: 507 case DT_WCS_LEN:
484 { 508 {
485 wchar_t *wstr = va_arg (ap, wchar_t *); 509 wchar_t *wstr = va_arg (ap, wchar_t *);
486 int wlen = va_arg (ap, int); 510 int wlen = va_arg (ap, int);
487 511
488 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 512 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
489 } 513 }
514 break;
490 515
491 case DT_XEVENT: 516 case DT_XEVENT:
492 { 517 {
493 XEvent *xe = va_arg (ap, XEvent *); 518 XEvent *xe = va_arg (ap, XEvent *);
494 HV *hv = newHV (); 519 HV *hv = newHV ();
… …
561 if (SvTRUE (ERRSV)) 586 if (SvTRUE (ERRSV))
562 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 587 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
563 588
564 if (htype == HOOK_DESTROY) 589 if (htype == HOOK_DESTROY)
565 { 590 {
566 clearSVptr ((SV *)term->self); 591 clearSVptr ((SV *)term->perl.self);
567 SvREFCNT_dec ((SV *)term->self); 592 SvREFCNT_dec ((SV *)term->perl.self);
568 } 593 }
569 594
570 return count; 595 return count;
571 } 596 }
572 597
… …
582 607
583PROTOTYPES: ENABLE 608PROTOTYPES: ENABLE
584 609
585BOOT: 610BOOT:
586{ 611{
587# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 612 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
613
588 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 614 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
589# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 615# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
590# include "hookinc.h" 616# include "hookinc.h"
591# undef def 617# undef def
592 618
619 HV *option = get_hv ("urxvt::OPTION", 1);
620# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
621# define nodef(name)
622# include "optinc.h"
623# undef nodef
624# undef def
625
626 HV *stash = gv_stashpv ("urxvt", 1);
627# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
593 export_const (DEFAULT_RSTYLE); 628 export_const_iv (DEFAULT_RSTYLE);
594 export_const (OVERLAY_RSTYLE); 629 export_const_iv (OVERLAY_RSTYLE);
595 export_const (RS_Bold); 630 export_const_iv (RS_Bold);
596 export_const (RS_Italic); 631 export_const_iv (RS_Italic);
597 export_const (RS_Blink); 632 export_const_iv (RS_Blink);
598 export_const (RS_RVid); 633 export_const_iv (RS_RVid);
599 export_const (RS_Uline); 634 export_const_iv (RS_Uline);
600 635
601 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 636 export_const_iv (CurrentTime);
637 export_const_iv (ShiftMask);
638 export_const_iv (LockMask);
639 export_const_iv (ControlMask);
640 export_const_iv (Mod1Mask);
641 export_const_iv (Mod2Mask);
642 export_const_iv (Mod3Mask);
643 export_const_iv (Mod4Mask);
644 export_const_iv (Mod5Mask);
645 export_const_iv (Button1Mask);
646 export_const_iv (Button2Mask);
647 export_const_iv (Button3Mask);
648 export_const_iv (Button4Mask);
649 export_const_iv (Button5Mask);
650 export_const_iv (AnyModifier);
602} 651}
603 652
604SV * 653SV *
605new (...) 654new (...)
606 CODE: 655 CODE:
… …
624 { 673 {
625 term->destroy (); 674 term->destroy ();
626 croak ("exception caught while initializing new terminal instance"); 675 croak ("exception caught while initializing new terminal instance");
627 } 676 }
628 677
629 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef; 678 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
630} 679}
631 OUTPUT: 680 OUTPUT:
632 RETVAL 681 RETVAL
633 682
634void 683void
… …
703 752
704MODULE = urxvt PACKAGE = urxvt::term 753MODULE = urxvt PACKAGE = urxvt::term
705 754
706void 755void
707rxvt_term::destroy () 756rxvt_term::destroy ()
757
758void
759rxvt_term::grab_button (int button, U32 modifiers)
760 CODE:
761 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
762 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
763 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
764
765bool
766rxvt_term::grab (U32 eventtime, int sync = 0)
767 CODE:
768{
769 int mode = sync ? GrabModeSync : GrabModeAsync;
770
771 THIS->perl.grabtime = 0;
772
773 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
774 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
775 mode, mode, None, GRAB_CURSOR, eventtime))
776 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
777 THIS->perl.grabtime = eventtime;
778 else
779 XUngrabPointer (THIS->display->display, eventtime);
780
781 RETVAL = !!THIS->perl.grabtime;
782}
783 OUTPUT:
784 RETVAL
785
786void
787rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime)
788 CODE:
789 XAllowEvents (THIS->display->display, AsyncBoth, eventtime);
790
791void
792rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)
793 CODE:
794 XAllowEvents (THIS->display->display, SyncBoth, eventtime);
795
796void
797rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)
798 CODE:
799 XAllowEvents (THIS->display->display, ReplayPointer, eventtime);
800 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);
801
802void
803rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)
804 CODE:
805 THIS->perl.grabtime = 0;
806 XUngrabKeyboard (THIS->display->display, eventtime);
807 XUngrabPointer (THIS->display->display, eventtime);
708 808
709int 809int
710rxvt_term::strwidth (SV *str) 810rxvt_term::strwidth (SV *str)
711 CODE: 811 CODE:
712{ 812{
… …
731 char *mbstr = rxvt_wcstombs (wstr); 831 char *mbstr = rxvt_wcstombs (wstr);
732 rxvt_pop_locale (); 832 rxvt_pop_locale ();
733 833
734 free (wstr); 834 free (wstr);
735 835
736 RETVAL = newSVpv (mbstr, 0); 836 RETVAL = taint_if (newSVpv (mbstr, 0), str);
737 free (mbstr); 837 free (mbstr);
738} 838}
739 OUTPUT: 839 OUTPUT:
740 RETVAL 840 RETVAL
741 841
… …
748 848
749 rxvt_push_locale (THIS->locale); 849 rxvt_push_locale (THIS->locale);
750 wchar_t *wstr = rxvt_mbstowcs (data, len); 850 wchar_t *wstr = rxvt_mbstowcs (data, len);
751 rxvt_pop_locale (); 851 rxvt_pop_locale ();
752 852
753 RETVAL = wcs2sv (wstr); 853 RETVAL = taint_if (wcs2sv (wstr), octets);
754 free (wstr); 854 free (wstr);
755} 855}
756 OUTPUT: 856 OUTPUT:
757 RETVAL 857 RETVAL
758 858
759# very portable, especially on objects as opposed to pods 859#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
760#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
761 860
762#define TERM_OFFSET_width TERM_OFFSET(width) 861#define TERM_OFFSET_width TERM_OFFSET(width)
763#define TERM_OFFSET_height TERM_OFFSET(height) 862#define TERM_OFFSET_height TERM_OFFSET(height)
764#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 863#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
765#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 864#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
790 CODE: 889 CODE:
791 RETVAL = *(int *)((char *)THIS + ix); 890 RETVAL = *(int *)((char *)THIS + ix);
792 OUTPUT: 891 OUTPUT:
793 RETVAL 892 RETVAL
794 893
894unsigned int
895rxvt_term::ModLevel3Mask ()
896 ALIAS:
897 ModLevel3Mask = 0
898 ModMetaMask = 1
899 ModNumLockMask = 2
900 CODE:
901 switch (ix)
902 {
903 case 0: RETVAL = THIS->ModLevel3Mask; break;
904 case 1: RETVAL = THIS->ModMetaMask; break;
905 case 2: RETVAL = THIS->ModNumLockMask; break;
906 }
907 OUTPUT:
908 RETVAL
909
795U32 910U32
796rxvt_term::parent () 911rxvt_term::parent ()
797 CODE: 912 CODE:
798 RETVAL = (U32)THIS->parent [0]; 913 RETVAL = (U32)THIS->parent [0];
799 OUTPUT: 914 OUTPUT:
… …
850 wchar_t *wstr = new wchar_t [THIS->ncol]; 965 wchar_t *wstr = new wchar_t [THIS->ncol];
851 966
852 for (int col = 0; col < THIS->ncol; col++) 967 for (int col = 0; col < THIS->ncol; col++)
853 wstr [col] = l.t [col]; 968 wstr [col] = l.t [col];
854 969
855 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 970 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
856 971
857 delete [] wstr; 972 delete [] wstr;
858 } 973 }
859 974
860 if (new_text) 975 if (new_text)
… …
981 else 1096 else
982 *r++ = *s; 1097 *r++ = *s;
983 1098
984 rxvt_pop_locale (); 1099 rxvt_pop_locale ();
985 1100
986 RETVAL = wcs2sv (rstr, r - rstr); 1101 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
987 1102
988 delete [] rstr; 1103 delete [] rstr;
989} 1104}
990 OUTPUT: 1105 OUTPUT:
991 RETVAL 1106 RETVAL
… …
1017 else if (IS_COMPOSE (*s)) 1132 else if (IS_COMPOSE (*s))
1018 r += rxvt_composite.expand (*s, r); 1133 r += rxvt_composite.expand (*s, r);
1019 else 1134 else
1020 *r++ = *s; 1135 *r++ = *s;
1021 1136
1022 RETVAL = wcs2sv (rstr, r - rstr); 1137 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1023 1138
1024 delete [] rstr; 1139 delete [] rstr;
1025} 1140}
1026 OUTPUT: 1141 OUTPUT:
1027 RETVAL 1142 RETVAL
… …
1049 1164
1050 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1165 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1051 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1166 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1052 1167
1053 if (GIMME_V != G_VOID) 1168 if (GIMME_V != G_VOID)
1054 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1169 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1055 1170
1056 if (newval) 1171 if (newval)
1057 { 1172 {
1058 if (SvOK (newval)) 1173 if (SvOK (newval))
1059 { 1174 {
… …
1064 else 1179 else
1065 THIS->rs [index] = 0; 1180 THIS->rs [index] = 0;
1066 } 1181 }
1067} 1182}
1068 1183
1184bool
1185rxvt_term::option (U32 optval, int set = -1)
1186 CODE:
1187{
1188 RETVAL = THIS->options & optval;
1189
1190 if (set >= 0)
1191 {
1192 if (set)
1193 THIS->options |= optval;
1194 else
1195 THIS->options &= ~optval;
1196
1197 switch (optval)
1198 {
1199 case Opt_skipBuiltinGlyphs:
1200 THIS->set_fonts ();
1201 THIS->scr_remap_chars ();
1202 THIS->scr_touch (true);
1203 THIS->want_refresh = 1;
1204 break;
1205
1206 case Opt_cursorUnderline:
1207 THIS->want_refresh = 1;
1208 break;
1209
1210# case Opt_scrollBar_floating:
1211# case Opt_scrollBar_right:
1212# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1213# break;
1214 }
1215 }
1216}
1217 OUTPUT:
1218 RETVAL
1219
1069void 1220void
1070rxvt_term::cur (...) 1221rxvt_term::cur (...)
1071 PROTOTYPE: $;$$ 1222 PROTOTYPE: $;$$
1072 ALIAS: 1223 ALIAS:
1073 screen_cur = 0 1224 screen_cur = 0
… …
1097 THIS->want_refresh = 1; 1248 THIS->want_refresh = 1;
1098 } 1249 }
1099} 1250}
1100 1251
1101int 1252int
1102rxvt_term::selection_grab (int eventtime = CurrentTime) 1253rxvt_term::selection_grab (U32 eventtime)
1103 1254
1104void 1255void
1105rxvt_term::selection (SV *newtext = 0) 1256rxvt_term::selection (SV *newtext = 0)
1106 PPCODE: 1257 PPCODE:
1107{ 1258{
1108 if (GIMME_V != G_VOID) 1259 if (GIMME_V != G_VOID)
1109 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1260 XPUSHs (taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))));
1110 1261
1111 if (newtext) 1262 if (newtext)
1112 { 1263 {
1113 free (THIS->selection.text); 1264 free (THIS->selection.text);
1114 1265
… …
1145 char *old_cmdbuf_endp = THIS->cmdbuf_endp; 1296 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1146 1297
1147 THIS->cmdbuf_ptr = str; 1298 THIS->cmdbuf_ptr = str;
1148 THIS->cmdbuf_endp = str + len; 1299 THIS->cmdbuf_endp = str + len;
1149 1300
1301 rxvt_push_locale (THIS->locale);
1150 THIS->cmd_parse (); 1302 THIS->cmd_parse ();
1303 rxvt_pop_locale ();
1151 1304
1152 THIS->cmdbuf_ptr = old_cmdbuf_ptr; 1305 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1153 THIS->cmdbuf_endp = old_cmdbuf_endp; 1306 THIS->cmdbuf_endp = old_cmdbuf_endp;
1154} 1307}
1155 1308

Diff Legend

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