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.32 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.47 by root, Mon Jan 9 02:06:43 2006 UTC

… …
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28 28
29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef>
31#include <cstdarg> 32#include <cstdarg>
32 33
33#include "rxvt.h" 34#include "rxvt.h"
34#include "iom.h" 35#include "iom.h"
35#include "rxvtutil.h" 36#include "rxvtutil.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include "perlxsi.c" 39#include "perlxsi.c"
39 40
41#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
42# define GRAB_CURSOR THIS->leftptr_cursor
43#else
44# define GRAB_CURSOR None
45#endif
46
40#undef LINENO 47#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW 49#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
44 51
45///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
46 53
54static SV *
55taint (SV *sv)
56{
57 SvTAINT (sv);
58 return sv;
59}
60
61static SV *
62taint_if (SV *sv, SV *src)
63{
64 if (SvTAINTED (src))
65 SvTAINT (sv);
66
67 return sv;
68}
69
47static wchar_t * 70static wchar_t *
48sv2wcs (SV *sv) 71sv2wcs (SV *sv)
49{ 72{
50 STRLEN len; 73 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 74 char *str = SvPVutf8 (sv, len);
… …
101 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 124 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
102 125
103 return (long)mg->mg_ptr; 126 return (long)mg->mg_ptr;
104} 127}
105 128
106#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 129#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
107#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 130#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
108 131
109///////////////////////////////////////////////////////////////////////////// 132/////////////////////////////////////////////////////////////////////////////
110 133
111struct perl_watcher 134struct perl_watcher
… …
290void 313void
291overlay::show () 314overlay::show ()
292{ 315{
293 char key[33]; sprintf (key, "%32lx", (long)this); 316 char key[33]; sprintf (key, "%32lx", (long)this);
294 317
295 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0)); 318 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
296 hv_store (hv, key, 32, newSViv ((long)this), 0); 319 hv_store (hv, key, 32, newSViv ((long)this), 0);
297} 320}
298 321
299void 322void
300overlay::hide () 323overlay::hide ()
301{ 324{
302 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0); 325 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
303 326
304 if (ovs) 327 if (ovs)
305 { 328 {
306 char key[33]; sprintf (key, "%32lx", (long)this); 329 char key[33]; sprintf (key, "%32lx", (long)this);
307 330
… …
389{ 412{
390 if (!perl) 413 if (!perl)
391 { 414 {
392 char *argv[] = { 415 char *argv[] = {
393 "", 416 "",
417 "-T",
394 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 418 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
395 }; 419 };
396 420
397 perl = perl_alloc (); 421 perl = perl_alloc ();
398 perl_construct (perl); 422 perl_construct (perl);
399 423
400 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
401 || perl_run (perl)) 425 || perl_run (perl))
402 { 426 {
403 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
404 428
405 perl_destruct (perl); 429 perl_destruct (perl);
… …
407 perl = 0; 431 perl = 0;
408 } 432 }
409 } 433 }
410} 434}
411 435
436static void
437ungrab (rxvt_term *THIS)
438{
439 if (THIS->perl.grabtime)
440 {
441 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
442 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
443 THIS->perl.grabtime = 0;
444 }
445}
446
412bool 447bool
413rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 448rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
414{ 449{
415 if (!perl) 450 if (!perl)
416 return false; 451 return false;
417 452
418 if (htype == HOOK_INIT) // first hook ever called 453 if (htype == HOOK_INIT) // first hook ever called
419 { 454 {
420 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 455 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
421 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 456 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
422 } 457 }
423 else if (!term->self) 458 else if (!term->perl.self)
424 return false; // perl not initialized for this instance 459 return false; // perl not initialized for this instance
425 else if (htype == HOOK_DESTROY) 460 else if (htype == HOOK_DESTROY)
426 { 461 {
427 // handled later 462 // handled later
428 } 463 }
429 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 464 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
430 { 465 {
431 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 466 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
432 467
433 if (HvKEYS (hv)) 468 if (HvKEYS (hv))
434 { 469 {
435 hv_iterinit (hv); 470 hv_iterinit (hv);
436 471
… …
466 case DT_LONG: 501 case DT_LONG:
467 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 502 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
468 break; 503 break;
469 504
470 case DT_STR: 505 case DT_STR:
471 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 506 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
472 break; 507 break;
473 508
474 case DT_STR_LEN: 509 case DT_STR_LEN:
475 { 510 {
476 char *str = va_arg (ap, char *); 511 char *str = va_arg (ap, char *);
477 int len = va_arg (ap, int); 512 int len = va_arg (ap, int);
478 513
479 XPUSHs (sv_2mortal (newSVpvn (str, len))); 514 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
480 } 515 }
481 break; 516 break;
482 517
483 case DT_WCS_LEN: 518 case DT_WCS_LEN:
484 { 519 {
485 wchar_t *wstr = va_arg (ap, wchar_t *); 520 wchar_t *wstr = va_arg (ap, wchar_t *);
486 int wlen = va_arg (ap, int); 521 int wlen = va_arg (ap, int);
487 522
488 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 523 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
489 } 524 }
525 break;
490 526
491 case DT_XEVENT: 527 case DT_XEVENT:
492 { 528 {
493 XEvent *xe = va_arg (ap, XEvent *); 529 XEvent *xe = va_arg (ap, XEvent *);
494 HV *hv = newHV (); 530 HV *hv = newHV ();
… …
557 PUTBACK; 593 PUTBACK;
558 FREETMPS; 594 FREETMPS;
559 LEAVE; 595 LEAVE;
560 596
561 if (SvTRUE (ERRSV)) 597 if (SvTRUE (ERRSV))
598 {
562 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 599 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
600 ungrab (term); // better lose the grab than the session
601 }
563 602
564 if (htype == HOOK_DESTROY) 603 if (htype == HOOK_DESTROY)
565 { 604 {
566 clearSVptr ((SV *)term->self); 605 clearSVptr ((SV *)term->perl.self);
567 SvREFCNT_dec ((SV *)term->self); 606 SvREFCNT_dec ((SV *)term->perl.self);
568 } 607 }
569 608
570 return count; 609 return count;
571 } 610 }
572 611
… …
582 621
583PROTOTYPES: ENABLE 622PROTOTYPES: ENABLE
584 623
585BOOT: 624BOOT:
586{ 625{
587# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name)); 626 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
627
588 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 628 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
589# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 629# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
590# include "hookinc.h" 630# include "hookinc.h"
591# undef def 631# undef def
592 632
633 HV *option = get_hv ("urxvt::OPTION", 1);
634# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
635# define nodef(name)
636# include "optinc.h"
637# undef nodef
638# undef def
639
640 HV *stash = gv_stashpv ("urxvt", 1);
641# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
593 export_const (DEFAULT_RSTYLE); 642 export_const_iv (DEFAULT_RSTYLE);
594 export_const (OVERLAY_RSTYLE); 643 export_const_iv (OVERLAY_RSTYLE);
595 export_const (RS_Bold); 644 export_const_iv (RS_Bold);
596 export_const (RS_Italic); 645 export_const_iv (RS_Italic);
597 export_const (RS_Blink); 646 export_const_iv (RS_Blink);
598 export_const (RS_RVid); 647 export_const_iv (RS_RVid);
599 export_const (RS_Uline); 648 export_const_iv (RS_Uline);
600 649
601 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 650 export_const_iv (CurrentTime);
651 export_const_iv (ShiftMask);
652 export_const_iv (LockMask);
653 export_const_iv (ControlMask);
654 export_const_iv (Mod1Mask);
655 export_const_iv (Mod2Mask);
656 export_const_iv (Mod3Mask);
657 export_const_iv (Mod4Mask);
658 export_const_iv (Mod5Mask);
659 export_const_iv (Button1Mask);
660 export_const_iv (Button2Mask);
661 export_const_iv (Button3Mask);
662 export_const_iv (Button4Mask);
663 export_const_iv (Button5Mask);
664 export_const_iv (AnyModifier);
602} 665}
603 666
604SV * 667SV *
605new (...) 668new (...)
606 CODE: 669 CODE:
… …
624 { 687 {
625 term->destroy (); 688 term->destroy ();
626 croak ("exception caught while initializing new terminal instance"); 689 croak ("exception caught while initializing new terminal instance");
627 } 690 }
628 691
629 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef; 692 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
630} 693}
631 OUTPUT: 694 OUTPUT:
632 RETVAL 695 RETVAL
633 696
634void 697void
… …
643 706
644void 707void
645fatal (const char *msg) 708fatal (const char *msg)
646 CODE: 709 CODE:
647 rxvt_fatal ("%s", msg); 710 rxvt_fatal ("%s", msg);
711
712SV *
713untaint (SV *sv)
714 CODE:
715 RETVAL = newSVsv (sv);
716 SvTAINTED_off (RETVAL);
717 OUTPUT:
718 RETVAL
719
720bool
721safe ()
722 CODE:
723 RETVAL = !rxvt_tainted ();
724 OUTPUT:
725 RETVAL
648 726
649NV 727NV
650NOW () 728NOW ()
651 CODE: 729 CODE:
652 RETVAL = NOW; 730 RETVAL = NOW;
… …
703 781
704MODULE = urxvt PACKAGE = urxvt::term 782MODULE = urxvt PACKAGE = urxvt::term
705 783
706void 784void
707rxvt_term::destroy () 785rxvt_term::destroy ()
786
787void
788rxvt_term::grab_button (int button, U32 modifiers)
789 CODE:
790 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
791 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
792 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
793
794bool
795rxvt_term::grab (U32 eventtime, int sync = 0)
796 CODE:
797{
798 int mode = sync ? GrabModeSync : GrabModeAsync;
799
800 THIS->perl.grabtime = 0;
801
802 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
803 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
804 mode, mode, None, GRAB_CURSOR, eventtime))
805 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
806 THIS->perl.grabtime = eventtime;
807 else
808 XUngrabPointer (THIS->display->display, eventtime);
809
810 RETVAL = !!THIS->perl.grabtime;
811}
812 OUTPUT:
813 RETVAL
814
815void
816rxvt_term::allow_events_async ()
817 CODE:
818 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
819
820void
821rxvt_term::allow_events_sync ()
822 CODE:
823 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
824
825void
826rxvt_term::allow_events_replay ()
827 CODE:
828 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
829 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
830
831void
832rxvt_term::ungrab ()
833 CODE:
834 ungrab (THIS);
708 835
709int 836int
710rxvt_term::strwidth (SV *str) 837rxvt_term::strwidth (SV *str)
711 CODE: 838 CODE:
712{ 839{
… …
731 char *mbstr = rxvt_wcstombs (wstr); 858 char *mbstr = rxvt_wcstombs (wstr);
732 rxvt_pop_locale (); 859 rxvt_pop_locale ();
733 860
734 free (wstr); 861 free (wstr);
735 862
736 RETVAL = newSVpv (mbstr, 0); 863 RETVAL = taint_if (newSVpv (mbstr, 0), str);
737 free (mbstr); 864 free (mbstr);
738} 865}
739 OUTPUT: 866 OUTPUT:
740 RETVAL 867 RETVAL
741 868
… …
748 875
749 rxvt_push_locale (THIS->locale); 876 rxvt_push_locale (THIS->locale);
750 wchar_t *wstr = rxvt_mbstowcs (data, len); 877 wchar_t *wstr = rxvt_mbstowcs (data, len);
751 rxvt_pop_locale (); 878 rxvt_pop_locale ();
752 879
753 RETVAL = wcs2sv (wstr); 880 RETVAL = taint_if (wcs2sv (wstr), octets);
754 free (wstr); 881 free (wstr);
755} 882}
756 OUTPUT: 883 OUTPUT:
757 RETVAL 884 RETVAL
758 885
759# very portable, especially on objects as opposed to pods 886#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
760#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
761 887
762#define TERM_OFFSET_width TERM_OFFSET(width) 888#define TERM_OFFSET_width TERM_OFFSET(width)
763#define TERM_OFFSET_height TERM_OFFSET(height) 889#define TERM_OFFSET_height TERM_OFFSET(height)
764#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 890#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
765#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 891#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
790 CODE: 916 CODE:
791 RETVAL = *(int *)((char *)THIS + ix); 917 RETVAL = *(int *)((char *)THIS + ix);
792 OUTPUT: 918 OUTPUT:
793 RETVAL 919 RETVAL
794 920
921unsigned int
922rxvt_term::ModLevel3Mask ()
923 ALIAS:
924 ModLevel3Mask = 0
925 ModMetaMask = 1
926 ModNumLockMask = 2
927 CODE:
928 switch (ix)
929 {
930 case 0: RETVAL = THIS->ModLevel3Mask; break;
931 case 1: RETVAL = THIS->ModMetaMask; break;
932 case 2: RETVAL = THIS->ModNumLockMask; break;
933 }
934 OUTPUT:
935 RETVAL
936
795U32 937U32
796rxvt_term::parent () 938rxvt_term::parent ()
797 CODE: 939 CODE:
798 RETVAL = (U32)THIS->parent [0]; 940 RETVAL = (U32)THIS->parent [0];
799 OUTPUT: 941 OUTPUT:
… …
847 989
848 if (GIMME_V != G_VOID) 990 if (GIMME_V != G_VOID)
849 { 991 {
850 wchar_t *wstr = new wchar_t [THIS->ncol]; 992 wchar_t *wstr = new wchar_t [THIS->ncol];
851 993
852 for (int col = 0; col <THIS->ncol; col++) 994 for (int col = 0; col < THIS->ncol; col++)
853 wstr [col] = l.t [col]; 995 wstr [col] = l.t [col];
854 996
855 XPUSHs (sv_2mortal (wcs2sv (wstr))); 997 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
856 998
857 delete [] wstr; 999 delete [] wstr;
858 } 1000 }
859 1001
860 if (new_text) 1002 if (new_text)
… …
950} 1092}
951 OUTPUT: 1093 OUTPUT:
952 RETVAL 1094 RETVAL
953 1095
954SV * 1096SV *
955rxvt_term::special_encode (SV *str) 1097rxvt_term::special_encode (SV *string)
956 CODE: 1098 CODE:
957 abort ();//TODO 1099{
1100 wchar_t *wstr = sv2wcs (string);
1101 int wlen = wcslen (wstr);
1102 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1103
1104 rxvt_push_locale (THIS->locale);
1105
1106 wchar_t *r = rstr;
1107 for (wchar_t *s = wstr; *s; s++)
1108 if (wcwidth (*s) == 0)
1109 {
1110 if (r == rstr)
1111 croak ("leading combining character unencodable");
1112
1113 unicode_t n = rxvt_compose (r[-1], *s);
1114 if (n == NOCHAR)
1115 n = rxvt_composite.compose (r[-1], *s);
1116
1117 r[-1] = n;
1118 }
1119#if !UNICODE_3
1120 else if (*s >= 0x10000)
1121 *r++ = rxvt_composite.compose (*s);
1122#endif
1123 else
1124 *r++ = *s;
1125
1126 rxvt_pop_locale ();
1127
1128 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1129
1130 delete [] rstr;
1131}
1132 OUTPUT:
1133 RETVAL
958 1134
959SV * 1135SV *
960rxvt_term::special_decode (SV *str) 1136rxvt_term::special_decode (SV *text)
961 CODE: 1137 CODE:
962 abort ();//TODO 1138{
1139 wchar_t *wstr = sv2wcs (text);
1140 int wlen = wcslen (wstr);
1141 int dlen = 0;
1142
1143 // find length
1144 for (wchar_t *s = wstr; *s; s++)
1145 if (*s == NOCHAR)
1146 ;
1147 else if (IS_COMPOSE (*s))
1148 dlen += rxvt_composite.expand (*s, 0);
1149 else
1150 dlen++;
1151
1152 wchar_t *rstr = new wchar_t [dlen];
1153
1154 // decode
1155 wchar_t *r = rstr;
1156 for (wchar_t *s = wstr; *s; s++)
1157 if (*s == NOCHAR)
1158 ;
1159 else if (IS_COMPOSE (*s))
1160 r += rxvt_composite.expand (*s, r);
1161 else
1162 *r++ = *s;
1163
1164 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1165
1166 delete [] rstr;
1167}
1168 OUTPUT:
1169 RETVAL
963 1170
964void 1171void
965rxvt_term::_resource (char *name, int index, SV *newval = 0) 1172rxvt_term::_resource (char *name, int index, SV *newval = 0)
966 PPCODE: 1173 PPCODE:
967{ 1174{
… …
984 1191
985 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1192 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
986 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1193 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
987 1194
988 if (GIMME_V != G_VOID) 1195 if (GIMME_V != G_VOID)
989 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1196 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
990 1197
991 if (newval) 1198 if (newval)
992 { 1199 {
993 if (SvOK (newval)) 1200 if (SvOK (newval))
994 { 1201 {
… …
999 else 1206 else
1000 THIS->rs [index] = 0; 1207 THIS->rs [index] = 0;
1001 } 1208 }
1002} 1209}
1003 1210
1211bool
1212rxvt_term::option (U32 optval, int set = -1)
1213 CODE:
1214{
1215 RETVAL = THIS->options & optval;
1216
1217 if (set >= 0)
1218 {
1219 if (set)
1220 THIS->options |= optval;
1221 else
1222 THIS->options &= ~optval;
1223
1224 switch (optval)
1225 {
1226 case Opt_skipBuiltinGlyphs:
1227 THIS->set_fonts ();
1228 THIS->scr_remap_chars ();
1229 THIS->scr_touch (true);
1230 THIS->want_refresh = 1;
1231 break;
1232
1233 case Opt_cursorUnderline:
1234 THIS->want_refresh = 1;
1235 break;
1236
1237# case Opt_scrollBar_floating:
1238# case Opt_scrollBar_right:
1239# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1240# break;
1241 }
1242 }
1243}
1244 OUTPUT:
1245 RETVAL
1246
1004void 1247void
1005rxvt_term::cur (...) 1248rxvt_term::screen_cur (...)
1006 PROTOTYPE: $;$$ 1249 PROTOTYPE: $;$$
1007 ALIAS: 1250 ALIAS:
1008 screen_cur = 0 1251 screen_cur = 0
1009 selection_beg = 1 1252 selection_beg = 1
1010 selection_end = 2 1253 selection_end = 2
… …
1032 THIS->want_refresh = 1; 1275 THIS->want_refresh = 1;
1033 } 1276 }
1034} 1277}
1035 1278
1036int 1279int
1037rxvt_term::selection_grab (int eventtime = CurrentTime) 1280rxvt_term::selection_grab (U32 eventtime)
1038 1281
1039void 1282void
1040rxvt_term::selection (SV *newtext = 0) 1283rxvt_term::selection (SV *newtext = 0)
1041 PPCODE: 1284 PPCODE:
1042{ 1285{
1043 if (GIMME_V != G_VOID) 1286 if (GIMME_V != G_VOID)
1287 XPUSHs (THIS->selection.text
1044 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1288 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1289 : &PL_sv_undef);
1045 1290
1046 if (newtext) 1291 if (newtext)
1047 { 1292 {
1048 free (THIS->selection.text); 1293 free (THIS->selection.text);
1049 1294
… …
1080 char *old_cmdbuf_endp = THIS->cmdbuf_endp; 1325 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1081 1326
1082 THIS->cmdbuf_ptr = str; 1327 THIS->cmdbuf_ptr = str;
1083 THIS->cmdbuf_endp = str + len; 1328 THIS->cmdbuf_endp = str + len;
1084 1329
1330 rxvt_push_locale (THIS->locale);
1085 THIS->cmd_parse (); 1331 THIS->cmd_parse ();
1332 rxvt_pop_locale ();
1086 1333
1087 THIS->cmdbuf_ptr = old_cmdbuf_ptr; 1334 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1088 THIS->cmdbuf_endp = old_cmdbuf_endp; 1335 THIS->cmdbuf_endp = old_cmdbuf_endp;
1089} 1336}
1090 1337

Diff Legend

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