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.32 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.57 by root, Thu Jan 12 01:30:53 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
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, ...)
415 if (!perl) 456 if (!perl)
416 return false; 457 return false;
417 458
418 if (htype == HOOK_INIT) // first hook ever called 459 if (htype == HOOK_INIT) // first hook ever called
419 { 460 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 461 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 462 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 463 }
423 else if (!term->self) 464 else if (!term->perl.self)
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->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 (!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 }
540 break;
490 541
491 case DT_XEVENT: 542 case DT_XEVENT:
492 { 543 {
493 XEvent *xe = va_arg (ap, XEvent *); 544 XEvent *xe = va_arg (ap, XEvent *);
494 HV *hv = newHV (); 545 HV *hv = newHV ();
495 546
496# 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)
497# 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)
498# undef set 549# undef set
499 550
500 setiv (type, xe->type); 551 setiv (type, xe->type);
501 setiv (send_event, xe->xany.send_event); 552 setiv (send_event, xe->xany.send_event);
502 setiv (serial, xe->xany.serial); 553 setiv (serial, xe->xany.serial);
503 554
504 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:
505 { 595 {
506 case KeyPress: 596 va_end (ap);
507 case KeyRelease: 597
508 case ButtonPress: 598 PUTBACK;
509 case ButtonRelease: 599 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
510 case MotionNotify: 600 SPAGAIN;
511 setiv (time, xe->xmotion.time); 601
512 setiv (x, xe->xmotion.x); 602 if (count)
513 setiv (y, xe->xmotion.y);
514 setiv (row, xe->xmotion.y / term->fheight);
515 setiv (col, xe->xmotion.x / term->fwidth);
516 setiv (x_root, xe->xmotion.x_root);
517 setiv (y_root, xe->xmotion.y_root);
518 setiv (state, xe->xmotion.state);
519 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;
520 } 626 }
521 627
522 switch (xe->type)
523 {
524 case KeyPress:
525 case KeyRelease:
526 setiv (keycode, xe->xkey.keycode);
527 break;
528
529 case ButtonPress:
530 case ButtonRelease:
531 setiv (button, xe->xbutton.button);
532 break;
533
534 case MotionNotify:
535 setiv (is_hint, xe->xmotion.is_hint);
536 break;
537 }
538
539 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
540 }
541 break;
542
543 case DT_END:
544 {
545 va_end (ap);
546
547 PUTBACK;
548 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
549 SPAGAIN;
550
551 if (count)
552 {
553 SV *status = POPs;
554 count = SvTRUE (status);
555 }
556
557 PUTBACK;
558 FREETMPS;
559 LEAVE;
560
561 if (SvTRUE (ERRSV))
562 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
563
564 if (htype == HOOK_DESTROY)
565 {
566 clearSVptr ((SV *)term->self);
567 SvREFCNT_dec ((SV *)term->self);
568 }
569
570 return count;
571 }
572
573 default: 628 default:
574 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 }
575 } 631 }
576 } 632 }
633 catch (...)
634 {
635 swap (perl_environ, environ);
636 throw;
637 }
577} 638}
578 639
579///////////////////////////////////////////////////////////////////////////// 640/////////////////////////////////////////////////////////////////////////////
580 641
581MODULE = urxvt PACKAGE = urxvt 642MODULE = urxvt PACKAGE = urxvt
582 643
583PROTOTYPES: ENABLE 644PROTOTYPES: ENABLE
584 645
585BOOT: 646BOOT:
586{ 647{
587# 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
588 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 653 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
589# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 654# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
590# include "hookinc.h" 655# include "hookinc.h"
591# undef def 656# undef def
592 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# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
593 export_const (DEFAULT_RSTYLE); 667 export_const_iv (DEFAULT_RSTYLE);
594 export_const (OVERLAY_RSTYLE); 668 export_const_iv (OVERLAY_RSTYLE);
595 export_const (RS_Bold); 669 export_const_iv (RS_Bold);
596 export_const (RS_Italic); 670 export_const_iv (RS_Italic);
597 export_const (RS_Blink); 671 export_const_iv (RS_Blink);
598 export_const (RS_RVid); 672 export_const_iv (RS_RVid);
599 export_const (RS_Uline); 673 export_const_iv (RS_Uline);
600 674
601 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 675 export_const_iv (CurrentTime);
676 export_const_iv (ShiftMask);
677 export_const_iv (LockMask);
678 export_const_iv (ControlMask);
679 export_const_iv (Mod1Mask);
680 export_const_iv (Mod2Mask);
681 export_const_iv (Mod3Mask);
682 export_const_iv (Mod4Mask);
683 export_const_iv (Mod5Mask);
684 export_const_iv (Button1Mask);
685 export_const_iv (Button2Mask);
686 export_const_iv (Button3Mask);
687 export_const_iv (Button4Mask);
688 export_const_iv (Button5Mask);
689 export_const_iv (AnyModifier);
690
691 export_const_iv (EVENT_NONE);
692 export_const_iv (EVENT_READ);
693 export_const_iv (EVENT_WRITE);
602} 694}
695
696void
697set_should_invoke (int htype, int value)
698 CODE:
699 rxvt_perl.should_invoke [htype] = value;
700
701void
702warn (const char *msg)
703 CODE:
704 rxvt_warn ("%s", msg);
705
706void
707fatal (const char *msg)
708 CODE:
709 rxvt_fatal ("%s", msg);
603 710
604SV * 711SV *
605new (...) 712untaint (SV *sv)
606 CODE: 713 CODE:
607{ 714 RETVAL = newSVsv (sv);
608 stringvec *argv = new stringvec; 715 SvTAINTED_off (RETVAL);
609 bool success; 716 OUTPUT:
610
611 for (int i = 0; i < items ;i++)
612 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
613
614 rxvt_term *term = new rxvt_term;
615
616 term->argv = argv;
617
618 try
619 {
620 if (!term->init (argv->size (), argv->begin ()))
621 term = 0;
622 }
623 catch (const class rxvt_failure_exception &e)
624 {
625 term->destroy ();
626 croak ("exception caught while initializing new terminal instance");
627 }
628
629 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef;
630}
631 OUTPUT:
632 RETVAL 717 RETVAL
633 718
634void 719bool
635set_should_invoke (int htype, int value) 720safe ()
636 CODE: 721 CODE:
637 rxvt_perl.should_invoke [htype] = value; 722 RETVAL = !rxvt_tainted ();
638 723 OUTPUT:
639void 724 RETVAL
640warn (const char *msg)
641 CODE:
642 rxvt_warn ("%s", msg);
643
644void
645fatal (const char *msg)
646 CODE:
647 rxvt_fatal ("%s", msg);
648 725
649NV 726NV
650NOW () 727NOW ()
651 CODE: 728 CODE:
652 RETVAL = NOW; 729 RETVAL = NOW;
701 OUTPUT: 778 OUTPUT:
702 RETVAL 779 RETVAL
703 780
704MODULE = urxvt PACKAGE = urxvt::term 781MODULE = urxvt PACKAGE = urxvt::term
705 782
783SV *
784_new (...)
785 CODE:
786{
787 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
788 croak ("first argument to urxvt::term->_new must be arrayref");
789
790 rxvt_term *term = new rxvt_term;
791
792 term->argv = new stringvec;
793 term->envv = new stringvec;
794
795 for (int i = 1; i < items; i++)
796 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
797
798 AV *envv = (AV *)SvRV (ST (0));
799 for (int i = av_len (envv) + 1; i--; )
800 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
801
802 term->envv->push_back (0);
803
804 bool success;
805
806 try
807 {
808 success = term->init (term->argv->size (), term->argv->begin ());
809 }
810 catch (const class rxvt_failure_exception &e)
811 {
812 success = false;
813 }
814
815 if (!success)
816 {
817 term->destroy ();
818 croak ("error while initializing new terminal instance");
819 }
820
821 RETVAL = term && term->perl.self
822 ? newSVterm (term) : &PL_sv_undef;
823}
824 OUTPUT:
825 RETVAL
826
706void 827void
707rxvt_term::destroy () 828rxvt_term::destroy ()
829
830void
831rxvt_term::grab_button (int button, U32 modifiers)
832 CODE:
833 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
834 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
835 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
836
837bool
838rxvt_term::grab (U32 eventtime, int sync = 0)
839 CODE:
840{
841 int mode = sync ? GrabModeSync : GrabModeAsync;
842
843 THIS->perl.grabtime = 0;
844
845 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
846 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
847 mode, mode, None, GRAB_CURSOR, eventtime))
848 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
849 THIS->perl.grabtime = eventtime;
850 else
851 XUngrabPointer (THIS->display->display, eventtime);
852
853 RETVAL = !!THIS->perl.grabtime;
854}
855 OUTPUT:
856 RETVAL
857
858void
859rxvt_term::allow_events_async ()
860 CODE:
861 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
862
863void
864rxvt_term::allow_events_sync ()
865 CODE:
866 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
867
868void
869rxvt_term::allow_events_replay ()
870 CODE:
871 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
872 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
873
874void
875rxvt_term::ungrab ()
876 CODE:
877 ungrab (THIS);
708 878
709int 879int
710rxvt_term::strwidth (SV *str) 880rxvt_term::strwidth (SV *str)
711 CODE: 881 CODE:
712{ 882{
731 char *mbstr = rxvt_wcstombs (wstr); 901 char *mbstr = rxvt_wcstombs (wstr);
732 rxvt_pop_locale (); 902 rxvt_pop_locale ();
733 903
734 free (wstr); 904 free (wstr);
735 905
736 RETVAL = newSVpv (mbstr, 0); 906 RETVAL = taint_if (newSVpv (mbstr, 0), str);
737 free (mbstr); 907 free (mbstr);
738} 908}
739 OUTPUT: 909 OUTPUT:
740 RETVAL 910 RETVAL
741 911
748 918
749 rxvt_push_locale (THIS->locale); 919 rxvt_push_locale (THIS->locale);
750 wchar_t *wstr = rxvt_mbstowcs (data, len); 920 wchar_t *wstr = rxvt_mbstowcs (data, len);
751 rxvt_pop_locale (); 921 rxvt_pop_locale ();
752 922
753 RETVAL = wcs2sv (wstr); 923 RETVAL = taint_if (wcs2sv (wstr), octets);
754 free (wstr); 924 free (wstr);
755} 925}
756 OUTPUT: 926 OUTPUT:
757 RETVAL 927 RETVAL
758 928
759# very portable, especially on objects as opposed to pods 929#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
760#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
761 930
762#define TERM_OFFSET_width TERM_OFFSET(width) 931#define TERM_OFFSET_width TERM_OFFSET(width)
763#define TERM_OFFSET_height TERM_OFFSET(height) 932#define TERM_OFFSET_height TERM_OFFSET(height)
764#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 933#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
765#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 934#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
790 CODE: 959 CODE:
791 RETVAL = *(int *)((char *)THIS + ix); 960 RETVAL = *(int *)((char *)THIS + ix);
792 OUTPUT: 961 OUTPUT:
793 RETVAL 962 RETVAL
794 963
964unsigned int
965rxvt_term::ModLevel3Mask ()
966 ALIAS:
967 ModLevel3Mask = 0
968 ModMetaMask = 1
969 ModNumLockMask = 2
970 CODE:
971 switch (ix)
972 {
973 case 0: RETVAL = THIS->ModLevel3Mask; break;
974 case 1: RETVAL = THIS->ModMetaMask; break;
975 case 2: RETVAL = THIS->ModNumLockMask; break;
976 }
977 OUTPUT:
978 RETVAL
979
980char *
981rxvt_term::display_id ()
982 ALIAS:
983 display_id = 0
984 locale = 1
985 CODE:
986 switch (ix)
987 {
988 case 0: RETVAL = THIS->display->id; break;
989 case 1: RETVAL = THIS->locale; break;
990 }
991 OUTPUT:
992 RETVAL
993
994SV *
995rxvt_term::_env ()
996 CODE:
997{
998 if (THIS->envv)
999 {
1000 AV *av = newAV ();
1001
1002 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1003 if (*i)
1004 av_push (av, newSVpv (*i, 0));
1005
1006 RETVAL = newRV_noinc ((SV *)av);
1007 }
1008 else
1009 RETVAL = &PL_sv_undef;
1010}
1011 OUTPUT:
1012 RETVAL
1013
1014int
1015rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1016 CODE:
1017 RETVAL = THIS->pty_ev.events;
1018 if (events != EVENT_UNDEF)
1019 THIS->pty_ev.set (events);
1020 OUTPUT:
1021 RETVAL
1022
795U32 1023U32
796rxvt_term::parent () 1024rxvt_term::parent ()
797 CODE: 1025 CODE:
798 RETVAL = (U32)THIS->parent [0]; 1026 RETVAL = (U32)THIS->parent [0];
799 OUTPUT: 1027 OUTPUT:
847 1075
848 if (GIMME_V != G_VOID) 1076 if (GIMME_V != G_VOID)
849 { 1077 {
850 wchar_t *wstr = new wchar_t [THIS->ncol]; 1078 wchar_t *wstr = new wchar_t [THIS->ncol];
851 1079
852 for (int col = 0; col <THIS->ncol; col++) 1080 for (int col = 0; col < THIS->ncol; col++)
853 wstr [col] = l.t [col]; 1081 wstr [col] = l.t [col];
854 1082
855 XPUSHs (sv_2mortal (wcs2sv (wstr))); 1083 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
856 1084
857 delete [] wstr; 1085 delete [] wstr;
858 } 1086 }
859 1087
860 if (new_text) 1088 if (new_text)
950} 1178}
951 OUTPUT: 1179 OUTPUT:
952 RETVAL 1180 RETVAL
953 1181
954SV * 1182SV *
955rxvt_term::special_encode (SV *str) 1183rxvt_term::special_encode (SV *string)
956 CODE: 1184 CODE:
957 abort ();//TODO 1185{
1186 wchar_t *wstr = sv2wcs (string);
1187 int wlen = wcslen (wstr);
1188 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1189
1190 rxvt_push_locale (THIS->locale);
1191
1192 wchar_t *r = rstr;
1193 for (wchar_t *s = wstr; *s; s++)
1194 if (wcwidth (*s) == 0)
1195 {
1196 if (r == rstr)
1197 croak ("leading combining character unencodable");
1198
1199 unicode_t n = rxvt_compose (r[-1], *s);
1200 if (n == NOCHAR)
1201 n = rxvt_composite.compose (r[-1], *s);
1202
1203 r[-1] = n;
1204 }
1205#if !UNICODE_3
1206 else if (*s >= 0x10000)
1207 *r++ = rxvt_composite.compose (*s);
1208#endif
1209 else
1210 *r++ = *s;
1211
1212 rxvt_pop_locale ();
1213
1214 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1215
1216 delete [] rstr;
1217}
1218 OUTPUT:
1219 RETVAL
958 1220
959SV * 1221SV *
960rxvt_term::special_decode (SV *str) 1222rxvt_term::special_decode (SV *text)
961 CODE: 1223 CODE:
962 abort ();//TODO 1224{
1225 wchar_t *wstr = sv2wcs (text);
1226 int wlen = wcslen (wstr);
1227 int dlen = 0;
1228
1229 // find length
1230 for (wchar_t *s = wstr; *s; s++)
1231 if (*s == NOCHAR)
1232 ;
1233 else if (IS_COMPOSE (*s))
1234 dlen += rxvt_composite.expand (*s, 0);
1235 else
1236 dlen++;
1237
1238 wchar_t *rstr = new wchar_t [dlen];
1239
1240 // decode
1241 wchar_t *r = rstr;
1242 for (wchar_t *s = wstr; *s; s++)
1243 if (*s == NOCHAR)
1244 ;
1245 else if (IS_COMPOSE (*s))
1246 r += rxvt_composite.expand (*s, r);
1247 else
1248 *r++ = *s;
1249
1250 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1251
1252 delete [] rstr;
1253}
1254 OUTPUT:
1255 RETVAL
963 1256
964void 1257void
965rxvt_term::_resource (char *name, int index, SV *newval = 0) 1258rxvt_term::_resource (char *name, int index, SV *newval = 0)
966 PPCODE: 1259 PPCODE:
967{ 1260{
984 1277
985 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1278 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
986 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1279 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
987 1280
988 if (GIMME_V != G_VOID) 1281 if (GIMME_V != G_VOID)
989 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1282 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
990 1283
991 if (newval) 1284 if (newval)
992 { 1285 {
993 if (SvOK (newval)) 1286 if (SvOK (newval))
994 { 1287 {
999 else 1292 else
1000 THIS->rs [index] = 0; 1293 THIS->rs [index] = 0;
1001 } 1294 }
1002} 1295}
1003 1296
1297const char *
1298rxvt_term::x_resource (const char *name)
1299 CLEANUP:
1300 SvTAINTED_on (ST (0));
1301
1302bool
1303rxvt_term::option (U32 optval, int set = -1)
1304 CODE:
1305{
1306 RETVAL = THIS->options & optval;
1307
1308 if (set >= 0)
1309 {
1310 if (set)
1311 THIS->options |= optval;
1312 else
1313 THIS->options &= ~optval;
1314
1315 switch (optval)
1316 {
1317 case Opt_skipBuiltinGlyphs:
1318 THIS->set_fonts ();
1319 THIS->scr_remap_chars ();
1320 THIS->scr_touch (true);
1321 THIS->want_refresh = 1;
1322 break;
1323
1324 case Opt_cursorUnderline:
1325 THIS->want_refresh = 1;
1326 break;
1327
1328# case Opt_scrollBar_floating:
1329# case Opt_scrollBar_right:
1330# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1331# break;
1332 }
1333 }
1334}
1335 OUTPUT:
1336 RETVAL
1337
1338bool
1339rxvt_term::parse_keysym (char *keysym, char *str)
1340 CODE:
1341 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1342 THIS->keyboard->register_done ();
1343 OUTPUT:
1344 RETVAL
1345
1004void 1346void
1005rxvt_term::cur (...) 1347rxvt_term::screen_cur (...)
1006 PROTOTYPE: $;$$ 1348 PROTOTYPE: $;$$
1007 ALIAS: 1349 ALIAS:
1008 screen_cur = 0 1350 screen_cur = 0
1009 selection_beg = 1 1351 selection_beg = 1
1010 selection_end = 2 1352 selection_end = 2
1031 if (ix) 1373 if (ix)
1032 THIS->want_refresh = 1; 1374 THIS->want_refresh = 1;
1033 } 1375 }
1034} 1376}
1035 1377
1378char
1379rxvt_term::cur_charset ()
1380 CODE:
1381 RETVAL = THIS->charsets [THIS->screen.charset];
1382 OUTPUT:
1383 RETVAL
1384
1036int 1385int
1037rxvt_term::selection_grab (int eventtime = CurrentTime) 1386rxvt_term::selection_grab (U32 eventtime)
1038 1387
1039void 1388void
1040rxvt_term::selection (SV *newtext = 0) 1389rxvt_term::selection (SV *newtext = 0)
1041 PPCODE: 1390 PPCODE:
1042{ 1391{
1043 if (GIMME_V != G_VOID) 1392 if (GIMME_V != G_VOID)
1393 XPUSHs (THIS->selection.text
1044 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1394 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1395 : &PL_sv_undef);
1045 1396
1046 if (newtext) 1397 if (newtext)
1047 { 1398 {
1048 free (THIS->selection.text); 1399 free (THIS->selection.text);
1049 1400
1050 THIS->selection.text = sv2wcs (newtext); 1401 THIS->selection.text = sv2wcs (newtext);
1051 THIS->selection.len = wcslen (THIS->selection.text); 1402 THIS->selection.len = wcslen (THIS->selection.text);
1052 } 1403 }
1053} 1404}
1405
1406void
1407rxvt_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)
1408
1409void
1410rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1411
1412void
1413rxvt_term::scr_bell ()
1054 1414
1055void 1415void
1056rxvt_term::scr_add_lines (SV *string) 1416rxvt_term::scr_add_lines (SV *string)
1057 CODE: 1417 CODE:
1058{ 1418{
1080 char *old_cmdbuf_endp = THIS->cmdbuf_endp; 1440 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1081 1441
1082 THIS->cmdbuf_ptr = str; 1442 THIS->cmdbuf_ptr = str;
1083 THIS->cmdbuf_endp = str + len; 1443 THIS->cmdbuf_endp = str + len;
1084 1444
1445 rxvt_push_locale (THIS->locale);
1085 THIS->cmd_parse (); 1446 THIS->cmd_parse ();
1447 rxvt_pop_locale ();
1086 1448
1087 THIS->cmdbuf_ptr = old_cmdbuf_ptr; 1449 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1088 THIS->cmdbuf_endp = old_cmdbuf_endp; 1450 THIS->cmdbuf_endp = old_cmdbuf_endp;
1089} 1451}
1090 1452

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines