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.28 by root, Fri Jan 6 02:58:02 2006 UTC vs.
Revision 1.54 by root, Wed Jan 11 00:59:58 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 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
634 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
635 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
636
533 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 637 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
534# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 638# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
535# include "hookinc.h" 639# include "hookinc.h"
536# undef def 640# undef def
537 641
642 HV *option = get_hv ("urxvt::OPTION", 1);
643# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
644# define nodef(name)
645# include "optinc.h"
646# undef nodef
647# undef def
648
649 HV *stash = gv_stashpv ("urxvt", 1);
650# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
538 export_const (DEFAULT_RSTYLE); 651 export_const_iv (DEFAULT_RSTYLE);
539 export_const (OVERLAY_RSTYLE); 652 export_const_iv (OVERLAY_RSTYLE);
540 export_const (RS_Bold); 653 export_const_iv (RS_Bold);
541 export_const (RS_Italic); 654 export_const_iv (RS_Italic);
542 export_const (RS_Blink); 655 export_const_iv (RS_Blink);
543 export_const (RS_RVid); 656 export_const_iv (RS_RVid);
544 export_const (RS_Uline); 657 export_const_iv (RS_Uline);
545 658
546 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 659 export_const_iv (CurrentTime);
660 export_const_iv (ShiftMask);
661 export_const_iv (LockMask);
662 export_const_iv (ControlMask);
663 export_const_iv (Mod1Mask);
664 export_const_iv (Mod2Mask);
665 export_const_iv (Mod3Mask);
666 export_const_iv (Mod4Mask);
667 export_const_iv (Mod5Mask);
668 export_const_iv (Button1Mask);
669 export_const_iv (Button2Mask);
670 export_const_iv (Button3Mask);
671 export_const_iv (Button4Mask);
672 export_const_iv (Button5Mask);
673 export_const_iv (AnyModifier);
674
675 export_const_iv (EVENT_NONE);
676 export_const_iv (EVENT_READ);
677 export_const_iv (EVENT_WRITE);
547} 678}
679
680void
681set_should_invoke (int htype, int value)
682 CODE:
683 rxvt_perl.should_invoke [htype] = value;
684
685void
686warn (const char *msg)
687 CODE:
688 rxvt_warn ("%s", msg);
689
690void
691fatal (const char *msg)
692 CODE:
693 rxvt_fatal ("%s", msg);
548 694
549SV * 695SV *
550new (...) 696untaint (SV *sv)
551 CODE: 697 CODE:
552{ 698 RETVAL = newSVsv (sv);
553 stringvec *argv = new stringvec; 699 SvTAINTED_off (RETVAL);
554 bool success; 700 OUTPUT:
555
556 for (int i = 0; i < items ;i++)
557 argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
558
559 rxvt_term *term = new rxvt_term;
560
561 term->argv = argv;
562
563 try
564 {
565 if (!term->init (argv->size (), argv->begin ()))
566 term = 0;
567 }
568 catch (const class rxvt_failure_exception &e)
569 {
570 term->destroy ();
571 croak ("exception caught while initializing new terminal instance");
572 }
573
574 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef;
575}
576 OUTPUT:
577 RETVAL 701 RETVAL
578 702
579void 703bool
580set_should_invoke (int htype, int value) 704safe ()
581 CODE: 705 CODE:
582 rxvt_perl.should_invoke [htype] = value; 706 RETVAL = !rxvt_tainted ();
583 707 OUTPUT:
584void 708 RETVAL
585warn (const char *msg)
586 CODE:
587 rxvt_warn ("%s", msg);
588
589void
590fatal (const char *msg)
591 CODE:
592 rxvt_fatal ("%s", msg);
593 709
594NV 710NV
595NOW () 711NOW ()
596 CODE: 712 CODE:
597 RETVAL = NOW; 713 RETVAL = NOW;
… …
646 OUTPUT: 762 OUTPUT:
647 RETVAL 763 RETVAL
648 764
649MODULE = urxvt PACKAGE = urxvt::term 765MODULE = urxvt PACKAGE = urxvt::term
650 766
767SV *
768_new (...)
769 CODE:
770{
771 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
772 croak ("first argument to urxvt::term->_new must be arrayref");
773
774 rxvt_term *term = new rxvt_term;
775
776 term->argv = new stringvec;
777 term->envv = new stringvec;
778
779 for (int i = 1; i < items; i++)
780 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
781
782 AV *envv = (AV *)SvRV (ST (0));
783 for (int i = av_len (envv) + 1; i--; )
784 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
785
786 term->envv->push_back (0);
787
788 bool success;
789
790 try
791 {
792 success = term->init (term->argv->size (), term->argv->begin ());
793 }
794 catch (const class rxvt_failure_exception &e)
795 {
796 success = false;
797 }
798
799 if (!success)
800 {
801 term->destroy ();
802 croak ("error while initializing new terminal instance");
803 }
804
805 RETVAL = term && term->perl.self
806 ? newSVterm (term) : &PL_sv_undef;
807}
808 OUTPUT:
809 RETVAL
810
651void 811void
652rxvt_term::destroy () 812rxvt_term::destroy ()
813
814void
815rxvt_term::grab_button (int button, U32 modifiers)
816 CODE:
817 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
818 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
819 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
820
821bool
822rxvt_term::grab (U32 eventtime, int sync = 0)
823 CODE:
824{
825 int mode = sync ? GrabModeSync : GrabModeAsync;
826
827 THIS->perl.grabtime = 0;
828
829 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
830 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
831 mode, mode, None, GRAB_CURSOR, eventtime))
832 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
833 THIS->perl.grabtime = eventtime;
834 else
835 XUngrabPointer (THIS->display->display, eventtime);
836
837 RETVAL = !!THIS->perl.grabtime;
838}
839 OUTPUT:
840 RETVAL
841
842void
843rxvt_term::allow_events_async ()
844 CODE:
845 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
846
847void
848rxvt_term::allow_events_sync ()
849 CODE:
850 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
851
852void
853rxvt_term::allow_events_replay ()
854 CODE:
855 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
856 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
857
858void
859rxvt_term::ungrab ()
860 CODE:
861 ungrab (THIS);
653 862
654int 863int
655rxvt_term::strwidth (SV *str) 864rxvt_term::strwidth (SV *str)
656 CODE: 865 CODE:
657{ 866{
… …
676 char *mbstr = rxvt_wcstombs (wstr); 885 char *mbstr = rxvt_wcstombs (wstr);
677 rxvt_pop_locale (); 886 rxvt_pop_locale ();
678 887
679 free (wstr); 888 free (wstr);
680 889
681 RETVAL = newSVpv (mbstr, 0); 890 RETVAL = taint_if (newSVpv (mbstr, 0), str);
682 free (mbstr); 891 free (mbstr);
683} 892}
684 OUTPUT: 893 OUTPUT:
685 RETVAL 894 RETVAL
686 895
… …
693 902
694 rxvt_push_locale (THIS->locale); 903 rxvt_push_locale (THIS->locale);
695 wchar_t *wstr = rxvt_mbstowcs (data, len); 904 wchar_t *wstr = rxvt_mbstowcs (data, len);
696 rxvt_pop_locale (); 905 rxvt_pop_locale ();
697 906
698 RETVAL = wcs2sv (wstr); 907 RETVAL = taint_if (wcs2sv (wstr), octets);
699 free (wstr); 908 free (wstr);
700} 909}
701 OUTPUT: 910 OUTPUT:
702 RETVAL 911 RETVAL
703 912
704# very portable, especially on objects as opposed to pods 913#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
705#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
706 914
707#define TERM_OFFSET_width TERM_OFFSET(width) 915#define TERM_OFFSET_width TERM_OFFSET(width)
708#define TERM_OFFSET_height TERM_OFFSET(height) 916#define TERM_OFFSET_height TERM_OFFSET(height)
709#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 917#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
710#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 918#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
735 CODE: 943 CODE:
736 RETVAL = *(int *)((char *)THIS + ix); 944 RETVAL = *(int *)((char *)THIS + ix);
737 OUTPUT: 945 OUTPUT:
738 RETVAL 946 RETVAL
739 947
948unsigned int
949rxvt_term::ModLevel3Mask ()
950 ALIAS:
951 ModLevel3Mask = 0
952 ModMetaMask = 1
953 ModNumLockMask = 2
954 CODE:
955 switch (ix)
956 {
957 case 0: RETVAL = THIS->ModLevel3Mask; break;
958 case 1: RETVAL = THIS->ModMetaMask; break;
959 case 2: RETVAL = THIS->ModNumLockMask; break;
960 }
961 OUTPUT:
962 RETVAL
963
964char *
965rxvt_term::display_id ()
966 ALIAS:
967 display_id = 0
968 locale = 1
969 CODE:
970 switch (ix)
971 {
972 case 0: RETVAL = THIS->display->id; break;
973 case 1: RETVAL = THIS->locale; break;
974 }
975 OUTPUT:
976 RETVAL
977
978SV *
979rxvt_term::_env ()
980 CODE:
981{
982 if (THIS->envv)
983 {
984 AV *av = newAV ();
985
986 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
987 if (*i)
988 av_push (av, newSVpv (*i, 0));
989
990 RETVAL = newRV_noinc ((SV *)av);
991 }
992 else
993 RETVAL = &PL_sv_undef;
994}
995 OUTPUT:
996 RETVAL
997
998int
999rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1000 CODE:
1001 RETVAL = THIS->pty_ev.events;
1002 if (events != EVENT_UNDEF)
1003 THIS->pty_ev.set (events);
1004 OUTPUT:
1005 RETVAL
1006
1007U32
1008rxvt_term::parent ()
1009 CODE:
1010 RETVAL = (U32)THIS->parent [0];
1011 OUTPUT:
1012 RETVAL
1013
1014U32
1015rxvt_term::vt ()
1016 CODE:
1017 RETVAL = (U32)THIS->vt;
1018 OUTPUT:
1019 RETVAL
1020
740U32 1021U32
741rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1022rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
742 CODE: 1023 CODE:
743{ 1024{
744 RETVAL = THIS->rstyle; 1025 RETVAL = THIS->rstyle;
… …
778 1059
779 if (GIMME_V != G_VOID) 1060 if (GIMME_V != G_VOID)
780 { 1061 {
781 wchar_t *wstr = new wchar_t [THIS->ncol]; 1062 wchar_t *wstr = new wchar_t [THIS->ncol];
782 1063
783 for (int col = 0; col <THIS->ncol; col++) 1064 for (int col = 0; col < THIS->ncol; col++)
784 wstr [col] = l.t [col]; 1065 wstr [col] = l.t [col];
785 1066
786 XPUSHs (sv_2mortal (wcs2sv (wstr))); 1067 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
787 1068
788 delete [] wstr; 1069 delete [] wstr;
789 } 1070 }
790 1071
791 if (new_text) 1072 if (new_text)
… …
881} 1162}
882 OUTPUT: 1163 OUTPUT:
883 RETVAL 1164 RETVAL
884 1165
885SV * 1166SV *
886rxvt_term::special_encode (SV *str) 1167rxvt_term::special_encode (SV *string)
887 CODE: 1168 CODE:
888 abort ();//TODO 1169{
1170 wchar_t *wstr = sv2wcs (string);
1171 int wlen = wcslen (wstr);
1172 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1173
1174 rxvt_push_locale (THIS->locale);
1175
1176 wchar_t *r = rstr;
1177 for (wchar_t *s = wstr; *s; s++)
1178 if (wcwidth (*s) == 0)
1179 {
1180 if (r == rstr)
1181 croak ("leading combining character unencodable");
1182
1183 unicode_t n = rxvt_compose (r[-1], *s);
1184 if (n == NOCHAR)
1185 n = rxvt_composite.compose (r[-1], *s);
1186
1187 r[-1] = n;
1188 }
1189#if !UNICODE_3
1190 else if (*s >= 0x10000)
1191 *r++ = rxvt_composite.compose (*s);
1192#endif
1193 else
1194 *r++ = *s;
1195
1196 rxvt_pop_locale ();
1197
1198 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1199
1200 delete [] rstr;
1201}
1202 OUTPUT:
1203 RETVAL
889 1204
890SV * 1205SV *
891rxvt_term::special_decode (SV *str) 1206rxvt_term::special_decode (SV *text)
892 CODE: 1207 CODE:
893 abort ();//TODO 1208{
1209 wchar_t *wstr = sv2wcs (text);
1210 int wlen = wcslen (wstr);
1211 int dlen = 0;
1212
1213 // find length
1214 for (wchar_t *s = wstr; *s; s++)
1215 if (*s == NOCHAR)
1216 ;
1217 else if (IS_COMPOSE (*s))
1218 dlen += rxvt_composite.expand (*s, 0);
1219 else
1220 dlen++;
1221
1222 wchar_t *rstr = new wchar_t [dlen];
1223
1224 // decode
1225 wchar_t *r = rstr;
1226 for (wchar_t *s = wstr; *s; s++)
1227 if (*s == NOCHAR)
1228 ;
1229 else if (IS_COMPOSE (*s))
1230 r += rxvt_composite.expand (*s, r);
1231 else
1232 *r++ = *s;
1233
1234 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1235
1236 delete [] rstr;
1237}
1238 OUTPUT:
1239 RETVAL
894 1240
895void 1241void
896rxvt_term::_resource (char *name, int index, SV *newval = 0) 1242rxvt_term::_resource (char *name, int index, SV *newval = 0)
897 PPCODE: 1243 PPCODE:
898{ 1244{
… …
915 1261
916 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1262 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
917 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1263 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
918 1264
919 if (GIMME_V != G_VOID) 1265 if (GIMME_V != G_VOID)
920 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1266 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
921 1267
922 if (newval) 1268 if (newval)
923 { 1269 {
924 if (SvOK (newval)) 1270 if (SvOK (newval))
925 { 1271 {
… …
930 else 1276 else
931 THIS->rs [index] = 0; 1277 THIS->rs [index] = 0;
932 } 1278 }
933} 1279}
934 1280
1281bool
1282rxvt_term::option (U32 optval, int set = -1)
1283 CODE:
1284{
1285 RETVAL = THIS->options & optval;
1286
1287 if (set >= 0)
1288 {
1289 if (set)
1290 THIS->options |= optval;
1291 else
1292 THIS->options &= ~optval;
1293
1294 switch (optval)
1295 {
1296 case Opt_skipBuiltinGlyphs:
1297 THIS->set_fonts ();
1298 THIS->scr_remap_chars ();
1299 THIS->scr_touch (true);
1300 THIS->want_refresh = 1;
1301 break;
1302
1303 case Opt_cursorUnderline:
1304 THIS->want_refresh = 1;
1305 break;
1306
1307# case Opt_scrollBar_floating:
1308# case Opt_scrollBar_right:
1309# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1310# break;
1311 }
1312 }
1313}
1314 OUTPUT:
1315 RETVAL
1316
1317bool
1318rxvt_term::parse_keysym (char *keysym, char *str)
1319 CODE:
1320 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1321 THIS->keyboard->register_done ();
1322 OUTPUT:
1323 RETVAL
1324
935void 1325void
936rxvt_term::cur (...) 1326rxvt_term::screen_cur (...)
937 PROTOTYPE: $;$$ 1327 PROTOTYPE: $;$$
938 ALIAS: 1328 ALIAS:
939 screen_cur = 0 1329 screen_cur = 0
940 selection_beg = 1 1330 selection_beg = 1
941 selection_end = 2 1331 selection_end = 2
… …
962 if (ix) 1352 if (ix)
963 THIS->want_refresh = 1; 1353 THIS->want_refresh = 1;
964 } 1354 }
965} 1355}
966 1356
1357char
1358rxvt_term::cur_charset ()
1359 CODE:
1360 RETVAL = THIS->charsets [THIS->screen.charset];
1361 OUTPUT:
1362 RETVAL
1363
967int 1364int
968rxvt_term::selection_grab (int eventtime = CurrentTime) 1365rxvt_term::selection_grab (U32 eventtime)
969 1366
970void 1367void
971rxvt_term::selection (SV *newtext = 0) 1368rxvt_term::selection (SV *newtext = 0)
972 PPCODE: 1369 PPCODE:
973{ 1370{
974 if (GIMME_V != G_VOID) 1371 if (GIMME_V != G_VOID)
1372 XPUSHs (THIS->selection.text
975 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1373 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1374 : &PL_sv_undef);
976 1375
977 if (newtext) 1376 if (newtext)
978 { 1377 {
979 free (THIS->selection.text); 1378 free (THIS->selection.text);
980 1379
… …
982 THIS->selection.len = wcslen (THIS->selection.text); 1381 THIS->selection.len = wcslen (THIS->selection.text);
983 } 1382 }
984} 1383}
985 1384
986void 1385void
1386rxvt_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)
1387
1388void
1389rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1390
1391void
1392rxvt_term::scr_bell ()
1393
1394void
987rxvt_term::scr_add_lines (SV *string) 1395rxvt_term::scr_add_lines (SV *string)
988 CODE: 1396 CODE:
989{ 1397{
990 wchar_t *wstr = sv2wcs (string); 1398 wchar_t *wstr = sv2wcs (string);
991 int wlen = wcslen (wstr);
992 unicode_t *ustr = new unicode_t [wlen];
993 int nlines = 0;
994
995 for (int i = wlen; i--; )
996 {
997 ustr [i] = wstr [i];
998 nlines += ustr [i] == '\012';
999 }
1000
1001 THIS->scr_add_lines (ustr, nlines, wlen); 1399 THIS->scr_add_lines (wstr, wcslen (wstr));
1002
1003 free (wstr); 1400 free (wstr);
1004 delete [] ustr;
1005} 1401}
1006 1402
1007void 1403void
1008rxvt_term::tt_write (SV *octets) 1404rxvt_term::tt_write (SV *octets)
1009 INIT: 1405 INIT:
… …
1023 char *old_cmdbuf_endp = THIS->cmdbuf_endp; 1419 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1024 1420
1025 THIS->cmdbuf_ptr = str; 1421 THIS->cmdbuf_ptr = str;
1026 THIS->cmdbuf_endp = str + len; 1422 THIS->cmdbuf_endp = str + len;
1027 1423
1424 rxvt_push_locale (THIS->locale);
1028 THIS->cmd_parse (); 1425 THIS->cmd_parse ();
1426 rxvt_pop_locale ();
1029 1427
1030 THIS->cmdbuf_ptr = old_cmdbuf_ptr; 1428 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1031 THIS->cmdbuf_endp = old_cmdbuf_endp; 1429 THIS->cmdbuf_endp = old_cmdbuf_endp;
1032} 1430}
1033 1431

Diff Legend

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