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.25 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.47 by root, Mon Jan 9 02:06:43 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);
… …
407 perl = 0; 431 perl = 0;
408 } 432 }
409 } 433 }
410} 434}
411 435
436static void
437ungrab (rxvt_term *THIS)
438{
439 if (THIS->perl.grabtime)
440 {
441 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
442 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
443 THIS->perl.grabtime = 0;
444 }
445}
446
412bool 447bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 448rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
414{ 449{
415 if (!perl) 450 if (!perl)
416 return false; 451 return false;
417 452
418 if (htype == HOOK_INIT) // first hook ever called 453 if (htype == HOOK_INIT) // first hook ever called
419 { 454 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 455 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 456 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 457 }
423 else if (!term->self) 458 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 459 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 460 else if (htype == HOOK_DESTROY)
426 { 461 {
427 // handled later 462 // handled later
428 } 463 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 464 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
430 { 465 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 466 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
432 467
433 if (HvKEYS (hv)) 468 if (HvKEYS (hv))
434 { 469 {
435 hv_iterinit (hv); 470 hv_iterinit (hv);
436 471
… …
465 500
466 case DT_LONG: 501 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 502 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 503 break;
469 504
470 case DT_STRING: 505 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 506 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 507 break;
473 508
474 case DT_USTRING_LEN: 509 case DT_STR_LEN:
475 { 510 {
476 unicode_t *ustr = va_arg (ap, unicode_t *); 511 char *str = va_arg (ap, char *);
477 int ulen = va_arg (ap, int); 512 int len = va_arg (ap, int);
513
514 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
515 }
516 break;
517
518 case DT_WCS_LEN:
519 {
478 wchar_t *wstr = new wchar_t [ulen]; 520 wchar_t *wstr = va_arg (ap, wchar_t *);
521 int wlen = va_arg (ap, int);
479 522
480 for (int i = ulen; i--; )
481 wstr [i] = ustr [i];
482
483 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen))); 523 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
524 }
525 break;
484 526
485 delete [] wstr; 527 case DT_XEVENT:
486 } 528 {
529 XEvent *xe = va_arg (ap, XEvent *);
530 HV *hv = newHV ();
531
532# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
533# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
534# undef set
535
536 setiv (type, xe->type);
537 setiv (send_event, xe->xany.send_event);
538 setiv (serial, xe->xany.serial);
539
540 switch (xe->type)
541 {
542 case KeyPress:
543 case KeyRelease:
544 case ButtonPress:
545 case ButtonRelease:
546 case MotionNotify:
547 setiv (time, xe->xmotion.time);
548 setiv (x, xe->xmotion.x);
549 setiv (y, xe->xmotion.y);
550 setiv (row, xe->xmotion.y / term->fheight);
551 setiv (col, xe->xmotion.x / term->fwidth);
552 setiv (x_root, xe->xmotion.x_root);
553 setiv (y_root, xe->xmotion.y_root);
554 setiv (state, xe->xmotion.state);
555 break;
556 }
557
558 switch (xe->type)
559 {
560 case KeyPress:
561 case KeyRelease:
562 setiv (keycode, xe->xkey.keycode);
563 break;
564
565 case ButtonPress:
566 case ButtonRelease:
567 setiv (button, xe->xbutton.button);
568 break;
569
570 case MotionNotify:
571 setiv (is_hint, xe->xmotion.is_hint);
572 break;
573 }
574
575 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
576 }
577 break;
487 578
488 case DT_END: 579 case DT_END:
489 { 580 {
490 va_end (ap); 581 va_end (ap);
491 582
… …
502 PUTBACK; 593 PUTBACK;
503 FREETMPS; 594 FREETMPS;
504 LEAVE; 595 LEAVE;
505 596
506 if (SvTRUE (ERRSV)) 597 if (SvTRUE (ERRSV))
598 {
507 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 599 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
600 ungrab (term); // better lose the grab than the session
601 }
508 602
509 if (htype == HOOK_DESTROY) 603 if (htype == HOOK_DESTROY)
510 { 604 {
511 clearSVptr ((SV *)term->self); 605 clearSVptr ((SV *)term->perl.self);
512 SvREFCNT_dec ((SV *)term->self); 606 SvREFCNT_dec ((SV *)term->perl.self);
513 } 607 }
514 608
515 return count; 609 return count;
516 } 610 }
517 611
… …
527 621
528PROTOTYPES: ENABLE 622PROTOTYPES: ENABLE
529 623
530BOOT: 624BOOT:
531{ 625{
532# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 626 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
627
533 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 628 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
534# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 629# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
535# include "hookinc.h" 630# include "hookinc.h"
536# undef def 631# undef def
537 632
633 HV *option = get_hv ("urxvt::OPTION", 1);
634# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
635# define nodef(name)
636# include "optinc.h"
637# undef nodef
638# undef def
639
640 HV *stash = gv_stashpv ("urxvt", 1);
641# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
538 export_const (DEFAULT_RSTYLE); 642 export_const_iv (DEFAULT_RSTYLE);
539 export_const (OVERLAY_RSTYLE); 643 export_const_iv (OVERLAY_RSTYLE);
540 export_const (RS_Bold); 644 export_const_iv (RS_Bold);
541 export_const (RS_Italic); 645 export_const_iv (RS_Italic);
542 export_const (RS_Blink); 646 export_const_iv (RS_Blink);
543 export_const (RS_RVid); 647 export_const_iv (RS_RVid);
544 export_const (RS_Uline); 648 export_const_iv (RS_Uline);
545 649
546 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 650 export_const_iv (CurrentTime);
651 export_const_iv (ShiftMask);
652 export_const_iv (LockMask);
653 export_const_iv (ControlMask);
654 export_const_iv (Mod1Mask);
655 export_const_iv (Mod2Mask);
656 export_const_iv (Mod3Mask);
657 export_const_iv (Mod4Mask);
658 export_const_iv (Mod5Mask);
659 export_const_iv (Button1Mask);
660 export_const_iv (Button2Mask);
661 export_const_iv (Button3Mask);
662 export_const_iv (Button4Mask);
663 export_const_iv (Button5Mask);
664 export_const_iv (AnyModifier);
547} 665}
666
667SV *
668new (...)
669 CODE:
670{
671 stringvec *argv = new stringvec;
672 bool success;
673
674 for (int i = 0; i < items ;i++)
675 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
676
677 rxvt_term *term = new rxvt_term;
678
679 term->argv = argv;
680
681 try
682 {
683 if (!term->init (argv->size (), argv->begin ()))
684 term = 0;
685 }
686 catch (const class rxvt_failure_exception &e)
687 {
688 term->destroy ();
689 croak ("exception caught while initializing new terminal instance");
690 }
691
692 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
693}
694 OUTPUT:
695 RETVAL
548 696
549void 697void
550set_should_invoke (int htype, int value) 698set_should_invoke (int htype, int value)
551 CODE: 699 CODE:
552 rxvt_perl.should_invoke [htype] = value; 700 rxvt_perl.should_invoke [htype] = value;
… …
558 706
559void 707void
560fatal (const char *msg) 708fatal (const char *msg)
561 CODE: 709 CODE:
562 rxvt_fatal ("%s", msg); 710 rxvt_fatal ("%s", msg);
711
712SV *
713untaint (SV *sv)
714 CODE:
715 RETVAL = newSVsv (sv);
716 SvTAINTED_off (RETVAL);
717 OUTPUT:
718 RETVAL
719
720bool
721safe ()
722 CODE:
723 RETVAL = !rxvt_tainted ();
724 OUTPUT:
725 RETVAL
563 726
564NV 727NV
565NOW () 728NOW ()
566 CODE: 729 CODE:
567 RETVAL = NOW; 730 RETVAL = NOW;
… …
615} 778}
616 OUTPUT: 779 OUTPUT:
617 RETVAL 780 RETVAL
618 781
619MODULE = urxvt PACKAGE = urxvt::term 782MODULE = urxvt PACKAGE = urxvt::term
783
784void
785rxvt_term::destroy ()
786
787void
788rxvt_term::grab_button (int button, U32 modifiers)
789 CODE:
790 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
791 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
792 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
793
794bool
795rxvt_term::grab (U32 eventtime, int sync = 0)
796 CODE:
797{
798 int mode = sync ? GrabModeSync : GrabModeAsync;
799
800 THIS->perl.grabtime = 0;
801
802 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
803 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
804 mode, mode, None, GRAB_CURSOR, eventtime))
805 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
806 THIS->perl.grabtime = eventtime;
807 else
808 XUngrabPointer (THIS->display->display, eventtime);
809
810 RETVAL = !!THIS->perl.grabtime;
811}
812 OUTPUT:
813 RETVAL
814
815void
816rxvt_term::allow_events_async ()
817 CODE:
818 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
819
820void
821rxvt_term::allow_events_sync ()
822 CODE:
823 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
824
825void
826rxvt_term::allow_events_replay ()
827 CODE:
828 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
829 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
830
831void
832rxvt_term::ungrab ()
833 CODE:
834 ungrab (THIS);
620 835
621int 836int
622rxvt_term::strwidth (SV *str) 837rxvt_term::strwidth (SV *str)
623 CODE: 838 CODE:
624{ 839{
… …
643 char *mbstr = rxvt_wcstombs (wstr); 858 char *mbstr = rxvt_wcstombs (wstr);
644 rxvt_pop_locale (); 859 rxvt_pop_locale ();
645 860
646 free (wstr); 861 free (wstr);
647 862
648 RETVAL = newSVpv (mbstr, 0); 863 RETVAL = taint_if (newSVpv (mbstr, 0), str);
649 free (mbstr); 864 free (mbstr);
650} 865}
651 OUTPUT: 866 OUTPUT:
652 RETVAL 867 RETVAL
653 868
… …
660 875
661 rxvt_push_locale (THIS->locale); 876 rxvt_push_locale (THIS->locale);
662 wchar_t *wstr = rxvt_mbstowcs (data, len); 877 wchar_t *wstr = rxvt_mbstowcs (data, len);
663 rxvt_pop_locale (); 878 rxvt_pop_locale ();
664 879
665 RETVAL = wcs2sv (wstr); 880 RETVAL = taint_if (wcs2sv (wstr), octets);
666 free (wstr); 881 free (wstr);
667} 882}
668 OUTPUT: 883 OUTPUT:
669 RETVAL 884 RETVAL
670 885
671# very portable, especially on objects as opposed to pods 886#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
672#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
673 887
674#define TERM_OFFSET_width TERM_OFFSET(width) 888#define TERM_OFFSET_width TERM_OFFSET(width)
675#define TERM_OFFSET_height TERM_OFFSET(height) 889#define TERM_OFFSET_height TERM_OFFSET(height)
676#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 890#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
677#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 891#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
702 CODE: 916 CODE:
703 RETVAL = *(int *)((char *)THIS + ix); 917 RETVAL = *(int *)((char *)THIS + ix);
704 OUTPUT: 918 OUTPUT:
705 RETVAL 919 RETVAL
706 920
921unsigned int
922rxvt_term::ModLevel3Mask ()
923 ALIAS:
924 ModLevel3Mask = 0
925 ModMetaMask = 1
926 ModNumLockMask = 2
927 CODE:
928 switch (ix)
929 {
930 case 0: RETVAL = THIS->ModLevel3Mask; break;
931 case 1: RETVAL = THIS->ModMetaMask; break;
932 case 2: RETVAL = THIS->ModNumLockMask; break;
933 }
934 OUTPUT:
935 RETVAL
936
937U32
938rxvt_term::parent ()
939 CODE:
940 RETVAL = (U32)THIS->parent [0];
941 OUTPUT:
942 RETVAL
943
944U32
945rxvt_term::vt ()
946 CODE:
947 RETVAL = (U32)THIS->vt;
948 OUTPUT:
949 RETVAL
950
707U32 951U32
708rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 952rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
709 CODE: 953 CODE:
710{ 954{
711 RETVAL = THIS->rstyle; 955 RETVAL = THIS->rstyle;
… …
733rxvt_term::want_refresh () 977rxvt_term::want_refresh ()
734 CODE: 978 CODE:
735 THIS->want_refresh = 1; 979 THIS->want_refresh = 1;
736 980
737void 981void
738rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 982rxvt_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: 983 PPCODE:
740{ 984{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 985 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
742 XSRETURN_EMPTY; 986 XSRETURN_EMPTY;
743 987
… …
745 989
746 if (GIMME_V != G_VOID) 990 if (GIMME_V != G_VOID)
747 { 991 {
748 wchar_t *wstr = new wchar_t [THIS->ncol]; 992 wchar_t *wstr = new wchar_t [THIS->ncol];
749 993
750 for (int col = 0; col <THIS->ncol; col++) 994 for (int col = 0; col < THIS->ncol; col++)
751 wstr [col] = l.t [col]; 995 wstr [col] = l.t [col];
752 996
753 XPUSHs (sv_2mortal (wcs2sv (wstr))); 997 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
754 998
755 delete [] wstr; 999 delete [] wstr;
756 } 1000 }
757 1001
758 if (new_text) 1002 if (new_text)
759 { 1003 {
760 wchar_t *wstr = sv2wcs (new_text); 1004 wchar_t *wstr = sv2wcs (new_text);
761 1005
762 int len = wcslen (wstr); 1006 int len = min (wcslen (wstr) - start_ofs, max_len);
763 1007
764 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1008 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
765 { 1009 {
766 free (wstr); 1010 free (wstr);
767 croak ("new_text extends beyond horizontal margins"); 1011 croak ("new_text extends beyond horizontal margins");
768 } 1012 }
769 1013
770 for (int col = start_col; col < start_col + len; col++) 1014 for (int col = start_col; col < start_col + len; col++)
771 { 1015 {
772 l.t [col] = wstr [col - start_col]; 1016 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])); 1017 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
774 } 1018 }
775 1019
776 free (wstr); 1020 free (wstr);
777 } 1021 }
778} 1022}
779 1023
780void 1024void
781rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1025rxvt_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: 1026 PPCODE:
783{ 1027{
784 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1028 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
785 XSRETURN_EMPTY; 1029 XSRETURN_EMPTY;
786 1030
… …
801 { 1045 {
802 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1046 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
803 croak ("new_rend must be arrayref"); 1047 croak ("new_rend must be arrayref");
804 1048
805 AV *av = (AV *)SvRV (new_rend); 1049 AV *av = (AV *)SvRV (new_rend);
806 int len = av_len (av) + 1; 1050 int len = min (av_len (av) + 1 - start_ofs, max_len);
807 1051
808 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1052 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
809 croak ("new_rend array extends beyond horizontal margins"); 1053 croak ("new_rend array extends beyond horizontal margins");
810 1054
811 for (int col = start_col; col < start_col + len; col++) 1055 for (int col = start_col; col < start_col + len; col++)
812 { 1056 {
813 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1057 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
814 1058
815 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1059 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
816 } 1060 }
817 } 1061 }
818} 1062}
819 1063
820int 1064int
821rxvt_term::ROW_l (int row_number, int new_length = -2) 1065rxvt_term::ROW_l (int row_number, int new_length = -1)
822 CODE: 1066 CODE:
823{ 1067{
824 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1068 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
825 XSRETURN_EMPTY; 1069 XSRETURN_EMPTY;
826 1070
827 line_t &l = ROW(row_number); 1071 line_t &l = ROW(row_number);
828 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1072 RETVAL = l.l;
829 1073
830 if (new_length >= -1) 1074 if (new_length >= 0)
831 l.l = new_length; 1075 l.l = new_length;
832} 1076}
833 OUTPUT: 1077 OUTPUT:
834 RETVAL 1078 RETVAL
835 1079
836bool 1080bool
837rxvt_term::ROW_is_longer (int row_number) 1081rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
838 CODE: 1082 CODE:
839{ 1083{
840 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1084 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
841 XSRETURN_EMPTY; 1085 XSRETURN_EMPTY;
842 1086
843 line_t &l = ROW(row_number); 1087 line_t &l = ROW(row_number);
844 RETVAL = l.l < 0; 1088 RETVAL = l.is_longer ();
1089
1090 if (new_is_longer >= 0)
1091 l.is_longer (new_is_longer);
845} 1092}
846 OUTPUT: 1093 OUTPUT:
847 RETVAL 1094 RETVAL
848 1095
849SV * 1096SV *
850rxvt_term::special_encode (SV *str) 1097rxvt_term::special_encode (SV *string)
851 CODE: 1098 CODE:
852 abort ();//TODO 1099{
1100 wchar_t *wstr = sv2wcs (string);
1101 int wlen = wcslen (wstr);
1102 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1103
1104 rxvt_push_locale (THIS->locale);
1105
1106 wchar_t *r = rstr;
1107 for (wchar_t *s = wstr; *s; s++)
1108 if (wcwidth (*s) == 0)
1109 {
1110 if (r == rstr)
1111 croak ("leading combining character unencodable");
1112
1113 unicode_t n = rxvt_compose (r[-1], *s);
1114 if (n == NOCHAR)
1115 n = rxvt_composite.compose (r[-1], *s);
1116
1117 r[-1] = n;
1118 }
1119#if !UNICODE_3
1120 else if (*s >= 0x10000)
1121 *r++ = rxvt_composite.compose (*s);
1122#endif
1123 else
1124 *r++ = *s;
1125
1126 rxvt_pop_locale ();
1127
1128 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1129
1130 delete [] rstr;
1131}
1132 OUTPUT:
1133 RETVAL
853 1134
854SV * 1135SV *
855rxvt_term::special_decode (SV *str) 1136rxvt_term::special_decode (SV *text)
856 CODE: 1137 CODE:
857 abort ();//TODO 1138{
1139 wchar_t *wstr = sv2wcs (text);
1140 int wlen = wcslen (wstr);
1141 int dlen = 0;
1142
1143 // find length
1144 for (wchar_t *s = wstr; *s; s++)
1145 if (*s == NOCHAR)
1146 ;
1147 else if (IS_COMPOSE (*s))
1148 dlen += rxvt_composite.expand (*s, 0);
1149 else
1150 dlen++;
1151
1152 wchar_t *rstr = new wchar_t [dlen];
1153
1154 // decode
1155 wchar_t *r = rstr;
1156 for (wchar_t *s = wstr; *s; s++)
1157 if (*s == NOCHAR)
1158 ;
1159 else if (IS_COMPOSE (*s))
1160 r += rxvt_composite.expand (*s, r);
1161 else
1162 *r++ = *s;
1163
1164 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1165
1166 delete [] rstr;
1167}
1168 OUTPUT:
1169 RETVAL
858 1170
859void 1171void
860rxvt_term::_resource (char *name, int index, SV *newval = 0) 1172rxvt_term::_resource (char *name, int index, SV *newval = 0)
861 PPCODE: 1173 PPCODE:
862{ 1174{
… …
879 1191
880 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1192 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
881 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1193 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
882 1194
883 if (GIMME_V != G_VOID) 1195 if (GIMME_V != G_VOID)
884 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1196 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
885 1197
886 if (newval) 1198 if (newval)
887 { 1199 {
888 if (SvOK (newval)) 1200 if (SvOK (newval))
889 { 1201 {
… …
894 else 1206 else
895 THIS->rs [index] = 0; 1207 THIS->rs [index] = 0;
896 } 1208 }
897} 1209}
898 1210
1211bool
1212rxvt_term::option (U32 optval, int set = -1)
1213 CODE:
1214{
1215 RETVAL = THIS->options & optval;
1216
1217 if (set >= 0)
1218 {
1219 if (set)
1220 THIS->options |= optval;
1221 else
1222 THIS->options &= ~optval;
1223
1224 switch (optval)
1225 {
1226 case Opt_skipBuiltinGlyphs:
1227 THIS->set_fonts ();
1228 THIS->scr_remap_chars ();
1229 THIS->scr_touch (true);
1230 THIS->want_refresh = 1;
1231 break;
1232
1233 case Opt_cursorUnderline:
1234 THIS->want_refresh = 1;
1235 break;
1236
1237# case Opt_scrollBar_floating:
1238# case Opt_scrollBar_right:
1239# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1240# break;
1241 }
1242 }
1243}
1244 OUTPUT:
1245 RETVAL
1246
899void 1247void
900rxvt_term::cur (...) 1248rxvt_term::screen_cur (...)
901 PROTOTYPE: $;$$ 1249 PROTOTYPE: $;$$
902 ALIAS: 1250 ALIAS:
903 screen_cur = 0 1251 screen_cur = 0
904 selection_beg = 1 1252 selection_beg = 1
905 selection_end = 2 1253 selection_end = 2
… …
927 THIS->want_refresh = 1; 1275 THIS->want_refresh = 1;
928 } 1276 }
929} 1277}
930 1278
931int 1279int
932rxvt_term::selection_grab (int eventtime = CurrentTime) 1280rxvt_term::selection_grab (U32 eventtime)
933 1281
934void 1282void
935rxvt_term::selection (SV *newtext = 0) 1283rxvt_term::selection (SV *newtext = 0)
936 PPCODE: 1284 PPCODE:
937{ 1285{
938 if (GIMME_V != G_VOID) 1286 if (GIMME_V != G_VOID)
1287 XPUSHs (THIS->selection.text
939 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1288 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1289 : &PL_sv_undef);
940 1290
941 if (newtext) 1291 if (newtext)
942 { 1292 {
943 free (THIS->selection.text); 1293 free (THIS->selection.text);
944 1294
… …
950void 1300void
951rxvt_term::scr_add_lines (SV *string) 1301rxvt_term::scr_add_lines (SV *string)
952 CODE: 1302 CODE:
953{ 1303{
954 wchar_t *wstr = sv2wcs (string); 1304 wchar_t *wstr = sv2wcs (string);
955 int wlen = wcslen (wstr);
956 unicode_t *ustr = new unicode_t [wlen];
957 int nlines = 0;
958
959 for (int i = wlen; i--; )
960 {
961 ustr [i] = wstr [i];
962 nlines += ustr [i] == '\012';
963 }
964
965 THIS->scr_add_lines (ustr, nlines, wlen); 1305 THIS->scr_add_lines (wstr, wcslen (wstr));
966
967 free (wstr); 1306 free (wstr);
968 delete [] ustr;
969} 1307}
970 1308
971void 1309void
972rxvt_term::tt_write (SV *octets) 1310rxvt_term::tt_write (SV *octets)
973 INIT: 1311 INIT:
974 STRLEN len; 1312 STRLEN len;
975 char *str = SvPVbyte (octets, len); 1313 char *str = SvPVbyte (octets, len);
976 C_ARGS: 1314 C_ARGS:
977 str, len 1315 str, len
978 1316
1317void
1318rxvt_term::cmd_parse (SV *octets)
1319 CODE:
1320{
1321 STRLEN len;
1322 char *str = SvPVbyte (octets, len);
1323
1324 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1325 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1326
1327 THIS->cmdbuf_ptr = str;
1328 THIS->cmdbuf_endp = str + len;
1329
1330 rxvt_push_locale (THIS->locale);
1331 THIS->cmd_parse ();
1332 rxvt_pop_locale ();
1333
1334 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1335 THIS->cmdbuf_endp = old_cmdbuf_endp;
1336}
1337
979SV * 1338SV *
980rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1339rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
981 CODE: 1340 CODE:
982{ 1341{
983 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1342 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

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