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.56 by root, Thu Jan 12 00:35:39 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);
52 return rxvt_utf8towcs (str, len); 76 return rxvt_utf8towcs (str, len);
53} 77}
54 78
55static SV * 79static SV *
80wcs2sv (wchar_t *wstr, int len = -1)
81{
82 char *str = rxvt_wcstoutf8 (wstr, len);
83
84 SV *sv = newSVpv (str, 0);
85 SvUTF8_on (sv);
86 free (str);
87
88 return sv;
89}
90
91static SV *
56new_ref (HV *hv, const char *klass) 92new_ref (HV *hv, const char *klass)
57{ 93{
58 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 94 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
59} 95}
60 96
… …
89 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);
90 126
91 return (long)mg->mg_ptr; 127 return (long)mg->mg_ptr;
92} 128}
93 129
94#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 130#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
95#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 131#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
96 132
97///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
98 134
99struct perl_watcher 135struct perl_watcher
… …
278void 314void
279overlay::show () 315overlay::show ()
280{ 316{
281 char key[33]; sprintf (key, "%32lx", (long)this); 317 char key[33]; sprintf (key, "%32lx", (long)this);
282 318
283 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));
284 hv_store (hv, key, 32, newSViv ((long)this), 0); 320 hv_store (hv, key, 32, newSViv ((long)this), 0);
285} 321}
286 322
287void 323void
288overlay::hide () 324overlay::hide ()
289{ 325{
290 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);
291 327
292 if (ovs) 328 if (ovs)
293 { 329 {
294 char key[33]; sprintf (key, "%32lx", (long)this); 330 char key[33]; sprintf (key, "%32lx", (long)this);
295 331
… …
375void 411void
376rxvt_perl_interp::init () 412rxvt_perl_interp::init ()
377{ 413{
378 if (!perl) 414 if (!perl)
379 { 415 {
416 temp_environ temp_environ(rxvt_environ);
417
380 char *argv[] = { 418 char *argv[] = {
381 "", 419 "",
420 "-T",
382 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 421 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
383 }; 422 };
384 423
385 perl = perl_alloc (); 424 perl = perl_alloc ();
386 perl_construct (perl); 425 perl_construct (perl);
387 426
388 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 427 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
389 || perl_run (perl)) 428 || perl_run (perl))
390 { 429 {
391 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 430 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
392 431
393 perl_destruct (perl); 432 perl_destruct (perl);
… …
395 perl = 0; 434 perl = 0;
396 } 435 }
397 } 436 }
398} 437}
399 438
439static void
440ungrab (rxvt_term *THIS)
441{
442 if (THIS->perl.grabtime)
443 {
444 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
445 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
446 THIS->perl.grabtime = 0;
447 }
448}
449
400bool 450bool
401rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 451rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
402{ 452{
403 if (!perl) 453 if (!perl)
404 return false; 454 return false;
405 455
406 if (htype == HOOK_INIT) // first hook ever called 456 if (htype == HOOK_INIT) // first hook ever called
407 { 457 {
408 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 458 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
409 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 459 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
410 } 460 }
411 else if (!term->self) 461 else if (!term->perl.self)
412 return false; // perl not initialized for this instance 462 return false; // perl not initialized for this instance
413 else if (htype == HOOK_DESTROY) 463 else if (htype == HOOK_DESTROY)
414 { 464 {
415 // handled later 465 // handled later
416 } 466 }
417 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 467 else
418 { 468 {
419 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 469 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
420
421 if (HvKEYS (hv))
422 { 470 {
471 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
472
473 if (HvKEYS (hv))
474 {
423 hv_iterinit (hv); 475 hv_iterinit (hv);
424 476
425 while (HE *he = hv_iternext (hv)) 477 while (HE *he = hv_iternext (hv))
426 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 478 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
479 }
480
427 } 481 }
482
483 if (!should_invoke [htype])
484 return false;
428 } 485 }
429 else if (!should_invoke [htype]) 486
430 return false; 487 temp_environ temp_environ(rxvt_environ);
431 488
432 dSP; 489 dSP;
433 va_list ap; 490 va_list ap;
434 491
435 va_start (ap, htype); 492 va_start (ap, htype);
… …
453 510
454 case DT_LONG: 511 case DT_LONG:
455 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 512 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
456 break; 513 break;
457 514
458 case DT_STRING: 515 case DT_STR:
459 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 516 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
517 break;
518
519 case DT_STR_LEN:
520 {
521 char *str = va_arg (ap, char *);
522 int len = va_arg (ap, int);
523
524 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
525 }
526 break;
527
528 case DT_WCS_LEN:
529 {
530 wchar_t *wstr = va_arg (ap, wchar_t *);
531 int wlen = va_arg (ap, int);
532
533 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
534 }
535 break;
536
537 case DT_XEVENT:
538 {
539 XEvent *xe = va_arg (ap, XEvent *);
540 HV *hv = newHV ();
541
542# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
543# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
544# undef set
545
546 setiv (type, xe->type);
547 setiv (send_event, xe->xany.send_event);
548 setiv (serial, xe->xany.serial);
549
550 switch (xe->type)
551 {
552 case KeyPress:
553 case KeyRelease:
554 case ButtonPress:
555 case ButtonRelease:
556 case MotionNotify:
557 setiv (time, xe->xmotion.time);
558 setiv (x, xe->xmotion.x);
559 setiv (y, xe->xmotion.y);
560 setiv (row, xe->xmotion.y / term->fheight);
561 setiv (col, xe->xmotion.x / term->fwidth);
562 setiv (x_root, xe->xmotion.x_root);
563 setiv (y_root, xe->xmotion.y_root);
564 setiv (state, xe->xmotion.state);
565 break;
566 }
567
568 switch (xe->type)
569 {
570 case KeyPress:
571 case KeyRelease:
572 setiv (keycode, xe->xkey.keycode);
573 break;
574
575 case ButtonPress:
576 case ButtonRelease:
577 setiv (button, xe->xbutton.button);
578 break;
579
580 case MotionNotify:
581 setiv (is_hint, xe->xmotion.is_hint);
582 break;
583 }
584
585 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
586 }
460 break; 587 break;
461 588
462 case DT_END: 589 case DT_END:
463 { 590 {
464 va_end (ap); 591 va_end (ap);
… …
476 PUTBACK; 603 PUTBACK;
477 FREETMPS; 604 FREETMPS;
478 LEAVE; 605 LEAVE;
479 606
480 if (SvTRUE (ERRSV)) 607 if (SvTRUE (ERRSV))
608 {
481 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 609 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
610 ungrab (term); // better lose the grab than the session
611 }
482 612
483 if (htype == HOOK_DESTROY) 613 if (htype == HOOK_DESTROY)
484 { 614 {
485 clearSVptr ((SV *)term->self); 615 clearSVptr ((SV *)term->perl.self);
486 SvREFCNT_dec ((SV *)term->self); 616 SvREFCNT_dec ((SV *)term->perl.self);
487 } 617 }
488 618
489 return count; 619 return count;
490 } 620 }
491 621
… …
501 631
502PROTOTYPES: ENABLE 632PROTOTYPES: ENABLE
503 633
504BOOT: 634BOOT:
505{ 635{
506# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 636 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
637 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
638 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
639 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
640
507 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 641 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
508# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 642# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
509# include "hookinc.h" 643# include "hookinc.h"
510# undef def 644# undef def
511 645
646 HV *option = get_hv ("urxvt::OPTION", 1);
647# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
648# define nodef(name)
649# include "optinc.h"
650# undef nodef
651# undef def
652
653 HV *stash = gv_stashpv ("urxvt", 1);
654# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
512 export_const (DEFAULT_RSTYLE); 655 export_const_iv (DEFAULT_RSTYLE);
513 export_const (OVERLAY_RSTYLE); 656 export_const_iv (OVERLAY_RSTYLE);
514 export_const (RS_Bold); 657 export_const_iv (RS_Bold);
515 export_const (RS_Italic); 658 export_const_iv (RS_Italic);
516 export_const (RS_Blink); 659 export_const_iv (RS_Blink);
517 export_const (RS_RVid); 660 export_const_iv (RS_RVid);
518 export_const (RS_Uline); 661 export_const_iv (RS_Uline);
519 662
520 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 663 export_const_iv (CurrentTime);
664 export_const_iv (ShiftMask);
665 export_const_iv (LockMask);
666 export_const_iv (ControlMask);
667 export_const_iv (Mod1Mask);
668 export_const_iv (Mod2Mask);
669 export_const_iv (Mod3Mask);
670 export_const_iv (Mod4Mask);
671 export_const_iv (Mod5Mask);
672 export_const_iv (Button1Mask);
673 export_const_iv (Button2Mask);
674 export_const_iv (Button3Mask);
675 export_const_iv (Button4Mask);
676 export_const_iv (Button5Mask);
677 export_const_iv (AnyModifier);
678
679 export_const_iv (EVENT_NONE);
680 export_const_iv (EVENT_READ);
681 export_const_iv (EVENT_WRITE);
521} 682}
522 683
523void 684void
524set_should_invoke (int htype, int value) 685set_should_invoke (int htype, int value)
525 CODE: 686 CODE:
… …
532 693
533void 694void
534fatal (const char *msg) 695fatal (const char *msg)
535 CODE: 696 CODE:
536 rxvt_fatal ("%s", msg); 697 rxvt_fatal ("%s", msg);
698
699SV *
700untaint (SV *sv)
701 CODE:
702 RETVAL = newSVsv (sv);
703 SvTAINTED_off (RETVAL);
704 OUTPUT:
705 RETVAL
706
707bool
708safe ()
709 CODE:
710 RETVAL = !rxvt_tainted ();
711 OUTPUT:
712 RETVAL
537 713
538NV 714NV
539NOW () 715NOW ()
540 CODE: 716 CODE:
541 RETVAL = NOW; 717 RETVAL = NOW;
… …
589} 765}
590 OUTPUT: 766 OUTPUT:
591 RETVAL 767 RETVAL
592 768
593MODULE = urxvt PACKAGE = urxvt::term 769MODULE = urxvt PACKAGE = urxvt::term
770
771SV *
772_new (...)
773 CODE:
774{
775 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
776 croak ("first argument to urxvt::term->_new must be arrayref");
777
778 rxvt_term *term = new rxvt_term;
779
780 term->argv = new stringvec;
781 term->envv = new stringvec;
782
783 for (int i = 1; i < items; i++)
784 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
785
786 AV *envv = (AV *)SvRV (ST (0));
787 for (int i = av_len (envv) + 1; i--; )
788 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
789
790 term->envv->push_back (0);
791
792 bool success;
793
794 try
795 {
796 success = term->init (term->argv->size (), term->argv->begin ());
797 }
798 catch (const class rxvt_failure_exception &e)
799 {
800 success = false;
801 }
802
803 if (!success)
804 {
805 term->destroy ();
806 croak ("error while initializing new terminal instance");
807 }
808
809 RETVAL = term && term->perl.self
810 ? newSVterm (term) : &PL_sv_undef;
811}
812 OUTPUT:
813 RETVAL
814
815void
816rxvt_term::destroy ()
817
818void
819rxvt_term::grab_button (int button, U32 modifiers)
820 CODE:
821 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
822 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
823 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
824
825bool
826rxvt_term::grab (U32 eventtime, int sync = 0)
827 CODE:
828{
829 int mode = sync ? GrabModeSync : GrabModeAsync;
830
831 THIS->perl.grabtime = 0;
832
833 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
834 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
835 mode, mode, None, GRAB_CURSOR, eventtime))
836 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
837 THIS->perl.grabtime = eventtime;
838 else
839 XUngrabPointer (THIS->display->display, eventtime);
840
841 RETVAL = !!THIS->perl.grabtime;
842}
843 OUTPUT:
844 RETVAL
845
846void
847rxvt_term::allow_events_async ()
848 CODE:
849 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
850
851void
852rxvt_term::allow_events_sync ()
853 CODE:
854 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
855
856void
857rxvt_term::allow_events_replay ()
858 CODE:
859 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
860 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
861
862void
863rxvt_term::ungrab ()
864 CODE:
865 ungrab (THIS);
594 866
595int 867int
596rxvt_term::strwidth (SV *str) 868rxvt_term::strwidth (SV *str)
597 CODE: 869 CODE:
598{ 870{
… …
617 char *mbstr = rxvt_wcstombs (wstr); 889 char *mbstr = rxvt_wcstombs (wstr);
618 rxvt_pop_locale (); 890 rxvt_pop_locale ();
619 891
620 free (wstr); 892 free (wstr);
621 893
622 RETVAL = newSVpv (mbstr, 0); 894 RETVAL = taint_if (newSVpv (mbstr, 0), str);
623 free (mbstr); 895 free (mbstr);
624} 896}
625 OUTPUT: 897 OUTPUT:
626 RETVAL 898 RETVAL
627 899
… …
634 906
635 rxvt_push_locale (THIS->locale); 907 rxvt_push_locale (THIS->locale);
636 wchar_t *wstr = rxvt_mbstowcs (data, len); 908 wchar_t *wstr = rxvt_mbstowcs (data, len);
637 rxvt_pop_locale (); 909 rxvt_pop_locale ();
638 910
639 char *str = rxvt_wcstoutf8 (wstr); 911 RETVAL = taint_if (wcs2sv (wstr), octets);
640 free (wstr); 912 free (wstr);
641
642 RETVAL = newSVpv (str, 0);
643 SvUTF8_on (RETVAL);
644 free (str);
645} 913}
646 OUTPUT: 914 OUTPUT:
647 RETVAL 915 RETVAL
648 916
649# very portable, especially on objects as opposed to pods 917#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
650#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
651 918
652#define TERM_OFFSET_width TERM_OFFSET(width) 919#define TERM_OFFSET_width TERM_OFFSET(width)
653#define TERM_OFFSET_height TERM_OFFSET(height) 920#define TERM_OFFSET_height TERM_OFFSET(height)
654#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 921#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
655#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 922#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
680 CODE: 947 CODE:
681 RETVAL = *(int *)((char *)THIS + ix); 948 RETVAL = *(int *)((char *)THIS + ix);
682 OUTPUT: 949 OUTPUT:
683 RETVAL 950 RETVAL
684 951
952unsigned int
953rxvt_term::ModLevel3Mask ()
954 ALIAS:
955 ModLevel3Mask = 0
956 ModMetaMask = 1
957 ModNumLockMask = 2
958 CODE:
959 switch (ix)
960 {
961 case 0: RETVAL = THIS->ModLevel3Mask; break;
962 case 1: RETVAL = THIS->ModMetaMask; break;
963 case 2: RETVAL = THIS->ModNumLockMask; break;
964 }
965 OUTPUT:
966 RETVAL
967
968char *
969rxvt_term::display_id ()
970 ALIAS:
971 display_id = 0
972 locale = 1
973 CODE:
974 switch (ix)
975 {
976 case 0: RETVAL = THIS->display->id; break;
977 case 1: RETVAL = THIS->locale; break;
978 }
979 OUTPUT:
980 RETVAL
981
982SV *
983rxvt_term::_env ()
984 CODE:
985{
986 if (THIS->envv)
987 {
988 AV *av = newAV ();
989
990 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
991 if (*i)
992 av_push (av, newSVpv (*i, 0));
993
994 RETVAL = newRV_noinc ((SV *)av);
995 }
996 else
997 RETVAL = &PL_sv_undef;
998}
999 OUTPUT:
1000 RETVAL
1001
1002int
1003rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1004 CODE:
1005 RETVAL = THIS->pty_ev.events;
1006 if (events != EVENT_UNDEF)
1007 THIS->pty_ev.set (events);
1008 OUTPUT:
1009 RETVAL
1010
685U32 1011U32
1012rxvt_term::parent ()
1013 CODE:
1014 RETVAL = (U32)THIS->parent [0];
1015 OUTPUT:
1016 RETVAL
1017
1018U32
1019rxvt_term::vt ()
1020 CODE:
1021 RETVAL = (U32)THIS->vt;
1022 OUTPUT:
1023 RETVAL
1024
1025U32
686rxvt_term::screen_rstyle (U32 new_rstyle = THIS->screen.s_rstyle) 1026rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
687 CODE: 1027 CODE:
688{ 1028{
689 RETVAL = THIS->screen.s_rstyle; 1029 RETVAL = THIS->rstyle;
690 THIS->screen.s_rstyle = new_rstyle; 1030 THIS->rstyle = new_rstyle;
691} 1031}
692 OUTPUT: 1032 OUTPUT:
693 RETVAL 1033 RETVAL
694 1034
695int 1035int
… …
711rxvt_term::want_refresh () 1051rxvt_term::want_refresh ()
712 CODE: 1052 CODE:
713 THIS->want_refresh = 1; 1053 THIS->want_refresh = 1;
714 1054
715void 1055void
716rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 1056rxvt_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: 1057 PPCODE:
718{ 1058{
719 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1059 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
720 XSRETURN_EMPTY; 1060 XSRETURN_EMPTY;
721 1061
… …
723 1063
724 if (GIMME_V != G_VOID) 1064 if (GIMME_V != G_VOID)
725 { 1065 {
726 wchar_t *wstr = new wchar_t [THIS->ncol]; 1066 wchar_t *wstr = new wchar_t [THIS->ncol];
727 1067
728 for (int col = 0; col <THIS->ncol; col++) 1068 for (int col = 0; col < THIS->ncol; col++)
729 wstr [col] = l.t [col]; 1069 wstr [col] = l.t [col];
730 1070
731 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 1071 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
732 free (wstr);
733 1072
734 SV *sv = newSVpv (str, 0); 1073 delete [] wstr;
735 SvUTF8_on (sv);
736 XPUSHs (sv_2mortal (sv));
737 free (str);
738 } 1074 }
739 1075
740 if (new_text) 1076 if (new_text)
741 { 1077 {
742 wchar_t *wstr = sv2wcs (new_text); 1078 wchar_t *wstr = sv2wcs (new_text);
743 1079
744 int len = wcslen (wstr); 1080 int len = min (wcslen (wstr) - start_ofs, max_len);
745 1081
746 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1082 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
747 { 1083 {
748 free (wstr); 1084 free (wstr);
749 croak ("new_text extends beyond horizontal margins"); 1085 croak ("new_text extends beyond horizontal margins");
750 } 1086 }
751 1087
752 for (int col = start_col; col < start_col + len; col++) 1088 for (int col = start_col; col < start_col + len; col++)
753 { 1089 {
754 l.t [col] = wstr [col - start_col]; 1090 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])); 1091 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
756 } 1092 }
757 1093
758 free (wstr); 1094 free (wstr);
759 } 1095 }
760} 1096}
761 1097
762void 1098void
763rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1099rxvt_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: 1100 PPCODE:
765{ 1101{
766 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1102 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
767 XSRETURN_EMPTY; 1103 XSRETURN_EMPTY;
768 1104
… …
783 { 1119 {
784 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1120 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
785 croak ("new_rend must be arrayref"); 1121 croak ("new_rend must be arrayref");
786 1122
787 AV *av = (AV *)SvRV (new_rend); 1123 AV *av = (AV *)SvRV (new_rend);
788 int len = av_len (av) + 1; 1124 int len = min (av_len (av) + 1 - start_ofs, max_len);
789 1125
790 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1126 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
791 croak ("new_rend array extends beyond horizontal margins"); 1127 croak ("new_rend array extends beyond horizontal margins");
792 1128
793 for (int col = start_col; col < start_col + len; col++) 1129 for (int col = start_col; col < start_col + len; col++)
794 { 1130 {
795 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1131 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
796 1132
797 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1133 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
798 } 1134 }
799 } 1135 }
800} 1136}
801 1137
802int 1138int
803rxvt_term::ROW_l (int row_number, int new_length = -2) 1139rxvt_term::ROW_l (int row_number, int new_length = -1)
804 CODE: 1140 CODE:
805{ 1141{
806 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1142 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
807 XSRETURN_EMPTY; 1143 XSRETURN_EMPTY;
808 1144
809 line_t &l = ROW(row_number); 1145 line_t &l = ROW(row_number);
810 RETVAL = l.l < 0 ? THIS->ncol : l.l; 1146 RETVAL = l.l;
811 1147
812 if (new_length >= -1) 1148 if (new_length >= 0)
813 l.l = new_length; 1149 l.l = new_length;
814} 1150}
815 OUTPUT: 1151 OUTPUT:
816 RETVAL 1152 RETVAL
817 1153
818bool 1154bool
819rxvt_term::ROW_is_longer (int row_number) 1155rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
820 CODE: 1156 CODE:
821{ 1157{
822 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1158 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
823 XSRETURN_EMPTY; 1159 XSRETURN_EMPTY;
824 1160
825 line_t &l = ROW(row_number); 1161 line_t &l = ROW(row_number);
826 RETVAL = l.l < 0; 1162 RETVAL = l.is_longer ();
1163
1164 if (new_is_longer >= 0)
1165 l.is_longer (new_is_longer);
827} 1166}
828 OUTPUT: 1167 OUTPUT:
829 RETVAL 1168 RETVAL
830 1169
831SV * 1170SV *
832rxvt_term::special_encode (SV *str) 1171rxvt_term::special_encode (SV *string)
833 CODE: 1172 CODE:
834 abort ();//TODO 1173{
1174 wchar_t *wstr = sv2wcs (string);
1175 int wlen = wcslen (wstr);
1176 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1177
1178 rxvt_push_locale (THIS->locale);
1179
1180 wchar_t *r = rstr;
1181 for (wchar_t *s = wstr; *s; s++)
1182 if (wcwidth (*s) == 0)
1183 {
1184 if (r == rstr)
1185 croak ("leading combining character unencodable");
1186
1187 unicode_t n = rxvt_compose (r[-1], *s);
1188 if (n == NOCHAR)
1189 n = rxvt_composite.compose (r[-1], *s);
1190
1191 r[-1] = n;
1192 }
1193#if !UNICODE_3
1194 else if (*s >= 0x10000)
1195 *r++ = rxvt_composite.compose (*s);
1196#endif
1197 else
1198 *r++ = *s;
1199
1200 rxvt_pop_locale ();
1201
1202 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1203
1204 delete [] rstr;
1205}
1206 OUTPUT:
1207 RETVAL
835 1208
836SV * 1209SV *
837rxvt_term::special_decode (SV *str) 1210rxvt_term::special_decode (SV *text)
838 CODE: 1211 CODE:
839 abort ();//TODO 1212{
1213 wchar_t *wstr = sv2wcs (text);
1214 int wlen = wcslen (wstr);
1215 int dlen = 0;
1216
1217 // find length
1218 for (wchar_t *s = wstr; *s; s++)
1219 if (*s == NOCHAR)
1220 ;
1221 else if (IS_COMPOSE (*s))
1222 dlen += rxvt_composite.expand (*s, 0);
1223 else
1224 dlen++;
1225
1226 wchar_t *rstr = new wchar_t [dlen];
1227
1228 // decode
1229 wchar_t *r = rstr;
1230 for (wchar_t *s = wstr; *s; s++)
1231 if (*s == NOCHAR)
1232 ;
1233 else if (IS_COMPOSE (*s))
1234 r += rxvt_composite.expand (*s, r);
1235 else
1236 *r++ = *s;
1237
1238 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1239
1240 delete [] rstr;
1241}
1242 OUTPUT:
1243 RETVAL
840 1244
841void 1245void
842rxvt_term::_resource (char *name, int index, SV *newval = 0) 1246rxvt_term::_resource (char *name, int index, SV *newval = 0)
843 PPCODE: 1247 PPCODE:
844{ 1248{
… …
861 1265
862 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1266 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
863 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1267 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
864 1268
865 if (GIMME_V != G_VOID) 1269 if (GIMME_V != G_VOID)
866 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1270 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
867 1271
868 if (newval) 1272 if (newval)
869 { 1273 {
870 if (SvOK (newval)) 1274 if (SvOK (newval))
871 { 1275 {
… …
876 else 1280 else
877 THIS->rs [index] = 0; 1281 THIS->rs [index] = 0;
878 } 1282 }
879} 1283}
880 1284
1285const char *
1286rxvt_term::x_resource (const char *name)
1287 CLEANUP:
1288 SvTAINTED_on (ST (0));
1289
1290bool
1291rxvt_term::option (U32 optval, int set = -1)
1292 CODE:
1293{
1294 RETVAL = THIS->options & optval;
1295
1296 if (set >= 0)
1297 {
1298 if (set)
1299 THIS->options |= optval;
1300 else
1301 THIS->options &= ~optval;
1302
1303 switch (optval)
1304 {
1305 case Opt_skipBuiltinGlyphs:
1306 THIS->set_fonts ();
1307 THIS->scr_remap_chars ();
1308 THIS->scr_touch (true);
1309 THIS->want_refresh = 1;
1310 break;
1311
1312 case Opt_cursorUnderline:
1313 THIS->want_refresh = 1;
1314 break;
1315
1316# case Opt_scrollBar_floating:
1317# case Opt_scrollBar_right:
1318# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1319# break;
1320 }
1321 }
1322}
1323 OUTPUT:
1324 RETVAL
1325
1326bool
1327rxvt_term::parse_keysym (char *keysym, char *str)
1328 CODE:
1329 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1330 THIS->keyboard->register_done ();
1331 OUTPUT:
1332 RETVAL
1333
881void 1334void
882rxvt_term::cur (...) 1335rxvt_term::screen_cur (...)
883 PROTOTYPE: $;$$ 1336 PROTOTYPE: $;$$
884 ALIAS: 1337 ALIAS:
885 screen_cur = 0 1338 screen_cur = 0
886 selection_beg = 1 1339 selection_beg = 1
887 selection_end = 2 1340 selection_end = 2
… …
908 if (ix) 1361 if (ix)
909 THIS->want_refresh = 1; 1362 THIS->want_refresh = 1;
910 } 1363 }
911} 1364}
912 1365
1366char
1367rxvt_term::cur_charset ()
1368 CODE:
1369 RETVAL = THIS->charsets [THIS->screen.charset];
1370 OUTPUT:
1371 RETVAL
1372
913int 1373int
914rxvt_term::selection_grab (int eventtime = CurrentTime) 1374rxvt_term::selection_grab (U32 eventtime)
915 1375
916void 1376void
917rxvt_term::selection (SV *newtext = 0) 1377rxvt_term::selection (SV *newtext = 0)
918 PPCODE: 1378 PPCODE:
919{ 1379{
920 if (GIMME_V != G_VOID) 1380 if (GIMME_V != G_VOID)
921 { 1381 XPUSHs (THIS->selection.text
922 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); 1382 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
923 SV *sv = newSVpv (sel, 0); 1383 : &PL_sv_undef);
924 SvUTF8_on (sv);
925 free (sel);
926 XPUSHs (sv_2mortal (sv));
927 }
928 1384
929 if (newtext) 1385 if (newtext)
930 { 1386 {
931 free (THIS->selection.text); 1387 free (THIS->selection.text);
932 1388
933 THIS->selection.text = sv2wcs (newtext); 1389 THIS->selection.text = sv2wcs (newtext);
934 THIS->selection.len = wcslen (THIS->selection.text); 1390 THIS->selection.len = wcslen (THIS->selection.text);
935 } 1391 }
1392}
1393
1394void
1395rxvt_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)
1396
1397void
1398rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1399
1400void
1401rxvt_term::scr_bell ()
1402
1403void
1404rxvt_term::scr_add_lines (SV *string)
1405 CODE:
1406{
1407 wchar_t *wstr = sv2wcs (string);
1408 THIS->scr_add_lines (wstr, wcslen (wstr));
1409 free (wstr);
936} 1410}
937 1411
938void 1412void
939rxvt_term::tt_write (SV *octets) 1413rxvt_term::tt_write (SV *octets)
940 INIT: 1414 INIT:
941 STRLEN len; 1415 STRLEN len;
942 char *str = SvPVbyte (octets, len); 1416 char *str = SvPVbyte (octets, len);
943 C_ARGS: 1417 C_ARGS:
944 str, len 1418 str, len
945 1419
1420void
1421rxvt_term::cmd_parse (SV *octets)
1422 CODE:
1423{
1424 STRLEN len;
1425 char *str = SvPVbyte (octets, len);
1426
1427 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1428 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1429
1430 THIS->cmdbuf_ptr = str;
1431 THIS->cmdbuf_endp = str + len;
1432
1433 rxvt_push_locale (THIS->locale);
1434 THIS->cmd_parse ();
1435 rxvt_pop_locale ();
1436
1437 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1438 THIS->cmdbuf_endp = old_cmdbuf_endp;
1439}
1440
946SV * 1441SV *
947rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1442rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
948 CODE: 1443 CODE:
949{ 1444{
950 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1445 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);

Diff Legend

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