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.64 by root, Fri Jan 13 15:42:50 2006 UTC vs.
Revision 1.71 by root, Tue Jan 17 16:22:41 2006 UTC

… …
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45# define GRAB_CURSOR THIS->leftptr_cursor
46#else 46#else
47# define GRAB_CURSOR None 47# define GRAB_CURSOR None
48#endif 48#endif
49 49
… …
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55#define ENABLE_PERL_FRILLS 1 55#define ENABLE_PERL_FRILLS 1
56 56
57///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
58
59static SV *
60taint (SV *sv)
61{
62 SvTAINT (sv);
63 return sv;
64}
65
66static SV *
67taint_if (SV *sv, SV *src)
68{
69 if (SvTAINTED (src))
70 SvTAINT (sv);
71
72 return sv;
73}
74 58
75static wchar_t * 59static wchar_t *
76sv2wcs (SV *sv) 60sv2wcs (SV *sv)
77{ 61{
78 STRLEN len; 62 STRLEN len;
… …
349 for (int y = ov_h; y--; ) 333 for (int y = ov_h; y--; )
350 { 334 {
351 text_t *t1 = text [y]; 335 text_t *t1 = text [y];
352 rend_t *r1 = rend [y]; 336 rend_t *r1 = rend [y];
353 337
354 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 338 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
355 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 339 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
356 340
357 for (int x = ov_w; x--; ) 341 for (int x = ov_w; x--; )
358 { 342 {
359 text_t t = *t1; *t1++ = *t2; *t2++ = t; 343 text_t t = *t1; *t1++ = *t2; *t2++ = t;
360 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 344 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
… …
407 perl_free (perl); 391 perl_free (perl);
408 } 392 }
409} 393}
410 394
411void 395void
412rxvt_perl_interp::init () 396rxvt_perl_interp::init (rxvt_term *term)
413{ 397{
414 if (!perl) 398 if (!perl)
415 { 399 {
400 rxvt_push_locale (""); // perl init destroys current locale
401
416 perl_environ = rxvt_environ; 402 perl_environ = rxvt_environ;
417 swap (perl_environ, environ); 403 swap (perl_environ, environ);
418 404
419 char *argv[] = { 405 char *argv[] = {
420 "", 406 "",
421 "-T",
422 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 407 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
423 }; 408 };
424 409
425 perl = perl_alloc (); 410 perl = perl_alloc ();
426 perl_construct (perl); 411 perl_construct (perl);
427 412
428 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 413 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
429 || perl_run (perl)) 414 || perl_run (perl))
430 { 415 {
431 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 416 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
432 417
433 perl_destruct (perl); 418 perl_destruct (perl);
434 perl_free (perl); 419 perl_free (perl);
435 perl = 0; 420 perl = 0;
436 } 421 }
437 422
438 swap (perl_environ, environ); 423 swap (perl_environ, environ);
424
425 rxvt_pop_locale ();
426 }
427
428 if (perl)
429 {
430 // runs outside of perls ENV
431 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
432 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
439 } 433 }
440} 434}
441 435
442static void 436static void
443ungrab (rxvt_term *THIS) 437ungrab (rxvt_term *THIS)
… …
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 442 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 443 THIS->perl.grabtime = 0;
450 } 444 }
451} 445}
452 446
447static void
448swap_overlays (rxvt_term *term)
449{
450 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
451
452 if (HvKEYS (hv))
453 {
454 hv_iterinit (hv);
455
456 while (HE *he = hv_iternext (hv))
457 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
458 }
459}
460
453bool 461bool
454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 462rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
455{ 463{
456 if (!perl) 464 if (!perl || !term->perl.self)
457 return false; 465 return false;
458 466
459 if (htype == HOOK_INIT) // first hook ever called 467 // pre-handling of some events
460 { 468 if (htype == HOOK_REFRESH_END)
461 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 469 swap_overlays (term);
462 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 470
463 } 471 swap (perl_environ, environ);
464 else if (!term->perl.self) 472
465 return false; // perl not initialized for this instance 473 bool event_consumed;
466 else if (htype == HOOK_DESTROY) 474
467 { 475 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
468 // handled later 476 || term->perl.should_invoke [htype])
469 } 477 try
470 else
471 {
472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
473 { 478 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 479 dSP;
480 va_list ap;
475 481
476 if (HvKEYS (hv)) 482 va_start (ap, htype);
483
484 ENTER;
485 SAVETMPS;
486
487 PUSHMARK (SP);
488
489 XPUSHs (sv_2mortal (newSVterm (term)));
490 XPUSHs (sv_2mortal (newSViv (htype)));
491
492 for (;;) {
493 data_type dt = (data_type)va_arg (ap, int);
494
495 switch (dt)
477 { 496 {
478 hv_iterinit (hv);
479
480 while (HE *he = hv_iternext (hv))
481 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
482 }
483
484 }
485
486 if (!term->perl.should_invoke [htype])
487 return false;
488 }
489
490 swap (perl_environ, environ);
491
492 try
493 {
494 dSP;
495 va_list ap;
496
497 va_start (ap, htype);
498
499 ENTER;
500 SAVETMPS;
501
502 PUSHMARK (SP);
503
504 XPUSHs (sv_2mortal (newSVterm (term)));
505 XPUSHs (sv_2mortal (newSViv (htype)));
506
507 for (;;) {
508 data_type dt = (data_type)va_arg (ap, int);
509
510 switch (dt)
511 {
512 case DT_INT: 497 case DT_INT:
513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 498 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
514 break; 499 break;
515 500
516 case DT_LONG: 501 case DT_LONG:
517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 502 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
518 break; 503 break;
519 504
520 case DT_STR: 505 case DT_STR:
521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 506 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
522 break; 507 break;
523 508
524 case DT_STR_LEN: 509 case DT_STR_LEN:
525 { 510 {
526 char *str = va_arg (ap, char *); 511 char *str = va_arg (ap, char *);
527 int len = va_arg (ap, int); 512 int len = va_arg (ap, int);
528 513
529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 514 XPUSHs (sv_2mortal (newSVpvn (str, len)));
530 } 515 }
531 break; 516 break;
532 517
533 case DT_WCS_LEN: 518 case DT_WCS_LEN:
534 { 519 {
535 wchar_t *wstr = va_arg (ap, wchar_t *); 520 wchar_t *wstr = va_arg (ap, wchar_t *);
536 int wlen = va_arg (ap, int); 521 int wlen = va_arg (ap, int);
537 522
538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 523 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
539 } 524 }
540 break; 525 break;
541 526
542 case DT_XEVENT: 527 case DT_XEVENT:
543 { 528 {
544 XEvent *xe = va_arg (ap, XEvent *); 529 XEvent *xe = va_arg (ap, XEvent *);
545 HV *hv = newHV (); 530 HV *hv = newHV ();
546 531
547# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 532# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
548# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 533# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
549# undef set 534# undef set
550 535
551 setiv (type, xe->type); 536 setiv (type, xe->type);
552 setiv (send_event, xe->xany.send_event); 537 setiv (send_event, xe->xany.send_event);
553 setiv (serial, xe->xany.serial); 538 setiv (serial, xe->xany.serial);
554 539
555 switch (xe->type) 540 switch (xe->type)
556 { 541 {
557 case KeyPress: 542 case KeyPress:
558 case KeyRelease: 543 case KeyRelease:
559 case ButtonPress: 544 case ButtonPress:
560 case ButtonRelease: 545 case ButtonRelease:
561 case MotionNotify: 546 case MotionNotify:
562 setiv (time, xe->xmotion.time); 547 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x); 548 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y); 549 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight); 550 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth); 551 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root); 552 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root); 553 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state); 554 setiv (state, xe->xmotion.state);
570 break; 555 break;
571 } 556 }
572 557
573 switch (xe->type) 558 switch (xe->type)
574 { 559 {
575 case KeyPress: 560 case KeyPress:
576 case KeyRelease: 561 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode); 562 setiv (keycode, xe->xkey.keycode);
578 break; 563 break;
579 564
580 case ButtonPress: 565 case ButtonPress:
581 case ButtonRelease: 566 case ButtonRelease:
582 setiv (button, xe->xbutton.button); 567 setiv (button, xe->xbutton.button);
583 break; 568 break;
584 569
585 case MotionNotify: 570 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint); 571 setiv (is_hint, xe->xmotion.is_hint);
587 break; 572 break;
588 } 573 }
589 574
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 575 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 } 576 }
592 break; 577 break;
593 578
594 case DT_END: 579 case DT_END:
595 { 580 goto call;
596 va_end (ap);
597 581
598 PUTBACK;
599 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
600 SPAGAIN;
601
602 if (count)
603 {
604 SV *status = POPs;
605 count = SvTRUE (status);
606 }
607
608 PUTBACK;
609 FREETMPS;
610 LEAVE;
611
612 if (SvTRUE (ERRSV))
613 {
614 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
615 ungrab (term); // better lose the grab than the session
616 }
617
618 if (htype == HOOK_DESTROY)
619 {
620 clearSVptr ((SV *)term->perl.self);
621 SvREFCNT_dec ((SV *)term->perl.self);
622 }
623
624 swap (perl_environ, environ);
625 return count;
626 }
627
628 default: 582 default:
629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 583 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 } 584 }
585 }
586
587 call:
588 va_end (ap);
589
590 PUTBACK;
591 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
592 SPAGAIN;
593
594 if (count)
595 {
596 SV *status = POPs;
597 count = SvTRUE (status);
598 }
599
600 PUTBACK;
601 FREETMPS;
602 LEAVE;
603
604 if (SvTRUE (ERRSV))
605 {
606 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
607 ungrab (term); // better lose the grab than the session
608 }
609
610 event_consumed = !!count;
631 } 611 }
612 catch (...)
613 {
614 swap (perl_environ, environ);
615 throw;
616 }
617 else
618 event_consumed = false;
619
620 // post-handling of some events
621 if (htype == HOOK_REFRESH_BEGIN)
622 swap_overlays (term);
623 else if (htype == HOOK_DESTROY)
624 {
625 clearSVptr ((SV *)term->perl.self);
626 SvREFCNT_dec ((SV *)term->perl.self);
632 } 627 }
633 catch (...) 628
634 {
635 swap (perl_environ, environ); 629 swap (perl_environ, environ);
636 throw; 630
637 } 631 return event_consumed;
638} 632}
639 633
640///////////////////////////////////////////////////////////////////////////// 634/////////////////////////////////////////////////////////////////////////////
641 635
642MODULE = urxvt PACKAGE = urxvt 636MODULE = urxvt PACKAGE = urxvt
… …
771void 765void
772fatal (const char *msg) 766fatal (const char *msg)
773 CODE: 767 CODE:
774 rxvt_fatal ("%s", msg); 768 rxvt_fatal ("%s", msg);
775 769
776SV *
777untaint (SV *sv)
778 CODE:
779 RETVAL = newSVsv (sv);
780 SvTAINTED_off (RETVAL);
781 OUTPUT:
782 RETVAL
783
784void 770void
785_exit (int status) 771_exit (int status)
786
787bool
788safe ()
789 CODE:
790 RETVAL = !rxvt_tainted ();
791 OUTPUT:
792 RETVAL
793 772
794NV 773NV
795NOW () 774NOW ()
796 CODE: 775 CODE:
797 RETVAL = NOW; 776 RETVAL = NOW;
… …
968 RETVAL 947 RETVAL
969 948
970void 949void
971rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0) 950rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
972 CODE: 951 CODE:
973 XReparentWindow (THIS->display->display, window, parent, x, y); 952 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
953
954void
955rxvt_term::XMapWindow (U32 window)
956 CODE:
957 XMapWindow (THIS->display->display, (Window)window);
958
959void
960rxvt_term::XUnmapWindow (U32 window)
961 CODE:
962 XUnmapWindow (THIS->display->display, (Window)window);
974 963
975#endif 964#endif
976 965
977void 966void
978rxvt_term::set_should_invoke (int htype, int inc) 967rxvt_term::set_should_invoke (int htype, int inc)
… …
1053 char *mbstr = rxvt_wcstombs (wstr); 1042 char *mbstr = rxvt_wcstombs (wstr);
1054 rxvt_pop_locale (); 1043 rxvt_pop_locale ();
1055 1044
1056 free (wstr); 1045 free (wstr);
1057 1046
1058 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1047 RETVAL = newSVpv (mbstr, 0);
1059 free (mbstr); 1048 free (mbstr);
1060} 1049}
1061 OUTPUT: 1050 OUTPUT:
1062 RETVAL 1051 RETVAL
1063 1052
… …
1070 1059
1071 rxvt_push_locale (THIS->locale); 1060 rxvt_push_locale (THIS->locale);
1072 wchar_t *wstr = rxvt_mbstowcs (data, len); 1061 wchar_t *wstr = rxvt_mbstowcs (data, len);
1073 rxvt_pop_locale (); 1062 rxvt_pop_locale ();
1074 1063
1075 RETVAL = taint_if (wcs2sv (wstr), octets); 1064 RETVAL = wcs2sv (wstr);
1076 free (wstr); 1065 free (wstr);
1077} 1066}
1078 OUTPUT: 1067 OUTPUT:
1079 RETVAL 1068 RETVAL
1080 1069
… …
1089#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1078#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1090#define TERM_OFFSET_focus TERM_OFFSET(focus) 1079#define TERM_OFFSET_focus TERM_OFFSET(focus)
1091#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1080#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1092#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1081#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1093#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1082#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1094#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1083#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1095 1084
1096int 1085int
1097rxvt_term::width () 1086rxvt_term::width ()
1098 ALIAS: 1087 ALIAS:
1099 width = TERM_OFFSET_width 1088 width = TERM_OFFSET_width
… …
1105 ncol = TERM_OFFSET_ncol 1094 ncol = TERM_OFFSET_ncol
1106 focus = TERM_OFFSET_focus 1095 focus = TERM_OFFSET_focus
1107 mapped = TERM_OFFSET_mapped 1096 mapped = TERM_OFFSET_mapped
1108 saveLines = TERM_OFFSET_saveLines 1097 saveLines = TERM_OFFSET_saveLines
1109 total_rows = TERM_OFFSET_total_rows 1098 total_rows = TERM_OFFSET_total_rows
1110 nsaved = TERM_OFFSET_nsaved 1099 top_row = TERM_OFFSET_top_row
1111 CODE: 1100 CODE:
1112 RETVAL = *(int *)((char *)THIS + ix); 1101 RETVAL = *(int *)((char *)THIS + ix);
1113 OUTPUT: 1102 OUTPUT:
1114 RETVAL 1103 RETVAL
1115 1104
… …
1199 THIS->rstyle = new_rstyle; 1188 THIS->rstyle = new_rstyle;
1200 OUTPUT: 1189 OUTPUT:
1201 RETVAL 1190 RETVAL
1202 1191
1203int 1192int
1204rxvt_term::view_start (int newval = -1) 1193rxvt_term::view_start (int newval = 1)
1205 PROTOTYPE: $;$ 1194 PROTOTYPE: $;$
1206 CODE: 1195 CODE:
1207{ 1196{
1208 RETVAL = THIS->view_start; 1197 RETVAL = THIS->view_start;
1209 1198
1210 if (newval >= 0) 1199 if (newval <= 0)
1211 { 1200 THIS->scr_changeview (max (newval, THIS->top_row));
1212 THIS->view_start = min (newval, THIS->nsaved);
1213 THIS->scr_changeview (RETVAL);
1214 }
1215} 1201}
1216 OUTPUT: 1202 OUTPUT:
1217 RETVAL 1203 RETVAL
1218 1204
1219void 1205void
… …
1223 1209
1224void 1210void
1225rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1211rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1226 PPCODE: 1212 PPCODE:
1227{ 1213{
1228 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1214 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1229 XSRETURN_EMPTY; 1215 XSRETURN_EMPTY;
1230 1216
1231 line_t &l = ROW(row_number); 1217 line_t &l = ROW(row_number);
1232 1218
1233 if (GIMME_V != G_VOID) 1219 if (GIMME_V != G_VOID)
… …
1235 wchar_t *wstr = new wchar_t [THIS->ncol]; 1221 wchar_t *wstr = new wchar_t [THIS->ncol];
1236 1222
1237 for (int col = 0; col < THIS->ncol; col++) 1223 for (int col = 0; col < THIS->ncol; col++)
1238 wstr [col] = l.t [col]; 1224 wstr [col] = l.t [col];
1239 1225
1240 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1226 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1241 1227
1242 delete [] wstr; 1228 delete [] wstr;
1243 } 1229 }
1244 1230
1245 if (new_text) 1231 if (new_text)
… …
1266 1252
1267void 1253void
1268rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1254rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1269 PPCODE: 1255 PPCODE:
1270{ 1256{
1271 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1257 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1272 XSRETURN_EMPTY; 1258 XSRETURN_EMPTY;
1273 1259
1274 line_t &l = ROW(row_number); 1260 line_t &l = ROW(row_number);
1275 1261
1276 if (GIMME_V != G_VOID) 1262 if (GIMME_V != G_VOID)
… …
1306 1292
1307int 1293int
1308rxvt_term::ROW_l (int row_number, int new_length = -1) 1294rxvt_term::ROW_l (int row_number, int new_length = -1)
1309 CODE: 1295 CODE:
1310{ 1296{
1311 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1297 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1312 XSRETURN_EMPTY; 1298 XSRETURN_EMPTY;
1313 1299
1314 line_t &l = ROW(row_number); 1300 line_t &l = ROW(row_number);
1315 RETVAL = l.l; 1301 RETVAL = l.l;
1316 1302
… …
1322 1308
1323bool 1309bool
1324rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1310rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1325 CODE: 1311 CODE:
1326{ 1312{
1327 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1313 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1328 XSRETURN_EMPTY; 1314 XSRETURN_EMPTY;
1329 1315
1330 line_t &l = ROW(row_number); 1316 line_t &l = ROW(row_number);
1331 RETVAL = l.is_longer (); 1317 RETVAL = l.is_longer ();
1332 1318
… …
1366 else 1352 else
1367 *r++ = *s; 1353 *r++ = *s;
1368 1354
1369 rxvt_pop_locale (); 1355 rxvt_pop_locale ();
1370 1356
1371 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1357 RETVAL = wcs2sv (rstr, r - rstr);
1372 1358
1373 delete [] rstr; 1359 delete [] rstr;
1374} 1360}
1375 OUTPUT: 1361 OUTPUT:
1376 RETVAL 1362 RETVAL
… …
1402 else if (IS_COMPOSE (*s)) 1388 else if (IS_COMPOSE (*s))
1403 r += rxvt_composite.expand (*s, r); 1389 r += rxvt_composite.expand (*s, r);
1404 else 1390 else
1405 *r++ = *s; 1391 *r++ = *s;
1406 1392
1407 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1393 RETVAL = wcs2sv (rstr, r - rstr);
1408 1394
1409 delete [] rstr; 1395 delete [] rstr;
1410} 1396}
1411 OUTPUT: 1397 OUTPUT:
1412 RETVAL 1398 RETVAL
… …
1434 1420
1435 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1421 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1436 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1422 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1437 1423
1438 if (GIMME_V != G_VOID) 1424 if (GIMME_V != G_VOID)
1439 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1425 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1440 1426
1441 if (newval) 1427 if (newval)
1442 { 1428 {
1443 if (SvOK (newval)) 1429 if (SvOK (newval))
1444 { 1430 {
… …
1451 } 1437 }
1452} 1438}
1453 1439
1454const char * 1440const char *
1455rxvt_term::x_resource (const char *name) 1441rxvt_term::x_resource (const char *name)
1456 CLEANUP:
1457 SvTAINTED_on (ST (0));
1458 1442
1459bool 1443bool
1460rxvt_term::option (U32 optval, int set = -1) 1444rxvt_term::option (U32 optval, int set = -1)
1461 CODE: 1445 CODE:
1462{ 1446{
… …
1522 PUSHs (sv_2mortal (newSViv (rc.col))); 1506 PUSHs (sv_2mortal (newSViv (rc.col)));
1523 } 1507 }
1524 1508
1525 if (items == 3) 1509 if (items == 3)
1526 { 1510 {
1527 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1511 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
1528 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1512 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1529 1513
1530 if (ix) 1514 if (ix)
1531 THIS->want_refresh = 1; 1515 THIS->want_refresh = 1;
1532 } 1516 }
… …
1556rxvt_term::selection (SV *newtext = 0) 1540rxvt_term::selection (SV *newtext = 0)
1557 PPCODE: 1541 PPCODE:
1558{ 1542{
1559 if (GIMME_V != G_VOID) 1543 if (GIMME_V != G_VOID)
1560 XPUSHs (THIS->selection.text 1544 XPUSHs (THIS->selection.text
1561 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1545 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1562 : &PL_sv_undef); 1546 : &PL_sv_undef);
1563 1547
1564 if (newtext) 1548 if (newtext)
1565 { 1549 {
1566 free (THIS->selection.text); 1550 free (THIS->selection.text);

Diff Legend

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