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.63 by root, Fri Jan 13 05:06:44 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 "unistd.h"
35
36#include "iom.h"
34#include "rxvt.h" 37#include "rxvt.h"
35#include "iom.h" 38#include "keyboard.h"
36#include "rxvtutil.h" 39#include "rxvtutil.h"
37#include "rxvtperl.h" 40#include "rxvtperl.h"
38 41
39#include "perlxsi.c" 42#include "perlxsi.c"
43
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
45# define GRAB_CURSOR THIS->leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
40 49
41#undef LINENO 50#undef LINENO
42#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
43#undef ROW 52#undef ROW
44#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
45 54
46///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
56
57static SV *
58taint (SV *sv)
59{
60 SvTAINT (sv);
61 return sv;
62}
63
64static SV *
65taint_if (SV *sv, SV *src)
66{
67 if (SvTAINTED (src))
68 SvTAINT (sv);
69
70 return sv;
71}
47 72
48static wchar_t * 73static wchar_t *
49sv2wcs (SV *sv) 74sv2wcs (SV *sv)
50{ 75{
51 STRLEN len; 76 STRLEN len;
… …
370 395
371struct rxvt_perl_interp rxvt_perl; 396struct rxvt_perl_interp rxvt_perl;
372 397
373static PerlInterpreter *perl; 398static PerlInterpreter *perl;
374 399
375rxvt_perl_interp::rxvt_perl_interp ()
376{
377}
378
379rxvt_perl_interp::~rxvt_perl_interp () 400rxvt_perl_interp::~rxvt_perl_interp ()
380{ 401{
381 if (perl) 402 if (perl)
382 { 403 {
383 perl_destruct (perl); 404 perl_destruct (perl);
… …
388void 409void
389rxvt_perl_interp::init () 410rxvt_perl_interp::init ()
390{ 411{
391 if (!perl) 412 if (!perl)
392 { 413 {
414 perl_environ = rxvt_environ;
415 swap (perl_environ, environ);
416
393 char *argv[] = { 417 char *argv[] = {
394 "", 418 "",
419 "-T",
395 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 420 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
396 }; 421 };
397 422
398 perl = perl_alloc (); 423 perl = perl_alloc ();
399 perl_construct (perl); 424 perl_construct (perl);
400 425
401 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 426 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
402 || perl_run (perl)) 427 || perl_run (perl))
403 { 428 {
404 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 429 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
405 430
406 perl_destruct (perl); 431 perl_destruct (perl);
407 perl_free (perl); 432 perl_free (perl);
408 perl = 0; 433 perl = 0;
409 } 434 }
435
436 swap (perl_environ, environ);
437 }
438}
439
440static void
441ungrab (rxvt_term *THIS)
442{
443 if (THIS->perl.grabtime)
444 {
445 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
446 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
447 THIS->perl.grabtime = 0;
410 } 448 }
411} 449}
412 450
413bool 451bool
414rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 452rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
425 return false; // perl not initialized for this instance 463 return false; // perl not initialized for this instance
426 else if (htype == HOOK_DESTROY) 464 else if (htype == HOOK_DESTROY)
427 { 465 {
428 // handled later 466 // handled later
429 } 467 }
430 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 468 else
431 { 469 {
432 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 470 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
433
434 if (HvKEYS (hv))
435 { 471 {
472 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
473
474 if (HvKEYS (hv))
475 {
436 hv_iterinit (hv); 476 hv_iterinit (hv);
437 477
438 while (HE *he = hv_iternext (hv)) 478 while (HE *he = hv_iternext (hv))
439 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 479 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480 }
481
440 } 482 }
483
484 if (!term->perl.should_invoke [htype])
485 return false;
441 } 486 }
442 else if (!should_invoke [htype])
443 return false;
444 487
488 swap (perl_environ, environ);
489
490 try
491 {
445 dSP; 492 dSP;
446 va_list ap; 493 va_list ap;
447 494
448 va_start (ap, htype); 495 va_start (ap, htype);
449 496
450 ENTER; 497 ENTER;
451 SAVETMPS; 498 SAVETMPS;
452 499
453 PUSHMARK (SP); 500 PUSHMARK (SP);
454 501
455 XPUSHs (sv_2mortal (newSVterm (term))); 502 XPUSHs (sv_2mortal (newSVterm (term)));
456 XPUSHs (sv_2mortal (newSViv (htype))); 503 XPUSHs (sv_2mortal (newSViv (htype)));
457 504
458 for (;;) { 505 for (;;) {
459 data_type dt = (data_type)va_arg (ap, int); 506 data_type dt = (data_type)va_arg (ap, int);
460 507
461 switch (dt) 508 switch (dt)
462 { 509 {
463 case DT_INT: 510 case DT_INT:
464 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 511 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
465 break; 512 break;
466 513
467 case DT_LONG: 514 case DT_LONG:
468 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
469 break; 516 break;
470 517
471 case DT_STR: 518 case DT_STR:
472 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 519 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
473 break; 520 break;
474 521
475 case DT_STR_LEN: 522 case DT_STR_LEN:
476 { 523 {
477 char *str = va_arg (ap, char *); 524 char *str = va_arg (ap, char *);
478 int len = va_arg (ap, int); 525 int len = va_arg (ap, int);
479 526
480 XPUSHs (sv_2mortal (newSVpvn (str, len))); 527 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
481 } 528 }
482 break; 529 break;
483 530
484 case DT_WCS_LEN: 531 case DT_WCS_LEN:
485 { 532 {
486 wchar_t *wstr = va_arg (ap, wchar_t *); 533 wchar_t *wstr = va_arg (ap, wchar_t *);
487 int wlen = va_arg (ap, int); 534 int wlen = va_arg (ap, int);
488 535
489 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 536 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
490 } 537 }
491 break; 538 break;
492 539
493 case DT_XEVENT: 540 case DT_XEVENT:
494 { 541 {
495 XEvent *xe = va_arg (ap, XEvent *); 542 XEvent *xe = va_arg (ap, XEvent *);
496 HV *hv = newHV (); 543 HV *hv = newHV ();
497 544
498# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 545# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
499# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 546# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
500# undef set 547# undef set
501 548
502 setiv (type, xe->type); 549 setiv (type, xe->type);
503 setiv (send_event, xe->xany.send_event); 550 setiv (send_event, xe->xany.send_event);
504 setiv (serial, xe->xany.serial); 551 setiv (serial, xe->xany.serial);
505 552
506 switch (xe->type) 553 switch (xe->type)
554 {
555 case KeyPress:
556 case KeyRelease:
557 case ButtonPress:
558 case ButtonRelease:
559 case MotionNotify:
560 setiv (time, xe->xmotion.time);
561 setiv (x, xe->xmotion.x);
562 setiv (y, xe->xmotion.y);
563 setiv (row, xe->xmotion.y / term->fheight);
564 setiv (col, xe->xmotion.x / term->fwidth);
565 setiv (x_root, xe->xmotion.x_root);
566 setiv (y_root, xe->xmotion.y_root);
567 setiv (state, xe->xmotion.state);
568 break;
569 }
570
571 switch (xe->type)
572 {
573 case KeyPress:
574 case KeyRelease:
575 setiv (keycode, xe->xkey.keycode);
576 break;
577
578 case ButtonPress:
579 case ButtonRelease:
580 setiv (button, xe->xbutton.button);
581 break;
582
583 case MotionNotify:
584 setiv (is_hint, xe->xmotion.is_hint);
585 break;
586 }
587
588 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
589 }
590 break;
591
592 case DT_END:
507 { 593 {
508 case KeyPress: 594 va_end (ap);
509 case KeyRelease: 595
510 case ButtonPress: 596 PUTBACK;
511 case ButtonRelease: 597 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
512 case MotionNotify: 598 SPAGAIN;
513 setiv (time, xe->xmotion.time); 599
514 setiv (x, xe->xmotion.x); 600 if (count)
515 setiv (y, xe->xmotion.y);
516 setiv (row, xe->xmotion.y / term->fheight);
517 setiv (col, xe->xmotion.x / term->fwidth);
518 setiv (x_root, xe->xmotion.x_root);
519 setiv (y_root, xe->xmotion.y_root);
520 setiv (state, xe->xmotion.state);
521 break; 601 {
602 SV *status = POPs;
603 count = SvTRUE (status);
604 }
605
606 PUTBACK;
607 FREETMPS;
608 LEAVE;
609
610 if (SvTRUE (ERRSV))
611 {
612 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
613 ungrab (term); // better lose the grab than the session
614 }
615
616 if (htype == HOOK_DESTROY)
617 {
618 clearSVptr ((SV *)term->perl.self);
619 SvREFCNT_dec ((SV *)term->perl.self);
620 }
621
622 swap (perl_environ, environ);
623 return count;
522 } 624 }
523 625
524 switch (xe->type)
525 {
526 case KeyPress:
527 case KeyRelease:
528 setiv (keycode, xe->xkey.keycode);
529 break;
530
531 case ButtonPress:
532 case ButtonRelease:
533 setiv (button, xe->xbutton.button);
534 break;
535
536 case MotionNotify:
537 setiv (is_hint, xe->xmotion.is_hint);
538 break;
539 }
540
541 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
542 }
543 break;
544
545 case DT_END:
546 {
547 va_end (ap);
548
549 PUTBACK;
550 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
551 SPAGAIN;
552
553 if (count)
554 {
555 SV *status = POPs;
556 count = SvTRUE (status);
557 }
558
559 PUTBACK;
560 FREETMPS;
561 LEAVE;
562
563 if (SvTRUE (ERRSV))
564 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
565
566 if (htype == HOOK_DESTROY)
567 {
568 clearSVptr ((SV *)term->perl.self);
569 SvREFCNT_dec ((SV *)term->perl.self);
570 }
571
572 return count;
573 }
574
575 default: 626 default:
576 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 627 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628 }
577 } 629 }
578 } 630 }
631 catch (...)
632 {
633 swap (perl_environ, environ);
634 throw;
635 }
579} 636}
580 637
581///////////////////////////////////////////////////////////////////////////// 638/////////////////////////////////////////////////////////////////////////////
582 639
583MODULE = urxvt PACKAGE = urxvt 640MODULE = urxvt PACKAGE = urxvt
584 641
585PROTOTYPES: ENABLE 642PROTOTYPES: ENABLE
586 643
587BOOT: 644BOOT:
588{ 645{
589 HV *stash = gv_stashpv ("urxvt", 1); 646 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
590# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name)); 647 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
648 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
649 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
591 650
592 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 651 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
593# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 652# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
594# include "hookinc.h" 653# include "hookinc.h"
595# undef def 654# undef def
596 655
597 656 HV *option = get_hv ("urxvt::OPTION", 1);
657# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
658# define nodef(name)
659# include "optinc.h"
660# undef nodef
661# undef def
662
663 HV *stash = gv_stashpv ("urxvt", 1);
664 struct {
665 const char *name;
666 IV iv;
667 } *civ, const_iv[] = {
668# define const_iv(name) { # name, (IV)name }
598 export_const_iv (DEFAULT_RSTYLE); 669 const_iv (DEFAULT_RSTYLE),
599 export_const_iv (OVERLAY_RSTYLE); 670 const_iv (OVERLAY_RSTYLE),
600 export_const_iv (RS_Bold); 671 const_iv (RS_Bold),
601 export_const_iv (RS_Italic); 672 const_iv (RS_Italic),
602 export_const_iv (RS_Blink); 673 const_iv (RS_Blink),
603 export_const_iv (RS_RVid); 674 const_iv (RS_RVid),
604 export_const_iv (RS_Uline); 675 const_iv (RS_Uline),
605 676
606 export_const_iv (CurrentTime); 677 const_iv (CurrentTime),
607 export_const_iv (ShiftMask); 678 const_iv (ShiftMask),
608 export_const_iv (LockMask); 679 const_iv (LockMask),
609 export_const_iv (ControlMask); 680 const_iv (ControlMask),
610 export_const_iv (Mod1Mask); 681 const_iv (Mod1Mask),
611 export_const_iv (Mod2Mask); 682 const_iv (Mod2Mask),
612 export_const_iv (Mod3Mask); 683 const_iv (Mod3Mask),
613 export_const_iv (Mod4Mask); 684 const_iv (Mod4Mask),
614 export_const_iv (Mod5Mask); 685 const_iv (Mod5Mask),
615 export_const_iv (Button1Mask); 686 const_iv (Button1Mask),
616 export_const_iv (Button2Mask); 687 const_iv (Button2Mask),
617 export_const_iv (Button3Mask); 688 const_iv (Button3Mask),
618 export_const_iv (Button4Mask); 689 const_iv (Button4Mask),
619 export_const_iv (Button5Mask); 690 const_iv (Button5Mask),
620 export_const_iv (AnyModifier); 691 const_iv (AnyModifier),
621 692
622 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1)); 693 const_iv (EVENT_NONE),
694 const_iv (EVENT_READ),
695 const_iv (EVENT_WRITE),
696
697 const_iv (NoEventMask),
698 const_iv (KeyPressMask),
699 const_iv (KeyReleaseMask),
700 const_iv (ButtonPressMask),
701 const_iv (ButtonReleaseMask),
702 const_iv (EnterWindowMask),
703 const_iv (LeaveWindowMask),
704 const_iv (PointerMotionMask),
705 const_iv (PointerMotionHintMask),
706 const_iv (Button1MotionMask),
707 const_iv (Button2MotionMask),
708 const_iv (Button3MotionMask),
709 const_iv (Button4MotionMask),
710 const_iv (Button5MotionMask),
711 const_iv (ButtonMotionMask),
712 const_iv (KeymapStateMask),
713 const_iv (ExposureMask),
714 const_iv (VisibilityChangeMask),
715 const_iv (StructureNotifyMask),
716 const_iv (ResizeRedirectMask),
717 const_iv (SubstructureNotifyMask),
718 const_iv (SubstructureRedirectMask),
719 const_iv (FocusChangeMask),
720 const_iv (PropertyChangeMask),
721 const_iv (ColormapChangeMask),
722 const_iv (OwnerGrabButtonMask),
723
724 const_iv (KeyPress),
725 const_iv (KeyRelease),
726 const_iv (ButtonPress),
727 const_iv (ButtonRelease),
728 const_iv (MotionNotify),
729 const_iv (EnterNotify),
730 const_iv (LeaveNotify),
731 const_iv (FocusIn),
732 const_iv (FocusOut),
733 const_iv (KeymapNotify),
734 const_iv (Expose),
735 const_iv (GraphicsExpose),
736 const_iv (NoExpose),
737 const_iv (VisibilityNotify),
738 const_iv (CreateNotify),
739 const_iv (DestroyNotify),
740 const_iv (UnmapNotify),
741 const_iv (MapNotify),
742 const_iv (MapRequest),
743 const_iv (ReparentNotify),
744 const_iv (ConfigureNotify),
745 const_iv (ConfigureRequest),
746 const_iv (GravityNotify),
747 const_iv (ResizeRequest),
748 const_iv (CirculateNotify),
749 const_iv (CirculateRequest),
750 const_iv (PropertyNotify),
751 const_iv (SelectionClear),
752 const_iv (SelectionRequest),
753 const_iv (SelectionNotify),
754 const_iv (ColormapNotify),
755 const_iv (ClientMessage),
756 const_iv (MappingNotify),
757 };
758
759 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
760 civ-- > const_iv; )
761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
623} 762}
763
764void
765warn (const char *msg)
766 CODE:
767 rxvt_warn ("%s", msg);
768
769void
770fatal (const char *msg)
771 CODE:
772 rxvt_fatal ("%s", msg);
624 773
625SV * 774SV *
626new (...) 775untaint (SV *sv)
627 CODE: 776 CODE:
628{ 777 RETVAL = newSVsv (sv);
629 stringvec *argv = new stringvec; 778 SvTAINTED_off (RETVAL);
630 bool success; 779 OUTPUT:
631
632 for (int i = 0; i < items ;i++)
633 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
634
635 rxvt_term *term = new rxvt_term;
636
637 term->argv = argv;
638
639 try
640 {
641 if (!term->init (argv->size (), argv->begin ()))
642 term = 0;
643 }
644 catch (const class rxvt_failure_exception &e)
645 {
646 term->destroy ();
647 croak ("exception caught while initializing new terminal instance");
648 }
649
650 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
651}
652 OUTPUT:
653 RETVAL 780 RETVAL
654 781
655void 782void
656set_should_invoke (int htype, int value) 783_exit (int status)
657 CODE:
658 rxvt_perl.should_invoke [htype] = value;
659 784
660void 785bool
661warn (const char *msg) 786safe ()
662 CODE: 787 CODE:
663 rxvt_warn ("%s", msg); 788 RETVAL = !rxvt_tainted ();
664 789 OUTPUT:
665void 790 RETVAL
666fatal (const char *msg)
667 CODE:
668 rxvt_fatal ("%s", msg);
669 791
670NV 792NV
671NOW () 793NOW ()
672 CODE: 794 CODE:
673 RETVAL = NOW; 795 RETVAL = NOW;
… …
722 OUTPUT: 844 OUTPUT:
723 RETVAL 845 RETVAL
724 846
725MODULE = urxvt PACKAGE = urxvt::term 847MODULE = urxvt PACKAGE = urxvt::term
726 848
849SV *
850_new (...)
851 CODE:
852{
853 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
854 croak ("first argument to urxvt::term->_new must be arrayref");
855
856 rxvt_term *term = new rxvt_term;
857
858 term->argv = new stringvec;
859 term->envv = new stringvec;
860
861 for (int i = 1; i < items; i++)
862 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
863
864 AV *envv = (AV *)SvRV (ST (0));
865 for (int i = av_len (envv) + 1; i--; )
866 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
867
868 term->envv->push_back (0);
869
870 bool success;
871
872 try
873 {
874 success = term->init (term->argv->size (), term->argv->begin ());
875 }
876 catch (const class rxvt_failure_exception &e)
877 {
878 success = false;
879 }
880
881 if (!success)
882 {
883 term->destroy ();
884 croak ("error while initializing new terminal instance");
885 }
886
887 RETVAL = term && term->perl.self
888 ? newSVterm (term) : &PL_sv_undef;
889}
890 OUTPUT:
891 RETVAL
892
727void 893void
728rxvt_term::destroy () 894rxvt_term::destroy ()
895
896void
897rxvt_term::set_should_invoke (int htype, int inc)
898 CODE:
899 THIS->perl.should_invoke [htype] += inc;
729 900
730void 901void
731rxvt_term::grab_button (int button, U32 modifiers) 902rxvt_term::grab_button (int button, U32 modifiers)
732 CODE: 903 CODE:
733 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 904 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
734 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 905 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
735 GrabModeSync, GrabModeSync, None, None); 906 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
736 907
737bool 908bool
738rxvt_term::grab (U32 eventtime, int sync = 0) 909rxvt_term::grab (U32 eventtime, int sync = 0)
739 CODE: 910 CODE:
740{ 911{
… …
742 913
743 THIS->perl.grabtime = 0; 914 THIS->perl.grabtime = 0;
744 915
745 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 916 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
746 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 917 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
747 mode, mode, None, None, eventtime)) 918 mode, mode, None, GRAB_CURSOR, eventtime))
748 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 919 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
749 THIS->perl.grabtime = eventtime; 920 THIS->perl.grabtime = eventtime;
750 else 921 else
751 XUngrabPointer (THIS->display->display, eventtime); 922 XUngrabPointer (THIS->display->display, eventtime);
752 923
… …
754} 925}
755 OUTPUT: 926 OUTPUT:
756 RETVAL 927 RETVAL
757 928
758void 929void
759rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 930rxvt_term::allow_events_async ()
760 CODE: 931 CODE:
761 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 932 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
762 933
763void 934void
764rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 935rxvt_term::allow_events_sync ()
765 CODE: 936 CODE:
766 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 937 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
767 938
768void 939void
769rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 940rxvt_term::allow_events_replay ()
770 CODE: 941 CODE:
771 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 942 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
772 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 943 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
773 944
774void 945void
775rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 946rxvt_term::ungrab ()
776 CODE: 947 CODE:
777 THIS->perl.grabtime = 0; 948 ungrab (THIS);
778 XUngrabKeyboard (THIS->display->display, eventtime);
779 XUngrabPointer (THIS->display->display, eventtime);
780 949
781int 950int
782rxvt_term::strwidth (SV *str) 951rxvt_term::strwidth (SV *str)
783 CODE: 952 CODE:
784{ 953{
… …
803 char *mbstr = rxvt_wcstombs (wstr); 972 char *mbstr = rxvt_wcstombs (wstr);
804 rxvt_pop_locale (); 973 rxvt_pop_locale ();
805 974
806 free (wstr); 975 free (wstr);
807 976
808 RETVAL = newSVpv (mbstr, 0); 977 RETVAL = taint_if (newSVpv (mbstr, 0), str);
809 free (mbstr); 978 free (mbstr);
810} 979}
811 OUTPUT: 980 OUTPUT:
812 RETVAL 981 RETVAL
813 982
… …
820 989
821 rxvt_push_locale (THIS->locale); 990 rxvt_push_locale (THIS->locale);
822 wchar_t *wstr = rxvt_mbstowcs (data, len); 991 wchar_t *wstr = rxvt_mbstowcs (data, len);
823 rxvt_pop_locale (); 992 rxvt_pop_locale ();
824 993
825 RETVAL = wcs2sv (wstr); 994 RETVAL = taint_if (wcs2sv (wstr), octets);
826 free (wstr); 995 free (wstr);
827} 996}
828 OUTPUT: 997 OUTPUT:
829 RETVAL 998 RETVAL
830 999
… …
877 case 2: RETVAL = THIS->ModNumLockMask; break; 1046 case 2: RETVAL = THIS->ModNumLockMask; break;
878 } 1047 }
879 OUTPUT: 1048 OUTPUT:
880 RETVAL 1049 RETVAL
881 1050
1051char *
1052rxvt_term::display_id ()
1053 ALIAS:
1054 display_id = 0
1055 locale = 1
1056 CODE:
1057 switch (ix)
1058 {
1059 case 0: RETVAL = THIS->display->id; break;
1060 case 1: RETVAL = THIS->locale; break;
1061 }
1062 OUTPUT:
1063 RETVAL
1064
1065SV *
1066rxvt_term::_env ()
1067 CODE:
1068{
1069 if (THIS->envv)
1070 {
1071 AV *av = newAV ();
1072
1073 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1074 if (*i)
1075 av_push (av, newSVpv (*i, 0));
1076
1077 RETVAL = newRV_noinc ((SV *)av);
1078 }
1079 else
1080 RETVAL = &PL_sv_undef;
1081}
1082 OUTPUT:
1083 RETVAL
1084
1085int
1086rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1087 CODE:
1088 RETVAL = THIS->pty_ev.events;
1089 if (events != EVENT_UNDEF)
1090 THIS->pty_ev.set (events);
1091 OUTPUT:
1092 RETVAL
1093
882U32 1094U32
883rxvt_term::parent () 1095rxvt_term::parent ()
884 CODE: 1096 CODE:
885 RETVAL = (U32)THIS->parent [0]; 1097 RETVAL = (U32)THIS->parent [0];
886 OUTPUT: 1098 OUTPUT:
… …
891 CODE: 1103 CODE:
892 RETVAL = (U32)THIS->vt; 1104 RETVAL = (U32)THIS->vt;
893 OUTPUT: 1105 OUTPUT:
894 RETVAL 1106 RETVAL
895 1107
1108void
1109rxvt_term::vt_emask_add (U32 emask)
1110 CODE:
1111 THIS->vt_emask_perl |= emask;
1112 THIS->vt_select_input ();
1113
896U32 1114U32
897rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1115rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
898 CODE: 1116 CODE:
899{
900 RETVAL = THIS->rstyle; 1117 RETVAL = THIS->rstyle;
901 THIS->rstyle = new_rstyle; 1118 THIS->rstyle = new_rstyle;
902}
903 OUTPUT: 1119 OUTPUT:
904 RETVAL 1120 RETVAL
905 1121
906int 1122int
907rxvt_term::view_start (int newval = -1) 1123rxvt_term::view_start (int newval = -1)
1124 PROTOTYPE: $;$
908 CODE: 1125 CODE:
909{ 1126{
910 RETVAL = THIS->view_start; 1127 RETVAL = THIS->view_start;
911 1128
912 if (newval >= 0) 1129 if (newval >= 0)
… …
937 wchar_t *wstr = new wchar_t [THIS->ncol]; 1154 wchar_t *wstr = new wchar_t [THIS->ncol];
938 1155
939 for (int col = 0; col < THIS->ncol; col++) 1156 for (int col = 0; col < THIS->ncol; col++)
940 wstr [col] = l.t [col]; 1157 wstr [col] = l.t [col];
941 1158
942 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1159 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
943 1160
944 delete [] wstr; 1161 delete [] wstr;
945 } 1162 }
946 1163
947 if (new_text) 1164 if (new_text)
… …
1068 else 1285 else
1069 *r++ = *s; 1286 *r++ = *s;
1070 1287
1071 rxvt_pop_locale (); 1288 rxvt_pop_locale ();
1072 1289
1073 RETVAL = wcs2sv (rstr, r - rstr); 1290 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1074 1291
1075 delete [] rstr; 1292 delete [] rstr;
1076} 1293}
1077 OUTPUT: 1294 OUTPUT:
1078 RETVAL 1295 RETVAL
… …
1104 else if (IS_COMPOSE (*s)) 1321 else if (IS_COMPOSE (*s))
1105 r += rxvt_composite.expand (*s, r); 1322 r += rxvt_composite.expand (*s, r);
1106 else 1323 else
1107 *r++ = *s; 1324 *r++ = *s;
1108 1325
1109 RETVAL = wcs2sv (rstr, r - rstr); 1326 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1110 1327
1111 delete [] rstr; 1328 delete [] rstr;
1112} 1329}
1113 OUTPUT: 1330 OUTPUT:
1114 RETVAL 1331 RETVAL
… …
1136 1353
1137 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1354 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1138 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1355 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1139 1356
1140 if (GIMME_V != G_VOID) 1357 if (GIMME_V != G_VOID)
1141 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1358 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1142 1359
1143 if (newval) 1360 if (newval)
1144 { 1361 {
1145 if (SvOK (newval)) 1362 if (SvOK (newval))
1146 { 1363 {
… …
1151 else 1368 else
1152 THIS->rs [index] = 0; 1369 THIS->rs [index] = 0;
1153 } 1370 }
1154} 1371}
1155 1372
1373const char *
1374rxvt_term::x_resource (const char *name)
1375 CLEANUP:
1376 SvTAINTED_on (ST (0));
1377
1378bool
1379rxvt_term::option (U32 optval, int set = -1)
1380 CODE:
1381{
1382 RETVAL = THIS->options & optval;
1383
1384 if (set >= 0)
1385 {
1386 if (set)
1387 THIS->options |= optval;
1388 else
1389 THIS->options &= ~optval;
1390
1391 switch (optval)
1392 {
1393 case Opt_skipBuiltinGlyphs:
1394 THIS->set_fonts ();
1395 THIS->scr_remap_chars ();
1396 THIS->scr_touch (true);
1397 THIS->want_refresh = 1;
1398 break;
1399
1400 case Opt_cursorUnderline:
1401 THIS->want_refresh = 1;
1402 break;
1403
1404# case Opt_scrollBar_floating:
1405# case Opt_scrollBar_right:
1406# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1407# break;
1408 }
1409 }
1410}
1411 OUTPUT:
1412 RETVAL
1413
1414bool
1415rxvt_term::parse_keysym (char *keysym, char *str)
1416 CODE:
1417 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1418 THIS->keyboard->register_done ();
1419 OUTPUT:
1420 RETVAL
1421
1156void 1422void
1157rxvt_term::cur (...) 1423rxvt_term::screen_cur (...)
1158 PROTOTYPE: $;$$ 1424 PROTOTYPE: $;$$
1159 ALIAS: 1425 ALIAS:
1160 screen_cur = 0 1426 screen_cur = 0
1161 selection_beg = 1 1427 selection_beg = 1
1162 selection_end = 2 1428 selection_end = 2
… …
1183 if (ix) 1449 if (ix)
1184 THIS->want_refresh = 1; 1450 THIS->want_refresh = 1;
1185 } 1451 }
1186} 1452}
1187 1453
1454char
1455rxvt_term::cur_charset ()
1456 CODE:
1457 RETVAL = THIS->charsets [THIS->screen.charset];
1458 OUTPUT:
1459 RETVAL
1460
1461#void
1462#rxvt_term::selection_clear ()
1463
1464void
1465rxvt_term::selection_make (U32 eventtime, bool rect = false)
1466 CODE:
1467 THIS->selection.op = SELECTION_CONT;
1468 THIS->selection.rect = rect;
1469 THIS->selection_make (eventtime);
1470
1188int 1471int
1189rxvt_term::selection_grab (U32 eventtime) 1472rxvt_term::selection_grab (U32 eventtime)
1190 1473
1191void 1474void
1192rxvt_term::selection (SV *newtext = 0) 1475rxvt_term::selection (SV *newtext = 0)
1193 PPCODE: 1476 PPCODE:
1194{ 1477{
1195 if (GIMME_V != G_VOID) 1478 if (GIMME_V != G_VOID)
1479 XPUSHs (THIS->selection.text
1196 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1480 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1481 : &PL_sv_undef);
1197 1482
1198 if (newtext) 1483 if (newtext)
1199 { 1484 {
1200 free (THIS->selection.text); 1485 free (THIS->selection.text);
1201 1486
1202 THIS->selection.text = sv2wcs (newtext); 1487 THIS->selection.text = sv2wcs (newtext);
1203 THIS->selection.len = wcslen (THIS->selection.text); 1488 THIS->selection.len = wcslen (THIS->selection.text);
1204 } 1489 }
1205} 1490}
1491
1492void
1493rxvt_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)
1494
1495void
1496rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1497
1498void
1499rxvt_term::scr_bell ()
1206 1500
1207void 1501void
1208rxvt_term::scr_add_lines (SV *string) 1502rxvt_term::scr_add_lines (SV *string)
1209 CODE: 1503 CODE:
1210{ 1504{

Diff Legend

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