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.51 by root, Mon Jan 9 23:00:07 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
34#include "iom.h"
33#include "rxvt.h" 35#include "rxvt.h"
34#include "iom.h" 36#include "keyboard.h"
35#include "rxvtutil.h" 37#include "rxvtutil.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include "perlxsi.c" 40#include "perlxsi.c"
41
42#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
43# define GRAB_CURSOR THIS->leftptr_cursor
44#else
45# define GRAB_CURSOR None
46#endif
39 47
40#undef LINENO 48#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 49#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW 50#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 51#define ROW(n) THIS->row_buf [LINENO (n)]
44 52
45///////////////////////////////////////////////////////////////////////////// 53/////////////////////////////////////////////////////////////////////////////
46 54
55static SV *
56taint (SV *sv)
57{
58 SvTAINT (sv);
59 return sv;
60}
61
62static SV *
63taint_if (SV *sv, SV *src)
64{
65 if (SvTAINTED (src))
66 SvTAINT (sv);
67
68 return sv;
69}
70
47static wchar_t * 71static wchar_t *
48sv2wcs (SV *sv) 72sv2wcs (SV *sv)
49{ 73{
50 STRLEN len; 74 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 75 char *str = SvPVutf8 (sv, len);
… …
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 125 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 126
103 return (long)mg->mg_ptr; 127 return (long)mg->mg_ptr;
104} 128}
105 129
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 130#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 131#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 132
109///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
110 134
111struct perl_watcher 135struct perl_watcher
… …
290void 314void
291overlay::show () 315overlay::show ()
292{ 316{
293 char key[33]; sprintf (key, "%32lx", (long)this); 317 char key[33]; sprintf (key, "%32lx", (long)this);
294 318
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 319 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); 320 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 321}
298 322
299void 323void
300overlay::hide () 324overlay::hide ()
301{ 325{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 326 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 327
304 if (ovs) 328 if (ovs)
305 { 329 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 330 char key[33]; sprintf (key, "%32lx", (long)this);
307 331
… …
389{ 413{
390 if (!perl) 414 if (!perl)
391 { 415 {
392 char *argv[] = { 416 char *argv[] = {
393 "", 417 "",
418 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 419 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 420 };
396 421
397 perl = perl_alloc (); 422 perl = perl_alloc ();
398 perl_construct (perl); 423 perl_construct (perl);
399 424
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 425 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 426 || perl_run (perl))
402 { 427 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 428 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 429
405 perl_destruct (perl); 430 perl_destruct (perl);
… …
407 perl = 0; 432 perl = 0;
408 } 433 }
409 } 434 }
410} 435}
411 436
437static void
438ungrab (rxvt_term *THIS)
439{
440 if (THIS->perl.grabtime)
441 {
442 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
443 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
444 THIS->perl.grabtime = 0;
445 }
446}
447
412bool 448bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 449rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
414{ 450{
415 if (!perl) 451 if (!perl)
416 return false; 452 return false;
417 453
418 if (htype == HOOK_INIT) // first hook ever called 454 if (htype == HOOK_INIT) // first hook ever called
419 { 455 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 456 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 457 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 458 }
423 else if (!term->self) 459 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 460 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 461 else if (htype == HOOK_DESTROY)
426 { 462 {
427 // handled later 463 // handled later
428 } 464 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 465 else
430 { 466 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 467 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
432
433 if (HvKEYS (hv))
434 { 468 {
469 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
470
471 if (HvKEYS (hv))
472 {
435 hv_iterinit (hv); 473 hv_iterinit (hv);
436 474
437 while (HE *he = hv_iternext (hv)) 475 while (HE *he = hv_iternext (hv))
438 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 476 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
477 }
478
439 } 479 }
480
481 if (!should_invoke [htype])
482 return false;
440 } 483 }
441 else if (!should_invoke [htype])
442 return false;
443 484
444 dSP; 485 dSP;
445 va_list ap; 486 va_list ap;
446 487
447 va_start (ap, htype); 488 va_start (ap, htype);
… …
465 506
466 case DT_LONG: 507 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 509 break;
469 510
470 case DT_STRING: 511 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 512 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 513 break;
473 514
474 case DT_USTRING_LEN: 515 case DT_STR_LEN:
475 { 516 {
476 unicode_t *ustr = va_arg (ap, unicode_t *); 517 char *str = va_arg (ap, char *);
477 int ulen = va_arg (ap, int); 518 int len = va_arg (ap, int);
519
520 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
521 }
522 break;
523
524 case DT_WCS_LEN:
525 {
478 wchar_t *wstr = new wchar_t [ulen]; 526 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int);
479 528
480 for (int i = ulen; i--; )
481 wstr [i] = ustr [i];
482
483 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen))); 529 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
530 }
531 break;
484 532
485 delete [] wstr; 533 case DT_XEVENT:
486 } 534 {
535 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV ();
537
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
539# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
540# undef set
541
542 setiv (type, xe->type);
543 setiv (send_event, xe->xany.send_event);
544 setiv (serial, xe->xany.serial);
545
546 switch (xe->type)
547 {
548 case KeyPress:
549 case KeyRelease:
550 case ButtonPress:
551 case ButtonRelease:
552 case MotionNotify:
553 setiv (time, xe->xmotion.time);
554 setiv (x, xe->xmotion.x);
555 setiv (y, xe->xmotion.y);
556 setiv (row, xe->xmotion.y / term->fheight);
557 setiv (col, xe->xmotion.x / term->fwidth);
558 setiv (x_root, xe->xmotion.x_root);
559 setiv (y_root, xe->xmotion.y_root);
560 setiv (state, xe->xmotion.state);
561 break;
562 }
563
564 switch (xe->type)
565 {
566 case KeyPress:
567 case KeyRelease:
568 setiv (keycode, xe->xkey.keycode);
569 break;
570
571 case ButtonPress:
572 case ButtonRelease:
573 setiv (button, xe->xbutton.button);
574 break;
575
576 case MotionNotify:
577 setiv (is_hint, xe->xmotion.is_hint);
578 break;
579 }
580
581 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
582 }
583 break;
487 584
488 case DT_END: 585 case DT_END:
489 { 586 {
490 va_end (ap); 587 va_end (ap);
491 588
… …
502 PUTBACK; 599 PUTBACK;
503 FREETMPS; 600 FREETMPS;
504 LEAVE; 601 LEAVE;
505 602
506 if (SvTRUE (ERRSV)) 603 if (SvTRUE (ERRSV))
604 {
507 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 605 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
606 ungrab (term); // better lose the grab than the session
607 }
508 608
509 if (htype == HOOK_DESTROY) 609 if (htype == HOOK_DESTROY)
510 { 610 {
511 clearSVptr ((SV *)term->self); 611 clearSVptr ((SV *)term->perl.self);
512 SvREFCNT_dec ((SV *)term->self); 612 SvREFCNT_dec ((SV *)term->perl.self);
513 } 613 }
514 614
515 return count; 615 return count;
516 } 616 }
517 617
… …
527 627
528PROTOTYPES: ENABLE 628PROTOTYPES: ENABLE
529 629
530BOOT: 630BOOT:
531{ 631{
532# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 632 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
633
533 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 634 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
534# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 635# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
535# include "hookinc.h" 636# include "hookinc.h"
536# undef def 637# undef def
537 638
639 HV *option = get_hv ("urxvt::OPTION", 1);
640# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
641# define nodef(name)
642# include "optinc.h"
643# undef nodef
644# undef def
645
646 HV *stash = gv_stashpv ("urxvt", 1);
647# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
538 export_const (DEFAULT_RSTYLE); 648 export_const_iv (DEFAULT_RSTYLE);
539 export_const (OVERLAY_RSTYLE); 649 export_const_iv (OVERLAY_RSTYLE);
540 export_const (RS_Bold); 650 export_const_iv (RS_Bold);
541 export_const (RS_Italic); 651 export_const_iv (RS_Italic);
542 export_const (RS_Blink); 652 export_const_iv (RS_Blink);
543 export_const (RS_RVid); 653 export_const_iv (RS_RVid);
544 export_const (RS_Uline); 654 export_const_iv (RS_Uline);
545 655
546 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 656 export_const_iv (CurrentTime);
657 export_const_iv (ShiftMask);
658 export_const_iv (LockMask);
659 export_const_iv (ControlMask);
660 export_const_iv (Mod1Mask);
661 export_const_iv (Mod2Mask);
662 export_const_iv (Mod3Mask);
663 export_const_iv (Mod4Mask);
664 export_const_iv (Mod5Mask);
665 export_const_iv (Button1Mask);
666 export_const_iv (Button2Mask);
667 export_const_iv (Button3Mask);
668 export_const_iv (Button4Mask);
669 export_const_iv (Button5Mask);
670 export_const_iv (AnyModifier);
671
672 export_const_iv (EVENT_NONE);
673 export_const_iv (EVENT_READ);
674 export_const_iv (EVENT_WRITE);
547} 675}
676
677SV *
678new (...)
679 CODE:
680{
681 stringvec *argv = new stringvec;
682 bool success;
683
684 for (int i = 0; i < items ;i++)
685 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
686
687 rxvt_term *term = new rxvt_term;
688
689 term->argv = argv;
690
691 try
692 {
693 if (!term->init (argv->size (), argv->begin ()))
694 term = 0;
695 }
696 catch (const class rxvt_failure_exception &e)
697 {
698 term->destroy ();
699 croak ("exception caught while initializing new terminal instance");
700 }
701
702 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
703}
704 OUTPUT:
705 RETVAL
548 706
549void 707void
550set_should_invoke (int htype, int value) 708set_should_invoke (int htype, int value)
551 CODE: 709 CODE:
552 rxvt_perl.should_invoke [htype] = value; 710 rxvt_perl.should_invoke [htype] = value;
… …
558 716
559void 717void
560fatal (const char *msg) 718fatal (const char *msg)
561 CODE: 719 CODE:
562 rxvt_fatal ("%s", msg); 720 rxvt_fatal ("%s", msg);
721
722SV *
723untaint (SV *sv)
724 CODE:
725 RETVAL = newSVsv (sv);
726 SvTAINTED_off (RETVAL);
727 OUTPUT:
728 RETVAL
729
730bool
731safe ()
732 CODE:
733 RETVAL = !rxvt_tainted ();
734 OUTPUT:
735 RETVAL
563 736
564NV 737NV
565NOW () 738NOW ()
566 CODE: 739 CODE:
567 RETVAL = NOW; 740 RETVAL = NOW;
… …
615} 788}
616 OUTPUT: 789 OUTPUT:
617 RETVAL 790 RETVAL
618 791
619MODULE = urxvt PACKAGE = urxvt::term 792MODULE = urxvt PACKAGE = urxvt::term
793
794void
795rxvt_term::destroy ()
796
797void
798rxvt_term::grab_button (int button, U32 modifiers)
799 CODE:
800 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
801 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
802 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
803
804bool
805rxvt_term::grab (U32 eventtime, int sync = 0)
806 CODE:
807{
808 int mode = sync ? GrabModeSync : GrabModeAsync;
809
810 THIS->perl.grabtime = 0;
811
812 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
813 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
814 mode, mode, None, GRAB_CURSOR, eventtime))
815 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
816 THIS->perl.grabtime = eventtime;
817 else
818 XUngrabPointer (THIS->display->display, eventtime);
819
820 RETVAL = !!THIS->perl.grabtime;
821}
822 OUTPUT:
823 RETVAL
824
825void
826rxvt_term::allow_events_async ()
827 CODE:
828 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
829
830void
831rxvt_term::allow_events_sync ()
832 CODE:
833 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
834
835void
836rxvt_term::allow_events_replay ()
837 CODE:
838 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
839 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
840
841void
842rxvt_term::ungrab ()
843 CODE:
844 ungrab (THIS);
620 845
621int 846int
622rxvt_term::strwidth (SV *str) 847rxvt_term::strwidth (SV *str)
623 CODE: 848 CODE:
624{ 849{
… …
643 char *mbstr = rxvt_wcstombs (wstr); 868 char *mbstr = rxvt_wcstombs (wstr);
644 rxvt_pop_locale (); 869 rxvt_pop_locale ();
645 870
646 free (wstr); 871 free (wstr);
647 872
648 RETVAL = newSVpv (mbstr, 0); 873 RETVAL = taint_if (newSVpv (mbstr, 0), str);
649 free (mbstr); 874 free (mbstr);
650} 875}
651 OUTPUT: 876 OUTPUT:
652 RETVAL 877 RETVAL
653 878
… …
660 885
661 rxvt_push_locale (THIS->locale); 886 rxvt_push_locale (THIS->locale);
662 wchar_t *wstr = rxvt_mbstowcs (data, len); 887 wchar_t *wstr = rxvt_mbstowcs (data, len);
663 rxvt_pop_locale (); 888 rxvt_pop_locale ();
664 889
665 RETVAL = wcs2sv (wstr); 890 RETVAL = taint_if (wcs2sv (wstr), octets);
666 free (wstr); 891 free (wstr);
667} 892}
668 OUTPUT: 893 OUTPUT:
669 RETVAL 894 RETVAL
670 895
671# very portable, especially on objects as opposed to pods 896#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
672#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
673 897
674#define TERM_OFFSET_width TERM_OFFSET(width) 898#define TERM_OFFSET_width TERM_OFFSET(width)
675#define TERM_OFFSET_height TERM_OFFSET(height) 899#define TERM_OFFSET_height TERM_OFFSET(height)
676#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 900#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
677#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 901#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
702 CODE: 926 CODE:
703 RETVAL = *(int *)((char *)THIS + ix); 927 RETVAL = *(int *)((char *)THIS + ix);
704 OUTPUT: 928 OUTPUT:
705 RETVAL 929 RETVAL
706 930
931unsigned int
932rxvt_term::ModLevel3Mask ()
933 ALIAS:
934 ModLevel3Mask = 0
935 ModMetaMask = 1
936 ModNumLockMask = 2
937 CODE:
938 switch (ix)
939 {
940 case 0: RETVAL = THIS->ModLevel3Mask; break;
941 case 1: RETVAL = THIS->ModMetaMask; break;
942 case 2: RETVAL = THIS->ModNumLockMask; break;
943 }
944 OUTPUT:
945 RETVAL
946
947char *
948rxvt_term::display_id ()
949 ALIAS:
950 display_id = 0
951 locale = 1
952 CODE:
953 switch (ix)
954 {
955 case 0: RETVAL = THIS->display->id; break;
956 case 1: RETVAL = THIS->locale; break;
957 }
958 OUTPUT:
959 RETVAL
960
961int
962rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
963 CODE:
964 RETVAL = THIS->pty_ev.events;
965 if (events != EVENT_UNDEF)
966 THIS->pty_ev.set (events);
967 OUTPUT:
968 RETVAL
969
970U32
971rxvt_term::parent ()
972 CODE:
973 RETVAL = (U32)THIS->parent [0];
974 OUTPUT:
975 RETVAL
976
977U32
978rxvt_term::vt ()
979 CODE:
980 RETVAL = (U32)THIS->vt;
981 OUTPUT:
982 RETVAL
983
707U32 984U32
708rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 985rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
709 CODE: 986 CODE:
710{ 987{
711 RETVAL = THIS->rstyle; 988 RETVAL = THIS->rstyle;
… …
733rxvt_term::want_refresh () 1010rxvt_term::want_refresh ()
734 CODE: 1011 CODE:
735 THIS->want_refresh = 1; 1012 THIS->want_refresh = 1;
736 1013
737void 1014void
738rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 1015rxvt_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: 1016 PPCODE:
740{ 1017{
741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1018 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
742 XSRETURN_EMPTY; 1019 XSRETURN_EMPTY;
743 1020
… …
745 1022
746 if (GIMME_V != G_VOID) 1023 if (GIMME_V != G_VOID)
747 { 1024 {
748 wchar_t *wstr = new wchar_t [THIS->ncol]; 1025 wchar_t *wstr = new wchar_t [THIS->ncol];
749 1026
750 for (int col = 0; col <THIS->ncol; col++) 1027 for (int col = 0; col < THIS->ncol; col++)
751 wstr [col] = l.t [col]; 1028 wstr [col] = l.t [col];
752 1029
753 XPUSHs (sv_2mortal (wcs2sv (wstr))); 1030 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
754 1031
755 delete [] wstr; 1032 delete [] wstr;
756 } 1033 }
757 1034
758 if (new_text) 1035 if (new_text)
759 { 1036 {
760 wchar_t *wstr = sv2wcs (new_text); 1037 wchar_t *wstr = sv2wcs (new_text);
761 1038
762 int len = wcslen (wstr); 1039 int len = min (wcslen (wstr) - start_ofs, max_len);
763 1040
764 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1041 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
765 { 1042 {
766 free (wstr); 1043 free (wstr);
767 croak ("new_text extends beyond horizontal margins"); 1044 croak ("new_text extends beyond horizontal margins");
768 } 1045 }
769 1046
770 for (int col = start_col; col < start_col + len; col++) 1047 for (int col = start_col; col < start_col + len; col++)
771 { 1048 {
772 l.t [col] = wstr [col - start_col]; 1049 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])); 1050 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
774 } 1051 }
775 1052
776 free (wstr); 1053 free (wstr);
777 } 1054 }
778} 1055}
779 1056
780void 1057void
781rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1058rxvt_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: 1059 PPCODE:
783{ 1060{
784 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1061 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
785 XSRETURN_EMPTY; 1062 XSRETURN_EMPTY;
786 1063
… …
801 { 1078 {
802 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1079 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
803 croak ("new_rend must be arrayref"); 1080 croak ("new_rend must be arrayref");
804 1081
805 AV *av = (AV *)SvRV (new_rend); 1082 AV *av = (AV *)SvRV (new_rend);
806 int len = av_len (av) + 1; 1083 int len = min (av_len (av) + 1 - start_ofs, max_len);
807 1084
808 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1085 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
809 croak ("new_rend array extends beyond horizontal margins"); 1086 croak ("new_rend array extends beyond horizontal margins");
810 1087
811 for (int col = start_col; col < start_col + len; col++) 1088 for (int col = start_col; col < start_col + len; col++)
812 { 1089 {
813 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1090 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
814 1091
815 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1092 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
816 } 1093 }
817 } 1094 }
818} 1095}
… …
848} 1125}
849 OUTPUT: 1126 OUTPUT:
850 RETVAL 1127 RETVAL
851 1128
852SV * 1129SV *
853rxvt_term::special_encode (SV *str) 1130rxvt_term::special_encode (SV *string)
854 CODE: 1131 CODE:
855 abort ();//TODO 1132{
1133 wchar_t *wstr = sv2wcs (string);
1134 int wlen = wcslen (wstr);
1135 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1136
1137 rxvt_push_locale (THIS->locale);
1138
1139 wchar_t *r = rstr;
1140 for (wchar_t *s = wstr; *s; s++)
1141 if (wcwidth (*s) == 0)
1142 {
1143 if (r == rstr)
1144 croak ("leading combining character unencodable");
1145
1146 unicode_t n = rxvt_compose (r[-1], *s);
1147 if (n == NOCHAR)
1148 n = rxvt_composite.compose (r[-1], *s);
1149
1150 r[-1] = n;
1151 }
1152#if !UNICODE_3
1153 else if (*s >= 0x10000)
1154 *r++ = rxvt_composite.compose (*s);
1155#endif
1156 else
1157 *r++ = *s;
1158
1159 rxvt_pop_locale ();
1160
1161 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1162
1163 delete [] rstr;
1164}
1165 OUTPUT:
1166 RETVAL
856 1167
857SV * 1168SV *
858rxvt_term::special_decode (SV *str) 1169rxvt_term::special_decode (SV *text)
859 CODE: 1170 CODE:
860 abort ();//TODO 1171{
1172 wchar_t *wstr = sv2wcs (text);
1173 int wlen = wcslen (wstr);
1174 int dlen = 0;
1175
1176 // find length
1177 for (wchar_t *s = wstr; *s; s++)
1178 if (*s == NOCHAR)
1179 ;
1180 else if (IS_COMPOSE (*s))
1181 dlen += rxvt_composite.expand (*s, 0);
1182 else
1183 dlen++;
1184
1185 wchar_t *rstr = new wchar_t [dlen];
1186
1187 // decode
1188 wchar_t *r = rstr;
1189 for (wchar_t *s = wstr; *s; s++)
1190 if (*s == NOCHAR)
1191 ;
1192 else if (IS_COMPOSE (*s))
1193 r += rxvt_composite.expand (*s, r);
1194 else
1195 *r++ = *s;
1196
1197 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1198
1199 delete [] rstr;
1200}
1201 OUTPUT:
1202 RETVAL
861 1203
862void 1204void
863rxvt_term::_resource (char *name, int index, SV *newval = 0) 1205rxvt_term::_resource (char *name, int index, SV *newval = 0)
864 PPCODE: 1206 PPCODE:
865{ 1207{
… …
882 1224
883 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1225 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
884 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1226 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
885 1227
886 if (GIMME_V != G_VOID) 1228 if (GIMME_V != G_VOID)
887 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1229 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
888 1230
889 if (newval) 1231 if (newval)
890 { 1232 {
891 if (SvOK (newval)) 1233 if (SvOK (newval))
892 { 1234 {
… …
897 else 1239 else
898 THIS->rs [index] = 0; 1240 THIS->rs [index] = 0;
899 } 1241 }
900} 1242}
901 1243
1244bool
1245rxvt_term::option (U32 optval, int set = -1)
1246 CODE:
1247{
1248 RETVAL = THIS->options & optval;
1249
1250 if (set >= 0)
1251 {
1252 if (set)
1253 THIS->options |= optval;
1254 else
1255 THIS->options &= ~optval;
1256
1257 switch (optval)
1258 {
1259 case Opt_skipBuiltinGlyphs:
1260 THIS->set_fonts ();
1261 THIS->scr_remap_chars ();
1262 THIS->scr_touch (true);
1263 THIS->want_refresh = 1;
1264 break;
1265
1266 case Opt_cursorUnderline:
1267 THIS->want_refresh = 1;
1268 break;
1269
1270# case Opt_scrollBar_floating:
1271# case Opt_scrollBar_right:
1272# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1273# break;
1274 }
1275 }
1276}
1277 OUTPUT:
1278 RETVAL
1279
1280bool
1281rxvt_term::parse_keysym (char *keysym, char *str)
1282 CODE:
1283 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1284 THIS->keyboard->register_done ();
1285 OUTPUT:
1286 RETVAL
1287
902void 1288void
903rxvt_term::cur (...) 1289rxvt_term::screen_cur (...)
904 PROTOTYPE: $;$$ 1290 PROTOTYPE: $;$$
905 ALIAS: 1291 ALIAS:
906 screen_cur = 0 1292 screen_cur = 0
907 selection_beg = 1 1293 selection_beg = 1
908 selection_end = 2 1294 selection_end = 2
… …
930 THIS->want_refresh = 1; 1316 THIS->want_refresh = 1;
931 } 1317 }
932} 1318}
933 1319
934int 1320int
935rxvt_term::selection_grab (int eventtime = CurrentTime) 1321rxvt_term::selection_grab (U32 eventtime)
936 1322
937void 1323void
938rxvt_term::selection (SV *newtext = 0) 1324rxvt_term::selection (SV *newtext = 0)
939 PPCODE: 1325 PPCODE:
940{ 1326{
941 if (GIMME_V != G_VOID) 1327 if (GIMME_V != G_VOID)
1328 XPUSHs (THIS->selection.text
942 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1329 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1330 : &PL_sv_undef);
943 1331
944 if (newtext) 1332 if (newtext)
945 { 1333 {
946 free (THIS->selection.text); 1334 free (THIS->selection.text);
947 1335
… …
949 THIS->selection.len = wcslen (THIS->selection.text); 1337 THIS->selection.len = wcslen (THIS->selection.text);
950 } 1338 }
951} 1339}
952 1340
953void 1341void
1342rxvt_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)
1343
1344void
1345rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1346
1347void
1348rxvt_term::scr_bell ()
1349
1350void
954rxvt_term::scr_add_lines (SV *string) 1351rxvt_term::scr_add_lines (SV *string)
955 CODE: 1352 CODE:
956{ 1353{
957 wchar_t *wstr = sv2wcs (string); 1354 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); 1355 THIS->scr_add_lines (wstr, wcslen (wstr));
969
970 free (wstr); 1356 free (wstr);
971 delete [] ustr;
972} 1357}
973 1358
974void 1359void
975rxvt_term::tt_write (SV *octets) 1360rxvt_term::tt_write (SV *octets)
976 INIT: 1361 INIT:
977 STRLEN len; 1362 STRLEN len;
978 char *str = SvPVbyte (octets, len); 1363 char *str = SvPVbyte (octets, len);
979 C_ARGS: 1364 C_ARGS:
980 str, len 1365 str, len
981 1366
1367void
1368rxvt_term::cmd_parse (SV *octets)
1369 CODE:
1370{
1371 STRLEN len;
1372 char *str = SvPVbyte (octets, len);
1373
1374 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1375 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1376
1377 THIS->cmdbuf_ptr = str;
1378 THIS->cmdbuf_endp = str + len;
1379
1380 rxvt_push_locale (THIS->locale);
1381 THIS->cmd_parse ();
1382 rxvt_pop_locale ();
1383
1384 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1385 THIS->cmdbuf_endp = old_cmdbuf_endp;
1386}
1387
982SV * 1388SV *
983rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1389rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
984 CODE: 1390 CODE:
985{ 1391{
986 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1392 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

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