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.36 by root, Sat Jan 7 19:29:17 2006 UTC vs.
Revision 1.64 by root, Fri Jan 13 15:42:50 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
55#define ENABLE_PERL_FRILLS 1
56
45///////////////////////////////////////////////////////////////////////////// 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}
46 74
47static wchar_t * 75static wchar_t *
48sv2wcs (SV *sv) 76sv2wcs (SV *sv)
49{ 77{
50 STRLEN len; 78 STRLEN len;
… …
369 397
370struct rxvt_perl_interp rxvt_perl; 398struct rxvt_perl_interp rxvt_perl;
371 399
372static PerlInterpreter *perl; 400static PerlInterpreter *perl;
373 401
374rxvt_perl_interp::rxvt_perl_interp ()
375{
376}
377
378rxvt_perl_interp::~rxvt_perl_interp () 402rxvt_perl_interp::~rxvt_perl_interp ()
379{ 403{
380 if (perl) 404 if (perl)
381 { 405 {
382 perl_destruct (perl); 406 perl_destruct (perl);
… …
387void 411void
388rxvt_perl_interp::init () 412rxvt_perl_interp::init ()
389{ 413{
390 if (!perl) 414 if (!perl)
391 { 415 {
416 perl_environ = rxvt_environ;
417 swap (perl_environ, environ);
418
392 char *argv[] = { 419 char *argv[] = {
393 "", 420 "",
421 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 422 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 423 };
396 424
397 perl = perl_alloc (); 425 perl = perl_alloc ();
398 perl_construct (perl); 426 perl_construct (perl);
399 427
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 428 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 429 || perl_run (perl))
402 { 430 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 431 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 432
405 perl_destruct (perl); 433 perl_destruct (perl);
406 perl_free (perl); 434 perl_free (perl);
407 perl = 0; 435 perl = 0;
408 } 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;
409 } 450 }
410} 451}
411 452
412bool 453bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
424 return false; // perl not initialized for this instance 465 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 466 else if (htype == HOOK_DESTROY)
426 { 467 {
427 // handled later 468 // handled later
428 } 469 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 470 else
430 { 471 {
431 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)
432
433 if (HvKEYS (hv))
434 { 473 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
475
476 if (HvKEYS (hv))
477 {
435 hv_iterinit (hv); 478 hv_iterinit (hv);
436 479
437 while (HE *he = hv_iternext (hv)) 480 while (HE *he = hv_iternext (hv))
438 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 481 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
482 }
483
439 } 484 }
485
486 if (!term->perl.should_invoke [htype])
487 return false;
440 } 488 }
441 else if (!should_invoke [htype])
442 return false;
443 489
490 swap (perl_environ, environ);
491
492 try
493 {
444 dSP; 494 dSP;
445 va_list ap; 495 va_list ap;
446 496
447 va_start (ap, htype); 497 va_start (ap, htype);
448 498
449 ENTER; 499 ENTER;
450 SAVETMPS; 500 SAVETMPS;
451 501
452 PUSHMARK (SP); 502 PUSHMARK (SP);
453 503
454 XPUSHs (sv_2mortal (newSVterm (term))); 504 XPUSHs (sv_2mortal (newSVterm (term)));
455 XPUSHs (sv_2mortal (newSViv (htype))); 505 XPUSHs (sv_2mortal (newSViv (htype)));
456 506
457 for (;;) { 507 for (;;) {
458 data_type dt = (data_type)va_arg (ap, int); 508 data_type dt = (data_type)va_arg (ap, int);
459 509
460 switch (dt) 510 switch (dt)
461 { 511 {
462 case DT_INT: 512 case DT_INT:
463 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
464 break; 514 break;
465 515
466 case DT_LONG: 516 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 518 break;
469 519
470 case DT_STR: 520 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 522 break;
473 523
474 case DT_STR_LEN: 524 case DT_STR_LEN:
475 { 525 {
476 char *str = va_arg (ap, char *); 526 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int); 527 int len = va_arg (ap, int);
478 528
479 XPUSHs (sv_2mortal (newSVpvn (str, len))); 529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
480 } 530 }
481 break; 531 break;
482 532
483 case DT_WCS_LEN: 533 case DT_WCS_LEN:
484 { 534 {
485 wchar_t *wstr = va_arg (ap, wchar_t *); 535 wchar_t *wstr = va_arg (ap, wchar_t *);
486 int wlen = va_arg (ap, int); 536 int wlen = va_arg (ap, int);
487 537
488 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
489 } 539 }
490 break; 540 break;
491 541
492 case DT_XEVENT: 542 case DT_XEVENT:
493 { 543 {
494 XEvent *xe = va_arg (ap, XEvent *); 544 XEvent *xe = va_arg (ap, XEvent *);
495 HV *hv = newHV (); 545 HV *hv = newHV ();
496 546
497# 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)
498# 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)
499# undef set 549# undef set
500 550
501 setiv (type, xe->type); 551 setiv (type, xe->type);
502 setiv (send_event, xe->xany.send_event); 552 setiv (send_event, xe->xany.send_event);
503 setiv (serial, xe->xany.serial); 553 setiv (serial, xe->xany.serial);
504 554
505 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:
506 { 595 {
507 case KeyPress: 596 va_end (ap);
508 case KeyRelease: 597
509 case ButtonPress: 598 PUTBACK;
510 case ButtonRelease: 599 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
511 case MotionNotify: 600 SPAGAIN;
512 setiv (time, xe->xmotion.time); 601
513 setiv (x, xe->xmotion.x); 602 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; 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;
521 } 626 }
522 627
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: 628 default:
575 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 }
576 } 631 }
577 } 632 }
633 catch (...)
634 {
635 swap (perl_environ, environ);
636 throw;
637 }
578} 638}
579 639
580///////////////////////////////////////////////////////////////////////////// 640/////////////////////////////////////////////////////////////////////////////
581 641
582MODULE = urxvt PACKAGE = urxvt 642MODULE = urxvt PACKAGE = urxvt
583 643
584PROTOTYPES: ENABLE 644PROTOTYPES: ENABLE
585 645
586BOOT: 646BOOT:
587{ 647{
588# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 648 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
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));
652
589 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 653 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
590# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 654# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
591# include "hookinc.h" 655# include "hookinc.h"
592# undef def 656# undef def
593 657
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 }
594 export_const (DEFAULT_RSTYLE); 671 const_iv (DEFAULT_RSTYLE),
595 export_const (OVERLAY_RSTYLE); 672 const_iv (OVERLAY_RSTYLE),
596 export_const (RS_Bold); 673 const_iv (RS_Bold),
597 export_const (RS_Italic); 674 const_iv (RS_Italic),
598 export_const (RS_Blink); 675 const_iv (RS_Blink),
599 export_const (RS_RVid); 676 const_iv (RS_RVid),
600 export_const (RS_Uline); 677 const_iv (RS_Uline),
678
601 export_const (CurrentTime); 679 const_iv (CurrentTime),
680 const_iv (ShiftMask),
681 const_iv (LockMask),
682 const_iv (ControlMask),
683 const_iv (Mod1Mask),
684 const_iv (Mod2Mask),
685 const_iv (Mod3Mask),
686 const_iv (Mod4Mask),
687 const_iv (Mod5Mask),
688 const_iv (Button1Mask),
689 const_iv (Button2Mask),
690 const_iv (Button3Mask),
691 const_iv (Button4Mask),
692 const_iv (Button5Mask),
693 const_iv (AnyModifier),
602 694
603 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 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));
604} 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);
605 775
606SV * 776SV *
607new (...) 777untaint (SV *sv)
608 CODE: 778 CODE:
609{ 779 RETVAL = newSVsv (sv);
610 stringvec *argv = new stringvec; 780 SvTAINTED_off (RETVAL);
611 bool success; 781 OUTPUT:
612
613 for (int i = 0; i < items ;i++)
614 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
615
616 rxvt_term *term = new rxvt_term;
617
618 term->argv = argv;
619
620 try
621 {
622 if (!term->init (argv->size (), argv->begin ()))
623 term = 0;
624 }
625 catch (const class rxvt_failure_exception &e)
626 {
627 term->destroy ();
628 croak ("exception caught while initializing new terminal instance");
629 }
630
631 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
632}
633 OUTPUT:
634 RETVAL 782 RETVAL
635 783
636void 784void
637set_should_invoke (int htype, int value) 785_exit (int status)
638 CODE:
639 rxvt_perl.should_invoke [htype] = value;
640 786
641void 787bool
642warn (const char *msg) 788safe ()
643 CODE: 789 CODE:
644 rxvt_warn ("%s", msg); 790 RETVAL = !rxvt_tainted ();
645 791 OUTPUT:
646void 792 RETVAL
647fatal (const char *msg)
648 CODE:
649 rxvt_fatal ("%s", msg);
650 793
651NV 794NV
652NOW () 795NOW ()
653 CODE: 796 CODE:
654 RETVAL = NOW; 797 RETVAL = NOW;
… …
703 OUTPUT: 846 OUTPUT:
704 RETVAL 847 RETVAL
705 848
706MODULE = urxvt PACKAGE = urxvt::term 849MODULE = urxvt PACKAGE = urxvt::term
707 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
708void 895void
709rxvt_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, parent, x, y);
974
975#endif
976
977void
978rxvt_term::set_should_invoke (int htype, int inc)
979 CODE:
980 THIS->perl.should_invoke [htype] += inc;
710 981
711void 982void
712rxvt_term::grab_button (int button, U32 modifiers) 983rxvt_term::grab_button (int button, U32 modifiers)
713 CODE: 984 CODE:
714 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 985 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
715 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 986 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
716 GrabModeSync, GrabModeSync, None, None); 987 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
717 988
718bool 989bool
719rxvt_term::grab (U32 eventtime, int sync = 0) 990rxvt_term::grab (U32 eventtime, int sync = 0)
720 CODE: 991 CODE:
721{ 992{
… …
723 994
724 THIS->perl.grabtime = 0; 995 THIS->perl.grabtime = 0;
725 996
726 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 997 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
727 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 998 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
728 mode, mode, None, None, eventtime)) 999 mode, mode, None, GRAB_CURSOR, eventtime))
729 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1000 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
730 THIS->perl.grabtime = eventtime; 1001 THIS->perl.grabtime = eventtime;
731 else 1002 else
732 XUngrabPointer (THIS->display->display, eventtime); 1003 XUngrabPointer (THIS->display->display, eventtime);
733 1004
… …
735} 1006}
736 OUTPUT: 1007 OUTPUT:
737 RETVAL 1008 RETVAL
738 1009
739void 1010void
740rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 1011rxvt_term::allow_events_async ()
741 CODE: 1012 CODE:
742 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 1013 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
743 1014
744void 1015void
745rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 1016rxvt_term::allow_events_sync ()
746 CODE: 1017 CODE:
747 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 1018 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
748 1019
749void 1020void
750rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 1021rxvt_term::allow_events_replay ()
751 CODE: 1022 CODE:
752 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 1023 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
753 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 1024 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
754 1025
755void 1026void
756rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 1027rxvt_term::ungrab ()
757 CODE: 1028 CODE:
758 THIS->perl.grabtime = 0; 1029 ungrab (THIS);
759 XUngrabKeyboard (THIS->display->display, eventtime);
760 XUngrabPointer (THIS->display->display, eventtime);
761 1030
762int 1031int
763rxvt_term::strwidth (SV *str) 1032rxvt_term::strwidth (SV *str)
764 CODE: 1033 CODE:
765{ 1034{
… …
784 char *mbstr = rxvt_wcstombs (wstr); 1053 char *mbstr = rxvt_wcstombs (wstr);
785 rxvt_pop_locale (); 1054 rxvt_pop_locale ();
786 1055
787 free (wstr); 1056 free (wstr);
788 1057
789 RETVAL = newSVpv (mbstr, 0); 1058 RETVAL = taint_if (newSVpv (mbstr, 0), str);
790 free (mbstr); 1059 free (mbstr);
791} 1060}
792 OUTPUT: 1061 OUTPUT:
793 RETVAL 1062 RETVAL
794 1063
… …
801 1070
802 rxvt_push_locale (THIS->locale); 1071 rxvt_push_locale (THIS->locale);
803 wchar_t *wstr = rxvt_mbstowcs (data, len); 1072 wchar_t *wstr = rxvt_mbstowcs (data, len);
804 rxvt_pop_locale (); 1073 rxvt_pop_locale ();
805 1074
806 RETVAL = wcs2sv (wstr); 1075 RETVAL = taint_if (wcs2sv (wstr), octets);
807 free (wstr); 1076 free (wstr);
808} 1077}
809 OUTPUT: 1078 OUTPUT:
810 RETVAL 1079 RETVAL
811 1080
812# very portable, especially on objects as opposed to pods 1081#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
813#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
814 1082
815#define TERM_OFFSET_width TERM_OFFSET(width) 1083#define TERM_OFFSET_width TERM_OFFSET(width)
816#define TERM_OFFSET_height TERM_OFFSET(height) 1084#define TERM_OFFSET_height TERM_OFFSET(height)
817#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1085#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
818#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1086#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
843 CODE: 1111 CODE:
844 RETVAL = *(int *)((char *)THIS + ix); 1112 RETVAL = *(int *)((char *)THIS + ix);
845 OUTPUT: 1113 OUTPUT:
846 RETVAL 1114 RETVAL
847 1115
1116unsigned int
1117rxvt_term::ModLevel3Mask ()
1118 ALIAS:
1119 ModLevel3Mask = 0
1120 ModMetaMask = 1
1121 ModNumLockMask = 2
1122 CODE:
1123 switch (ix)
1124 {
1125 case 0: RETVAL = THIS->ModLevel3Mask; break;
1126 case 1: RETVAL = THIS->ModMetaMask; break;
1127 case 2: RETVAL = THIS->ModNumLockMask; break;
1128 }
1129 OUTPUT:
1130 RETVAL
1131
1132char *
1133rxvt_term::display_id ()
1134 ALIAS:
1135 display_id = 0
1136 locale = 1
1137 CODE:
1138 switch (ix)
1139 {
1140 case 0: RETVAL = THIS->display->id; break;
1141 case 1: RETVAL = THIS->locale; break;
1142 }
1143 OUTPUT:
1144 RETVAL
1145
1146SV *
1147rxvt_term::_env ()
1148 CODE:
1149{
1150 if (THIS->envv)
1151 {
1152 AV *av = newAV ();
1153
1154 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1155 if (*i)
1156 av_push (av, newSVpv (*i, 0));
1157
1158 RETVAL = newRV_noinc ((SV *)av);
1159 }
1160 else
1161 RETVAL = &PL_sv_undef;
1162}
1163 OUTPUT:
1164 RETVAL
1165
1166int
1167rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1168 CODE:
1169 RETVAL = THIS->pty_ev.events;
1170 if (events != EVENT_UNDEF)
1171 THIS->pty_ev.set (events);
1172 OUTPUT:
1173 RETVAL
1174
848U32 1175U32
849rxvt_term::parent () 1176rxvt_term::parent ()
850 CODE: 1177 CODE:
851 RETVAL = (U32)THIS->parent [0]; 1178 RETVAL = (U32)THIS->parent [0];
852 OUTPUT: 1179 OUTPUT:
… …
857 CODE: 1184 CODE:
858 RETVAL = (U32)THIS->vt; 1185 RETVAL = (U32)THIS->vt;
859 OUTPUT: 1186 OUTPUT:
860 RETVAL 1187 RETVAL
861 1188
1189void
1190rxvt_term::vt_emask_add (U32 emask)
1191 CODE:
1192 THIS->vt_emask_perl |= emask;
1193 THIS->vt_select_input ();
1194
862U32 1195U32
863rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1196rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
864 CODE: 1197 CODE:
865{
866 RETVAL = THIS->rstyle; 1198 RETVAL = THIS->rstyle;
867 THIS->rstyle = new_rstyle; 1199 THIS->rstyle = new_rstyle;
868}
869 OUTPUT: 1200 OUTPUT:
870 RETVAL 1201 RETVAL
871 1202
872int 1203int
873rxvt_term::view_start (int newval = -1) 1204rxvt_term::view_start (int newval = -1)
1205 PROTOTYPE: $;$
874 CODE: 1206 CODE:
875{ 1207{
876 RETVAL = THIS->view_start; 1208 RETVAL = THIS->view_start;
877 1209
878 if (newval >= 0) 1210 if (newval >= 0)
… …
903 wchar_t *wstr = new wchar_t [THIS->ncol]; 1235 wchar_t *wstr = new wchar_t [THIS->ncol];
904 1236
905 for (int col = 0; col < THIS->ncol; col++) 1237 for (int col = 0; col < THIS->ncol; col++)
906 wstr [col] = l.t [col]; 1238 wstr [col] = l.t [col];
907 1239
908 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1240 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
909 1241
910 delete [] wstr; 1242 delete [] wstr;
911 } 1243 }
912 1244
913 if (new_text) 1245 if (new_text)
… …
1034 else 1366 else
1035 *r++ = *s; 1367 *r++ = *s;
1036 1368
1037 rxvt_pop_locale (); 1369 rxvt_pop_locale ();
1038 1370
1039 RETVAL = wcs2sv (rstr, r - rstr); 1371 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1040 1372
1041 delete [] rstr; 1373 delete [] rstr;
1042} 1374}
1043 OUTPUT: 1375 OUTPUT:
1044 RETVAL 1376 RETVAL
… …
1070 else if (IS_COMPOSE (*s)) 1402 else if (IS_COMPOSE (*s))
1071 r += rxvt_composite.expand (*s, r); 1403 r += rxvt_composite.expand (*s, r);
1072 else 1404 else
1073 *r++ = *s; 1405 *r++ = *s;
1074 1406
1075 RETVAL = wcs2sv (rstr, r - rstr); 1407 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1076 1408
1077 delete [] rstr; 1409 delete [] rstr;
1078} 1410}
1079 OUTPUT: 1411 OUTPUT:
1080 RETVAL 1412 RETVAL
… …
1102 1434
1103 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1435 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1104 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1436 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1105 1437
1106 if (GIMME_V != G_VOID) 1438 if (GIMME_V != G_VOID)
1107 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1439 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1108 1440
1109 if (newval) 1441 if (newval)
1110 { 1442 {
1111 if (SvOK (newval)) 1443 if (SvOK (newval))
1112 { 1444 {
… …
1117 else 1449 else
1118 THIS->rs [index] = 0; 1450 THIS->rs [index] = 0;
1119 } 1451 }
1120} 1452}
1121 1453
1454const char *
1455rxvt_term::x_resource (const char *name)
1456 CLEANUP:
1457 SvTAINTED_on (ST (0));
1458
1459bool
1460rxvt_term::option (U32 optval, int set = -1)
1461 CODE:
1462{
1463 RETVAL = THIS->options & optval;
1464
1465 if (set >= 0)
1466 {
1467 if (set)
1468 THIS->options |= optval;
1469 else
1470 THIS->options &= ~optval;
1471
1472 switch (optval)
1473 {
1474 case Opt_skipBuiltinGlyphs:
1475 THIS->set_fonts ();
1476 THIS->scr_remap_chars ();
1477 THIS->scr_touch (true);
1478 THIS->want_refresh = 1;
1479 break;
1480
1481 case Opt_cursorUnderline:
1482 THIS->want_refresh = 1;
1483 break;
1484
1485# case Opt_scrollBar_floating:
1486# case Opt_scrollBar_right:
1487# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1488# break;
1489 }
1490 }
1491}
1492 OUTPUT:
1493 RETVAL
1494
1495bool
1496rxvt_term::parse_keysym (char *keysym, char *str)
1497 CODE:
1498 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1499 THIS->keyboard->register_done ();
1500 OUTPUT:
1501 RETVAL
1502
1122void 1503void
1123rxvt_term::cur (...) 1504rxvt_term::screen_cur (...)
1124 PROTOTYPE: $;$$ 1505 PROTOTYPE: $;$$
1125 ALIAS: 1506 ALIAS:
1126 screen_cur = 0 1507 screen_cur = 0
1127 selection_beg = 1 1508 selection_beg = 1
1128 selection_end = 2 1509 selection_end = 2
… …
1149 if (ix) 1530 if (ix)
1150 THIS->want_refresh = 1; 1531 THIS->want_refresh = 1;
1151 } 1532 }
1152} 1533}
1153 1534
1535char
1536rxvt_term::cur_charset ()
1537 CODE:
1538 RETVAL = THIS->charsets [THIS->screen.charset];
1539 OUTPUT:
1540 RETVAL
1541
1542#void
1543#rxvt_term::selection_clear ()
1544
1545void
1546rxvt_term::selection_make (U32 eventtime, bool rect = false)
1547 CODE:
1548 THIS->selection.op = SELECTION_CONT;
1549 THIS->selection.rect = rect;
1550 THIS->selection_make (eventtime);
1551
1154int 1552int
1155rxvt_term::selection_grab (U32 eventtime) 1553rxvt_term::selection_grab (U32 eventtime)
1156 1554
1157void 1555void
1158rxvt_term::selection (SV *newtext = 0) 1556rxvt_term::selection (SV *newtext = 0)
1159 PPCODE: 1557 PPCODE:
1160{ 1558{
1161 if (GIMME_V != G_VOID) 1559 if (GIMME_V != G_VOID)
1560 XPUSHs (THIS->selection.text
1162 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1561 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1562 : &PL_sv_undef);
1163 1563
1164 if (newtext) 1564 if (newtext)
1165 { 1565 {
1166 free (THIS->selection.text); 1566 free (THIS->selection.text);
1167 1567
1168 THIS->selection.text = sv2wcs (newtext); 1568 THIS->selection.text = sv2wcs (newtext);
1169 THIS->selection.len = wcslen (THIS->selection.text); 1569 THIS->selection.len = wcslen (THIS->selection.text);
1170 } 1570 }
1171} 1571}
1572
1573void
1574rxvt_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)
1575
1576void
1577rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1578
1579void
1580rxvt_term::scr_bell ()
1172 1581
1173void 1582void
1174rxvt_term::scr_add_lines (SV *string) 1583rxvt_term::scr_add_lines (SV *string)
1175 CODE: 1584 CODE:
1176{ 1585{

Diff Legend

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