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.29 by root, Fri Jan 6 03:40:19 2006 UTC vs.
Revision 1.44 by root, Sun Jan 8 22:58:13 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);
… …
415 if (!perl) 439 if (!perl)
416 return false; 440 return false;
417 441
418 if (htype == HOOK_INIT) // first hook ever called 442 if (htype == HOOK_INIT) // first hook ever called
419 { 443 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 444 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 445 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 446 }
423 else if (!term->self) 447 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 448 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 449 else if (htype == HOOK_DESTROY)
426 { 450 {
427 // handled later 451 // handled later
428 } 452 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 453 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
430 { 454 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 455 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
432 456
433 if (HvKEYS (hv)) 457 if (HvKEYS (hv))
434 { 458 {
435 hv_iterinit (hv); 459 hv_iterinit (hv);
436 460
… …
465 489
466 case DT_LONG: 490 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 491 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 492 break;
469 493
470 case DT_STRING: 494 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 495 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 496 break;
473 497
474 case DT_STRING_LEN: 498 case DT_STR_LEN:
475 { 499 {
476 char *str = va_arg (ap, char *); 500 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int); 501 int len = va_arg (ap, int);
478 502
479 XPUSHs (sv_2mortal (newSVpvn (str, len))); 503 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
480 } 504 }
481 break; 505 break;
506
507 case DT_WCS_LEN:
508 {
509 wchar_t *wstr = va_arg (ap, wchar_t *);
510 int wlen = va_arg (ap, int);
511
512 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
513 }
514 break;
482 515
483 case DT_XEVENT: 516 case DT_XEVENT:
484 { 517 {
485 XEvent *xe = va_arg (ap, XEvent *); 518 XEvent *xe = va_arg (ap, XEvent *);
486 HV *hv = newHV (); 519 HV *hv = newHV ();
… …
501 case ButtonRelease: 534 case ButtonRelease:
502 case MotionNotify: 535 case MotionNotify:
503 setiv (time, xe->xmotion.time); 536 setiv (time, xe->xmotion.time);
504 setiv (x, xe->xmotion.x); 537 setiv (x, xe->xmotion.x);
505 setiv (y, xe->xmotion.y); 538 setiv (y, xe->xmotion.y);
539 setiv (row, xe->xmotion.y / term->fheight);
540 setiv (col, xe->xmotion.x / term->fwidth);
506 setiv (x_root, xe->xmotion.x_root); 541 setiv (x_root, xe->xmotion.x_root);
507 setiv (y_root, xe->xmotion.y_root); 542 setiv (y_root, xe->xmotion.y_root);
508 setiv (state, xe->xmotion.state); 543 setiv (state, xe->xmotion.state);
509 break; 544 break;
510 } 545 }
… …
528 563
529 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 564 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
530 } 565 }
531 break; 566 break;
532 567
533 case DT_USTRING_LEN:
534 {
535 unicode_t *ustr = va_arg (ap, unicode_t *);
536 int ulen = va_arg (ap, int);
537 wchar_t *wstr = new wchar_t [ulen];
538
539 for (int i = ulen; i--; )
540 wstr [i] = ustr [i];
541
542 XPUSHs (sv_2mortal (wcs2sv (wstr, ulen)));
543
544 delete [] wstr;
545 }
546
547 case DT_END: 568 case DT_END:
548 { 569 {
549 va_end (ap); 570 va_end (ap);
550 571
551 PUTBACK; 572 PUTBACK;
… …
565 if (SvTRUE (ERRSV)) 586 if (SvTRUE (ERRSV))
566 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 587 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
567 588
568 if (htype == HOOK_DESTROY) 589 if (htype == HOOK_DESTROY)
569 { 590 {
570 clearSVptr ((SV *)term->self); 591 clearSVptr ((SV *)term->perl.self);
571 SvREFCNT_dec ((SV *)term->self); 592 SvREFCNT_dec ((SV *)term->perl.self);
572 } 593 }
573 594
574 return count; 595 return count;
575 } 596 }
576 597
… …
586 607
587PROTOTYPES: ENABLE 608PROTOTYPES: ENABLE
588 609
589BOOT: 610BOOT:
590{ 611{
591# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 612 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
613
592 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 614 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
593# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 615# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
594# include "hookinc.h" 616# include "hookinc.h"
595# undef def 617# undef def
596 618
619 HV *option = get_hv ("urxvt::OPTION", 1);
620# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
621# define nodef(name)
622# include "optinc.h"
623# undef nodef
624# undef def
625
626 HV *stash = gv_stashpv ("urxvt", 1);
627# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
597 export_const (DEFAULT_RSTYLE); 628 export_const_iv (DEFAULT_RSTYLE);
598 export_const (OVERLAY_RSTYLE); 629 export_const_iv (OVERLAY_RSTYLE);
599 export_const (RS_Bold); 630 export_const_iv (RS_Bold);
600 export_const (RS_Italic); 631 export_const_iv (RS_Italic);
601 export_const (RS_Blink); 632 export_const_iv (RS_Blink);
602 export_const (RS_RVid); 633 export_const_iv (RS_RVid);
603 export_const (RS_Uline); 634 export_const_iv (RS_Uline);
604 635
605 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 636 export_const_iv (CurrentTime);
637 export_const_iv (ShiftMask);
638 export_const_iv (LockMask);
639 export_const_iv (ControlMask);
640 export_const_iv (Mod1Mask);
641 export_const_iv (Mod2Mask);
642 export_const_iv (Mod3Mask);
643 export_const_iv (Mod4Mask);
644 export_const_iv (Mod5Mask);
645 export_const_iv (Button1Mask);
646 export_const_iv (Button2Mask);
647 export_const_iv (Button3Mask);
648 export_const_iv (Button4Mask);
649 export_const_iv (Button5Mask);
650 export_const_iv (AnyModifier);
606} 651}
607 652
608SV * 653SV *
609new (...) 654new (...)
610 CODE: 655 CODE:
… …
628 { 673 {
629 term->destroy (); 674 term->destroy ();
630 croak ("exception caught while initializing new terminal instance"); 675 croak ("exception caught while initializing new terminal instance");
631 } 676 }
632 677
633 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef; 678 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
634} 679}
635 OUTPUT: 680 OUTPUT:
636 RETVAL 681 RETVAL
637 682
638void 683void
… …
707 752
708MODULE = urxvt PACKAGE = urxvt::term 753MODULE = urxvt PACKAGE = urxvt::term
709 754
710void 755void
711rxvt_term::destroy () 756rxvt_term::destroy ()
757
758void
759rxvt_term::grab_button (int button, U32 modifiers)
760 CODE:
761 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
762 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
763 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
764
765bool
766rxvt_term::grab (U32 eventtime, int sync = 0)
767 CODE:
768{
769 int mode = sync ? GrabModeSync : GrabModeAsync;
770
771 THIS->perl.grabtime = 0;
772
773 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
774 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
775 mode, mode, None, GRAB_CURSOR, eventtime))
776 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
777 THIS->perl.grabtime = eventtime;
778 else
779 XUngrabPointer (THIS->display->display, eventtime);
780
781 RETVAL = !!THIS->perl.grabtime;
782}
783 OUTPUT:
784 RETVAL
785
786void
787rxvt_term::allow_events_async ()
788 CODE:
789 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
790
791void
792rxvt_term::allow_events_sync ()
793 CODE:
794 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
795
796void
797rxvt_term::allow_events_replay ()
798 CODE:
799 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
800 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
801
802void
803rxvt_term::ungrab ()
804 CODE:
805{
806 if (THIS->perl.grabtime)
807 {
808 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
809 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
810 THIS->perl.grabtime = 0;
811 }
812}
712 813
713int 814int
714rxvt_term::strwidth (SV *str) 815rxvt_term::strwidth (SV *str)
715 CODE: 816 CODE:
716{ 817{
… …
735 char *mbstr = rxvt_wcstombs (wstr); 836 char *mbstr = rxvt_wcstombs (wstr);
736 rxvt_pop_locale (); 837 rxvt_pop_locale ();
737 838
738 free (wstr); 839 free (wstr);
739 840
740 RETVAL = newSVpv (mbstr, 0); 841 RETVAL = taint_if (newSVpv (mbstr, 0), str);
741 free (mbstr); 842 free (mbstr);
742} 843}
743 OUTPUT: 844 OUTPUT:
744 RETVAL 845 RETVAL
745 846
… …
752 853
753 rxvt_push_locale (THIS->locale); 854 rxvt_push_locale (THIS->locale);
754 wchar_t *wstr = rxvt_mbstowcs (data, len); 855 wchar_t *wstr = rxvt_mbstowcs (data, len);
755 rxvt_pop_locale (); 856 rxvt_pop_locale ();
756 857
757 RETVAL = wcs2sv (wstr); 858 RETVAL = taint_if (wcs2sv (wstr), octets);
758 free (wstr); 859 free (wstr);
759} 860}
760 OUTPUT: 861 OUTPUT:
761 RETVAL 862 RETVAL
762 863
763# very portable, especially on objects as opposed to pods 864#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
764#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
765 865
766#define TERM_OFFSET_width TERM_OFFSET(width) 866#define TERM_OFFSET_width TERM_OFFSET(width)
767#define TERM_OFFSET_height TERM_OFFSET(height) 867#define TERM_OFFSET_height TERM_OFFSET(height)
768#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 868#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
769#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 869#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
794 CODE: 894 CODE:
795 RETVAL = *(int *)((char *)THIS + ix); 895 RETVAL = *(int *)((char *)THIS + ix);
796 OUTPUT: 896 OUTPUT:
797 RETVAL 897 RETVAL
798 898
899unsigned int
900rxvt_term::ModLevel3Mask ()
901 ALIAS:
902 ModLevel3Mask = 0
903 ModMetaMask = 1
904 ModNumLockMask = 2
905 CODE:
906 switch (ix)
907 {
908 case 0: RETVAL = THIS->ModLevel3Mask; break;
909 case 1: RETVAL = THIS->ModMetaMask; break;
910 case 2: RETVAL = THIS->ModNumLockMask; break;
911 }
912 OUTPUT:
913 RETVAL
914
915U32
916rxvt_term::parent ()
917 CODE:
918 RETVAL = (U32)THIS->parent [0];
919 OUTPUT:
920 RETVAL
921
922U32
923rxvt_term::vt ()
924 CODE:
925 RETVAL = (U32)THIS->vt;
926 OUTPUT:
927 RETVAL
928
799U32 929U32
800rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 930rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
801 CODE: 931 CODE:
802{ 932{
803 RETVAL = THIS->rstyle; 933 RETVAL = THIS->rstyle;
… …
837 967
838 if (GIMME_V != G_VOID) 968 if (GIMME_V != G_VOID)
839 { 969 {
840 wchar_t *wstr = new wchar_t [THIS->ncol]; 970 wchar_t *wstr = new wchar_t [THIS->ncol];
841 971
842 for (int col = 0; col <THIS->ncol; col++) 972 for (int col = 0; col < THIS->ncol; col++)
843 wstr [col] = l.t [col]; 973 wstr [col] = l.t [col];
844 974
845 XPUSHs (sv_2mortal (wcs2sv (wstr))); 975 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
846 976
847 delete [] wstr; 977 delete [] wstr;
848 } 978 }
849 979
850 if (new_text) 980 if (new_text)
… …
940} 1070}
941 OUTPUT: 1071 OUTPUT:
942 RETVAL 1072 RETVAL
943 1073
944SV * 1074SV *
945rxvt_term::special_encode (SV *str) 1075rxvt_term::special_encode (SV *string)
946 CODE: 1076 CODE:
947 abort ();//TODO 1077{
1078 wchar_t *wstr = sv2wcs (string);
1079 int wlen = wcslen (wstr);
1080 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1081
1082 rxvt_push_locale (THIS->locale);
1083
1084 wchar_t *r = rstr;
1085 for (wchar_t *s = wstr; *s; s++)
1086 if (wcwidth (*s) == 0)
1087 {
1088 if (r == rstr)
1089 croak ("leading combining character unencodable");
1090
1091 unicode_t n = rxvt_compose (r[-1], *s);
1092 if (n == NOCHAR)
1093 n = rxvt_composite.compose (r[-1], *s);
1094
1095 r[-1] = n;
1096 }
1097#if !UNICODE_3
1098 else if (*s >= 0x10000)
1099 *r++ = rxvt_composite.compose (*s);
1100#endif
1101 else
1102 *r++ = *s;
1103
1104 rxvt_pop_locale ();
1105
1106 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1107
1108 delete [] rstr;
1109}
1110 OUTPUT:
1111 RETVAL
948 1112
949SV * 1113SV *
950rxvt_term::special_decode (SV *str) 1114rxvt_term::special_decode (SV *text)
951 CODE: 1115 CODE:
952 abort ();//TODO 1116{
1117 wchar_t *wstr = sv2wcs (text);
1118 int wlen = wcslen (wstr);
1119 int dlen = 0;
1120
1121 // find length
1122 for (wchar_t *s = wstr; *s; s++)
1123 if (*s == NOCHAR)
1124 ;
1125 else if (IS_COMPOSE (*s))
1126 dlen += rxvt_composite.expand (*s, 0);
1127 else
1128 dlen++;
1129
1130 wchar_t *rstr = new wchar_t [dlen];
1131
1132 // decode
1133 wchar_t *r = rstr;
1134 for (wchar_t *s = wstr; *s; s++)
1135 if (*s == NOCHAR)
1136 ;
1137 else if (IS_COMPOSE (*s))
1138 r += rxvt_composite.expand (*s, r);
1139 else
1140 *r++ = *s;
1141
1142 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1143
1144 delete [] rstr;
1145}
1146 OUTPUT:
1147 RETVAL
953 1148
954void 1149void
955rxvt_term::_resource (char *name, int index, SV *newval = 0) 1150rxvt_term::_resource (char *name, int index, SV *newval = 0)
956 PPCODE: 1151 PPCODE:
957{ 1152{
… …
974 1169
975 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1170 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
976 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1171 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
977 1172
978 if (GIMME_V != G_VOID) 1173 if (GIMME_V != G_VOID)
979 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1174 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
980 1175
981 if (newval) 1176 if (newval)
982 { 1177 {
983 if (SvOK (newval)) 1178 if (SvOK (newval))
984 { 1179 {
… …
989 else 1184 else
990 THIS->rs [index] = 0; 1185 THIS->rs [index] = 0;
991 } 1186 }
992} 1187}
993 1188
1189bool
1190rxvt_term::option (U32 optval, int set = -1)
1191 CODE:
1192{
1193 RETVAL = THIS->options & optval;
1194
1195 if (set >= 0)
1196 {
1197 if (set)
1198 THIS->options |= optval;
1199 else
1200 THIS->options &= ~optval;
1201
1202 switch (optval)
1203 {
1204 case Opt_skipBuiltinGlyphs:
1205 THIS->set_fonts ();
1206 THIS->scr_remap_chars ();
1207 THIS->scr_touch (true);
1208 THIS->want_refresh = 1;
1209 break;
1210
1211 case Opt_cursorUnderline:
1212 THIS->want_refresh = 1;
1213 break;
1214
1215# case Opt_scrollBar_floating:
1216# case Opt_scrollBar_right:
1217# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1218# break;
1219 }
1220 }
1221}
1222 OUTPUT:
1223 RETVAL
1224
994void 1225void
995rxvt_term::cur (...) 1226rxvt_term::cur (...)
996 PROTOTYPE: $;$$ 1227 PROTOTYPE: $;$$
997 ALIAS: 1228 ALIAS:
998 screen_cur = 0 1229 screen_cur = 0
… …
1022 THIS->want_refresh = 1; 1253 THIS->want_refresh = 1;
1023 } 1254 }
1024} 1255}
1025 1256
1026int 1257int
1027rxvt_term::selection_grab (int eventtime = CurrentTime) 1258rxvt_term::selection_grab (U32 eventtime)
1028 1259
1029void 1260void
1030rxvt_term::selection (SV *newtext = 0) 1261rxvt_term::selection (SV *newtext = 0)
1031 PPCODE: 1262 PPCODE:
1032{ 1263{
1033 if (GIMME_V != G_VOID) 1264 if (GIMME_V != G_VOID)
1034 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1265 XPUSHs (taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))));
1035 1266
1036 if (newtext) 1267 if (newtext)
1037 { 1268 {
1038 free (THIS->selection.text); 1269 free (THIS->selection.text);
1039 1270
… …
1045void 1276void
1046rxvt_term::scr_add_lines (SV *string) 1277rxvt_term::scr_add_lines (SV *string)
1047 CODE: 1278 CODE:
1048{ 1279{
1049 wchar_t *wstr = sv2wcs (string); 1280 wchar_t *wstr = sv2wcs (string);
1050 int wlen = wcslen (wstr);
1051 unicode_t *ustr = new unicode_t [wlen];
1052 int nlines = 0;
1053
1054 for (int i = wlen; i--; )
1055 {
1056 ustr [i] = wstr [i];
1057 nlines += ustr [i] == '\012';
1058 }
1059
1060 THIS->scr_add_lines (ustr, nlines, wlen); 1281 THIS->scr_add_lines (wstr, wcslen (wstr));
1061
1062 free (wstr); 1282 free (wstr);
1063 delete [] ustr;
1064} 1283}
1065 1284
1066void 1285void
1067rxvt_term::tt_write (SV *octets) 1286rxvt_term::tt_write (SV *octets)
1068 INIT: 1287 INIT:
… …
1082 char *old_cmdbuf_endp = THIS->cmdbuf_endp; 1301 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1083 1302
1084 THIS->cmdbuf_ptr = str; 1303 THIS->cmdbuf_ptr = str;
1085 THIS->cmdbuf_endp = str + len; 1304 THIS->cmdbuf_endp = str + len;
1086 1305
1306 rxvt_push_locale (THIS->locale);
1087 THIS->cmd_parse (); 1307 THIS->cmd_parse ();
1308 rxvt_pop_locale ();
1088 1309
1089 THIS->cmdbuf_ptr = old_cmdbuf_ptr; 1310 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1090 THIS->cmdbuf_endp = old_cmdbuf_endp; 1311 THIS->cmdbuf_endp = old_cmdbuf_endp;
1091} 1312}
1092 1313

Diff Legend

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