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.66 by root, Sat Jan 14 09:28:57 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
55#define ENABLE_PERL_FRILLS 1
56
46///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
58
59static SV *
60taint (SV *sv)
61{
62 SvTAINT (sv);
63 return sv;
64}
65
66static SV *
67taint_if (SV *sv, SV *src)
68{
69 if (SvTAINTED (src))
70 SvTAINT (sv);
71
72 return sv;
73}
47 74
48static wchar_t * 75static wchar_t *
49sv2wcs (SV *sv) 76sv2wcs (SV *sv)
50{ 77{
51 STRLEN len; 78 STRLEN len;
370 397
371struct rxvt_perl_interp rxvt_perl; 398struct rxvt_perl_interp rxvt_perl;
372 399
373static PerlInterpreter *perl; 400static PerlInterpreter *perl;
374 401
375rxvt_perl_interp::rxvt_perl_interp ()
376{
377}
378
379rxvt_perl_interp::~rxvt_perl_interp () 402rxvt_perl_interp::~rxvt_perl_interp ()
380{ 403{
381 if (perl) 404 if (perl)
382 { 405 {
383 perl_destruct (perl); 406 perl_destruct (perl);
388void 411void
389rxvt_perl_interp::init () 412rxvt_perl_interp::init ()
390{ 413{
391 if (!perl) 414 if (!perl)
392 { 415 {
416 perl_environ = rxvt_environ;
417 swap (perl_environ, environ);
418
393 char *argv[] = { 419 char *argv[] = {
394 "", 420 "",
421 "-T",
395 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 422 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
396 }; 423 };
397 424
398 perl = perl_alloc (); 425 perl = perl_alloc ();
399 perl_construct (perl); 426 perl_construct (perl);
400 427
401 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 428 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
402 || perl_run (perl)) 429 || perl_run (perl))
403 { 430 {
404 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 431 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
405 432
406 perl_destruct (perl); 433 perl_destruct (perl);
407 perl_free (perl); 434 perl_free (perl);
408 perl = 0; 435 perl = 0;
409 } 436 }
437
438 swap (perl_environ, environ);
439 }
440}
441
442static void
443ungrab (rxvt_term *THIS)
444{
445 if (THIS->perl.grabtime)
446 {
447 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0;
410 } 450 }
411} 451}
412 452
413bool 453bool
414rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
425 return false; // perl not initialized for this instance 465 return false; // perl not initialized for this instance
426 else if (htype == HOOK_DESTROY) 466 else if (htype == HOOK_DESTROY)
427 { 467 {
428 // handled later 468 // handled later
429 } 469 }
430 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 470 else
431 { 471 {
432 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
433
434 if (HvKEYS (hv))
435 { 473 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
475
476 if (HvKEYS (hv))
477 {
436 hv_iterinit (hv); 478 hv_iterinit (hv);
437 479
438 while (HE *he = hv_iternext (hv)) 480 while (HE *he = hv_iternext (hv))
439 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 481 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
482 }
483
440 } 484 }
485
486 if (!term->perl.should_invoke [htype])
487 return false;
441 } 488 }
442 else if (!should_invoke [htype])
443 return false;
444 489
490 swap (perl_environ, environ);
491
492 try
493 {
445 dSP; 494 dSP;
446 va_list ap; 495 va_list ap;
447 496
448 va_start (ap, htype); 497 va_start (ap, htype);
449 498
450 ENTER; 499 ENTER;
451 SAVETMPS; 500 SAVETMPS;
452 501
453 PUSHMARK (SP); 502 PUSHMARK (SP);
454 503
455 XPUSHs (sv_2mortal (newSVterm (term))); 504 XPUSHs (sv_2mortal (newSVterm (term)));
456 XPUSHs (sv_2mortal (newSViv (htype))); 505 XPUSHs (sv_2mortal (newSViv (htype)));
457 506
458 for (;;) { 507 for (;;) {
459 data_type dt = (data_type)va_arg (ap, int); 508 data_type dt = (data_type)va_arg (ap, int);
460 509
461 switch (dt) 510 switch (dt)
462 { 511 {
463 case DT_INT: 512 case DT_INT:
464 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
465 break; 514 break;
466 515
467 case DT_LONG: 516 case DT_LONG:
468 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
469 break; 518 break;
470 519
471 case DT_STR: 520 case DT_STR:
472 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
473 break; 522 break;
474 523
475 case DT_STR_LEN: 524 case DT_STR_LEN:
476 { 525 {
477 char *str = va_arg (ap, char *); 526 char *str = va_arg (ap, char *);
478 int len = va_arg (ap, int); 527 int len = va_arg (ap, int);
479 528
480 XPUSHs (sv_2mortal (newSVpvn (str, len))); 529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
481 } 530 }
482 break; 531 break;
483 532
484 case DT_WCS_LEN: 533 case DT_WCS_LEN:
485 { 534 {
486 wchar_t *wstr = va_arg (ap, wchar_t *); 535 wchar_t *wstr = va_arg (ap, wchar_t *);
487 int wlen = va_arg (ap, int); 536 int wlen = va_arg (ap, int);
488 537
489 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
490 } 539 }
491 break; 540 break;
492 541
493 case DT_XEVENT: 542 case DT_XEVENT:
494 { 543 {
495 XEvent *xe = va_arg (ap, XEvent *); 544 XEvent *xe = va_arg (ap, XEvent *);
496 HV *hv = newHV (); 545 HV *hv = newHV ();
497 546
498# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 547# 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) 548# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
500# undef set 549# undef set
501 550
502 setiv (type, xe->type); 551 setiv (type, xe->type);
503 setiv (send_event, xe->xany.send_event); 552 setiv (send_event, xe->xany.send_event);
504 setiv (serial, xe->xany.serial); 553 setiv (serial, xe->xany.serial);
505 554
506 switch (xe->type) 555 switch (xe->type)
556 {
557 case KeyPress:
558 case KeyRelease:
559 case ButtonPress:
560 case ButtonRelease:
561 case MotionNotify:
562 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state);
570 break;
571 }
572
573 switch (xe->type)
574 {
575 case KeyPress:
576 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode);
578 break;
579
580 case ButtonPress:
581 case ButtonRelease:
582 setiv (button, xe->xbutton.button);
583 break;
584
585 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint);
587 break;
588 }
589
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 }
592 break;
593
594 case DT_END:
507 { 595 {
508 case KeyPress: 596 va_end (ap);
509 case KeyRelease: 597
510 case ButtonPress: 598 PUTBACK;
511 case ButtonRelease: 599 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
512 case MotionNotify: 600 SPAGAIN;
513 setiv (time, xe->xmotion.time); 601
514 setiv (x, xe->xmotion.x); 602 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; 603 {
604 SV *status = POPs;
605 count = SvTRUE (status);
606 }
607
608 PUTBACK;
609 FREETMPS;
610 LEAVE;
611
612 if (SvTRUE (ERRSV))
613 {
614 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
615 ungrab (term); // better lose the grab than the session
616 }
617
618 if (htype == HOOK_DESTROY)
619 {
620 clearSVptr ((SV *)term->perl.self);
621 SvREFCNT_dec ((SV *)term->perl.self);
622 }
623
624 swap (perl_environ, environ);
625 return count;
522 } 626 }
523 627
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: 628 default:
576 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 }
577 } 631 }
578 } 632 }
633 catch (...)
634 {
635 swap (perl_environ, environ);
636 throw;
637 }
579} 638}
580 639
581///////////////////////////////////////////////////////////////////////////// 640/////////////////////////////////////////////////////////////////////////////
582 641
583MODULE = urxvt PACKAGE = urxvt 642MODULE = urxvt PACKAGE = urxvt
584 643
585PROTOTYPES: ENABLE 644PROTOTYPES: ENABLE
586 645
587BOOT: 646BOOT:
588{ 647{
589 HV *stash = gv_stashpv ("urxvt", 1); 648 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
590# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name)); 649 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
650 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
651 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
591 652
592 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 653 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
593# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 654# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
594# include "hookinc.h" 655# include "hookinc.h"
595# undef def 656# undef def
596 657
597 658 HV *option = get_hv ("urxvt::OPTION", 1);
659# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
660# define nodef(name)
661# include "optinc.h"
662# undef nodef
663# undef def
664
665 HV *stash = gv_stashpv ("urxvt", 1);
666 struct {
667 const char *name;
668 IV iv;
669 } *civ, const_iv[] = {
670# define const_iv(name) { # name, (IV)name }
598 export_const_iv (DEFAULT_RSTYLE); 671 const_iv (DEFAULT_RSTYLE),
599 export_const_iv (OVERLAY_RSTYLE); 672 const_iv (OVERLAY_RSTYLE),
600 export_const_iv (RS_Bold); 673 const_iv (RS_Bold),
601 export_const_iv (RS_Italic); 674 const_iv (RS_Italic),
602 export_const_iv (RS_Blink); 675 const_iv (RS_Blink),
603 export_const_iv (RS_RVid); 676 const_iv (RS_RVid),
604 export_const_iv (RS_Uline); 677 const_iv (RS_Uline),
605 678
606 export_const_iv (CurrentTime); 679 const_iv (CurrentTime),
607 export_const_iv (ShiftMask); 680 const_iv (ShiftMask),
608 export_const_iv (LockMask); 681 const_iv (LockMask),
609 export_const_iv (ControlMask); 682 const_iv (ControlMask),
610 export_const_iv (Mod1Mask); 683 const_iv (Mod1Mask),
611 export_const_iv (Mod2Mask); 684 const_iv (Mod2Mask),
612 export_const_iv (Mod3Mask); 685 const_iv (Mod3Mask),
613 export_const_iv (Mod4Mask); 686 const_iv (Mod4Mask),
614 export_const_iv (Mod5Mask); 687 const_iv (Mod5Mask),
615 export_const_iv (Button1Mask); 688 const_iv (Button1Mask),
616 export_const_iv (Button2Mask); 689 const_iv (Button2Mask),
617 export_const_iv (Button3Mask); 690 const_iv (Button3Mask),
618 export_const_iv (Button4Mask); 691 const_iv (Button4Mask),
619 export_const_iv (Button5Mask); 692 const_iv (Button5Mask),
620 export_const_iv (AnyModifier); 693 const_iv (AnyModifier),
621 694
622 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1)); 695 const_iv (EVENT_NONE),
696 const_iv (EVENT_READ),
697 const_iv (EVENT_WRITE),
698
699 const_iv (NoEventMask),
700 const_iv (KeyPressMask),
701 const_iv (KeyReleaseMask),
702 const_iv (ButtonPressMask),
703 const_iv (ButtonReleaseMask),
704 const_iv (EnterWindowMask),
705 const_iv (LeaveWindowMask),
706 const_iv (PointerMotionMask),
707 const_iv (PointerMotionHintMask),
708 const_iv (Button1MotionMask),
709 const_iv (Button2MotionMask),
710 const_iv (Button3MotionMask),
711 const_iv (Button4MotionMask),
712 const_iv (Button5MotionMask),
713 const_iv (ButtonMotionMask),
714 const_iv (KeymapStateMask),
715 const_iv (ExposureMask),
716 const_iv (VisibilityChangeMask),
717 const_iv (StructureNotifyMask),
718 const_iv (ResizeRedirectMask),
719 const_iv (SubstructureNotifyMask),
720 const_iv (SubstructureRedirectMask),
721 const_iv (FocusChangeMask),
722 const_iv (PropertyChangeMask),
723 const_iv (ColormapChangeMask),
724 const_iv (OwnerGrabButtonMask),
725
726 const_iv (KeyPress),
727 const_iv (KeyRelease),
728 const_iv (ButtonPress),
729 const_iv (ButtonRelease),
730 const_iv (MotionNotify),
731 const_iv (EnterNotify),
732 const_iv (LeaveNotify),
733 const_iv (FocusIn),
734 const_iv (FocusOut),
735 const_iv (KeymapNotify),
736 const_iv (Expose),
737 const_iv (GraphicsExpose),
738 const_iv (NoExpose),
739 const_iv (VisibilityNotify),
740 const_iv (CreateNotify),
741 const_iv (DestroyNotify),
742 const_iv (UnmapNotify),
743 const_iv (MapNotify),
744 const_iv (MapRequest),
745 const_iv (ReparentNotify),
746 const_iv (ConfigureNotify),
747 const_iv (ConfigureRequest),
748 const_iv (GravityNotify),
749 const_iv (ResizeRequest),
750 const_iv (CirculateNotify),
751 const_iv (CirculateRequest),
752 const_iv (PropertyNotify),
753 const_iv (SelectionClear),
754 const_iv (SelectionRequest),
755 const_iv (SelectionNotify),
756 const_iv (ColormapNotify),
757 const_iv (ClientMessage),
758 const_iv (MappingNotify),
759 };
760
761 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
762 civ-- > const_iv; )
763 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
623} 764}
765
766void
767warn (const char *msg)
768 CODE:
769 rxvt_warn ("%s", msg);
770
771void
772fatal (const char *msg)
773 CODE:
774 rxvt_fatal ("%s", msg);
624 775
625SV * 776SV *
626new (...) 777untaint (SV *sv)
627 CODE: 778 CODE:
628{ 779 RETVAL = newSVsv (sv);
629 stringvec *argv = new stringvec; 780 SvTAINTED_off (RETVAL);
630 bool success; 781 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 782 RETVAL
654 783
655void 784void
656set_should_invoke (int htype, int value) 785_exit (int status)
657 CODE:
658 rxvt_perl.should_invoke [htype] = value;
659 786
660void 787bool
661warn (const char *msg) 788safe ()
662 CODE: 789 CODE:
663 rxvt_warn ("%s", msg); 790 RETVAL = !rxvt_tainted ();
664 791 OUTPUT:
665void 792 RETVAL
666fatal (const char *msg)
667 CODE:
668 rxvt_fatal ("%s", msg);
669 793
670NV 794NV
671NOW () 795NOW ()
672 CODE: 796 CODE:
673 RETVAL = NOW; 797 RETVAL = NOW;
722 OUTPUT: 846 OUTPUT:
723 RETVAL 847 RETVAL
724 848
725MODULE = urxvt PACKAGE = urxvt::term 849MODULE = urxvt PACKAGE = urxvt::term
726 850
851SV *
852_new (...)
853 CODE:
854{
855 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
856 croak ("first argument to urxvt::term->_new must be arrayref");
857
858 rxvt_term *term = new rxvt_term;
859
860 term->argv = new stringvec;
861 term->envv = new stringvec;
862
863 for (int i = 1; i < items; i++)
864 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
865
866 AV *envv = (AV *)SvRV (ST (0));
867 for (int i = av_len (envv) + 1; i--; )
868 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
869
870 term->envv->push_back (0);
871
872 bool success;
873
874 try
875 {
876 success = term->init (term->argv->size (), term->argv->begin ());
877 }
878 catch (const class rxvt_failure_exception &e)
879 {
880 success = false;
881 }
882
883 if (!success)
884 {
885 term->destroy ();
886 croak ("error while initializing new terminal instance");
887 }
888
889 RETVAL = term && term->perl.self
890 ? newSVterm (term) : &PL_sv_undef;
891}
892 OUTPUT:
893 RETVAL
894
727void 895void
728rxvt_term::destroy () 896rxvt_term::destroy ()
897
898#if ENABLE_PERL_FRILLS
899
900void
901rxvt_term::XListProperties (U32 window)
902 PPCODE:
903{
904 int count;
905 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
906
907 EXTEND (SP, count);
908 while (count--)
909 PUSHs (newSVuv ((U32)props [count]));
910
911 XFree (props);
912}
913
914void
915rxvt_term::XGetWindowProperty (U32 window, U32 property)
916 PPCODE:
917{
918 Atom type;
919 int format;
920 unsigned long nitems;
921 unsigned long bytes_after;
922 unsigned char *prop;
923 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
924 0, 1<<30, 0, AnyPropertyType,
925 &type, &format, &nitems, &bytes_after, &prop);
926 if (type != None)
927 {
928 EXTEND (SP, 3);
929 PUSHs (newSVuv ((U32)type));
930 PUSHs (newSViv (format));
931 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
932 XFree (prop);
933 }
934}
935
936void
937rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
938 CODE:
939{
940 STRLEN len;
941 char *data_ = SvPVbyte (data, len);
942
943 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
944 type, format, PropModeReplace,
945 (unsigned char *)data, len * 8 / format);
946}
947
948void
949rxvt_term::XDeleteProperty (U32 window, U32 property)
950 CODE:
951 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
952
953U32
954rxvt_term::DefaultRootWindow ()
955 CODE:
956 RETVAL = (U32)THIS->display->root;
957 OUTPUT:
958 RETVAL
959
960U32
961rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
962 CODE:
963 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
964 x, y, width, height, 0,
965 THIS->pix_colors_focused[Color_border],
966 THIS->pix_colors_focused[Color_border]);
967 OUTPUT:
968 RETVAL
969
970void
971rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
972 CODE:
973 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
974
975void
976rxvt_term::XMapWindow (U32 window)
977 CODE:
978 XMapWindow (THIS->display->display, (Window)window);
979
980void
981rxvt_term::XUnmapWindow (U32 window)
982 CODE:
983 XUnmapWindow (THIS->display->display, (Window)window);
984
985#endif
986
987void
988rxvt_term::set_should_invoke (int htype, int inc)
989 CODE:
990 THIS->perl.should_invoke [htype] += inc;
729 991
730void 992void
731rxvt_term::grab_button (int button, U32 modifiers) 993rxvt_term::grab_button (int button, U32 modifiers)
732 CODE: 994 CODE:
733 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 995 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
734 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 996 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
735 GrabModeSync, GrabModeSync, None, None); 997 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
736 998
737bool 999bool
738rxvt_term::grab (U32 eventtime, int sync = 0) 1000rxvt_term::grab (U32 eventtime, int sync = 0)
739 CODE: 1001 CODE:
740{ 1002{
742 1004
743 THIS->perl.grabtime = 0; 1005 THIS->perl.grabtime = 0;
744 1006
745 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1007 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
746 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1008 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
747 mode, mode, None, None, eventtime)) 1009 mode, mode, None, GRAB_CURSOR, eventtime))
748 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1010 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
749 THIS->perl.grabtime = eventtime; 1011 THIS->perl.grabtime = eventtime;
750 else 1012 else
751 XUngrabPointer (THIS->display->display, eventtime); 1013 XUngrabPointer (THIS->display->display, eventtime);
752 1014
754} 1016}
755 OUTPUT: 1017 OUTPUT:
756 RETVAL 1018 RETVAL
757 1019
758void 1020void
759rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 1021rxvt_term::allow_events_async ()
760 CODE: 1022 CODE:
761 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 1023 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
762 1024
763void 1025void
764rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 1026rxvt_term::allow_events_sync ()
765 CODE: 1027 CODE:
766 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 1028 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
767 1029
768void 1030void
769rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 1031rxvt_term::allow_events_replay ()
770 CODE: 1032 CODE:
771 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 1033 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
772 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 1034 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
773 1035
774void 1036void
775rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 1037rxvt_term::ungrab ()
776 CODE: 1038 CODE:
777 THIS->perl.grabtime = 0; 1039 ungrab (THIS);
778 XUngrabKeyboard (THIS->display->display, eventtime);
779 XUngrabPointer (THIS->display->display, eventtime);
780 1040
781int 1041int
782rxvt_term::strwidth (SV *str) 1042rxvt_term::strwidth (SV *str)
783 CODE: 1043 CODE:
784{ 1044{
803 char *mbstr = rxvt_wcstombs (wstr); 1063 char *mbstr = rxvt_wcstombs (wstr);
804 rxvt_pop_locale (); 1064 rxvt_pop_locale ();
805 1065
806 free (wstr); 1066 free (wstr);
807 1067
808 RETVAL = newSVpv (mbstr, 0); 1068 RETVAL = taint_if (newSVpv (mbstr, 0), str);
809 free (mbstr); 1069 free (mbstr);
810} 1070}
811 OUTPUT: 1071 OUTPUT:
812 RETVAL 1072 RETVAL
813 1073
820 1080
821 rxvt_push_locale (THIS->locale); 1081 rxvt_push_locale (THIS->locale);
822 wchar_t *wstr = rxvt_mbstowcs (data, len); 1082 wchar_t *wstr = rxvt_mbstowcs (data, len);
823 rxvt_pop_locale (); 1083 rxvt_pop_locale ();
824 1084
825 RETVAL = wcs2sv (wstr); 1085 RETVAL = taint_if (wcs2sv (wstr), octets);
826 free (wstr); 1086 free (wstr);
827} 1087}
828 OUTPUT: 1088 OUTPUT:
829 RETVAL 1089 RETVAL
830 1090
877 case 2: RETVAL = THIS->ModNumLockMask; break; 1137 case 2: RETVAL = THIS->ModNumLockMask; break;
878 } 1138 }
879 OUTPUT: 1139 OUTPUT:
880 RETVAL 1140 RETVAL
881 1141
1142char *
1143rxvt_term::display_id ()
1144 ALIAS:
1145 display_id = 0
1146 locale = 1
1147 CODE:
1148 switch (ix)
1149 {
1150 case 0: RETVAL = THIS->display->id; break;
1151 case 1: RETVAL = THIS->locale; break;
1152 }
1153 OUTPUT:
1154 RETVAL
1155
1156SV *
1157rxvt_term::_env ()
1158 CODE:
1159{
1160 if (THIS->envv)
1161 {
1162 AV *av = newAV ();
1163
1164 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1165 if (*i)
1166 av_push (av, newSVpv (*i, 0));
1167
1168 RETVAL = newRV_noinc ((SV *)av);
1169 }
1170 else
1171 RETVAL = &PL_sv_undef;
1172}
1173 OUTPUT:
1174 RETVAL
1175
1176int
1177rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1178 CODE:
1179 RETVAL = THIS->pty_ev.events;
1180 if (events != EVENT_UNDEF)
1181 THIS->pty_ev.set (events);
1182 OUTPUT:
1183 RETVAL
1184
882U32 1185U32
883rxvt_term::parent () 1186rxvt_term::parent ()
884 CODE: 1187 CODE:
885 RETVAL = (U32)THIS->parent [0]; 1188 RETVAL = (U32)THIS->parent [0];
886 OUTPUT: 1189 OUTPUT:
891 CODE: 1194 CODE:
892 RETVAL = (U32)THIS->vt; 1195 RETVAL = (U32)THIS->vt;
893 OUTPUT: 1196 OUTPUT:
894 RETVAL 1197 RETVAL
895 1198
1199void
1200rxvt_term::vt_emask_add (U32 emask)
1201 CODE:
1202 THIS->vt_emask_perl |= emask;
1203 THIS->vt_select_input ();
1204
896U32 1205U32
897rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1206rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
898 CODE: 1207 CODE:
899{
900 RETVAL = THIS->rstyle; 1208 RETVAL = THIS->rstyle;
901 THIS->rstyle = new_rstyle; 1209 THIS->rstyle = new_rstyle;
902}
903 OUTPUT: 1210 OUTPUT:
904 RETVAL 1211 RETVAL
905 1212
906int 1213int
907rxvt_term::view_start (int newval = -1) 1214rxvt_term::view_start (int newval = -1)
1215 PROTOTYPE: $;$
908 CODE: 1216 CODE:
909{ 1217{
910 RETVAL = THIS->view_start; 1218 RETVAL = THIS->view_start;
911 1219
912 if (newval >= 0) 1220 if (newval >= 0)
937 wchar_t *wstr = new wchar_t [THIS->ncol]; 1245 wchar_t *wstr = new wchar_t [THIS->ncol];
938 1246
939 for (int col = 0; col < THIS->ncol; col++) 1247 for (int col = 0; col < THIS->ncol; col++)
940 wstr [col] = l.t [col]; 1248 wstr [col] = l.t [col];
941 1249
942 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1250 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
943 1251
944 delete [] wstr; 1252 delete [] wstr;
945 } 1253 }
946 1254
947 if (new_text) 1255 if (new_text)
1068 else 1376 else
1069 *r++ = *s; 1377 *r++ = *s;
1070 1378
1071 rxvt_pop_locale (); 1379 rxvt_pop_locale ();
1072 1380
1073 RETVAL = wcs2sv (rstr, r - rstr); 1381 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1074 1382
1075 delete [] rstr; 1383 delete [] rstr;
1076} 1384}
1077 OUTPUT: 1385 OUTPUT:
1078 RETVAL 1386 RETVAL
1104 else if (IS_COMPOSE (*s)) 1412 else if (IS_COMPOSE (*s))
1105 r += rxvt_composite.expand (*s, r); 1413 r += rxvt_composite.expand (*s, r);
1106 else 1414 else
1107 *r++ = *s; 1415 *r++ = *s;
1108 1416
1109 RETVAL = wcs2sv (rstr, r - rstr); 1417 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1110 1418
1111 delete [] rstr; 1419 delete [] rstr;
1112} 1420}
1113 OUTPUT: 1421 OUTPUT:
1114 RETVAL 1422 RETVAL
1136 1444
1137 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1445 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1138 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1446 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1139 1447
1140 if (GIMME_V != G_VOID) 1448 if (GIMME_V != G_VOID)
1141 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1449 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1142 1450
1143 if (newval) 1451 if (newval)
1144 { 1452 {
1145 if (SvOK (newval)) 1453 if (SvOK (newval))
1146 { 1454 {
1151 else 1459 else
1152 THIS->rs [index] = 0; 1460 THIS->rs [index] = 0;
1153 } 1461 }
1154} 1462}
1155 1463
1464const char *
1465rxvt_term::x_resource (const char *name)
1466 CLEANUP:
1467 SvTAINTED_on (ST (0));
1468
1469bool
1470rxvt_term::option (U32 optval, int set = -1)
1471 CODE:
1472{
1473 RETVAL = THIS->options & optval;
1474
1475 if (set >= 0)
1476 {
1477 if (set)
1478 THIS->options |= optval;
1479 else
1480 THIS->options &= ~optval;
1481
1482 switch (optval)
1483 {
1484 case Opt_skipBuiltinGlyphs:
1485 THIS->set_fonts ();
1486 THIS->scr_remap_chars ();
1487 THIS->scr_touch (true);
1488 THIS->want_refresh = 1;
1489 break;
1490
1491 case Opt_cursorUnderline:
1492 THIS->want_refresh = 1;
1493 break;
1494
1495# case Opt_scrollBar_floating:
1496# case Opt_scrollBar_right:
1497# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1498# break;
1499 }
1500 }
1501}
1502 OUTPUT:
1503 RETVAL
1504
1505bool
1506rxvt_term::parse_keysym (char *keysym, char *str)
1507 CODE:
1508 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1509 THIS->keyboard->register_done ();
1510 OUTPUT:
1511 RETVAL
1512
1156void 1513void
1157rxvt_term::cur (...) 1514rxvt_term::screen_cur (...)
1158 PROTOTYPE: $;$$ 1515 PROTOTYPE: $;$$
1159 ALIAS: 1516 ALIAS:
1160 screen_cur = 0 1517 screen_cur = 0
1161 selection_beg = 1 1518 selection_beg = 1
1162 selection_end = 2 1519 selection_end = 2
1183 if (ix) 1540 if (ix)
1184 THIS->want_refresh = 1; 1541 THIS->want_refresh = 1;
1185 } 1542 }
1186} 1543}
1187 1544
1545char
1546rxvt_term::cur_charset ()
1547 CODE:
1548 RETVAL = THIS->charsets [THIS->screen.charset];
1549 OUTPUT:
1550 RETVAL
1551
1552#void
1553#rxvt_term::selection_clear ()
1554
1555void
1556rxvt_term::selection_make (U32 eventtime, bool rect = false)
1557 CODE:
1558 THIS->selection.op = SELECTION_CONT;
1559 THIS->selection.rect = rect;
1560 THIS->selection_make (eventtime);
1561
1188int 1562int
1189rxvt_term::selection_grab (U32 eventtime) 1563rxvt_term::selection_grab (U32 eventtime)
1190 1564
1191void 1565void
1192rxvt_term::selection (SV *newtext = 0) 1566rxvt_term::selection (SV *newtext = 0)
1193 PPCODE: 1567 PPCODE:
1194{ 1568{
1195 if (GIMME_V != G_VOID) 1569 if (GIMME_V != G_VOID)
1570 XPUSHs (THIS->selection.text
1196 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1571 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1572 : &PL_sv_undef);
1197 1573
1198 if (newtext) 1574 if (newtext)
1199 { 1575 {
1200 free (THIS->selection.text); 1576 free (THIS->selection.text);
1201 1577
1202 THIS->selection.text = sv2wcs (newtext); 1578 THIS->selection.text = sv2wcs (newtext);
1203 THIS->selection.len = wcslen (THIS->selection.text); 1579 THIS->selection.len = wcslen (THIS->selection.text);
1204 } 1580 }
1205} 1581}
1582
1583void
1584rxvt_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)
1585
1586void
1587rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1588
1589void
1590rxvt_term::scr_bell ()
1206 1591
1207void 1592void
1208rxvt_term::scr_add_lines (SV *string) 1593rxvt_term::scr_add_lines (SV *string)
1209 CODE: 1594 CODE:
1210{ 1595{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines