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.34 by root, Fri Jan 6 21:06:09 2006 UTC vs.
Revision 1.48 by root, Mon Jan 9 05:08:02 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 }
490 break; 525 break;
491 526
492 case DT_XEVENT: 527 case DT_XEVENT:
493 { 528 {
… …
558 PUTBACK; 593 PUTBACK;
559 FREETMPS; 594 FREETMPS;
560 LEAVE; 595 LEAVE;
561 596
562 if (SvTRUE (ERRSV)) 597 if (SvTRUE (ERRSV))
598 {
563 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 }
564 602
565 if (htype == HOOK_DESTROY) 603 if (htype == HOOK_DESTROY)
566 { 604 {
567 clearSVptr ((SV *)term->self); 605 clearSVptr ((SV *)term->perl.self);
568 SvREFCNT_dec ((SV *)term->self); 606 SvREFCNT_dec ((SV *)term->perl.self);
569 } 607 }
570 608
571 return count; 609 return count;
572 } 610 }
573 611
… …
583 621
584PROTOTYPES: ENABLE 622PROTOTYPES: ENABLE
585 623
586BOOT: 624BOOT:
587{ 625{
588# 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
589 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 628 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
590# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 629# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
591# include "hookinc.h" 630# include "hookinc.h"
592# undef def 631# undef def
593 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));
594 export_const (DEFAULT_RSTYLE); 642 export_const_iv (DEFAULT_RSTYLE);
595 export_const (OVERLAY_RSTYLE); 643 export_const_iv (OVERLAY_RSTYLE);
596 export_const (RS_Bold); 644 export_const_iv (RS_Bold);
597 export_const (RS_Italic); 645 export_const_iv (RS_Italic);
598 export_const (RS_Blink); 646 export_const_iv (RS_Blink);
599 export_const (RS_RVid); 647 export_const_iv (RS_RVid);
600 export_const (RS_Uline); 648 export_const_iv (RS_Uline);
601 649
602 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);
603} 665}
604 666
605SV * 667SV *
606new (...) 668new (...)
607 CODE: 669 CODE:
… …
625 { 687 {
626 term->destroy (); 688 term->destroy ();
627 croak ("exception caught while initializing new terminal instance"); 689 croak ("exception caught while initializing new terminal instance");
628 } 690 }
629 691
630 RETVAL = term && term->self ? newSVterm (term) : &PL_sv_undef; 692 RETVAL = term && term->perl.self ? newSVterm (term) : &PL_sv_undef;
631} 693}
632 OUTPUT: 694 OUTPUT:
633 RETVAL 695 RETVAL
634 696
635void 697void
… …
644 706
645void 707void
646fatal (const char *msg) 708fatal (const char *msg)
647 CODE: 709 CODE:
648 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
649 726
650NV 727NV
651NOW () 728NOW ()
652 CODE: 729 CODE:
653 RETVAL = NOW; 730 RETVAL = NOW;
… …
704 781
705MODULE = urxvt PACKAGE = urxvt::term 782MODULE = urxvt PACKAGE = urxvt::term
706 783
707void 784void
708rxvt_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);
709 835
710int 836int
711rxvt_term::strwidth (SV *str) 837rxvt_term::strwidth (SV *str)
712 CODE: 838 CODE:
713{ 839{
… …
732 char *mbstr = rxvt_wcstombs (wstr); 858 char *mbstr = rxvt_wcstombs (wstr);
733 rxvt_pop_locale (); 859 rxvt_pop_locale ();
734 860
735 free (wstr); 861 free (wstr);
736 862
737 RETVAL = newSVpv (mbstr, 0); 863 RETVAL = taint_if (newSVpv (mbstr, 0), str);
738 free (mbstr); 864 free (mbstr);
739} 865}
740 OUTPUT: 866 OUTPUT:
741 RETVAL 867 RETVAL
742 868
… …
749 875
750 rxvt_push_locale (THIS->locale); 876 rxvt_push_locale (THIS->locale);
751 wchar_t *wstr = rxvt_mbstowcs (data, len); 877 wchar_t *wstr = rxvt_mbstowcs (data, len);
752 rxvt_pop_locale (); 878 rxvt_pop_locale ();
753 879
754 RETVAL = wcs2sv (wstr); 880 RETVAL = taint_if (wcs2sv (wstr), octets);
755 free (wstr); 881 free (wstr);
756} 882}
757 OUTPUT: 883 OUTPUT:
758 RETVAL 884 RETVAL
759 885
760# very portable, especially on objects as opposed to pods 886#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
761#define TERM_OFFSET(sym) (((char *)&((TermWin_t *)0)->sym) - (char *)(TermWin_t *)0)
762 887
763#define TERM_OFFSET_width TERM_OFFSET(width) 888#define TERM_OFFSET_width TERM_OFFSET(width)
764#define TERM_OFFSET_height TERM_OFFSET(height) 889#define TERM_OFFSET_height TERM_OFFSET(height)
765#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 890#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
766#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 891#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
… …
791 CODE: 916 CODE:
792 RETVAL = *(int *)((char *)THIS + ix); 917 RETVAL = *(int *)((char *)THIS + ix);
793 OUTPUT: 918 OUTPUT:
794 RETVAL 919 RETVAL
795 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
937char *
938rxvt_term::display_id ()
939 CODE:
940 RETVAL = THIS->display->id;
941 OUTPUT:
942 RETVAL
943
796U32 944U32
797rxvt_term::parent () 945rxvt_term::parent ()
798 CODE: 946 CODE:
799 RETVAL = (U32)THIS->parent [0]; 947 RETVAL = (U32)THIS->parent [0];
800 OUTPUT: 948 OUTPUT:
… …
851 wchar_t *wstr = new wchar_t [THIS->ncol]; 999 wchar_t *wstr = new wchar_t [THIS->ncol];
852 1000
853 for (int col = 0; col < THIS->ncol; col++) 1001 for (int col = 0; col < THIS->ncol; col++)
854 wstr [col] = l.t [col]; 1002 wstr [col] = l.t [col];
855 1003
856 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1004 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
857 1005
858 delete [] wstr; 1006 delete [] wstr;
859 } 1007 }
860 1008
861 if (new_text) 1009 if (new_text)
… …
982 else 1130 else
983 *r++ = *s; 1131 *r++ = *s;
984 1132
985 rxvt_pop_locale (); 1133 rxvt_pop_locale ();
986 1134
987 RETVAL = wcs2sv (rstr, r - rstr); 1135 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
988 1136
989 delete [] rstr; 1137 delete [] rstr;
990} 1138}
991 OUTPUT: 1139 OUTPUT:
992 RETVAL 1140 RETVAL
… …
1018 else if (IS_COMPOSE (*s)) 1166 else if (IS_COMPOSE (*s))
1019 r += rxvt_composite.expand (*s, r); 1167 r += rxvt_composite.expand (*s, r);
1020 else 1168 else
1021 *r++ = *s; 1169 *r++ = *s;
1022 1170
1023 RETVAL = wcs2sv (rstr, r - rstr); 1171 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1024 1172
1025 delete [] rstr; 1173 delete [] rstr;
1026} 1174}
1027 OUTPUT: 1175 OUTPUT:
1028 RETVAL 1176 RETVAL
… …
1050 1198
1051 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1199 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1052 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1200 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1053 1201
1054 if (GIMME_V != G_VOID) 1202 if (GIMME_V != G_VOID)
1055 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1203 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1056 1204
1057 if (newval) 1205 if (newval)
1058 { 1206 {
1059 if (SvOK (newval)) 1207 if (SvOK (newval))
1060 { 1208 {
… …
1065 else 1213 else
1066 THIS->rs [index] = 0; 1214 THIS->rs [index] = 0;
1067 } 1215 }
1068} 1216}
1069 1217
1218bool
1219rxvt_term::option (U32 optval, int set = -1)
1220 CODE:
1221{
1222 RETVAL = THIS->options & optval;
1223
1224 if (set >= 0)
1225 {
1226 if (set)
1227 THIS->options |= optval;
1228 else
1229 THIS->options &= ~optval;
1230
1231 switch (optval)
1232 {
1233 case Opt_skipBuiltinGlyphs:
1234 THIS->set_fonts ();
1235 THIS->scr_remap_chars ();
1236 THIS->scr_touch (true);
1237 THIS->want_refresh = 1;
1238 break;
1239
1240 case Opt_cursorUnderline:
1241 THIS->want_refresh = 1;
1242 break;
1243
1244# case Opt_scrollBar_floating:
1245# case Opt_scrollBar_right:
1246# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1247# break;
1248 }
1249 }
1250}
1251 OUTPUT:
1252 RETVAL
1253
1070void 1254void
1071rxvt_term::cur (...) 1255rxvt_term::screen_cur (...)
1072 PROTOTYPE: $;$$ 1256 PROTOTYPE: $;$$
1073 ALIAS: 1257 ALIAS:
1074 screen_cur = 0 1258 screen_cur = 0
1075 selection_beg = 1 1259 selection_beg = 1
1076 selection_end = 2 1260 selection_end = 2
… …
1098 THIS->want_refresh = 1; 1282 THIS->want_refresh = 1;
1099 } 1283 }
1100} 1284}
1101 1285
1102int 1286int
1103rxvt_term::selection_grab (int eventtime = CurrentTime) 1287rxvt_term::selection_grab (U32 eventtime)
1104 1288
1105void 1289void
1106rxvt_term::selection (SV *newtext = 0) 1290rxvt_term::selection (SV *newtext = 0)
1107 PPCODE: 1291 PPCODE:
1108{ 1292{
1109 if (GIMME_V != G_VOID) 1293 if (GIMME_V != G_VOID)
1294 XPUSHs (THIS->selection.text
1110 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1295 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
1296 : &PL_sv_undef);
1111 1297
1112 if (newtext) 1298 if (newtext)
1113 { 1299 {
1114 free (THIS->selection.text); 1300 free (THIS->selection.text);
1115 1301
… …
1146 char *old_cmdbuf_endp = THIS->cmdbuf_endp; 1332 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1147 1333
1148 THIS->cmdbuf_ptr = str; 1334 THIS->cmdbuf_ptr = str;
1149 THIS->cmdbuf_endp = str + len; 1335 THIS->cmdbuf_endp = str + len;
1150 1336
1337 rxvt_push_locale (THIS->locale);
1151 THIS->cmd_parse (); 1338 THIS->cmd_parse ();
1339 rxvt_pop_locale ();
1152 1340
1153 THIS->cmdbuf_ptr = old_cmdbuf_ptr; 1341 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1154 THIS->cmdbuf_endp = old_cmdbuf_endp; 1342 THIS->cmdbuf_endp = old_cmdbuf_endp;
1155} 1343}
1156 1344

Diff Legend

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