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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines