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.24 by root, Wed Jan 4 21:37:55 2006 UTC vs.
Revision 1.42 by root, Sun Jan 8 08:43:11 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);
52 return rxvt_utf8towcs (str, len); 75 return rxvt_utf8towcs (str, len);
53} 76}
54 77
55static SV * 78static SV *
79wcs2sv (wchar_t *wstr, int len = -1)
80{
81 char *str = rxvt_wcstoutf8 (wstr, len);
82
83 SV *sv = newSVpv (str, 0);
84 SvUTF8_on (sv);
85 free (str);
86
87 return sv;
88}
89
90static SV *
56new_ref (HV *hv, const char *klass) 91new_ref (HV *hv, const char *klass)
57{ 92{
58 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 93 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
59} 94}
60 95
… …
89 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);
90 125
91 return (long)mg->mg_ptr; 126 return (long)mg->mg_ptr;
92} 127}
93 128
94#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 129#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
95#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 130#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
96 131
97///////////////////////////////////////////////////////////////////////////// 132/////////////////////////////////////////////////////////////////////////////
98 133
99struct perl_watcher 134struct perl_watcher
… …
278void 313void
279overlay::show () 314overlay::show ()
280{ 315{
281 char key[33]; sprintf (key, "%32lx", (long)this); 316 char key[33]; sprintf (key, "%32lx", (long)this);
282 317
283 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));
284 hv_store (hv, key, 32, newSViv ((long)this), 0); 319 hv_store (hv, key, 32, newSViv ((long)this), 0);
285} 320}
286 321
287void 322void
288overlay::hide () 323overlay::hide ()
289{ 324{
290 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);
291 326
292 if (ovs) 327 if (ovs)
293 { 328 {
294 char key[33]; sprintf (key, "%32lx", (long)this); 329 char key[33]; sprintf (key, "%32lx", (long)this);
295 330
… …
371 perl_free (perl); 406 perl_free (perl);
372 } 407 }
373} 408}
374 409
375void 410void
376rxvt_perl_interp::init () 411rxvt_perl_interp::init (bool tainted)
377{ 412{
378 if (!perl) 413 if (!perl)
379 { 414 {
380 char *argv[] = { 415 char *argv[] = {
381 "", 416 "",
382 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 417 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
418 "-T",
383 }; 419 };
384 420
385 perl = perl_alloc (); 421 perl = perl_alloc ();
386 perl_construct (perl); 422 perl_construct (perl);
387 423
388 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 2 + !!tainted, argv, (char **)NULL)
389 || perl_run (perl)) 425 || perl_run (perl))
390 { 426 {
391 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
392 428
393 perl_destruct (perl); 429 perl_destruct (perl);
… …
403 if (!perl) 439 if (!perl)
404 return false; 440 return false;
405 441
406 if (htype == HOOK_INIT) // first hook ever called 442 if (htype == HOOK_INIT) // first hook ever called
407 { 443 {
408 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 444 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
409 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);
410 } 446 }
411 else if (!term->self) 447 else if (!term->perl.self)
412 return false; // perl not initialized for this instance 448 return false; // perl not initialized for this instance
413 else if (htype == HOOK_DESTROY) 449 else if (htype == HOOK_DESTROY)
414 { 450 {
415 // handled later 451 // handled later
416 } 452 }
417 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 453 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
418 { 454 {
419 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));
420 456
421 if (HvKEYS (hv)) 457 if (HvKEYS (hv))
422 { 458 {
423 hv_iterinit (hv); 459 hv_iterinit (hv);
424 460
… …
453 489
454 case DT_LONG: 490 case DT_LONG:
455 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 491 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
456 break; 492 break;
457 493
458 case DT_STRING: 494 case DT_STR:
459 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 495 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
496 break;
497
498 case DT_STR_LEN:
499 {
500 char *str = va_arg (ap, char *);
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 {
509 wchar_t *wstr = va_arg (ap, wchar_t *);
510 int wlen = va_arg (ap, int);
511
512 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
513 }
514 break;
515
516 case DT_XEVENT:
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 }
460 break; 566 break;
461 567
462 case DT_END: 568 case DT_END:
463 { 569 {
464 va_end (ap); 570 va_end (ap);
… …
480 if (SvTRUE (ERRSV)) 586 if (SvTRUE (ERRSV))
481 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));
482 588
483 if (htype == HOOK_DESTROY) 589 if (htype == HOOK_DESTROY)
484 { 590 {
485 clearSVptr ((SV *)term->self); 591 clearSVptr ((SV *)term->perl.self);
486 SvREFCNT_dec ((SV *)term->self); 592 SvREFCNT_dec ((SV *)term->perl.self);
487 } 593 }
488 594
489 return count; 595 return count;
490 } 596 }
491 597
… …
501 607
502PROTOTYPES: ENABLE 608PROTOTYPES: ENABLE
503 609
504BOOT: 610BOOT:
505{ 611{
506# 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
507 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 614 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
508# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 615# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
509# include "hookinc.h" 616# include "hookinc.h"
510# undef def 617# undef def
511 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));
512 export_const (DEFAULT_RSTYLE); 628 export_const_iv (DEFAULT_RSTYLE);
513 export_const (OVERLAY_RSTYLE); 629 export_const_iv (OVERLAY_RSTYLE);
514 export_const (RS_Bold); 630 export_const_iv (RS_Bold);
515 export_const (RS_Italic); 631 export_const_iv (RS_Italic);
516 export_const (RS_Blink); 632 export_const_iv (RS_Blink);
517 export_const (RS_RVid); 633 export_const_iv (RS_RVid);
518 export_const (RS_Uline); 634 export_const_iv (RS_Uline);
519 635
520 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);
521} 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
522 682
523void 683void
524set_should_invoke (int htype, int value) 684set_should_invoke (int htype, int value)
525 CODE: 685 CODE:
526 rxvt_perl.should_invoke [htype] = value; 686 rxvt_perl.should_invoke [htype] = value;
… …
589} 749}
590 OUTPUT: 750 OUTPUT:
591 RETVAL 751 RETVAL
592 752
593MODULE = 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 (U32 eventtime = THIS->perl.grabtime)
788 CODE:
789 XAllowEvents (THIS->display->display, AsyncBoth, eventtime);
790
791void
792rxvt_term::allow_events_sync (U32 eventtime = THIS->perl.grabtime)
793 CODE:
794 XAllowEvents (THIS->display->display, SyncBoth, eventtime);
795
796void
797rxvt_term::allow_events_replay (U32 eventtime = THIS->perl.grabtime)
798 CODE:
799 XAllowEvents (THIS->display->display, ReplayPointer, eventtime);
800 XAllowEvents (THIS->display->display, ReplayKeyboard, eventtime);
801
802void
803rxvt_term::ungrab (U32 eventtime = THIS->perl.grabtime)
804 CODE:
805 THIS->perl.grabtime = 0;
806 XUngrabKeyboard (THIS->display->display, eventtime);
807 XUngrabPointer (THIS->display->display, eventtime);
594 808
595int 809int
596rxvt_term::strwidth (SV *str) 810rxvt_term::strwidth (SV *str)
597 CODE: 811 CODE:
598{ 812{
… …
617 char *mbstr = rxvt_wcstombs (wstr); 831 char *mbstr = rxvt_wcstombs (wstr);
618 rxvt_pop_locale (); 832 rxvt_pop_locale ();
619 833
620 free (wstr); 834 free (wstr);
621 835
622 RETVAL = newSVpv (mbstr, 0); 836 RETVAL = taint_if (newSVpv (mbstr, 0), str);
623 free (mbstr); 837 free (mbstr);
624} 838}
625 OUTPUT: 839 OUTPUT:
626 RETVAL 840 RETVAL
627 841
… …
634 848
635 rxvt_push_locale (THIS->locale); 849 rxvt_push_locale (THIS->locale);
636 wchar_t *wstr = rxvt_mbstowcs (data, len); 850 wchar_t *wstr = rxvt_mbstowcs (data, len);
637 rxvt_pop_locale (); 851 rxvt_pop_locale ();
638 852
639 char *str = rxvt_wcstoutf8 (wstr); 853 RETVAL = taint_if (wcs2sv (wstr), octets);
640 free (wstr); 854 free (wstr);
641
642 RETVAL = newSVpv (str, 0);
643 SvUTF8_on (RETVAL);
644 free (str);
645} 855}
646 OUTPUT: 856 OUTPUT:
647 RETVAL 857 RETVAL
648 858
649# very portable, especially on objects as opposed to pods 859#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
650#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
651 860
652#define TERM_OFFSET_width TERM_OFFSET(width) 861#define TERM_OFFSET_width TERM_OFFSET(width)
653#define TERM_OFFSET_height TERM_OFFSET(height) 862#define TERM_OFFSET_height TERM_OFFSET(height)
654#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 863#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
655#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 864#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
680 CODE: 889 CODE:
681 RETVAL = *(int *)((char *)THIS + ix); 890 RETVAL = *(int *)((char *)THIS + ix);
682 OUTPUT: 891 OUTPUT:
683 RETVAL 892 RETVAL
684 893
894unsigned int
895rxvt_term::ModLevel3Mask ()
896 ALIAS:
897 ModLevel3Mask = 0
898 ModMetaMask = 1
899 ModNumLockMask = 2
900 CODE:
901 switch (ix)
902 {
903 case 0: RETVAL = THIS->ModLevel3Mask; break;
904 case 1: RETVAL = THIS->ModMetaMask; break;
905 case 2: RETVAL = THIS->ModNumLockMask; break;
906 }
907 OUTPUT:
908 RETVAL
909
685U32 910U32
911rxvt_term::parent ()
912 CODE:
913 RETVAL = (U32)THIS->parent [0];
914 OUTPUT:
915 RETVAL
916
917U32
918rxvt_term::vt ()
919 CODE:
920 RETVAL = (U32)THIS->vt;
921 OUTPUT:
922 RETVAL
923
924U32
686rxvt_term::screen_rstyle (U32 new_rstyle = THIS->screen.s_rstyle) 925rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
687 CODE: 926 CODE:
688{ 927{
689 RETVAL = THIS->screen.s_rstyle; 928 RETVAL = THIS->rstyle;
690 THIS->screen.s_rstyle = new_rstyle; 929 THIS->rstyle = new_rstyle;
691} 930}
692 OUTPUT: 931 OUTPUT:
693 RETVAL 932 RETVAL
694 933
695int 934int
… …
711rxvt_term::want_refresh () 950rxvt_term::want_refresh ()
712 CODE: 951 CODE:
713 THIS->want_refresh = 1; 952 THIS->want_refresh = 1;
714 953
715void 954void
716rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 955rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
717 PPCODE: 956 PPCODE:
718{ 957{
719 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 958 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
720 XSRETURN_EMPTY; 959 XSRETURN_EMPTY;
721 960
… …
723 962
724 if (GIMME_V != G_VOID) 963 if (GIMME_V != G_VOID)
725 { 964 {
726 wchar_t *wstr = new wchar_t [THIS->ncol]; 965 wchar_t *wstr = new wchar_t [THIS->ncol];
727 966
728 for (int col = 0; col <THIS->ncol; col++) 967 for (int col = 0; col < THIS->ncol; col++)
729 wstr [col] = l.t [col]; 968 wstr [col] = l.t [col];
730 969
731 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 970 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
732 free (wstr);
733 971
734 SV *sv = newSVpv (str, 0); 972 delete [] wstr;
735 SvUTF8_on (sv);
736 XPUSHs (sv_2mortal (sv));
737 free (str);
738 } 973 }
739 974
740 if (new_text) 975 if (new_text)
741 { 976 {
742 wchar_t *wstr = sv2wcs (new_text); 977 wchar_t *wstr = sv2wcs (new_text);
743 978
744 int len = wcslen (wstr); 979 int len = min (wcslen (wstr) - start_ofs, max_len);
745 980
746 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 981 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
747 { 982 {
748 free (wstr); 983 free (wstr);
749 croak ("new_text extends beyond horizontal margins"); 984 croak ("new_text extends beyond horizontal margins");
750 } 985 }
751 986
752 for (int col = start_col; col < start_col + len; col++) 987 for (int col = start_col; col < start_col + len; col++)
753 { 988 {
754 l.t [col] = wstr [col - start_col]; 989 l.t [col] = wstr [start_ofs + col - start_col];
755 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 990 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
756 } 991 }
757 992
758 free (wstr); 993 free (wstr);
759 } 994 }
760} 995}
761 996
762void 997void
763rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 998rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
764 PPCODE: 999 PPCODE:
765{ 1000{
766 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1001 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
767 XSRETURN_EMPTY; 1002 XSRETURN_EMPTY;
768 1003
… …
783 { 1018 {
784 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1019 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
785 croak ("new_rend must be arrayref"); 1020 croak ("new_rend must be arrayref");
786 1021
787 AV *av = (AV *)SvRV (new_rend); 1022 AV *av = (AV *)SvRV (new_rend);
788 int len = av_len (av) + 1; 1023 int len = min (av_len (av) + 1 - start_ofs, max_len);
789 1024
790 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1025 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
791 croak ("new_rend array extends beyond horizontal margins"); 1026 croak ("new_rend array extends beyond horizontal margins");
792 1027
793 for (int col = start_col; col < start_col + len; col++) 1028 for (int col = start_col; col < start_col + len; col++)
794 { 1029 {
795 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1030 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
796 1031
797 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1032 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
798 } 1033 }
799 } 1034 }
800} 1035}
801 1036
802int 1037int
803rxvt_term::ROW_l (int row_number, int new_length = -2) 1038rxvt_term::ROW_l (int row_number, int new_length = -1)
804 CODE: 1039 CODE:
805{ 1040{
806 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1041 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
807 XSRETURN_EMPTY; 1042 XSRETURN_EMPTY;
808 1043
809 line_t &l = ROW(row_number); 1044 line_t &l = ROW(row_number);
810 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1045 RETVAL = l.l;
811 1046
812 if (new_length >= -1) 1047 if (new_length >= 0)
813 l.l = new_length; 1048 l.l = new_length;
814} 1049}
815 OUTPUT: 1050 OUTPUT:
816 RETVAL 1051 RETVAL
817 1052
818bool 1053bool
819rxvt_term::ROW_is_longer (int row_number) 1054rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
820 CODE: 1055 CODE:
821{ 1056{
822 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1057 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
823 XSRETURN_EMPTY; 1058 XSRETURN_EMPTY;
824 1059
825 line_t &l = ROW(row_number); 1060 line_t &l = ROW(row_number);
826 RETVAL = l.l < 0; 1061 RETVAL = l.is_longer ();
1062
1063 if (new_is_longer >= 0)
1064 l.is_longer (new_is_longer);
827} 1065}
828 OUTPUT: 1066 OUTPUT:
829 RETVAL 1067 RETVAL
830 1068
831SV * 1069SV *
832rxvt_term::special_encode (SV *str) 1070rxvt_term::special_encode (SV *string)
833 CODE: 1071 CODE:
834 abort ();//TODO 1072{
1073 wchar_t *wstr = sv2wcs (string);
1074 int wlen = wcslen (wstr);
1075 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1076
1077 rxvt_push_locale (THIS->locale);
1078
1079 wchar_t *r = rstr;
1080 for (wchar_t *s = wstr; *s; s++)
1081 if (wcwidth (*s) == 0)
1082 {
1083 if (r == rstr)
1084 croak ("leading combining character unencodable");
1085
1086 unicode_t n = rxvt_compose (r[-1], *s);
1087 if (n == NOCHAR)
1088 n = rxvt_composite.compose (r[-1], *s);
1089
1090 r[-1] = n;
1091 }
1092#if !UNICODE_3
1093 else if (*s >= 0x10000)
1094 *r++ = rxvt_composite.compose (*s);
1095#endif
1096 else
1097 *r++ = *s;
1098
1099 rxvt_pop_locale ();
1100
1101 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1102
1103 delete [] rstr;
1104}
1105 OUTPUT:
1106 RETVAL
835 1107
836SV * 1108SV *
837rxvt_term::special_decode (SV *str) 1109rxvt_term::special_decode (SV *text)
838 CODE: 1110 CODE:
839 abort ();//TODO 1111{
1112 wchar_t *wstr = sv2wcs (text);
1113 int wlen = wcslen (wstr);
1114 int dlen = 0;
1115
1116 // find length
1117 for (wchar_t *s = wstr; *s; s++)
1118 if (*s == NOCHAR)
1119 ;
1120 else if (IS_COMPOSE (*s))
1121 dlen += rxvt_composite.expand (*s, 0);
1122 else
1123 dlen++;
1124
1125 wchar_t *rstr = new wchar_t [dlen];
1126
1127 // decode
1128 wchar_t *r = rstr;
1129 for (wchar_t *s = wstr; *s; s++)
1130 if (*s == NOCHAR)
1131 ;
1132 else if (IS_COMPOSE (*s))
1133 r += rxvt_composite.expand (*s, r);
1134 else
1135 *r++ = *s;
1136
1137 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1138
1139 delete [] rstr;
1140}
1141 OUTPUT:
1142 RETVAL
840 1143
841void 1144void
842rxvt_term::_resource (char *name, int index, SV *newval = 0) 1145rxvt_term::_resource (char *name, int index, SV *newval = 0)
843 PPCODE: 1146 PPCODE:
844{ 1147{
… …
861 1164
862 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1165 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
863 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1166 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
864 1167
865 if (GIMME_V != G_VOID) 1168 if (GIMME_V != G_VOID)
866 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1169 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
867 1170
868 if (newval) 1171 if (newval)
869 { 1172 {
870 if (SvOK (newval)) 1173 if (SvOK (newval))
871 { 1174 {
… …
876 else 1179 else
877 THIS->rs [index] = 0; 1180 THIS->rs [index] = 0;
878 } 1181 }
879} 1182}
880 1183
1184bool
1185rxvt_term::option (U32 optval, int set = -1)
1186 CODE:
1187{
1188 RETVAL = THIS->options & optval;
1189
1190 if (set >= 0)
1191 {
1192 if (set)
1193 THIS->options |= optval;
1194 else
1195 THIS->options &= ~optval;
1196
1197 switch (optval)
1198 {
1199 case Opt_skipBuiltinGlyphs:
1200 THIS->set_fonts ();
1201 THIS->scr_remap_chars ();
1202 THIS->scr_touch (true);
1203 THIS->want_refresh = 1;
1204 break;
1205
1206 case Opt_cursorUnderline:
1207 THIS->want_refresh = 1;
1208 break;
1209
1210# case Opt_scrollBar_floating:
1211# case Opt_scrollBar_right:
1212# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1213# break;
1214 }
1215 }
1216}
1217 OUTPUT:
1218 RETVAL
1219
881void 1220void
882rxvt_term::cur (...) 1221rxvt_term::cur (...)
883 PROTOTYPE: $;$$ 1222 PROTOTYPE: $;$$
884 ALIAS: 1223 ALIAS:
885 screen_cur = 0 1224 screen_cur = 0
… …
909 THIS->want_refresh = 1; 1248 THIS->want_refresh = 1;
910 } 1249 }
911} 1250}
912 1251
913int 1252int
914rxvt_term::selection_grab (int eventtime = CurrentTime) 1253rxvt_term::selection_grab (U32 eventtime)
915 1254
916void 1255void
917rxvt_term::selection (SV *newtext = 0) 1256rxvt_term::selection (SV *newtext = 0)
918 PPCODE: 1257 PPCODE:
919{ 1258{
920 if (GIMME_V != G_VOID) 1259 if (GIMME_V != G_VOID)
921 { 1260 XPUSHs (taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))));
922 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
923 SV *sv = newSVpv (sel, 0);
924 SvUTF8_on (sv);
925 free (sel);
926 XPUSHs (sv_2mortal (sv));
927 }
928 1261
929 if (newtext) 1262 if (newtext)
930 { 1263 {
931 free (THIS->selection.text); 1264 free (THIS->selection.text);
932 1265
933 THIS->selection.text = sv2wcs (newtext); 1266 THIS->selection.text = sv2wcs (newtext);
934 THIS->selection.len = wcslen (THIS->selection.text); 1267 THIS->selection.len = wcslen (THIS->selection.text);
935 } 1268 }
1269}
1270
1271void
1272rxvt_term::scr_add_lines (SV *string)
1273 CODE:
1274{
1275 wchar_t *wstr = sv2wcs (string);
1276 THIS->scr_add_lines (wstr, wcslen (wstr));
1277 free (wstr);
936} 1278}
937 1279
938void 1280void
939rxvt_term::tt_write (SV *octets) 1281rxvt_term::tt_write (SV *octets)
940 INIT: 1282 INIT:
941 STRLEN len; 1283 STRLEN len;
942 char *str = SvPVbyte (octets, len); 1284 char *str = SvPVbyte (octets, len);
943 C_ARGS: 1285 C_ARGS:
944 str, len 1286 str, len
945 1287
1288void
1289rxvt_term::cmd_parse (SV *octets)
1290 CODE:
1291{
1292 STRLEN len;
1293 char *str = SvPVbyte (octets, len);
1294
1295 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1296 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1297
1298 THIS->cmdbuf_ptr = str;
1299 THIS->cmdbuf_endp = str + len;
1300
1301 rxvt_push_locale (THIS->locale);
1302 THIS->cmd_parse ();
1303 rxvt_pop_locale ();
1304
1305 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1306 THIS->cmdbuf_endp = old_cmdbuf_endp;
1307}
1308
946SV * 1309SV *
947rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1310rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
948 CODE: 1311 CODE:
949{ 1312{
950 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1313 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

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