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.34 by root, Fri Jan 6 21:06:09 2006 UTC vs.
Revision 1.58 by root, Thu Jan 12 01:38:37 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 "iom.h"
33#include "rxvt.h" 35#include "rxvt.h"
34#include "iom.h" 36#include "keyboard.h"
35#include "rxvtutil.h" 37#include "rxvtutil.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include "perlxsi.c" 40#include "perlxsi.c"
41
42#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
43# define GRAB_CURSOR THIS->leftptr_cursor
44#else
45# define GRAB_CURSOR None
46#endif
39 47
40#undef LINENO 48#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 49#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW 50#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 51#define ROW(n) THIS->row_buf [LINENO (n)]
44 52
45///////////////////////////////////////////////////////////////////////////// 53/////////////////////////////////////////////////////////////////////////////
46 54
55static SV *
56taint (SV *sv)
57{
58 SvTAINT (sv);
59 return sv;
60}
61
62static SV *
63taint_if (SV *sv, SV *src)
64{
65 if (SvTAINTED (src))
66 SvTAINT (sv);
67
68 return sv;
69}
70
47static wchar_t * 71static wchar_t *
48sv2wcs (SV *sv) 72sv2wcs (SV *sv)
49{ 73{
50 STRLEN len; 74 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 75 char *str = SvPVutf8 (sv, len);
… …
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 125 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 126
103 return (long)mg->mg_ptr; 127 return (long)mg->mg_ptr;
104} 128}
105 129
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 130#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 131#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 132
109///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
110 134
111struct perl_watcher 135struct perl_watcher
… …
290void 314void
291overlay::show () 315overlay::show ()
292{ 316{
293 char key[33]; sprintf (key, "%32lx", (long)this); 317 char key[33]; sprintf (key, "%32lx", (long)this);
294 318
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 319 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
296 hv_store (hv, key, 32, newSViv ((long)this), 0); 320 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 321}
298 322
299void 323void
300overlay::hide () 324overlay::hide ()
301{ 325{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 326 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 327
304 if (ovs) 328 if (ovs)
305 { 329 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 330 char key[33]; sprintf (key, "%32lx", (long)this);
307 331
… …
369 393
370struct rxvt_perl_interp rxvt_perl; 394struct rxvt_perl_interp rxvt_perl;
371 395
372static PerlInterpreter *perl; 396static PerlInterpreter *perl;
373 397
374rxvt_perl_interp::rxvt_perl_interp ()
375{
376}
377
378rxvt_perl_interp::~rxvt_perl_interp () 398rxvt_perl_interp::~rxvt_perl_interp ()
379{ 399{
380 if (perl) 400 if (perl)
381 { 401 {
382 perl_destruct (perl); 402 perl_destruct (perl);
… …
387void 407void
388rxvt_perl_interp::init () 408rxvt_perl_interp::init ()
389{ 409{
390 if (!perl) 410 if (!perl)
391 { 411 {
412 perl_environ = rxvt_environ;
413 swap (perl_environ, environ);
414
392 char *argv[] = { 415 char *argv[] = {
393 "", 416 "",
417 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 418 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 419 };
396 420
397 perl = perl_alloc (); 421 perl = perl_alloc ();
398 perl_construct (perl); 422 perl_construct (perl);
399 423
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 425 || perl_run (perl))
402 { 426 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 428
405 perl_destruct (perl); 429 perl_destruct (perl);
406 perl_free (perl); 430 perl_free (perl);
407 perl = 0; 431 perl = 0;
408 } 432 }
433
434 swap (perl_environ, environ);
435 }
436}
437
438static void
439ungrab (rxvt_term *THIS)
440{
441 if (THIS->perl.grabtime)
442 {
443 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
444 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
445 THIS->perl.grabtime = 0;
409 } 446 }
410} 447}
411 448
412bool 449bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 450rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
… …
415 if (!perl) 452 if (!perl)
416 return false; 453 return false;
417 454
418 if (htype == HOOK_INIT) // first hook ever called 455 if (htype == HOOK_INIT) // first hook ever called
419 { 456 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 457 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 458 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 459 }
423 else if (!term->self) 460 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 461 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 462 else if (htype == HOOK_DESTROY)
426 { 463 {
427 // handled later 464 // handled later
428 } 465 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 466 else
430 { 467 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 468 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
432
433 if (HvKEYS (hv))
434 { 469 {
470 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
471
472 if (HvKEYS (hv))
473 {
435 hv_iterinit (hv); 474 hv_iterinit (hv);
436 475
437 while (HE *he = hv_iternext (hv)) 476 while (HE *he = hv_iternext (hv))
438 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 477 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
478 }
479
439 } 480 }
481
482 if (!should_invoke [htype])
483 return false;
440 } 484 }
441 else if (!should_invoke [htype])
442 return false;
443 485
486 swap (perl_environ, environ);
487
488 try
489 {
444 dSP; 490 dSP;
445 va_list ap; 491 va_list ap;
446 492
447 va_start (ap, htype); 493 va_start (ap, htype);
448 494
449 ENTER; 495 ENTER;
450 SAVETMPS; 496 SAVETMPS;
451 497
452 PUSHMARK (SP); 498 PUSHMARK (SP);
453 499
454 XPUSHs (sv_2mortal (newSVterm (term))); 500 XPUSHs (sv_2mortal (newSVterm (term)));
455 XPUSHs (sv_2mortal (newSViv (htype))); 501 XPUSHs (sv_2mortal (newSViv (htype)));
456 502
457 for (;;) { 503 for (;;) {
458 data_type dt = (data_type)va_arg (ap, int); 504 data_type dt = (data_type)va_arg (ap, int);
459 505
460 switch (dt) 506 switch (dt)
461 { 507 {
462 case DT_INT: 508 case DT_INT:
463 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 509 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
464 break; 510 break;
465 511
466 case DT_LONG: 512 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 514 break;
469 515
470 case DT_STR: 516 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 517 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 518 break;
473 519
474 case DT_STR_LEN: 520 case DT_STR_LEN:
475 { 521 {
476 char *str = va_arg (ap, char *); 522 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int); 523 int len = va_arg (ap, int);
478 524
479 XPUSHs (sv_2mortal (newSVpvn (str, len))); 525 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
480 } 526 }
481 break; 527 break;
482 528
483 case DT_WCS_LEN: 529 case DT_WCS_LEN:
484 { 530 {
485 wchar_t *wstr = va_arg (ap, wchar_t *); 531 wchar_t *wstr = va_arg (ap, wchar_t *);
486 int wlen = va_arg (ap, int); 532 int wlen = va_arg (ap, int);
487 533
488 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 534 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
489 } 535 }
490 break; 536 break;
491 537
492 case DT_XEVENT: 538 case DT_XEVENT:
493 { 539 {
494 XEvent *xe = va_arg (ap, XEvent *); 540 XEvent *xe = va_arg (ap, XEvent *);
495 HV *hv = newHV (); 541 HV *hv = newHV ();
496 542
497# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 543# 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) 544# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
499# undef set 545# undef set
500 546
501 setiv (type, xe->type); 547 setiv (type, xe->type);
502 setiv (send_event, xe->xany.send_event); 548 setiv (send_event, xe->xany.send_event);
503 setiv (serial, xe->xany.serial); 549 setiv (serial, xe->xany.serial);
504 550
505 switch (xe->type) 551 switch (xe->type)
552 {
553 case KeyPress:
554 case KeyRelease:
555 case ButtonPress:
556 case ButtonRelease:
557 case MotionNotify:
558 setiv (time, xe->xmotion.time);
559 setiv (x, xe->xmotion.x);
560 setiv (y, xe->xmotion.y);
561 setiv (row, xe->xmotion.y / term->fheight);
562 setiv (col, xe->xmotion.x / term->fwidth);
563 setiv (x_root, xe->xmotion.x_root);
564 setiv (y_root, xe->xmotion.y_root);
565 setiv (state, xe->xmotion.state);
566 break;
567 }
568
569 switch (xe->type)
570 {
571 case KeyPress:
572 case KeyRelease:
573 setiv (keycode, xe->xkey.keycode);
574 break;
575
576 case ButtonPress:
577 case ButtonRelease:
578 setiv (button, xe->xbutton.button);
579 break;
580
581 case MotionNotify:
582 setiv (is_hint, xe->xmotion.is_hint);
583 break;
584 }
585
586 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
587 }
588 break;
589
590 case DT_END:
506 { 591 {
507 case KeyPress: 592 va_end (ap);
508 case KeyRelease: 593
509 case ButtonPress: 594 PUTBACK;
510 case ButtonRelease: 595 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
511 case MotionNotify: 596 SPAGAIN;
512 setiv (time, xe->xmotion.time); 597
513 setiv (x, xe->xmotion.x); 598 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; 599 {
600 SV *status = POPs;
601 count = SvTRUE (status);
602 }
603
604 PUTBACK;
605 FREETMPS;
606 LEAVE;
607
608 if (SvTRUE (ERRSV))
609 {
610 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
611 ungrab (term); // better lose the grab than the session
612 }
613
614 if (htype == HOOK_DESTROY)
615 {
616 clearSVptr ((SV *)term->perl.self);
617 SvREFCNT_dec ((SV *)term->perl.self);
618 }
619
620 swap (perl_environ, environ);
621 return count;
521 } 622 }
522 623
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->self);
568 SvREFCNT_dec ((SV *)term->self);
569 }
570
571 return count;
572 }
573
574 default: 624 default:
575 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 625 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
626 }
576 } 627 }
577 } 628 }
629 catch (...)
630 {
631 swap (perl_environ, environ);
632 throw;
633 }
578} 634}
579 635
580///////////////////////////////////////////////////////////////////////////// 636/////////////////////////////////////////////////////////////////////////////
581 637
582MODULE = urxvt PACKAGE = urxvt 638MODULE = urxvt PACKAGE = urxvt
583 639
584PROTOTYPES: ENABLE 640PROTOTYPES: ENABLE
585 641
586BOOT: 642BOOT:
587{ 643{
588# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 644 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
645 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
646 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
647 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
648
589 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 649 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
590# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 650# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
591# include "hookinc.h" 651# include "hookinc.h"
592# undef def 652# undef def
593 653
654 HV *option = get_hv ("urxvt::OPTION", 1);
655# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
656# define nodef(name)
657# include "optinc.h"
658# undef nodef
659# undef def
660
661 HV *stash = gv_stashpv ("urxvt", 1);
662# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
594 export_const (DEFAULT_RSTYLE); 663 export_const_iv (DEFAULT_RSTYLE);
595 export_const (OVERLAY_RSTYLE); 664 export_const_iv (OVERLAY_RSTYLE);
596 export_const (RS_Bold); 665 export_const_iv (RS_Bold);
597 export_const (RS_Italic); 666 export_const_iv (RS_Italic);
598 export_const (RS_Blink); 667 export_const_iv (RS_Blink);
599 export_const (RS_RVid); 668 export_const_iv (RS_RVid);
600 export_const (RS_Uline); 669 export_const_iv (RS_Uline);
601 670
602 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 671 export_const_iv (CurrentTime);
672 export_const_iv (ShiftMask);
673 export_const_iv (LockMask);
674 export_const_iv (ControlMask);
675 export_const_iv (Mod1Mask);
676 export_const_iv (Mod2Mask);
677 export_const_iv (Mod3Mask);
678 export_const_iv (Mod4Mask);
679 export_const_iv (Mod5Mask);
680 export_const_iv (Button1Mask);
681 export_const_iv (Button2Mask);
682 export_const_iv (Button3Mask);
683 export_const_iv (Button4Mask);
684 export_const_iv (Button5Mask);
685 export_const_iv (AnyModifier);
686
687 export_const_iv (EVENT_NONE);
688 export_const_iv (EVENT_READ);
689 export_const_iv (EVENT_WRITE);
603} 690}
691
692void
693set_should_invoke (int htype, int value)
694 CODE:
695 rxvt_perl.should_invoke [htype] = value;
696
697void
698warn (const char *msg)
699 CODE:
700 rxvt_warn ("%s", msg);
701
702void
703fatal (const char *msg)
704 CODE:
705 rxvt_fatal ("%s", msg);
604 706
605SV * 707SV *
606new (...) 708untaint (SV *sv)
607 CODE: 709 CODE:
608{ 710 RETVAL = newSVsv (sv);
609 stringvec *argv = new stringvec; 711 SvTAINTED_off (RETVAL);
610 bool success; 712 OUTPUT:
611
612 for (int i = 0; i < items ;i++)
613 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
614
615 rxvt_term *term = new rxvt_term;
616
617 term->argv = argv;
618
619 try
620 {
621 if (!term->init (argv->size (), argv->begin ()))
622 term = 0;
623 }
624 catch (const class rxvt_failure_exception &e)
625 {
626 term->destroy ();
627 croak ("exception caught while initializing new terminal instance");
628 }
629
630 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef;
631}
632 OUTPUT:
633 RETVAL 713 RETVAL
634 714
635void 715bool
636set_should_invoke (int htype, int value) 716safe ()
637 CODE: 717 CODE:
638 rxvt_perl.should_invoke [htype] = value; 718 RETVAL = !rxvt_tainted ();
639 719 OUTPUT:
640void 720 RETVAL
641warn (const char *msg)
642 CODE:
643 rxvt_warn ("%s", msg);
644
645void
646fatal (const char *msg)
647 CODE:
648 rxvt_fatal ("%s", msg);
649 721
650NV 722NV
651NOW () 723NOW ()
652 CODE: 724 CODE:
653 RETVAL = NOW; 725 RETVAL = NOW;
… …
702 OUTPUT: 774 OUTPUT:
703 RETVAL 775 RETVAL
704 776
705MODULE = urxvt PACKAGE = urxvt::term 777MODULE = urxvt PACKAGE = urxvt::term
706 778
779SV *
780_new (...)
781 CODE:
782{
783 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
784 croak ("first argument to urxvt::term->_new must be arrayref");
785
786 rxvt_term *term = new rxvt_term;
787
788 term->argv = new stringvec;
789 term->envv = new stringvec;
790
791 for (int i = 1; i < items; i++)
792 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
793
794 AV *envv = (AV *)SvRV (ST (0));
795 for (int i = av_len (envv) + 1; i--; )
796 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
797
798 term->envv->push_back (0);
799
800 bool success;
801
802 try
803 {
804 success = term->init (term->argv->size (), term->argv->begin ());
805 }
806 catch (const class rxvt_failure_exception &e)
807 {
808 success = false;
809 }
810
811 if (!success)
812 {
813 term->destroy ();
814 croak ("error while initializing new terminal instance");
815 }
816
817 RETVAL = term && term->perl.self
818 ? newSVterm (term) : &PL_sv_undef;
819}
820 OUTPUT:
821 RETVAL
822
707void 823void
708rxvt_term::destroy () 824rxvt_term::destroy ()
825
826void
827rxvt_term::grab_button (int button, U32 modifiers)
828 CODE:
829 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
830 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
831 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
832
833bool
834rxvt_term::grab (U32 eventtime, int sync = 0)
835 CODE:
836{
837 int mode = sync ? GrabModeSync : GrabModeAsync;
838
839 THIS->perl.grabtime = 0;
840
841 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
842 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
843 mode, mode, None, GRAB_CURSOR, eventtime))
844 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
845 THIS->perl.grabtime = eventtime;
846 else
847 XUngrabPointer (THIS->display->display, eventtime);
848
849 RETVAL = !!THIS->perl.grabtime;
850}
851 OUTPUT:
852 RETVAL
853
854void
855rxvt_term::allow_events_async ()
856 CODE:
857 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
858
859void
860rxvt_term::allow_events_sync ()
861 CODE:
862 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
863
864void
865rxvt_term::allow_events_replay ()
866 CODE:
867 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
868 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
869
870void
871rxvt_term::ungrab ()
872 CODE:
873 ungrab (THIS);
709 874
710int 875int
711rxvt_term::strwidth (SV *str) 876rxvt_term::strwidth (SV *str)
712 CODE: 877 CODE:
713{ 878{
… …
732 char *mbstr = rxvt_wcstombs (wstr); 897 char *mbstr = rxvt_wcstombs (wstr);
733 rxvt_pop_locale (); 898 rxvt_pop_locale ();
734 899
735 free (wstr); 900 free (wstr);
736 901
737 RETVAL = newSVpv (mbstr, 0); 902 RETVAL = taint_if (newSVpv (mbstr, 0), str);
738 free (mbstr); 903 free (mbstr);
739} 904}
740 OUTPUT: 905 OUTPUT:
741 RETVAL 906 RETVAL
742 907
… …
749 914
750 rxvt_push_locale (THIS->locale); 915 rxvt_push_locale (THIS->locale);
751 wchar_t *wstr = rxvt_mbstowcs (data, len); 916 wchar_t *wstr = rxvt_mbstowcs (data, len);
752 rxvt_pop_locale (); 917 rxvt_pop_locale ();
753 918
754 RETVAL = wcs2sv (wstr); 919 RETVAL = taint_if (wcs2sv (wstr), octets);
755 free (wstr); 920 free (wstr);
756} 921}
757 OUTPUT: 922 OUTPUT:
758 RETVAL 923 RETVAL
759 924
760# very portable, especially on objects as opposed to pods 925#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
761#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
762 926
763#define TERM_OFFSET_width TERM_OFFSET(width) 927#define TERM_OFFSET_width TERM_OFFSET(width)
764#define TERM_OFFSET_height TERM_OFFSET(height) 928#define TERM_OFFSET_height TERM_OFFSET(height)
765#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 929#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
766#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 930#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
791 CODE: 955 CODE:
792 RETVAL = *(int *)((char *)THIS + ix); 956 RETVAL = *(int *)((char *)THIS + ix);
793 OUTPUT: 957 OUTPUT:
794 RETVAL 958 RETVAL
795 959
960unsigned int
961rxvt_term::ModLevel3Mask ()
962 ALIAS:
963 ModLevel3Mask = 0
964 ModMetaMask = 1
965 ModNumLockMask = 2
966 CODE:
967 switch (ix)
968 {
969 case 0: RETVAL = THIS->ModLevel3Mask; break;
970 case 1: RETVAL = THIS->ModMetaMask; break;
971 case 2: RETVAL = THIS->ModNumLockMask; break;
972 }
973 OUTPUT:
974 RETVAL
975
976char *
977rxvt_term::display_id ()
978 ALIAS:
979 display_id = 0
980 locale = 1
981 CODE:
982 switch (ix)
983 {
984 case 0: RETVAL = THIS->display->id; break;
985 case 1: RETVAL = THIS->locale; break;
986 }
987 OUTPUT:
988 RETVAL
989
990SV *
991rxvt_term::_env ()
992 CODE:
993{
994 if (THIS->envv)
995 {
996 AV *av = newAV ();
997
998 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
999 if (*i)
1000 av_push (av, newSVpv (*i, 0));
1001
1002 RETVAL = newRV_noinc ((SV *)av);
1003 }
1004 else
1005 RETVAL = &PL_sv_undef;
1006}
1007 OUTPUT:
1008 RETVAL
1009
1010int
1011rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1012 CODE:
1013 RETVAL = THIS->pty_ev.events;
1014 if (events != EVENT_UNDEF)
1015 THIS->pty_ev.set (events);
1016 OUTPUT:
1017 RETVAL
1018
796U32 1019U32
797rxvt_term::parent () 1020rxvt_term::parent ()
798 CODE: 1021 CODE:
799 RETVAL = (U32)THIS->parent [0]; 1022 RETVAL = (U32)THIS->parent [0];
800 OUTPUT: 1023 OUTPUT:
… …
851 wchar_t *wstr = new wchar_t [THIS->ncol]; 1074 wchar_t *wstr = new wchar_t [THIS->ncol];
852 1075
853 for (int col = 0; col < THIS->ncol; col++) 1076 for (int col = 0; col < THIS->ncol; col++)
854 wstr [col] = l.t [col]; 1077 wstr [col] = l.t [col];
855 1078
856 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1079 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
857 1080
858 delete [] wstr; 1081 delete [] wstr;
859 } 1082 }
860 1083
861 if (new_text) 1084 if (new_text)
… …
982 else 1205 else
983 *r++ = *s; 1206 *r++ = *s;
984 1207
985 rxvt_pop_locale (); 1208 rxvt_pop_locale ();
986 1209
987 RETVAL = wcs2sv (rstr, r - rstr); 1210 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
988 1211
989 delete [] rstr; 1212 delete [] rstr;
990} 1213}
991 OUTPUT: 1214 OUTPUT:
992 RETVAL 1215 RETVAL
… …
1018 else if (IS_COMPOSE (*s)) 1241 else if (IS_COMPOSE (*s))
1019 r += rxvt_composite.expand (*s, r); 1242 r += rxvt_composite.expand (*s, r);
1020 else 1243 else
1021 *r++ = *s; 1244 *r++ = *s;
1022 1245
1023 RETVAL = wcs2sv (rstr, r - rstr); 1246 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1024 1247
1025 delete [] rstr; 1248 delete [] rstr;
1026} 1249}
1027 OUTPUT: 1250 OUTPUT:
1028 RETVAL 1251 RETVAL
… …
1050 1273
1051 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1274 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1052 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1275 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1053 1276
1054 if (GIMME_V != G_VOID) 1277 if (GIMME_V != G_VOID)
1055 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1278 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1056 1279
1057 if (newval) 1280 if (newval)
1058 { 1281 {
1059 if (SvOK (newval)) 1282 if (SvOK (newval))
1060 { 1283 {
… …
1065 else 1288 else
1066 THIS->rs [index] = 0; 1289 THIS->rs [index] = 0;
1067 } 1290 }
1068} 1291}
1069 1292
1293const char *
1294rxvt_term::x_resource (const char *name)
1295 CLEANUP:
1296 SvTAINTED_on (ST (0));
1297
1298bool
1299rxvt_term::option (U32 optval, int set = -1)
1300 CODE:
1301{
1302 RETVAL = THIS->options & optval;
1303
1304 if (set >= 0)
1305 {
1306 if (set)
1307 THIS->options |= optval;
1308 else
1309 THIS->options &= ~optval;
1310
1311 switch (optval)
1312 {
1313 case Opt_skipBuiltinGlyphs:
1314 THIS->set_fonts ();
1315 THIS->scr_remap_chars ();
1316 THIS->scr_touch (true);
1317 THIS->want_refresh = 1;
1318 break;
1319
1320 case Opt_cursorUnderline:
1321 THIS->want_refresh = 1;
1322 break;
1323
1324# case Opt_scrollBar_floating:
1325# case Opt_scrollBar_right:
1326# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1327# break;
1328 }
1329 }
1330}
1331 OUTPUT:
1332 RETVAL
1333
1334bool
1335rxvt_term::parse_keysym (char *keysym, char *str)
1336 CODE:
1337 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1338 THIS->keyboard->register_done ();
1339 OUTPUT:
1340 RETVAL
1341
1070void 1342void
1071rxvt_term::cur (...) 1343rxvt_term::screen_cur (...)
1072 PROTOTYPE: $;$$ 1344 PROTOTYPE: $;$$
1073 ALIAS: 1345 ALIAS:
1074 screen_cur = 0 1346 screen_cur = 0
1075 selection_beg = 1 1347 selection_beg = 1
1076 selection_end = 2 1348 selection_end = 2
… …
1097 if (ix) 1369 if (ix)
1098 THIS->want_refresh = 1; 1370 THIS->want_refresh = 1;
1099 } 1371 }
1100} 1372}
1101 1373
1374char
1375rxvt_term::cur_charset ()
1376 CODE:
1377 RETVAL = THIS->charsets [THIS->screen.charset];
1378 OUTPUT:
1379 RETVAL
1380
1102int 1381int
1103rxvt_term::selection_grab (int eventtime = CurrentTime) 1382rxvt_term::selection_grab (U32 eventtime)
1104 1383
1105void 1384void
1106rxvt_term::selection (SV *newtext = 0) 1385rxvt_term::selection (SV *newtext = 0)
1107 PPCODE: 1386 PPCODE:
1108{ 1387{
1109 if (GIMME_V != G_VOID) 1388 if (GIMME_V != G_VOID)
1389 XPUSHs (THIS->selection.text
1110 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1390 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1391 : &PL_sv_undef);
1111 1392
1112 if (newtext) 1393 if (newtext)
1113 { 1394 {
1114 free (THIS->selection.text); 1395 free (THIS->selection.text);
1115 1396
1116 THIS->selection.text = sv2wcs (newtext); 1397 THIS->selection.text = sv2wcs (newtext);
1117 THIS->selection.len = wcslen (THIS->selection.text); 1398 THIS->selection.len = wcslen (THIS->selection.text);
1118 } 1399 }
1119} 1400}
1401
1402void
1403rxvt_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)
1404
1405void
1406rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1407
1408void
1409rxvt_term::scr_bell ()
1120 1410
1121void 1411void
1122rxvt_term::scr_add_lines (SV *string) 1412rxvt_term::scr_add_lines (SV *string)
1123 CODE: 1413 CODE:
1124{ 1414{
… …
1146 char *old_cmdbuf_endp = THIS->cmdbuf_endp; 1436 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1147 1437
1148 THIS->cmdbuf_ptr = str; 1438 THIS->cmdbuf_ptr = str;
1149 THIS->cmdbuf_endp = str + len; 1439 THIS->cmdbuf_endp = str + len;
1150 1440
1441 rxvt_push_locale (THIS->locale);
1151 THIS->cmd_parse (); 1442 THIS->cmd_parse ();
1443 rxvt_pop_locale ();
1152 1444
1153 THIS->cmdbuf_ptr = old_cmdbuf_ptr; 1445 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1154 THIS->cmdbuf_endp = old_cmdbuf_endp; 1446 THIS->cmdbuf_endp = old_cmdbuf_endp;
1155} 1447}
1156 1448

Diff Legend

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