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.60 by root, Thu Jan 12 05:22:47 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/////////////////////////////////////////////////////////////////////////////
46 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}
72
47static wchar_t * 73static wchar_t *
48sv2wcs (SV *sv) 74sv2wcs (SV *sv)
49{ 75{
50 STRLEN len; 76 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 77 char *str = SvPVutf8 (sv, len);
… …
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 127 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 128
103 return (long)mg->mg_ptr; 129 return (long)mg->mg_ptr;
104} 130}
105 131
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 132#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 133#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 134
109///////////////////////////////////////////////////////////////////////////// 135/////////////////////////////////////////////////////////////////////////////
110 136
111struct perl_watcher 137struct perl_watcher
… …
290void 316void
291overlay::show () 317overlay::show ()
292{ 318{
293 char key[33]; sprintf (key, "%32lx", (long)this); 319 char key[33]; sprintf (key, "%32lx", (long)this);
294 320
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 321 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); 322 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 323}
298 324
299void 325void
300overlay::hide () 326overlay::hide ()
301{ 327{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 328 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 329
304 if (ovs) 330 if (ovs)
305 { 331 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 332 char key[33]; sprintf (key, "%32lx", (long)this);
307 333
… …
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, ...)
… …
415 if (!perl) 454 if (!perl)
416 return false; 455 return false;
417 456
418 if (htype == HOOK_INIT) // first hook ever called 457 if (htype == HOOK_INIT) // first hook ever called
419 { 458 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 459 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 460 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 461 }
423 else if (!term->self) 462 else if (!term->perl.self)
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->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 (!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->self);
568 SvREFCNT_dec ((SV *)term->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# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 646 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
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));
650
589 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 651 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
590# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 652# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
591# include "hookinc.h" 653# include "hookinc.h"
592# undef def 654# undef def
593 655
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# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
594 export_const (DEFAULT_RSTYLE); 665 export_const_iv (DEFAULT_RSTYLE);
595 export_const (OVERLAY_RSTYLE); 666 export_const_iv (OVERLAY_RSTYLE);
596 export_const (RS_Bold); 667 export_const_iv (RS_Bold);
597 export_const (RS_Italic); 668 export_const_iv (RS_Italic);
598 export_const (RS_Blink); 669 export_const_iv (RS_Blink);
599 export_const (RS_RVid); 670 export_const_iv (RS_RVid);
600 export_const (RS_Uline); 671 export_const_iv (RS_Uline);
601 672
602 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 673 export_const_iv (CurrentTime);
674 export_const_iv (ShiftMask);
675 export_const_iv (LockMask);
676 export_const_iv (ControlMask);
677 export_const_iv (Mod1Mask);
678 export_const_iv (Mod2Mask);
679 export_const_iv (Mod3Mask);
680 export_const_iv (Mod4Mask);
681 export_const_iv (Mod5Mask);
682 export_const_iv (Button1Mask);
683 export_const_iv (Button2Mask);
684 export_const_iv (Button3Mask);
685 export_const_iv (Button4Mask);
686 export_const_iv (Button5Mask);
687 export_const_iv (AnyModifier);
688
689 export_const_iv (EVENT_NONE);
690 export_const_iv (EVENT_READ);
691 export_const_iv (EVENT_WRITE);
603} 692}
693
694void
695set_should_invoke (int htype, int value)
696 CODE:
697 rxvt_perl.should_invoke [htype] = value;
698
699void
700warn (const char *msg)
701 CODE:
702 rxvt_warn ("%s", msg);
703
704void
705fatal (const char *msg)
706 CODE:
707 rxvt_fatal ("%s", msg);
604 708
605SV * 709SV *
606new (...) 710untaint (SV *sv)
607 CODE: 711 CODE:
608{ 712 RETVAL = newSVsv (sv);
609 stringvec *argv = new stringvec; 713 SvTAINTED_off (RETVAL);
610 bool success; 714 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 715 RETVAL
634 716
635void 717void
636set_should_invoke (int htype, int value) 718_exit (int status)
637 CODE:
638 rxvt_perl.should_invoke [htype] = value;
639 719
640void 720bool
641warn (const char *msg) 721safe ()
642 CODE: 722 CODE:
643 rxvt_warn ("%s", msg); 723 RETVAL = !rxvt_tainted ();
644 724 OUTPUT:
645void 725 RETVAL
646fatal (const char *msg)
647 CODE:
648 rxvt_fatal ("%s", msg);
649 726
650NV 727NV
651NOW () 728NOW ()
652 CODE: 729 CODE:
653 RETVAL = NOW; 730 RETVAL = NOW;
… …
702 OUTPUT: 779 OUTPUT:
703 RETVAL 780 RETVAL
704 781
705MODULE = urxvt PACKAGE = urxvt::term 782MODULE = urxvt PACKAGE = urxvt::term
706 783
784SV *
785_new (...)
786 CODE:
787{
788 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
789 croak ("first argument to urxvt::term->_new must be arrayref");
790
791 rxvt_term *term = new rxvt_term;
792
793 term->argv = new stringvec;
794 term->envv = new stringvec;
795
796 for (int i = 1; i < items; i++)
797 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
798
799 AV *envv = (AV *)SvRV (ST (0));
800 for (int i = av_len (envv) + 1; i--; )
801 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
802
803 term->envv->push_back (0);
804
805 bool success;
806
807 try
808 {
809 success = term->init (term->argv->size (), term->argv->begin ());
810 }
811 catch (const class rxvt_failure_exception &e)
812 {
813 success = false;
814 }
815
816 if (!success)
817 {
818 term->destroy ();
819 croak ("error while initializing new terminal instance");
820 }
821
822 RETVAL = term && term->perl.self
823 ? newSVterm (term) : &PL_sv_undef;
824}
825 OUTPUT:
826 RETVAL
827
707void 828void
708rxvt_term::destroy () 829rxvt_term::destroy ()
830
831void
832rxvt_term::grab_button (int button, U32 modifiers)
833 CODE:
834 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
835 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
836 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
837
838bool
839rxvt_term::grab (U32 eventtime, int sync = 0)
840 CODE:
841{
842 int mode = sync ? GrabModeSync : GrabModeAsync;
843
844 THIS->perl.grabtime = 0;
845
846 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
847 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
848 mode, mode, None, GRAB_CURSOR, eventtime))
849 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
850 THIS->perl.grabtime = eventtime;
851 else
852 XUngrabPointer (THIS->display->display, eventtime);
853
854 RETVAL = !!THIS->perl.grabtime;
855}
856 OUTPUT:
857 RETVAL
858
859void
860rxvt_term::allow_events_async ()
861 CODE:
862 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
863
864void
865rxvt_term::allow_events_sync ()
866 CODE:
867 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
868
869void
870rxvt_term::allow_events_replay ()
871 CODE:
872 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
873 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
874
875void
876rxvt_term::ungrab ()
877 CODE:
878 ungrab (THIS);
709 879
710int 880int
711rxvt_term::strwidth (SV *str) 881rxvt_term::strwidth (SV *str)
712 CODE: 882 CODE:
713{ 883{
… …
732 char *mbstr = rxvt_wcstombs (wstr); 902 char *mbstr = rxvt_wcstombs (wstr);
733 rxvt_pop_locale (); 903 rxvt_pop_locale ();
734 904
735 free (wstr); 905 free (wstr);
736 906
737 RETVAL = newSVpv (mbstr, 0); 907 RETVAL = taint_if (newSVpv (mbstr, 0), str);
738 free (mbstr); 908 free (mbstr);
739} 909}
740 OUTPUT: 910 OUTPUT:
741 RETVAL 911 RETVAL
742 912
… …
749 919
750 rxvt_push_locale (THIS->locale); 920 rxvt_push_locale (THIS->locale);
751 wchar_t *wstr = rxvt_mbstowcs (data, len); 921 wchar_t *wstr = rxvt_mbstowcs (data, len);
752 rxvt_pop_locale (); 922 rxvt_pop_locale ();
753 923
754 RETVAL = wcs2sv (wstr); 924 RETVAL = taint_if (wcs2sv (wstr), octets);
755 free (wstr); 925 free (wstr);
756} 926}
757 OUTPUT: 927 OUTPUT:
758 RETVAL 928 RETVAL
759 929
760# very portable, especially on objects as opposed to pods 930#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
761#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
762 931
763#define TERM_OFFSET_width TERM_OFFSET(width) 932#define TERM_OFFSET_width TERM_OFFSET(width)
764#define TERM_OFFSET_height TERM_OFFSET(height) 933#define TERM_OFFSET_height TERM_OFFSET(height)
765#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 934#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
766#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 935#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
791 CODE: 960 CODE:
792 RETVAL = *(int *)((char *)THIS + ix); 961 RETVAL = *(int *)((char *)THIS + ix);
793 OUTPUT: 962 OUTPUT:
794 RETVAL 963 RETVAL
795 964
965unsigned int
966rxvt_term::ModLevel3Mask ()
967 ALIAS:
968 ModLevel3Mask = 0
969 ModMetaMask = 1
970 ModNumLockMask = 2
971 CODE:
972 switch (ix)
973 {
974 case 0: RETVAL = THIS->ModLevel3Mask; break;
975 case 1: RETVAL = THIS->ModMetaMask; break;
976 case 2: RETVAL = THIS->ModNumLockMask; break;
977 }
978 OUTPUT:
979 RETVAL
980
981char *
982rxvt_term::display_id ()
983 ALIAS:
984 display_id = 0
985 locale = 1
986 CODE:
987 switch (ix)
988 {
989 case 0: RETVAL = THIS->display->id; break;
990 case 1: RETVAL = THIS->locale; break;
991 }
992 OUTPUT:
993 RETVAL
994
995SV *
996rxvt_term::_env ()
997 CODE:
998{
999 if (THIS->envv)
1000 {
1001 AV *av = newAV ();
1002
1003 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1004 if (*i)
1005 av_push (av, newSVpv (*i, 0));
1006
1007 RETVAL = newRV_noinc ((SV *)av);
1008 }
1009 else
1010 RETVAL = &PL_sv_undef;
1011}
1012 OUTPUT:
1013 RETVAL
1014
1015int
1016rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1017 CODE:
1018 RETVAL = THIS->pty_ev.events;
1019 if (events != EVENT_UNDEF)
1020 THIS->pty_ev.set (events);
1021 OUTPUT:
1022 RETVAL
1023
796U32 1024U32
797rxvt_term::parent () 1025rxvt_term::parent ()
798 CODE: 1026 CODE:
799 RETVAL = (U32)THIS->parent [0]; 1027 RETVAL = (U32)THIS->parent [0];
800 OUTPUT: 1028 OUTPUT:
… …
851 wchar_t *wstr = new wchar_t [THIS->ncol]; 1079 wchar_t *wstr = new wchar_t [THIS->ncol];
852 1080
853 for (int col = 0; col < THIS->ncol; col++) 1081 for (int col = 0; col < THIS->ncol; col++)
854 wstr [col] = l.t [col]; 1082 wstr [col] = l.t [col];
855 1083
856 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1084 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
857 1085
858 delete [] wstr; 1086 delete [] wstr;
859 } 1087 }
860 1088
861 if (new_text) 1089 if (new_text)
… …
982 else 1210 else
983 *r++ = *s; 1211 *r++ = *s;
984 1212
985 rxvt_pop_locale (); 1213 rxvt_pop_locale ();
986 1214
987 RETVAL = wcs2sv (rstr, r - rstr); 1215 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
988 1216
989 delete [] rstr; 1217 delete [] rstr;
990} 1218}
991 OUTPUT: 1219 OUTPUT:
992 RETVAL 1220 RETVAL
… …
1018 else if (IS_COMPOSE (*s)) 1246 else if (IS_COMPOSE (*s))
1019 r += rxvt_composite.expand (*s, r); 1247 r += rxvt_composite.expand (*s, r);
1020 else 1248 else
1021 *r++ = *s; 1249 *r++ = *s;
1022 1250
1023 RETVAL = wcs2sv (rstr, r - rstr); 1251 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1024 1252
1025 delete [] rstr; 1253 delete [] rstr;
1026} 1254}
1027 OUTPUT: 1255 OUTPUT:
1028 RETVAL 1256 RETVAL
… …
1050 1278
1051 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1279 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1052 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1280 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1053 1281
1054 if (GIMME_V != G_VOID) 1282 if (GIMME_V != G_VOID)
1055 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1283 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1056 1284
1057 if (newval) 1285 if (newval)
1058 { 1286 {
1059 if (SvOK (newval)) 1287 if (SvOK (newval))
1060 { 1288 {
… …
1065 else 1293 else
1066 THIS->rs [index] = 0; 1294 THIS->rs [index] = 0;
1067 } 1295 }
1068} 1296}
1069 1297
1298const char *
1299rxvt_term::x_resource (const char *name)
1300 CLEANUP:
1301 SvTAINTED_on (ST (0));
1302
1303bool
1304rxvt_term::option (U32 optval, int set = -1)
1305 CODE:
1306{
1307 RETVAL = THIS->options & optval;
1308
1309 if (set >= 0)
1310 {
1311 if (set)
1312 THIS->options |= optval;
1313 else
1314 THIS->options &= ~optval;
1315
1316 switch (optval)
1317 {
1318 case Opt_skipBuiltinGlyphs:
1319 THIS->set_fonts ();
1320 THIS->scr_remap_chars ();
1321 THIS->scr_touch (true);
1322 THIS->want_refresh = 1;
1323 break;
1324
1325 case Opt_cursorUnderline:
1326 THIS->want_refresh = 1;
1327 break;
1328
1329# case Opt_scrollBar_floating:
1330# case Opt_scrollBar_right:
1331# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1332# break;
1333 }
1334 }
1335}
1336 OUTPUT:
1337 RETVAL
1338
1339bool
1340rxvt_term::parse_keysym (char *keysym, char *str)
1341 CODE:
1342 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1343 THIS->keyboard->register_done ();
1344 OUTPUT:
1345 RETVAL
1346
1070void 1347void
1071rxvt_term::cur (...) 1348rxvt_term::screen_cur (...)
1072 PROTOTYPE: $;$$ 1349 PROTOTYPE: $;$$
1073 ALIAS: 1350 ALIAS:
1074 screen_cur = 0 1351 screen_cur = 0
1075 selection_beg = 1 1352 selection_beg = 1
1076 selection_end = 2 1353 selection_end = 2
… …
1097 if (ix) 1374 if (ix)
1098 THIS->want_refresh = 1; 1375 THIS->want_refresh = 1;
1099 } 1376 }
1100} 1377}
1101 1378
1379char
1380rxvt_term::cur_charset ()
1381 CODE:
1382 RETVAL = THIS->charsets [THIS->screen.charset];
1383 OUTPUT:
1384 RETVAL
1385
1386#void
1387#rxvt_term::selection_clear ()
1388
1389void
1390rxvt_term::selection_make (U32 eventtime, bool rect = false)
1391 CODE:
1392 THIS->selection.op = SELECTION_CONT;
1393 THIS->selection.rect = rect;
1394 THIS->selection_make (eventtime);
1395
1102int 1396int
1103rxvt_term::selection_grab (int eventtime = CurrentTime) 1397rxvt_term::selection_grab (U32 eventtime)
1104 1398
1105void 1399void
1106rxvt_term::selection (SV *newtext = 0) 1400rxvt_term::selection (SV *newtext = 0)
1107 PPCODE: 1401 PPCODE:
1108{ 1402{
1109 if (GIMME_V != G_VOID) 1403 if (GIMME_V != G_VOID)
1404 XPUSHs (THIS->selection.text
1110 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1405 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1406 : &PL_sv_undef);
1111 1407
1112 if (newtext) 1408 if (newtext)
1113 { 1409 {
1114 free (THIS->selection.text); 1410 free (THIS->selection.text);
1115 1411
1116 THIS->selection.text = sv2wcs (newtext); 1412 THIS->selection.text = sv2wcs (newtext);
1117 THIS->selection.len = wcslen (THIS->selection.text); 1413 THIS->selection.len = wcslen (THIS->selection.text);
1118 } 1414 }
1119} 1415}
1416
1417void
1418rxvt_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)
1419
1420void
1421rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1422
1423void
1424rxvt_term::scr_bell ()
1120 1425
1121void 1426void
1122rxvt_term::scr_add_lines (SV *string) 1427rxvt_term::scr_add_lines (SV *string)
1123 CODE: 1428 CODE:
1124{ 1429{
… …
1146 char *old_cmdbuf_endp = THIS->cmdbuf_endp; 1451 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1147 1452
1148 THIS->cmdbuf_ptr = str; 1453 THIS->cmdbuf_ptr = str;
1149 THIS->cmdbuf_endp = str + len; 1454 THIS->cmdbuf_endp = str + len;
1150 1455
1456 rxvt_push_locale (THIS->locale);
1151 THIS->cmd_parse (); 1457 THIS->cmd_parse ();
1458 rxvt_pop_locale ();
1152 1459
1153 THIS->cmdbuf_ptr = old_cmdbuf_ptr; 1460 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1154 THIS->cmdbuf_endp = old_cmdbuf_endp; 1461 THIS->cmdbuf_endp = old_cmdbuf_endp;
1155} 1462}
1156 1463

Diff Legend

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