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.26 by root, Thu Jan 5 21:21:49 2006 UTC vs.
Revision 1.44 by root, Sun Jan 8 22:58:13 2006 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2005 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28 28
29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef>
31#include <cstdarg> 32#include <cstdarg>
32 33
33#include "rxvt.h" 34#include "rxvt.h"
34#include "iom.h" 35#include "iom.h"
35#include "rxvtutil.h" 36#include "rxvtutil.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include "perlxsi.c" 39#include "perlxsi.c"
39 40
41#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
42# define GRAB_CURSOR THIS->leftptr_cursor
43#else
44# define GRAB_CURSOR None
45#endif
46
40#undef LINENO 47#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW 49#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
44 51
45///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
46 53
54static SV *
55taint (SV *sv)
56{
57 SvTAINT (sv);
58 return sv;
59}
60
61static SV *
62taint_if (SV *sv, SV *src)
63{
64 if (SvTAINTED (src))
65 SvTAINT (sv);
66
67 return sv;
68}
69
47static wchar_t * 70static wchar_t *
48sv2wcs (SV *sv) 71sv2wcs (SV *sv)
49{ 72{
50 STRLEN len; 73 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 74 char *str = SvPVutf8 (sv, len);
… …
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 124 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 125
103 return (long)mg->mg_ptr; 126 return (long)mg->mg_ptr;
104} 127}
105 128
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 129#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 130#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 131
109///////////////////////////////////////////////////////////////////////////// 132/////////////////////////////////////////////////////////////////////////////
110 133
111struct perl_watcher 134struct perl_watcher
… …
290void 313void
291overlay::show () 314overlay::show ()
292{ 315{
293 char key[33]; sprintf (key, "%32lx", (long)this); 316 char key[33]; sprintf (key, "%32lx", (long)this);
294 317
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 318 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
296 hv_store (hv, key, 32, newSViv ((long)this), 0); 319 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 320}
298 321
299void 322void
300overlay::hide () 323overlay::hide ()
301{ 324{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 325 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 326
304 if (ovs) 327 if (ovs)
305 { 328 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 329 char key[33]; sprintf (key, "%32lx", (long)this);
307 330
… …
389{ 412{
390 if (!perl) 413 if (!perl)
391 { 414 {
392 char *argv[] = { 415 char *argv[] = {
393 "", 416 "",
417 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 418 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 419 };
396 420
397 perl = perl_alloc (); 421 perl = perl_alloc ();
398 perl_construct (perl); 422 perl_construct (perl);
399 423
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 425 || perl_run (perl))
402 { 426 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 428
405 perl_destruct (perl); 429 perl_destruct (perl);
… …
415 if (!perl) 439 if (!perl)
416 return false; 440 return false;
417 441
418 if (htype == HOOK_INIT) // first hook ever called 442 if (htype == HOOK_INIT) // first hook ever called
419 { 443 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 444 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 445 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 446 }
423 else if (!term->self) 447 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 448 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 449 else if (htype == HOOK_DESTROY)
426 { 450 {
427 // handled later 451 // handled later
428 } 452 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 453 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
430 { 454 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 455 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
432 456
433 if (HvKEYS (hv)) 457 if (HvKEYS (hv))
434 { 458 {
435 hv_iterinit (hv); 459 hv_iterinit (hv);
436 460
… …
465 489
466 case DT_LONG: 490 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 491 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 492 break;
469 493
470 case DT_STRING: 494 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 495 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 496 break;
473 497
474 case DT_USTRING_LEN: 498 case DT_STR_LEN:
475 { 499 {
476 unicode_t *ustr = va_arg (ap, unicode_t *); 500 char *str = va_arg (ap, char *);
477 int ulen = va_arg (ap, int); 501 int len = va_arg (ap, int);
502
503 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
504 }
505 break;
506
507 case DT_WCS_LEN:
508 {
478 wchar_t *wstr = new wchar_t [ulen]; 509 wchar_t *wstr = va_arg (ap, wchar_t *);
510 int wlen = va_arg (ap, int);
479 511
480 for (int i = ulen; i--; )
481 wstr [i] = ustr [i];
482
483 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen))); 512 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
513 }
514 break;
484 515
485 delete [] wstr; 516 case DT_XEVENT:
486 } 517 {
518 XEvent *xe = va_arg (ap, XEvent *);
519 HV *hv = newHV ();
520
521# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
522# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
523# undef set
524
525 setiv (type, xe->type);
526 setiv (send_event, xe->xany.send_event);
527 setiv (serial, xe->xany.serial);
528
529 switch (xe->type)
530 {
531 case KeyPress:
532 case KeyRelease:
533 case ButtonPress:
534 case ButtonRelease:
535 case MotionNotify:
536 setiv (time, xe->xmotion.time);
537 setiv (x, xe->xmotion.x);
538 setiv (y, xe->xmotion.y);
539 setiv (row, xe->xmotion.y / term->fheight);
540 setiv (col, xe->xmotion.x / term->fwidth);
541 setiv (x_root, xe->xmotion.x_root);
542 setiv (y_root, xe->xmotion.y_root);
543 setiv (state, xe->xmotion.state);
544 break;
545 }
546
547 switch (xe->type)
548 {
549 case KeyPress:
550 case KeyRelease:
551 setiv (keycode, xe->xkey.keycode);
552 break;
553
554 case ButtonPress:
555 case ButtonRelease:
556 setiv (button, xe->xbutton.button);
557 break;
558
559 case MotionNotify:
560 setiv (is_hint, xe->xmotion.is_hint);
561 break;
562 }
563
564 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
565 }
566 break;
487 567
488 case DT_END: 568 case DT_END:
489 { 569 {
490 va_end (ap); 570 va_end (ap);
491 571
… …
506 if (SvTRUE (ERRSV)) 586 if (SvTRUE (ERRSV))
507 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 587 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
508 588
509 if (htype == HOOK_DESTROY) 589 if (htype == HOOK_DESTROY)
510 { 590 {
511 clearSVptr ((SV *)term->self); 591 clearSVptr ((SV *)term->perl.self);
512 SvREFCNT_dec ((SV *)term->self); 592 SvREFCNT_dec ((SV *)term->perl.self);
513 } 593 }
514 594
515 return count; 595 return count;
516 } 596 }
517 597
… …
527 607
528PROTOTYPES: ENABLE 608PROTOTYPES: ENABLE
529 609
530BOOT: 610BOOT:
531{ 611{
532# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 612 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
613
533 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 614 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
534# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 615# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
535# include "hookinc.h" 616# include "hookinc.h"
536# undef def 617# undef def
537 618
619 HV *option = get_hv ("urxvt::OPTION", 1);
620# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
621# define nodef(name)
622# include "optinc.h"
623# undef nodef
624# undef def
625
626 HV *stash = gv_stashpv ("urxvt", 1);
627# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
538 export_const (DEFAULT_RSTYLE); 628 export_const_iv (DEFAULT_RSTYLE);
539 export_const (OVERLAY_RSTYLE); 629 export_const_iv (OVERLAY_RSTYLE);
540 export_const (RS_Bold); 630 export_const_iv (RS_Bold);
541 export_const (RS_Italic); 631 export_const_iv (RS_Italic);
542 export_const (RS_Blink); 632 export_const_iv (RS_Blink);
543 export_const (RS_RVid); 633 export_const_iv (RS_RVid);
544 export_const (RS_Uline); 634 export_const_iv (RS_Uline);
545 635
546 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 636 export_const_iv (CurrentTime);
637 export_const_iv (ShiftMask);
638 export_const_iv (LockMask);
639 export_const_iv (ControlMask);
640 export_const_iv (Mod1Mask);
641 export_const_iv (Mod2Mask);
642 export_const_iv (Mod3Mask);
643 export_const_iv (Mod4Mask);
644 export_const_iv (Mod5Mask);
645 export_const_iv (Button1Mask);
646 export_const_iv (Button2Mask);
647 export_const_iv (Button3Mask);
648 export_const_iv (Button4Mask);
649 export_const_iv (Button5Mask);
650 export_const_iv (AnyModifier);
547} 651}
652
653SV *
654new (...)
655 CODE:
656{
657 stringvec *argv = new stringvec;
658 bool success;
659
660 for (int i = 0; i < items ;i++)
661 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
662
663 rxvt_term *term = new rxvt_term;
664
665 term->argv = argv;
666
667 try
668 {
669 if (!term->init (argv->size (), argv->begin ()))
670 term = 0;
671 }
672 catch (const class rxvt_failure_exception &e)
673 {
674 term->destroy ();
675 croak ("exception caught while initializing new terminal instance");
676 }
677
678 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
679}
680 OUTPUT:
681 RETVAL
548 682
549void 683void
550set_should_invoke (int htype, int value) 684set_should_invoke (int htype, int value)
551 CODE: 685 CODE:
552 rxvt_perl.should_invoke [htype] = value; 686 rxvt_perl.should_invoke [htype] = value;
… …
615} 749}
616 OUTPUT: 750 OUTPUT:
617 RETVAL 751 RETVAL
618 752
619MODULE = urxvt PACKAGE = urxvt::term 753MODULE = urxvt PACKAGE = urxvt::term
754
755void
756rxvt_term::destroy ()
757
758void
759rxvt_term::grab_button (int button, U32 modifiers)
760 CODE:
761 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
762 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
763 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
764
765bool
766rxvt_term::grab (U32 eventtime, int sync = 0)
767 CODE:
768{
769 int mode = sync ? GrabModeSync : GrabModeAsync;
770
771 THIS->perl.grabtime = 0;
772
773 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
774 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
775 mode, mode, None, GRAB_CURSOR, eventtime))
776 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
777 THIS->perl.grabtime = eventtime;
778 else
779 XUngrabPointer (THIS->display->display, eventtime);
780
781 RETVAL = !!THIS->perl.grabtime;
782}
783 OUTPUT:
784 RETVAL
785
786void
787rxvt_term::allow_events_async ()
788 CODE:
789 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
790
791void
792rxvt_term::allow_events_sync ()
793 CODE:
794 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
795
796void
797rxvt_term::allow_events_replay ()
798 CODE:
799 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
800 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
801
802void
803rxvt_term::ungrab ()
804 CODE:
805{
806 if (THIS->perl.grabtime)
807 {
808 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
809 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
810 THIS->perl.grabtime = 0;
811 }
812}
620 813
621int 814int
622rxvt_term::strwidth (SV *str) 815rxvt_term::strwidth (SV *str)
623 CODE: 816 CODE:
624{ 817{
… …
643 char *mbstr = rxvt_wcstombs (wstr); 836 char *mbstr = rxvt_wcstombs (wstr);
644 rxvt_pop_locale (); 837 rxvt_pop_locale ();
645 838
646 free (wstr); 839 free (wstr);
647 840
648 RETVAL = newSVpv (mbstr, 0); 841 RETVAL = taint_if (newSVpv (mbstr, 0), str);
649 free (mbstr); 842 free (mbstr);
650} 843}
651 OUTPUT: 844 OUTPUT:
652 RETVAL 845 RETVAL
653 846
… …
660 853
661 rxvt_push_locale (THIS->locale); 854 rxvt_push_locale (THIS->locale);
662 wchar_t *wstr = rxvt_mbstowcs (data, len); 855 wchar_t *wstr = rxvt_mbstowcs (data, len);
663 rxvt_pop_locale (); 856 rxvt_pop_locale ();
664 857
665 RETVAL = wcs2sv (wstr); 858 RETVAL = taint_if (wcs2sv (wstr), octets);
666 free (wstr); 859 free (wstr);
667} 860}
668 OUTPUT: 861 OUTPUT:
669 RETVAL 862 RETVAL
670 863
671# very portable, especially on objects as opposed to pods 864#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
672#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
673 865
674#define TERM_OFFSET_width TERM_OFFSET(width) 866#define TERM_OFFSET_width TERM_OFFSET(width)
675#define TERM_OFFSET_height TERM_OFFSET(height) 867#define TERM_OFFSET_height TERM_OFFSET(height)
676#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 868#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
677#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 869#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
702 CODE: 894 CODE:
703 RETVAL = *(int *)((char *)THIS + ix); 895 RETVAL = *(int *)((char *)THIS + ix);
704 OUTPUT: 896 OUTPUT:
705 RETVAL 897 RETVAL
706 898
899unsigned int
900rxvt_term::ModLevel3Mask ()
901 ALIAS:
902 ModLevel3Mask = 0
903 ModMetaMask = 1
904 ModNumLockMask = 2
905 CODE:
906 switch (ix)
907 {
908 case 0: RETVAL = THIS->ModLevel3Mask; break;
909 case 1: RETVAL = THIS->ModMetaMask; break;
910 case 2: RETVAL = THIS->ModNumLockMask; break;
911 }
912 OUTPUT:
913 RETVAL
914
915U32
916rxvt_term::parent ()
917 CODE:
918 RETVAL = (U32)THIS->parent [0];
919 OUTPUT:
920 RETVAL
921
922U32
923rxvt_term::vt ()
924 CODE:
925 RETVAL = (U32)THIS->vt;
926 OUTPUT:
927 RETVAL
928
707U32 929U32
708rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 930rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
709 CODE: 931 CODE:
710{ 932{
711 RETVAL = THIS->rstyle; 933 RETVAL = THIS->rstyle;
… …
733rxvt_term::want_refresh () 955rxvt_term::want_refresh ()
734 CODE: 956 CODE:
735 THIS->want_refresh = 1; 957 THIS->want_refresh = 1;
736 958
737void 959void
738rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 960rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
739 PPCODE: 961 PPCODE:
740{ 962{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 963 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
742 XSRETURN_EMPTY; 964 XSRETURN_EMPTY;
743 965
… …
745 967
746 if (GIMME_V != G_VOID) 968 if (GIMME_V != G_VOID)
747 { 969 {
748 wchar_t *wstr = new wchar_t [THIS->ncol]; 970 wchar_t *wstr = new wchar_t [THIS->ncol];
749 971
750 for (int col = 0; col <THIS->ncol; col++) 972 for (int col = 0; col < THIS->ncol; col++)
751 wstr [col] = l.t [col]; 973 wstr [col] = l.t [col];
752 974
753 XPUSHs (sv_2mortal (wcs2sv (wstr))); 975 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
754 976
755 delete [] wstr; 977 delete [] wstr;
756 } 978 }
757 979
758 if (new_text) 980 if (new_text)
759 { 981 {
760 wchar_t *wstr = sv2wcs (new_text); 982 wchar_t *wstr = sv2wcs (new_text);
761 983
762 int len = wcslen (wstr); 984 int len = min (wcslen (wstr) - start_ofs, max_len);
763 985
764 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 986 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
765 { 987 {
766 free (wstr); 988 free (wstr);
767 croak ("new_text extends beyond horizontal margins"); 989 croak ("new_text extends beyond horizontal margins");
768 } 990 }
769 991
770 for (int col = start_col; col < start_col + len; col++) 992 for (int col = start_col; col < start_col + len; col++)
771 { 993 {
772 l.t [col] = wstr [col - start_col]; 994 l.t [col] = wstr [start_ofs + col - start_col];
773 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 995 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
774 } 996 }
775 997
776 free (wstr); 998 free (wstr);
777 } 999 }
778} 1000}
779 1001
780void 1002void
781rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1003rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
782 PPCODE: 1004 PPCODE:
783{ 1005{
784 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1006 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
785 XSRETURN_EMPTY; 1007 XSRETURN_EMPTY;
786 1008
… …
801 { 1023 {
802 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1024 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
803 croak ("new_rend must be arrayref"); 1025 croak ("new_rend must be arrayref");
804 1026
805 AV *av = (AV *)SvRV (new_rend); 1027 AV *av = (AV *)SvRV (new_rend);
806 int len = av_len (av) + 1; 1028 int len = min (av_len (av) + 1 - start_ofs, max_len);
807 1029
808 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1030 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
809 croak ("new_rend array extends beyond horizontal margins"); 1031 croak ("new_rend array extends beyond horizontal margins");
810 1032
811 for (int col = start_col; col < start_col + len; col++) 1033 for (int col = start_col; col < start_col + len; col++)
812 { 1034 {
813 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1035 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
814 1036
815 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1037 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
816 } 1038 }
817 } 1039 }
818} 1040}
… …
848} 1070}
849 OUTPUT: 1071 OUTPUT:
850 RETVAL 1072 RETVAL
851 1073
852SV * 1074SV *
853rxvt_term::special_encode (SV *str) 1075rxvt_term::special_encode (SV *string)
854 CODE: 1076 CODE:
855 abort ();//TODO 1077{
1078 wchar_t *wstr = sv2wcs (string);
1079 int wlen = wcslen (wstr);
1080 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1081
1082 rxvt_push_locale (THIS->locale);
1083
1084 wchar_t *r = rstr;
1085 for (wchar_t *s = wstr; *s; s++)
1086 if (wcwidth (*s) == 0)
1087 {
1088 if (r == rstr)
1089 croak ("leading combining character unencodable");
1090
1091 unicode_t n = rxvt_compose (r[-1], *s);
1092 if (n == NOCHAR)
1093 n = rxvt_composite.compose (r[-1], *s);
1094
1095 r[-1] = n;
1096 }
1097#if !UNICODE_3
1098 else if (*s >= 0x10000)
1099 *r++ = rxvt_composite.compose (*s);
1100#endif
1101 else
1102 *r++ = *s;
1103
1104 rxvt_pop_locale ();
1105
1106 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1107
1108 delete [] rstr;
1109}
1110 OUTPUT:
1111 RETVAL
856 1112
857SV * 1113SV *
858rxvt_term::special_decode (SV *str) 1114rxvt_term::special_decode (SV *text)
859 CODE: 1115 CODE:
860 abort ();//TODO 1116{
1117 wchar_t *wstr = sv2wcs (text);
1118 int wlen = wcslen (wstr);
1119 int dlen = 0;
1120
1121 // find length
1122 for (wchar_t *s = wstr; *s; s++)
1123 if (*s == NOCHAR)
1124 ;
1125 else if (IS_COMPOSE (*s))
1126 dlen += rxvt_composite.expand (*s, 0);
1127 else
1128 dlen++;
1129
1130 wchar_t *rstr = new wchar_t [dlen];
1131
1132 // decode
1133 wchar_t *r = rstr;
1134 for (wchar_t *s = wstr; *s; s++)
1135 if (*s == NOCHAR)
1136 ;
1137 else if (IS_COMPOSE (*s))
1138 r += rxvt_composite.expand (*s, r);
1139 else
1140 *r++ = *s;
1141
1142 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1143
1144 delete [] rstr;
1145}
1146 OUTPUT:
1147 RETVAL
861 1148
862void 1149void
863rxvt_term::_resource (char *name, int index, SV *newval = 0) 1150rxvt_term::_resource (char *name, int index, SV *newval = 0)
864 PPCODE: 1151 PPCODE:
865{ 1152{
… …
882 1169
883 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1170 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
884 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1171 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
885 1172
886 if (GIMME_V != G_VOID) 1173 if (GIMME_V != G_VOID)
887 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1174 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
888 1175
889 if (newval) 1176 if (newval)
890 { 1177 {
891 if (SvOK (newval)) 1178 if (SvOK (newval))
892 { 1179 {
… …
897 else 1184 else
898 THIS->rs [index] = 0; 1185 THIS->rs [index] = 0;
899 } 1186 }
900} 1187}
901 1188
1189bool
1190rxvt_term::option (U32 optval, int set = -1)
1191 CODE:
1192{
1193 RETVAL = THIS->options & optval;
1194
1195 if (set >= 0)
1196 {
1197 if (set)
1198 THIS->options |= optval;
1199 else
1200 THIS->options &= ~optval;
1201
1202 switch (optval)
1203 {
1204 case Opt_skipBuiltinGlyphs:
1205 THIS->set_fonts ();
1206 THIS->scr_remap_chars ();
1207 THIS->scr_touch (true);
1208 THIS->want_refresh = 1;
1209 break;
1210
1211 case Opt_cursorUnderline:
1212 THIS->want_refresh = 1;
1213 break;
1214
1215# case Opt_scrollBar_floating:
1216# case Opt_scrollBar_right:
1217# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1218# break;
1219 }
1220 }
1221}
1222 OUTPUT:
1223 RETVAL
1224
902void 1225void
903rxvt_term::cur (...) 1226rxvt_term::cur (...)
904 PROTOTYPE: $;$$ 1227 PROTOTYPE: $;$$
905 ALIAS: 1228 ALIAS:
906 screen_cur = 0 1229 screen_cur = 0
… …
930 THIS->want_refresh = 1; 1253 THIS->want_refresh = 1;
931 } 1254 }
932} 1255}
933 1256
934int 1257int
935rxvt_term::selection_grab (int eventtime = CurrentTime) 1258rxvt_term::selection_grab (U32 eventtime)
936 1259
937void 1260void
938rxvt_term::selection (SV *newtext = 0) 1261rxvt_term::selection (SV *newtext = 0)
939 PPCODE: 1262 PPCODE:
940{ 1263{
941 if (GIMME_V != G_VOID) 1264 if (GIMME_V != G_VOID)
942 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1265 XPUSHs (taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))));
943 1266
944 if (newtext) 1267 if (newtext)
945 { 1268 {
946 free (THIS->selection.text); 1269 free (THIS->selection.text);
947 1270
… …
953void 1276void
954rxvt_term::scr_add_lines (SV *string) 1277rxvt_term::scr_add_lines (SV *string)
955 CODE: 1278 CODE:
956{ 1279{
957 wchar_t *wstr = sv2wcs (string); 1280 wchar_t *wstr = sv2wcs (string);
958 int wlen = wcslen (wstr);
959 unicode_t *ustr = new unicode_t [wlen];
960 int nlines = 0;
961
962 for (int i = wlen; i--; )
963 {
964 ustr [i] = wstr [i];
965 nlines += ustr [i] == '\012';
966 }
967
968 THIS->scr_add_lines (ustr, nlines, wlen); 1281 THIS->scr_add_lines (wstr, wcslen (wstr));
969
970 free (wstr); 1282 free (wstr);
971 delete [] ustr;
972} 1283}
973 1284
974void 1285void
975rxvt_term::tt_write (SV *octets) 1286rxvt_term::tt_write (SV *octets)
976 INIT: 1287 INIT:
977 STRLEN len; 1288 STRLEN len;
978 char *str = SvPVbyte (octets, len); 1289 char *str = SvPVbyte (octets, len);
979 C_ARGS: 1290 C_ARGS:
980 str, len 1291 str, len
981 1292
1293void
1294rxvt_term::cmd_parse (SV *octets)
1295 CODE:
1296{
1297 STRLEN len;
1298 char *str = SvPVbyte (octets, len);
1299
1300 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1301 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1302
1303 THIS->cmdbuf_ptr = str;
1304 THIS->cmdbuf_endp = str + len;
1305
1306 rxvt_push_locale (THIS->locale);
1307 THIS->cmd_parse ();
1308 rxvt_pop_locale ();
1309
1310 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1311 THIS->cmdbuf_endp = old_cmdbuf_endp;
1312}
1313
982SV * 1314SV *
983rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1315rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
984 CODE: 1316 CODE:
985{ 1317{
986 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1318 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

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