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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines