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.41 by root, Sun Jan 8 03:07:05 2006 UTC vs.
Revision 1.68 by root, Mon Jan 16 08:48:09 2006 UTC

29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h"
35
36#include "iom.h"
34#include "rxvt.h" 37#include "rxvt.h"
35#include "iom.h" 38#include "keyboard.h"
36#include "rxvtutil.h" 39#include "rxvtutil.h"
37#include "rxvtperl.h" 40#include "rxvtperl.h"
38 41
39#include "perlxsi.c" 42#include "perlxsi.c"
40 43
47#undef LINENO 50#undef LINENO
48#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)
49#undef ROW 52#undef ROW
50#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
51 54
55#define ENABLE_PERL_FRILLS 1
56
52///////////////////////////////////////////////////////////////////////////// 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}
53 74
54static wchar_t * 75static wchar_t *
55sv2wcs (SV *sv) 76sv2wcs (SV *sv)
56{ 77{
57 STRLEN len; 78 STRLEN len;
328 for (int y = ov_h; y--; ) 349 for (int y = ov_h; y--; )
329 { 350 {
330 text_t *t1 = text [y]; 351 text_t *t1 = text [y];
331 rend_t *r1 = rend [y]; 352 rend_t *r1 = rend [y];
332 353
333 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 354 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
334 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 355 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
335 356
336 for (int x = ov_w; x--; ) 357 for (int x = ov_w; x--; )
337 { 358 {
338 text_t t = *t1; *t1++ = *t2; *t2++ = t; 359 text_t t = *t1; *t1++ = *t2; *t2++ = t;
339 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 360 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
376 397
377struct rxvt_perl_interp rxvt_perl; 398struct rxvt_perl_interp rxvt_perl;
378 399
379static PerlInterpreter *perl; 400static PerlInterpreter *perl;
380 401
381rxvt_perl_interp::rxvt_perl_interp ()
382{
383}
384
385rxvt_perl_interp::~rxvt_perl_interp () 402rxvt_perl_interp::~rxvt_perl_interp ()
386{ 403{
387 if (perl) 404 if (perl)
388 { 405 {
389 perl_destruct (perl); 406 perl_destruct (perl);
390 perl_free (perl); 407 perl_free (perl);
391 } 408 }
392} 409}
393 410
394void 411void
395rxvt_perl_interp::init () 412rxvt_perl_interp::init (rxvt_term *term)
396{ 413{
397 if (!perl) 414 if (!perl)
398 { 415 {
416 rxvt_push_locale (""); // perl init destroys current locale
417
418 perl_environ = rxvt_environ;
419 swap (perl_environ, environ);
420
399 char *argv[] = { 421 char *argv[] = {
400 "", 422 "",
423 "-T",
401 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 424 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
402 }; 425 };
403 426
404 perl = perl_alloc (); 427 perl = perl_alloc ();
405 perl_construct (perl); 428 perl_construct (perl);
406 429
407 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 430 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
408 || perl_run (perl)) 431 || perl_run (perl))
409 { 432 {
410 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 433 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
411 434
412 perl_destruct (perl); 435 perl_destruct (perl);
413 perl_free (perl); 436 perl_free (perl);
414 perl = 0; 437 perl = 0;
415 } 438 }
439
440 swap (perl_environ, environ);
441
442 rxvt_pop_locale ();
443 }
444
445 // runs outside of perls ENV
446 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
447 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
448}
449
450static void
451ungrab (rxvt_term *THIS)
452{
453 if (THIS->perl.grabtime)
454 {
455 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
456 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
457 THIS->perl.grabtime = 0;
458 }
459}
460
461static void
462swap_overlays (rxvt_term *term)
463{
464 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
465
466 if (HvKEYS (hv))
467 {
468 hv_iterinit (hv);
469
470 while (HE *he = hv_iternext (hv))
471 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
416 } 472 }
417} 473}
418 474
419bool 475bool
420rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 476rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
421{ 477{
422 if (!perl) 478 if (!perl || !term->perl.self)
423 return false; 479 return false;
424 480
425 if (htype == HOOK_INIT) // first hook ever called 481 // pre-handling of some events
426 { 482 if (htype == HOOK_REFRESH_END)
427 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 483 swap_overlays (term);
428 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
429 }
430 else if (!term->perl.self)
431 return false; // perl not initialized for this instance
432 else if (htype == HOOK_DESTROY)
433 {
434 // handled later
435 }
436 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
437 {
438 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
439 484
440 if (HvKEYS (hv)) 485 swap (perl_environ, environ);
441 {
442 hv_iterinit (hv);
443 486
444 while (HE *he = hv_iternext (hv)) 487 bool event_consumed;
445 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
446 }
447 }
448 else if (!should_invoke [htype])
449 return false;
450 488
451 dSP; 489 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
452 va_list ap; 490 || term->perl.should_invoke [htype])
453 491 try
454 va_start (ap, htype);
455
456 ENTER;
457 SAVETMPS;
458
459 PUSHMARK (SP);
460
461 XPUSHs (sv_2mortal (newSVterm (term)));
462 XPUSHs (sv_2mortal (newSViv (htype)));
463
464 for (;;) {
465 data_type dt = (data_type)va_arg (ap, int);
466
467 switch (dt)
468 { 492 {
493 dSP;
494 va_list ap;
495
496 va_start (ap, htype);
497
498 ENTER;
499 SAVETMPS;
500
501 PUSHMARK (SP);
502
503 XPUSHs (sv_2mortal (newSVterm (term)));
504 XPUSHs (sv_2mortal (newSViv (htype)));
505
506 for (;;) {
507 data_type dt = (data_type)va_arg (ap, int);
508
509 switch (dt)
510 {
469 case DT_INT: 511 case DT_INT:
470 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 512 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
471 break; 513 break;
472 514
473 case DT_LONG: 515 case DT_LONG:
474 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 516 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
475 break; 517 break;
476 518
477 case DT_STR: 519 case DT_STR:
478 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 520 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
479 break; 521 break;
480 522
481 case DT_STR_LEN: 523 case DT_STR_LEN:
482 { 524 {
483 char *str = va_arg (ap, char *); 525 char *str = va_arg (ap, char *);
484 int len = va_arg (ap, int); 526 int len = va_arg (ap, int);
485 527
486 XPUSHs (sv_2mortal (newSVpvn (str, len))); 528 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
487 } 529 }
488 break; 530 break;
489 531
490 case DT_WCS_LEN: 532 case DT_WCS_LEN:
491 { 533 {
492 wchar_t *wstr = va_arg (ap, wchar_t *); 534 wchar_t *wstr = va_arg (ap, wchar_t *);
493 int wlen = va_arg (ap, int); 535 int wlen = va_arg (ap, int);
494 536
495 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 537 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
496 } 538 }
497 break; 539 break;
498 540
499 case DT_XEVENT: 541 case DT_XEVENT:
500 { 542 {
501 XEvent *xe = va_arg (ap, XEvent *); 543 XEvent *xe = va_arg (ap, XEvent *);
502 HV *hv = newHV (); 544 HV *hv = newHV ();
503 545
504# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 546# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
505# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 547# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
506# undef set 548# undef set
507 549
508 setiv (type, xe->type); 550 setiv (type, xe->type);
509 setiv (send_event, xe->xany.send_event); 551 setiv (send_event, xe->xany.send_event);
510 setiv (serial, xe->xany.serial); 552 setiv (serial, xe->xany.serial);
511 553
512 switch (xe->type) 554 switch (xe->type)
513 { 555 {
514 case KeyPress: 556 case KeyPress:
515 case KeyRelease: 557 case KeyRelease:
516 case ButtonPress: 558 case ButtonPress:
517 case ButtonRelease: 559 case ButtonRelease:
518 case MotionNotify: 560 case MotionNotify:
519 setiv (time, xe->xmotion.time); 561 setiv (time, xe->xmotion.time);
520 setiv (x, xe->xmotion.x); 562 setiv (x, xe->xmotion.x);
521 setiv (y, xe->xmotion.y); 563 setiv (y, xe->xmotion.y);
522 setiv (row, xe->xmotion.y / term->fheight); 564 setiv (row, xe->xmotion.y / term->fheight);
523 setiv (col, xe->xmotion.x / term->fwidth); 565 setiv (col, xe->xmotion.x / term->fwidth);
524 setiv (x_root, xe->xmotion.x_root); 566 setiv (x_root, xe->xmotion.x_root);
525 setiv (y_root, xe->xmotion.y_root); 567 setiv (y_root, xe->xmotion.y_root);
526 setiv (state, xe->xmotion.state); 568 setiv (state, xe->xmotion.state);
569 break;
570 }
571
572 switch (xe->type)
573 {
574 case KeyPress:
575 case KeyRelease:
576 setiv (keycode, xe->xkey.keycode);
577 break;
578
579 case ButtonPress:
580 case ButtonRelease:
581 setiv (button, xe->xbutton.button);
582 break;
583
584 case MotionNotify:
585 setiv (is_hint, xe->xmotion.is_hint);
586 break;
587 }
588
589 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
590 }
527 break; 591 break;
592
593 case DT_END:
594 goto call;
595
596 default:
597 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
528 } 598 }
529
530 switch (xe->type)
531 {
532 case KeyPress:
533 case KeyRelease:
534 setiv (keycode, xe->xkey.keycode);
535 break;
536
537 case ButtonPress:
538 case ButtonRelease:
539 setiv (button, xe->xbutton.button);
540 break;
541
542 case MotionNotify:
543 setiv (is_hint, xe->xmotion.is_hint);
544 break;
545 }
546
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
548 } 599 }
549 break;
550 600
551 case DT_END: 601 call:
552 {
553 va_end (ap); 602 va_end (ap);
554 603
555 PUTBACK; 604 PUTBACK;
556 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL); 605 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
557 SPAGAIN; 606 SPAGAIN;
558 607
559 if (count) 608 if (count)
560 { 609 {
561 SV *status = POPs; 610 SV *status = POPs;
562 count = SvTRUE (status); 611 count = SvTRUE (status);
563 } 612 }
564 613
565 PUTBACK; 614 PUTBACK;
566 FREETMPS; 615 FREETMPS;
567 LEAVE; 616 LEAVE;
568 617
569 if (SvTRUE (ERRSV)) 618 if (SvTRUE (ERRSV))
619 {
570 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 620 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
571 621 ungrab (term); // better lose the grab than the session
572 if (htype == HOOK_DESTROY)
573 {
574 clearSVptr ((SV *)term->perl.self);
575 SvREFCNT_dec ((SV *)term->perl.self);
576 } 622 }
577 623
578 return count; 624 event_consumed = !!count;
579 }
580
581 default:
582 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
583 } 625 }
626 catch (...)
627 {
628 swap (perl_environ, environ);
629 throw;
630 }
631 else
632 event_consumed = false;
633
634 // post-handling of some events
635 if (htype == HOOK_REFRESH_BEGIN)
636 swap_overlays (term);
637 else if (htype == HOOK_DESTROY)
638 {
639 clearSVptr ((SV *)term->perl.self);
640 SvREFCNT_dec ((SV *)term->perl.self);
584 } 641 }
642
643 swap (perl_environ, environ);
644
645 return event_consumed;
585} 646}
586 647
587///////////////////////////////////////////////////////////////////////////// 648/////////////////////////////////////////////////////////////////////////////
588 649
589MODULE = urxvt PACKAGE = urxvt 650MODULE = urxvt PACKAGE = urxvt
590 651
591PROTOTYPES: ENABLE 652PROTOTYPES: ENABLE
592 653
593BOOT: 654BOOT:
594{ 655{
595 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1)); 656 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
657 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
658 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
659 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
596 660
597 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 661 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
598# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 662# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
599# include "hookinc.h" 663# include "hookinc.h"
600# undef def 664# undef def
605# include "optinc.h" 669# include "optinc.h"
606# undef nodef 670# undef nodef
607# undef def 671# undef def
608 672
609 HV *stash = gv_stashpv ("urxvt", 1); 673 HV *stash = gv_stashpv ("urxvt", 1);
610# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name)); 674 struct {
675 const char *name;
676 IV iv;
677 } *civ, const_iv[] = {
678# define const_iv(name) { # name, (IV)name }
611 export_const_iv (DEFAULT_RSTYLE); 679 const_iv (DEFAULT_RSTYLE),
612 export_const_iv (OVERLAY_RSTYLE); 680 const_iv (OVERLAY_RSTYLE),
613 export_const_iv (RS_Bold); 681 const_iv (RS_Bold),
614 export_const_iv (RS_Italic); 682 const_iv (RS_Italic),
615 export_const_iv (RS_Blink); 683 const_iv (RS_Blink),
616 export_const_iv (RS_RVid); 684 const_iv (RS_RVid),
617 export_const_iv (RS_Uline); 685 const_iv (RS_Uline),
618 686
619 export_const_iv (CurrentTime); 687 const_iv (CurrentTime),
620 export_const_iv (ShiftMask); 688 const_iv (ShiftMask),
621 export_const_iv (LockMask); 689 const_iv (LockMask),
622 export_const_iv (ControlMask); 690 const_iv (ControlMask),
623 export_const_iv (Mod1Mask); 691 const_iv (Mod1Mask),
624 export_const_iv (Mod2Mask); 692 const_iv (Mod2Mask),
625 export_const_iv (Mod3Mask); 693 const_iv (Mod3Mask),
626 export_const_iv (Mod4Mask); 694 const_iv (Mod4Mask),
627 export_const_iv (Mod5Mask); 695 const_iv (Mod5Mask),
628 export_const_iv (Button1Mask); 696 const_iv (Button1Mask),
629 export_const_iv (Button2Mask); 697 const_iv (Button2Mask),
630 export_const_iv (Button3Mask); 698 const_iv (Button3Mask),
631 export_const_iv (Button4Mask); 699 const_iv (Button4Mask),
632 export_const_iv (Button5Mask); 700 const_iv (Button5Mask),
633 export_const_iv (AnyModifier); 701 const_iv (AnyModifier),
702
703 const_iv (EVENT_NONE),
704 const_iv (EVENT_READ),
705 const_iv (EVENT_WRITE),
706
707 const_iv (NoEventMask),
708 const_iv (KeyPressMask),
709 const_iv (KeyReleaseMask),
710 const_iv (ButtonPressMask),
711 const_iv (ButtonReleaseMask),
712 const_iv (EnterWindowMask),
713 const_iv (LeaveWindowMask),
714 const_iv (PointerMotionMask),
715 const_iv (PointerMotionHintMask),
716 const_iv (Button1MotionMask),
717 const_iv (Button2MotionMask),
718 const_iv (Button3MotionMask),
719 const_iv (Button4MotionMask),
720 const_iv (Button5MotionMask),
721 const_iv (ButtonMotionMask),
722 const_iv (KeymapStateMask),
723 const_iv (ExposureMask),
724 const_iv (VisibilityChangeMask),
725 const_iv (StructureNotifyMask),
726 const_iv (ResizeRedirectMask),
727 const_iv (SubstructureNotifyMask),
728 const_iv (SubstructureRedirectMask),
729 const_iv (FocusChangeMask),
730 const_iv (PropertyChangeMask),
731 const_iv (ColormapChangeMask),
732 const_iv (OwnerGrabButtonMask),
733
734 const_iv (KeyPress),
735 const_iv (KeyRelease),
736 const_iv (ButtonPress),
737 const_iv (ButtonRelease),
738 const_iv (MotionNotify),
739 const_iv (EnterNotify),
740 const_iv (LeaveNotify),
741 const_iv (FocusIn),
742 const_iv (FocusOut),
743 const_iv (KeymapNotify),
744 const_iv (Expose),
745 const_iv (GraphicsExpose),
746 const_iv (NoExpose),
747 const_iv (VisibilityNotify),
748 const_iv (CreateNotify),
749 const_iv (DestroyNotify),
750 const_iv (UnmapNotify),
751 const_iv (MapNotify),
752 const_iv (MapRequest),
753 const_iv (ReparentNotify),
754 const_iv (ConfigureNotify),
755 const_iv (ConfigureRequest),
756 const_iv (GravityNotify),
757 const_iv (ResizeRequest),
758 const_iv (CirculateNotify),
759 const_iv (CirculateRequest),
760 const_iv (PropertyNotify),
761 const_iv (SelectionClear),
762 const_iv (SelectionRequest),
763 const_iv (SelectionNotify),
764 const_iv (ColormapNotify),
765 const_iv (ClientMessage),
766 const_iv (MappingNotify),
767 };
768
769 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
770 civ-- > const_iv; )
771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
634} 772}
773
774void
775warn (const char *msg)
776 CODE:
777 rxvt_warn ("%s", msg);
778
779void
780fatal (const char *msg)
781 CODE:
782 rxvt_fatal ("%s", msg);
635 783
636SV * 784SV *
637new (...) 785untaint (SV *sv)
638 CODE: 786 CODE:
639{ 787 RETVAL = newSVsv (sv);
640 stringvec *argv = new stringvec; 788 SvTAINTED_off (RETVAL);
641 bool success; 789 OUTPUT:
642
643 for (int i = 0; i < items ;i++)
644 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
645
646 rxvt_term *term = new rxvt_term;
647
648 term->argv = argv;
649
650 try
651 {
652 if (!term->init (argv->size (), argv->begin ()))
653 term = 0;
654 }
655 catch (const class rxvt_failure_exception &e)
656 {
657 term->destroy ();
658 croak ("exception caught while initializing new terminal instance");
659 }
660
661 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
662}
663 OUTPUT:
664 RETVAL 790 RETVAL
665 791
666void 792void
667set_should_invoke (int htype, int value) 793_exit (int status)
668 CODE:
669 rxvt_perl.should_invoke [htype] = value;
670 794
671void 795bool
672warn (const char *msg) 796safe ()
673 CODE: 797 CODE:
674 rxvt_warn ("%s", msg); 798 RETVAL = !rxvt_tainted ();
675 799 OUTPUT:
676void 800 RETVAL
677fatal (const char *msg)
678 CODE:
679 rxvt_fatal ("%s", msg);
680 801
681NV 802NV
682NOW () 803NOW ()
683 CODE: 804 CODE:
684 RETVAL = NOW; 805 RETVAL = NOW;
733 OUTPUT: 854 OUTPUT:
734 RETVAL 855 RETVAL
735 856
736MODULE = urxvt PACKAGE = urxvt::term 857MODULE = urxvt PACKAGE = urxvt::term
737 858
859SV *
860_new (...)
861 CODE:
862{
863 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
864 croak ("first argument to urxvt::term->_new must be arrayref");
865
866 rxvt_term *term = new rxvt_term;
867
868 term->argv = new stringvec;
869 term->envv = new stringvec;
870
871 for (int i = 1; i < items; i++)
872 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
873
874 AV *envv = (AV *)SvRV (ST (0));
875 for (int i = av_len (envv) + 1; i--; )
876 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
877
878 term->envv->push_back (0);
879
880 bool success;
881
882 try
883 {
884 success = term->init (term->argv->size (), term->argv->begin ());
885 }
886 catch (const class rxvt_failure_exception &e)
887 {
888 success = false;
889 }
890
891 if (!success)
892 {
893 term->destroy ();
894 croak ("error while initializing new terminal instance");
895 }
896
897 RETVAL = term && term->perl.self
898 ? newSVterm (term) : &PL_sv_undef;
899}
900 OUTPUT:
901 RETVAL
902
738void 903void
739rxvt_term::destroy () 904rxvt_term::destroy ()
905
906#if ENABLE_PERL_FRILLS
907
908void
909rxvt_term::XListProperties (U32 window)
910 PPCODE:
911{
912 int count;
913 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
914
915 EXTEND (SP, count);
916 while (count--)
917 PUSHs (newSVuv ((U32)props [count]));
918
919 XFree (props);
920}
921
922void
923rxvt_term::XGetWindowProperty (U32 window, U32 property)
924 PPCODE:
925{
926 Atom type;
927 int format;
928 unsigned long nitems;
929 unsigned long bytes_after;
930 unsigned char *prop;
931 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
932 0, 1<<30, 0, AnyPropertyType,
933 &type, &format, &nitems, &bytes_after, &prop);
934 if (type != None)
935 {
936 EXTEND (SP, 3);
937 PUSHs (newSVuv ((U32)type));
938 PUSHs (newSViv (format));
939 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
940 XFree (prop);
941 }
942}
943
944void
945rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
946 CODE:
947{
948 STRLEN len;
949 char *data_ = SvPVbyte (data, len);
950
951 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
952 type, format, PropModeReplace,
953 (unsigned char *)data, len * 8 / format);
954}
955
956void
957rxvt_term::XDeleteProperty (U32 window, U32 property)
958 CODE:
959 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
960
961U32
962rxvt_term::DefaultRootWindow ()
963 CODE:
964 RETVAL = (U32)THIS->display->root;
965 OUTPUT:
966 RETVAL
967
968U32
969rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
970 CODE:
971 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
972 x, y, width, height, 0,
973 THIS->pix_colors_focused[Color_border],
974 THIS->pix_colors_focused[Color_border]);
975 OUTPUT:
976 RETVAL
977
978void
979rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
980 CODE:
981 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
982
983void
984rxvt_term::XMapWindow (U32 window)
985 CODE:
986 XMapWindow (THIS->display->display, (Window)window);
987
988void
989rxvt_term::XUnmapWindow (U32 window)
990 CODE:
991 XUnmapWindow (THIS->display->display, (Window)window);
992
993#endif
994
995void
996rxvt_term::set_should_invoke (int htype, int inc)
997 CODE:
998 THIS->perl.should_invoke [htype] += inc;
740 999
741void 1000void
742rxvt_term::grab_button (int button, U32 modifiers) 1001rxvt_term::grab_button (int button, U32 modifiers)
743 CODE: 1002 CODE:
744 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1003 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
765} 1024}
766 OUTPUT: 1025 OUTPUT:
767 RETVAL 1026 RETVAL
768 1027
769void 1028void
770rxvt_term::allow_events_async (U32 eventtime = THIS->perl.grabtime) 1029rxvt_term::allow_events_async ()
771 CODE: 1030 CODE:
772 XAllowEvents (THIS->display->display, AsyncBoth, eventtime); 1031 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
773 1032
774void 1033void
775rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime) 1034rxvt_term::allow_events_sync ()
776 CODE: 1035 CODE:
777 XAllowEvents (THIS->display->display, SyncBoth, eventtime); 1036 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
778 1037
779void 1038void
780rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime) 1039rxvt_term::allow_events_replay ()
781 CODE: 1040 CODE:
782 XAllowEvents (THIS->display->display, ReplayPointer, eventtime); 1041 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
783 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime); 1042 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
784 1043
785void 1044void
786rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime) 1045rxvt_term::ungrab ()
787 CODE: 1046 CODE:
788 THIS->perl.grabtime = 0; 1047 ungrab (THIS);
789 XUngrabKeyboard (THIS->display->display, eventtime);
790 XUngrabPointer (THIS->display->display, eventtime);
791 1048
792int 1049int
793rxvt_term::strwidth (SV *str) 1050rxvt_term::strwidth (SV *str)
794 CODE: 1051 CODE:
795{ 1052{
814 char *mbstr = rxvt_wcstombs (wstr); 1071 char *mbstr = rxvt_wcstombs (wstr);
815 rxvt_pop_locale (); 1072 rxvt_pop_locale ();
816 1073
817 free (wstr); 1074 free (wstr);
818 1075
819 RETVAL = newSVpv (mbstr, 0); 1076 RETVAL = taint_if (newSVpv (mbstr, 0), str);
820 free (mbstr); 1077 free (mbstr);
821} 1078}
822 OUTPUT: 1079 OUTPUT:
823 RETVAL 1080 RETVAL
824 1081
831 1088
832 rxvt_push_locale (THIS->locale); 1089 rxvt_push_locale (THIS->locale);
833 wchar_t *wstr = rxvt_mbstowcs (data, len); 1090 wchar_t *wstr = rxvt_mbstowcs (data, len);
834 rxvt_pop_locale (); 1091 rxvt_pop_locale ();
835 1092
836 RETVAL = wcs2sv (wstr); 1093 RETVAL = taint_if (wcs2sv (wstr), octets);
837 free (wstr); 1094 free (wstr);
838} 1095}
839 OUTPUT: 1096 OUTPUT:
840 RETVAL 1097 RETVAL
841 1098
850#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1107#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
851#define TERM_OFFSET_focus TERM_OFFSET(focus) 1108#define TERM_OFFSET_focus TERM_OFFSET(focus)
852#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1109#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
853#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1110#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
854#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1111#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
855#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1112#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
856 1113
857int 1114int
858rxvt_term::width () 1115rxvt_term::width ()
859 ALIAS: 1116 ALIAS:
860 width = TERM_OFFSET_width 1117 width = TERM_OFFSET_width
866 ncol = TERM_OFFSET_ncol 1123 ncol = TERM_OFFSET_ncol
867 focus = TERM_OFFSET_focus 1124 focus = TERM_OFFSET_focus
868 mapped = TERM_OFFSET_mapped 1125 mapped = TERM_OFFSET_mapped
869 saveLines = TERM_OFFSET_saveLines 1126 saveLines = TERM_OFFSET_saveLines
870 total_rows = TERM_OFFSET_total_rows 1127 total_rows = TERM_OFFSET_total_rows
871 nsaved = TERM_OFFSET_nsaved 1128 top_row = TERM_OFFSET_top_row
872 CODE: 1129 CODE:
873 RETVAL = *(int *)((char *)THIS + ix); 1130 RETVAL = *(int *)((char *)THIS + ix);
874 OUTPUT: 1131 OUTPUT:
875 RETVAL 1132 RETVAL
876 1133
888 case 2: RETVAL = THIS->ModNumLockMask; break; 1145 case 2: RETVAL = THIS->ModNumLockMask; break;
889 } 1146 }
890 OUTPUT: 1147 OUTPUT:
891 RETVAL 1148 RETVAL
892 1149
1150char *
1151rxvt_term::display_id ()
1152 ALIAS:
1153 display_id = 0
1154 locale = 1
1155 CODE:
1156 switch (ix)
1157 {
1158 case 0: RETVAL = THIS->display->id; break;
1159 case 1: RETVAL = THIS->locale; break;
1160 }
1161 OUTPUT:
1162 RETVAL
1163
1164SV *
1165rxvt_term::_env ()
1166 CODE:
1167{
1168 if (THIS->envv)
1169 {
1170 AV *av = newAV ();
1171
1172 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
1173 if (*i)
1174 av_push (av, newSVpv (*i, 0));
1175
1176 RETVAL = newRV_noinc ((SV *)av);
1177 }
1178 else
1179 RETVAL = &PL_sv_undef;
1180}
1181 OUTPUT:
1182 RETVAL
1183
1184int
1185rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1186 CODE:
1187 RETVAL = THIS->pty_ev.events;
1188 if (events != EVENT_UNDEF)
1189 THIS->pty_ev.set (events);
1190 OUTPUT:
1191 RETVAL
1192
893U32 1193U32
894rxvt_term::parent () 1194rxvt_term::parent ()
895 CODE: 1195 CODE:
896 RETVAL = (U32)THIS->parent [0]; 1196 RETVAL = (U32)THIS->parent [0];
897 OUTPUT: 1197 OUTPUT:
902 CODE: 1202 CODE:
903 RETVAL = (U32)THIS->vt; 1203 RETVAL = (U32)THIS->vt;
904 OUTPUT: 1204 OUTPUT:
905 RETVAL 1205 RETVAL
906 1206
1207void
1208rxvt_term::vt_emask_add (U32 emask)
1209 CODE:
1210 THIS->vt_emask_perl |= emask;
1211 THIS->vt_select_input ();
1212
907U32 1213U32
908rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1214rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
909 CODE: 1215 CODE:
910{
911 RETVAL = THIS->rstyle; 1216 RETVAL = THIS->rstyle;
912 THIS->rstyle = new_rstyle; 1217 THIS->rstyle = new_rstyle;
913}
914 OUTPUT: 1218 OUTPUT:
915 RETVAL 1219 RETVAL
916 1220
917int 1221int
918rxvt_term::view_start (int newval = -1) 1222rxvt_term::view_start (int newval = 1)
1223 PROTOTYPE: $;$
919 CODE: 1224 CODE:
920{ 1225{
921 RETVAL = THIS->view_start; 1226 RETVAL = THIS->view_start;
922 1227
923 if (newval >= 0) 1228 if (newval <= 0)
924 { 1229 THIS->scr_changeview (max (newval, THIS->top_row));
925 THIS->view_start = min (newval, THIS->nsaved);
926 THIS->scr_changeview (RETVAL);
927 }
928} 1230}
929 OUTPUT: 1231 OUTPUT:
930 RETVAL 1232 RETVAL
931 1233
932void 1234void
936 1238
937void 1239void
938rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1240rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
939 PPCODE: 1241 PPCODE:
940{ 1242{
941 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1243 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
942 XSRETURN_EMPTY; 1244 XSRETURN_EMPTY;
943 1245
944 line_t &l = ROW(row_number); 1246 line_t &l = ROW(row_number);
945 1247
946 if (GIMME_V != G_VOID) 1248 if (GIMME_V != G_VOID)
948 wchar_t *wstr = new wchar_t [THIS->ncol]; 1250 wchar_t *wstr = new wchar_t [THIS->ncol];
949 1251
950 for (int col = 0; col < THIS->ncol; col++) 1252 for (int col = 0; col < THIS->ncol; col++)
951 wstr [col] = l.t [col]; 1253 wstr [col] = l.t [col];
952 1254
953 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1255 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
954 1256
955 delete [] wstr; 1257 delete [] wstr;
956 } 1258 }
957 1259
958 if (new_text) 1260 if (new_text)
979 1281
980void 1282void
981rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1283rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
982 PPCODE: 1284 PPCODE:
983{ 1285{
984 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1286 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
985 XSRETURN_EMPTY; 1287 XSRETURN_EMPTY;
986 1288
987 line_t &l = ROW(row_number); 1289 line_t &l = ROW(row_number);
988 1290
989 if (GIMME_V != G_VOID) 1291 if (GIMME_V != G_VOID)
1019 1321
1020int 1322int
1021rxvt_term::ROW_l (int row_number, int new_length = -1) 1323rxvt_term::ROW_l (int row_number, int new_length = -1)
1022 CODE: 1324 CODE:
1023{ 1325{
1024 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1326 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1025 XSRETURN_EMPTY; 1327 XSRETURN_EMPTY;
1026 1328
1027 line_t &l = ROW(row_number); 1329 line_t &l = ROW(row_number);
1028 RETVAL = l.l; 1330 RETVAL = l.l;
1029 1331
1035 1337
1036bool 1338bool
1037rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1339rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1038 CODE: 1340 CODE:
1039{ 1341{
1040 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1342 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1041 XSRETURN_EMPTY; 1343 XSRETURN_EMPTY;
1042 1344
1043 line_t &l = ROW(row_number); 1345 line_t &l = ROW(row_number);
1044 RETVAL = l.is_longer (); 1346 RETVAL = l.is_longer ();
1045 1347
1079 else 1381 else
1080 *r++ = *s; 1382 *r++ = *s;
1081 1383
1082 rxvt_pop_locale (); 1384 rxvt_pop_locale ();
1083 1385
1084 RETVAL = wcs2sv (rstr, r - rstr); 1386 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1085 1387
1086 delete [] rstr; 1388 delete [] rstr;
1087} 1389}
1088 OUTPUT: 1390 OUTPUT:
1089 RETVAL 1391 RETVAL
1115 else if (IS_COMPOSE (*s)) 1417 else if (IS_COMPOSE (*s))
1116 r += rxvt_composite.expand (*s, r); 1418 r += rxvt_composite.expand (*s, r);
1117 else 1419 else
1118 *r++ = *s; 1420 *r++ = *s;
1119 1421
1120 RETVAL = wcs2sv (rstr, r - rstr); 1422 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1121 1423
1122 delete [] rstr; 1424 delete [] rstr;
1123} 1425}
1124 OUTPUT: 1426 OUTPUT:
1125 RETVAL 1427 RETVAL
1147 1449
1148 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1450 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1149 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1451 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1150 1452
1151 if (GIMME_V != G_VOID) 1453 if (GIMME_V != G_VOID)
1152 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1454 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1153 1455
1154 if (newval) 1456 if (newval)
1155 { 1457 {
1156 if (SvOK (newval)) 1458 if (SvOK (newval))
1157 { 1459 {
1162 else 1464 else
1163 THIS->rs [index] = 0; 1465 THIS->rs [index] = 0;
1164 } 1466 }
1165} 1467}
1166 1468
1469const char *
1470rxvt_term::x_resource (const char *name)
1471 CLEANUP:
1472 SvTAINTED_on (ST (0));
1473
1167bool 1474bool
1168rxvt_term::option (U32 optval, int set = -1) 1475rxvt_term::option (U32 optval, int set = -1)
1169 CODE: 1476 CODE:
1170{ 1477{
1171 RETVAL = THIS->options & optval; 1478 RETVAL = THIS->options & optval;
1198 } 1505 }
1199} 1506}
1200 OUTPUT: 1507 OUTPUT:
1201 RETVAL 1508 RETVAL
1202 1509
1510bool
1511rxvt_term::parse_keysym (char *keysym, char *str)
1512 CODE:
1513 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1514 THIS->keyboard->register_done ();
1515 OUTPUT:
1516 RETVAL
1517
1203void 1518void
1204rxvt_term::cur (...) 1519rxvt_term::screen_cur (...)
1205 PROTOTYPE: $;$$ 1520 PROTOTYPE: $;$$
1206 ALIAS: 1521 ALIAS:
1207 screen_cur = 0 1522 screen_cur = 0
1208 selection_beg = 1 1523 selection_beg = 1
1209 selection_end = 2 1524 selection_end = 2
1222 PUSHs (sv_2mortal (newSViv (rc.col))); 1537 PUSHs (sv_2mortal (newSViv (rc.col)));
1223 } 1538 }
1224 1539
1225 if (items == 3) 1540 if (items == 3)
1226 { 1541 {
1227 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1542 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
1228 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1543 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1229 1544
1230 if (ix) 1545 if (ix)
1231 THIS->want_refresh = 1; 1546 THIS->want_refresh = 1;
1232 } 1547 }
1233} 1548}
1234 1549
1550char
1551rxvt_term::cur_charset ()
1552 CODE:
1553 RETVAL = THIS->charsets [THIS->screen.charset];
1554 OUTPUT:
1555 RETVAL
1556
1557#void
1558#rxvt_term::selection_clear ()
1559
1560void
1561rxvt_term::selection_make (U32 eventtime, bool rect = false)
1562 CODE:
1563 THIS->selection.op = SELECTION_CONT;
1564 THIS->selection.rect = rect;
1565 THIS->selection_make (eventtime);
1566
1235int 1567int
1236rxvt_term::selection_grab (U32 eventtime) 1568rxvt_term::selection_grab (U32 eventtime)
1237 1569
1238void 1570void
1239rxvt_term::selection (SV *newtext = 0) 1571rxvt_term::selection (SV *newtext = 0)
1240 PPCODE: 1572 PPCODE:
1241{ 1573{
1242 if (GIMME_V != G_VOID) 1574 if (GIMME_V != G_VOID)
1575 XPUSHs (THIS->selection.text
1243 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1576 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1577 : &PL_sv_undef);
1244 1578
1245 if (newtext) 1579 if (newtext)
1246 { 1580 {
1247 free (THIS->selection.text); 1581 free (THIS->selection.text);
1248 1582
1249 THIS->selection.text = sv2wcs (newtext); 1583 THIS->selection.text = sv2wcs (newtext);
1250 THIS->selection.len = wcslen (THIS->selection.text); 1584 THIS->selection.len = wcslen (THIS->selection.text);
1251 } 1585 }
1252} 1586}
1587
1588void
1589rxvt_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)
1590
1591void
1592rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1593
1594void
1595rxvt_term::scr_bell ()
1253 1596
1254void 1597void
1255rxvt_term::scr_add_lines (SV *string) 1598rxvt_term::scr_add_lines (SV *string)
1256 CODE: 1599 CODE:
1257{ 1600{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines