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.63 by root, Fri Jan 13 05:06:44 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
34#include "unistd.h"
35
36#include "iom.h"
33#include "rxvt.h" 37#include "rxvt.h"
34#include "iom.h" 38#include "keyboard.h"
35#include "rxvtutil.h" 39#include "rxvtutil.h"
36#include "rxvtperl.h" 40#include "rxvtperl.h"
37 41
38#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
39 49
40#undef LINENO 50#undef LINENO
41#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)
42#undef ROW 52#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
44 54
45///////////////////////////////////////////////////////////////////////////// 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}
46 72
47static wchar_t * 73static wchar_t *
48sv2wcs (SV *sv) 74sv2wcs (SV *sv)
49{ 75{
50 STRLEN len; 76 STRLEN len;
… …
369 395
370struct rxvt_perl_interp rxvt_perl; 396struct rxvt_perl_interp rxvt_perl;
371 397
372static PerlInterpreter *perl; 398static PerlInterpreter *perl;
373 399
374rxvt_perl_interp::rxvt_perl_interp ()
375{
376}
377
378rxvt_perl_interp::~rxvt_perl_interp () 400rxvt_perl_interp::~rxvt_perl_interp ()
379{ 401{
380 if (perl) 402 if (perl)
381 { 403 {
382 perl_destruct (perl); 404 perl_destruct (perl);
… …
387void 409void
388rxvt_perl_interp::init () 410rxvt_perl_interp::init ()
389{ 411{
390 if (!perl) 412 if (!perl)
391 { 413 {
414 perl_environ = rxvt_environ;
415 swap (perl_environ, environ);
416
392 char *argv[] = { 417 char *argv[] = {
393 "", 418 "",
419 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 420 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 421 };
396 422
397 perl = perl_alloc (); 423 perl = perl_alloc ();
398 perl_construct (perl); 424 perl_construct (perl);
399 425
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 426 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 427 || perl_run (perl))
402 { 428 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 429 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 430
405 perl_destruct (perl); 431 perl_destruct (perl);
406 perl_free (perl); 432 perl_free (perl);
407 perl = 0; 433 perl = 0;
408 } 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;
409 } 448 }
410} 449}
411 450
412bool 451bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 452rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
424 return false; // perl not initialized for this instance 463 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 464 else if (htype == HOOK_DESTROY)
426 { 465 {
427 // handled later 466 // handled later
428 } 467 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 468 else
430 { 469 {
431 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)
432
433 if (HvKEYS (hv))
434 { 471 {
472 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
473
474 if (HvKEYS (hv))
475 {
435 hv_iterinit (hv); 476 hv_iterinit (hv);
436 477
437 while (HE *he = hv_iternext (hv)) 478 while (HE *he = hv_iternext (hv))
438 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 479 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480 }
481
439 } 482 }
483
484 if (!term->perl.should_invoke [htype])
485 return false;
440 } 486 }
441 else if (!should_invoke [htype])
442 return false;
443 487
488 swap (perl_environ, environ);
489
490 try
491 {
444 dSP; 492 dSP;
445 va_list ap; 493 va_list ap;
446 494
447 va_start (ap, htype); 495 va_start (ap, htype);
448 496
449 ENTER; 497 ENTER;
450 SAVETMPS; 498 SAVETMPS;
451 499
452 PUSHMARK (SP); 500 PUSHMARK (SP);
453 501
454 XPUSHs (sv_2mortal (newSVterm (term))); 502 XPUSHs (sv_2mortal (newSVterm (term)));
455 XPUSHs (sv_2mortal (newSViv (htype))); 503 XPUSHs (sv_2mortal (newSViv (htype)));
456 504
457 for (;;) { 505 for (;;) {
458 data_type dt = (data_type)va_arg (ap, int); 506 data_type dt = (data_type)va_arg (ap, int);
459 507
460 switch (dt) 508 switch (dt)
461 { 509 {
462 case DT_INT: 510 case DT_INT:
463 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 511 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
464 break; 512 break;
465 513
466 case DT_LONG: 514 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 516 break;
469 517
470 case DT_STR: 518 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 519 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 520 break;
473 521
474 case DT_STR_LEN: 522 case DT_STR_LEN:
475 { 523 {
476 char *str = va_arg (ap, char *); 524 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int); 525 int len = va_arg (ap, int);
478 526
479 XPUSHs (sv_2mortal (newSVpvn (str, len))); 527 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
480 } 528 }
481 break; 529 break;
482 530
483 case DT_WCS_LEN: 531 case DT_WCS_LEN:
484 { 532 {
485 wchar_t *wstr = va_arg (ap, wchar_t *); 533 wchar_t *wstr = va_arg (ap, wchar_t *);
486 int wlen = va_arg (ap, int); 534 int wlen = va_arg (ap, int);
487 535
488 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 536 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
489 } 537 }
490 break; 538 break;
491 539
492 case DT_XEVENT: 540 case DT_XEVENT:
493 { 541 {
494 XEvent *xe = va_arg (ap, XEvent *); 542 XEvent *xe = va_arg (ap, XEvent *);
495 HV *hv = newHV (); 543 HV *hv = newHV ();
496 544
497# 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)
498# 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)
499# undef set 547# undef set
500 548
501 setiv (type, xe->type); 549 setiv (type, xe->type);
502 setiv (send_event, xe->xany.send_event); 550 setiv (send_event, xe->xany.send_event);
503 setiv (serial, xe->xany.serial); 551 setiv (serial, xe->xany.serial);
504 552
505 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:
506 { 593 {
507 case KeyPress: 594 va_end (ap);
508 case KeyRelease: 595
509 case ButtonPress: 596 PUTBACK;
510 case ButtonRelease: 597 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
511 case MotionNotify: 598 SPAGAIN;
512 setiv (time, xe->xmotion.time); 599
513 setiv (x, xe->xmotion.x); 600 if (count)
514 setiv (y, xe->xmotion.y);
515 setiv (row, xe->xmotion.y / term->fheight);
516 setiv (col, xe->xmotion.x / term->fwidth);
517 setiv (x_root, xe->xmotion.x_root);
518 setiv (y_root, xe->xmotion.y_root);
519 setiv (state, xe->xmotion.state);
520 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;
521 } 624 }
522 625
523 switch (xe->type)
524 {
525 case KeyPress:
526 case KeyRelease:
527 setiv (keycode, xe->xkey.keycode);
528 break;
529
530 case ButtonPress:
531 case ButtonRelease:
532 setiv (button, xe->xbutton.button);
533 break;
534
535 case MotionNotify:
536 setiv (is_hint, xe->xmotion.is_hint);
537 break;
538 }
539
540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
541 }
542 break;
543
544 case DT_END:
545 {
546 va_end (ap);
547
548 PUTBACK;
549 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
550 SPAGAIN;
551
552 if (count)
553 {
554 SV *status = POPs;
555 count = SvTRUE (status);
556 }
557
558 PUTBACK;
559 FREETMPS;
560 LEAVE;
561
562 if (SvTRUE (ERRSV))
563 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
564
565 if (htype == HOOK_DESTROY)
566 {
567 clearSVptr ((SV *)term->perl.self);
568 SvREFCNT_dec ((SV *)term->perl.self);
569 }
570
571 return count;
572 }
573
574 default: 626 default:
575 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 627 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628 }
576 } 629 }
577 } 630 }
631 catch (...)
632 {
633 swap (perl_environ, environ);
634 throw;
635 }
578} 636}
579 637
580///////////////////////////////////////////////////////////////////////////// 638/////////////////////////////////////////////////////////////////////////////
581 639
582MODULE = urxvt PACKAGE = urxvt 640MODULE = urxvt PACKAGE = urxvt
583 641
584PROTOTYPES: ENABLE 642PROTOTYPES: ENABLE
585 643
586BOOT: 644BOOT:
587{ 645{
588 HV *stash = gv_stashpv ("urxvt", 1); 646 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
589# 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));
590 650
591 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 651 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
592# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 652# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
593# include "hookinc.h" 653# include "hookinc.h"
594# undef def 654# undef def
595 655
596 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 }
597 export_const_iv (DEFAULT_RSTYLE); 669 const_iv (DEFAULT_RSTYLE),
598 export_const_iv (OVERLAY_RSTYLE); 670 const_iv (OVERLAY_RSTYLE),
599 export_const_iv (RS_Bold); 671 const_iv (RS_Bold),
600 export_const_iv (RS_Italic); 672 const_iv (RS_Italic),
601 export_const_iv (RS_Blink); 673 const_iv (RS_Blink),
602 export_const_iv (RS_RVid); 674 const_iv (RS_RVid),
603 export_const_iv (RS_Uline); 675 const_iv (RS_Uline),
676
604 export_const_iv (CurrentTime); 677 const_iv (CurrentTime),
678 const_iv (ShiftMask),
679 const_iv (LockMask),
680 const_iv (ControlMask),
681 const_iv (Mod1Mask),
682 const_iv (Mod2Mask),
683 const_iv (Mod3Mask),
684 const_iv (Mod4Mask),
685 const_iv (Mod5Mask),
686 const_iv (Button1Mask),
687 const_iv (Button2Mask),
688 const_iv (Button3Mask),
689 const_iv (Button4Mask),
690 const_iv (Button5Mask),
691 const_iv (AnyModifier),
605 692
606 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));
607} 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);
608 773
609SV * 774SV *
610new (...) 775untaint (SV *sv)
611 CODE: 776 CODE:
612{ 777 RETVAL = newSVsv (sv);
613 stringvec *argv = new stringvec; 778 SvTAINTED_off (RETVAL);
614 bool success; 779 OUTPUT:
615
616 for (int i = 0; i < items ;i++)
617 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
618
619 rxvt_term *term = new rxvt_term;
620
621 term->argv = argv;
622
623 try
624 {
625 if (!term->init (argv->size (), argv->begin ()))
626 term = 0;
627 }
628 catch (const class rxvt_failure_exception &e)
629 {
630 term->destroy ();
631 croak ("exception caught while initializing new terminal instance");
632 }
633
634 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
635}
636 OUTPUT:
637 RETVAL 780 RETVAL
638 781
639void 782void
640set_should_invoke (int htype, int value) 783_exit (int status)
641 CODE:
642 rxvt_perl.should_invoke [htype] = value;
643 784
644void 785bool
645warn (const char *msg) 786safe ()
646 CODE: 787 CODE:
647 rxvt_warn ("%s", msg); 788 RETVAL = !rxvt_tainted ();
648 789 OUTPUT:
649void 790 RETVAL
650fatal (const char *msg)
651 CODE:
652 rxvt_fatal ("%s", msg);
653 791
654NV 792NV
655NOW () 793NOW ()
656 CODE: 794 CODE:
657 RETVAL = NOW; 795 RETVAL = NOW;
… …
706 OUTPUT: 844 OUTPUT:
707 RETVAL 845 RETVAL
708 846
709MODULE = urxvt PACKAGE = urxvt::term 847MODULE = urxvt PACKAGE = urxvt::term
710 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
711void 893void
712rxvt_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;
713 900
714void 901void
715rxvt_term::grab_button (int button, U32 modifiers) 902rxvt_term::grab_button (int button, U32 modifiers)
716 CODE: 903 CODE:
717 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 904 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
718 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 905 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
719 GrabModeSync, GrabModeSync, None, None); 906 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
720 907
721bool 908bool
722rxvt_term::grab (U32 eventtime, int sync = 0) 909rxvt_term::grab (U32 eventtime, int sync = 0)
723 CODE: 910 CODE:
724{ 911{
… …
726 913
727 THIS->perl.grabtime = 0; 914 THIS->perl.grabtime = 0;
728 915
729 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 916 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
730 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 917 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
731 mode, mode, None, None, eventtime)) 918 mode, mode, None, GRAB_CURSOR, eventtime))
732 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 919 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
733 THIS->perl.grabtime = eventtime; 920 THIS->perl.grabtime = eventtime;
734 else 921 else
735 XUngrabPointer (THIS->display->display, eventtime); 922 XUngrabPointer (THIS->display->display, eventtime);
736 923
… …
738} 925}
739 OUTPUT: 926 OUTPUT:
740 RETVAL 927 RETVAL
741 928
742void 929void
743rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 930rxvt_term::allow_events_async ()
744 CODE: 931 CODE:
745 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 932 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
746 933
747void 934void
748rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 935rxvt_term::allow_events_sync ()
749 CODE: 936 CODE:
750 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 937 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
751 938
752void 939void
753rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 940rxvt_term::allow_events_replay ()
754 CODE: 941 CODE:
755 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 942 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
756 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 943 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
757 944
758void 945void
759rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 946rxvt_term::ungrab ()
760 CODE: 947 CODE:
761 THIS->perl.grabtime = 0; 948 ungrab (THIS);
762 XUngrabKeyboard (THIS->display->display, eventtime);
763 XUngrabPointer (THIS->display->display, eventtime);
764 949
765int 950int
766rxvt_term::strwidth (SV *str) 951rxvt_term::strwidth (SV *str)
767 CODE: 952 CODE:
768{ 953{
… …
787 char *mbstr = rxvt_wcstombs (wstr); 972 char *mbstr = rxvt_wcstombs (wstr);
788 rxvt_pop_locale (); 973 rxvt_pop_locale ();
789 974
790 free (wstr); 975 free (wstr);
791 976
792 RETVAL = newSVpv (mbstr, 0); 977 RETVAL = taint_if (newSVpv (mbstr, 0), str);
793 free (mbstr); 978 free (mbstr);
794} 979}
795 OUTPUT: 980 OUTPUT:
796 RETVAL 981 RETVAL
797 982
… …
804 989
805 rxvt_push_locale (THIS->locale); 990 rxvt_push_locale (THIS->locale);
806 wchar_t *wstr = rxvt_mbstowcs (data, len); 991 wchar_t *wstr = rxvt_mbstowcs (data, len);
807 rxvt_pop_locale (); 992 rxvt_pop_locale ();
808 993
809 RETVAL = wcs2sv (wstr); 994 RETVAL = taint_if (wcs2sv (wstr), octets);
810 free (wstr); 995 free (wstr);
811} 996}
812 OUTPUT: 997 OUTPUT:
813 RETVAL 998 RETVAL
814 999
815# very portable, especially on objects as opposed to pods 1000#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
816#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
817 1001
818#define TERM_OFFSET_width TERM_OFFSET(width) 1002#define TERM_OFFSET_width TERM_OFFSET(width)
819#define TERM_OFFSET_height TERM_OFFSET(height) 1003#define TERM_OFFSET_height TERM_OFFSET(height)
820#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1004#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
821#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1005#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
846 CODE: 1030 CODE:
847 RETVAL = *(int *)((char *)THIS + ix); 1031 RETVAL = *(int *)((char *)THIS + ix);
848 OUTPUT: 1032 OUTPUT:
849 RETVAL 1033 RETVAL
850 1034
1035unsigned int
1036rxvt_term::ModLevel3Mask ()
1037 ALIAS:
1038 ModLevel3Mask = 0
1039 ModMetaMask = 1
1040 ModNumLockMask = 2
1041 CODE:
1042 switch (ix)
1043 {
1044 case 0: RETVAL = THIS->ModLevel3Mask; break;
1045 case 1: RETVAL = THIS->ModMetaMask; break;
1046 case 2: RETVAL = THIS->ModNumLockMask; break;
1047 }
1048 OUTPUT:
1049 RETVAL
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
851U32 1094U32
852rxvt_term::parent () 1095rxvt_term::parent ()
853 CODE: 1096 CODE:
854 RETVAL = (U32)THIS->parent [0]; 1097 RETVAL = (U32)THIS->parent [0];
855 OUTPUT: 1098 OUTPUT:
… …
860 CODE: 1103 CODE:
861 RETVAL = (U32)THIS->vt; 1104 RETVAL = (U32)THIS->vt;
862 OUTPUT: 1105 OUTPUT:
863 RETVAL 1106 RETVAL
864 1107
1108void
1109rxvt_term::vt_emask_add (U32 emask)
1110 CODE:
1111 THIS->vt_emask_perl |= emask;
1112 THIS->vt_select_input ();
1113
865U32 1114U32
866rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1115rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
867 CODE: 1116 CODE:
868{
869 RETVAL = THIS->rstyle; 1117 RETVAL = THIS->rstyle;
870 THIS->rstyle = new_rstyle; 1118 THIS->rstyle = new_rstyle;
871}
872 OUTPUT: 1119 OUTPUT:
873 RETVAL 1120 RETVAL
874 1121
875int 1122int
876rxvt_term::view_start (int newval = -1) 1123rxvt_term::view_start (int newval = -1)
1124 PROTOTYPE: $;$
877 CODE: 1125 CODE:
878{ 1126{
879 RETVAL = THIS->view_start; 1127 RETVAL = THIS->view_start;
880 1128
881 if (newval >= 0) 1129 if (newval >= 0)
… …
906 wchar_t *wstr = new wchar_t [THIS->ncol]; 1154 wchar_t *wstr = new wchar_t [THIS->ncol];
907 1155
908 for (int col = 0; col < THIS->ncol; col++) 1156 for (int col = 0; col < THIS->ncol; col++)
909 wstr [col] = l.t [col]; 1157 wstr [col] = l.t [col];
910 1158
911 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1159 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
912 1160
913 delete [] wstr; 1161 delete [] wstr;
914 } 1162 }
915 1163
916 if (new_text) 1164 if (new_text)
… …
1037 else 1285 else
1038 *r++ = *s; 1286 *r++ = *s;
1039 1287
1040 rxvt_pop_locale (); 1288 rxvt_pop_locale ();
1041 1289
1042 RETVAL = wcs2sv (rstr, r - rstr); 1290 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1043 1291
1044 delete [] rstr; 1292 delete [] rstr;
1045} 1293}
1046 OUTPUT: 1294 OUTPUT:
1047 RETVAL 1295 RETVAL
… …
1073 else if (IS_COMPOSE (*s)) 1321 else if (IS_COMPOSE (*s))
1074 r += rxvt_composite.expand (*s, r); 1322 r += rxvt_composite.expand (*s, r);
1075 else 1323 else
1076 *r++ = *s; 1324 *r++ = *s;
1077 1325
1078 RETVAL = wcs2sv (rstr, r - rstr); 1326 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1079 1327
1080 delete [] rstr; 1328 delete [] rstr;
1081} 1329}
1082 OUTPUT: 1330 OUTPUT:
1083 RETVAL 1331 RETVAL
… …
1105 1353
1106 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1354 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1107 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);
1108 1356
1109 if (GIMME_V != G_VOID) 1357 if (GIMME_V != G_VOID)
1110 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);
1111 1359
1112 if (newval) 1360 if (newval)
1113 { 1361 {
1114 if (SvOK (newval)) 1362 if (SvOK (newval))
1115 { 1363 {
… …
1120 else 1368 else
1121 THIS->rs [index] = 0; 1369 THIS->rs [index] = 0;
1122 } 1370 }
1123} 1371}
1124 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
1125void 1422void
1126rxvt_term::cur (...) 1423rxvt_term::screen_cur (...)
1127 PROTOTYPE: $;$$ 1424 PROTOTYPE: $;$$
1128 ALIAS: 1425 ALIAS:
1129 screen_cur = 0 1426 screen_cur = 0
1130 selection_beg = 1 1427 selection_beg = 1
1131 selection_end = 2 1428 selection_end = 2
… …
1152 if (ix) 1449 if (ix)
1153 THIS->want_refresh = 1; 1450 THIS->want_refresh = 1;
1154 } 1451 }
1155} 1452}
1156 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
1157int 1471int
1158rxvt_term::selection_grab (U32 eventtime) 1472rxvt_term::selection_grab (U32 eventtime)
1159 1473
1160void 1474void
1161rxvt_term::selection (SV *newtext = 0) 1475rxvt_term::selection (SV *newtext = 0)
1162 PPCODE: 1476 PPCODE:
1163{ 1477{
1164 if (GIMME_V != G_VOID) 1478 if (GIMME_V != G_VOID)
1479 XPUSHs (THIS->selection.text
1165 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);
1166 1482
1167 if (newtext) 1483 if (newtext)
1168 { 1484 {
1169 free (THIS->selection.text); 1485 free (THIS->selection.text);
1170 1486
1171 THIS->selection.text = sv2wcs (newtext); 1487 THIS->selection.text = sv2wcs (newtext);
1172 THIS->selection.len = wcslen (THIS->selection.text); 1488 THIS->selection.len = wcslen (THIS->selection.text);
1173 } 1489 }
1174} 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 ()
1175 1500
1176void 1501void
1177rxvt_term::scr_add_lines (SV *string) 1502rxvt_term::scr_add_lines (SV *string)
1178 CODE: 1503 CODE:
1179{ 1504{

Diff Legend

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