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.65 by root, Fri Jan 13 15:45:44 2006 UTC vs.
Revision 1.73 by root, Wed Jan 18 09:40:53 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
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
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 0 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", 407 "-e"
422 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 408 "BEGIN {"
409 " urxvt->bootstrap;"
410 " unshift @INC, '" LIBDIR "';"
411 "}"
412 ""
413 "use urxvt;"
423 }; 414 };
424 415
425 perl = perl_alloc (); 416 perl = perl_alloc ();
426 perl_construct (perl); 417 perl_construct (perl);
427 418
428 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 419 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
429 || perl_run (perl)) 420 || perl_run (perl))
430 { 421 {
431 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 422 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
432 423
433 perl_destruct (perl); 424 perl_destruct (perl);
434 perl_free (perl); 425 perl_free (perl);
435 perl = 0; 426 perl = 0;
436 } 427 }
437 428
438 swap (perl_environ, environ); 429 swap (perl_environ, environ);
430
431 rxvt_pop_locale ();
432 }
433
434 if (perl)
435 {
436 // runs outside of perls ENV
437 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
438 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
439 } 439 }
440} 440}
441 441
442static void 442static void
443ungrab (rxvt_term *THIS) 443ungrab (rxvt_term *THIS)
… …
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 449 THIS->perl.grabtime = 0;
450 } 450 }
451} 451}
452 452
453static void
454swap_overlays (rxvt_term *term)
455{
456 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
457
458 if (HvKEYS (hv))
459 {
460 hv_iterinit (hv);
461
462 while (HE *he = hv_iternext (hv))
463 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
464 }
465}
466
453bool 467bool
454rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
455{ 469{
456 if (!perl) 470 if (!perl || !term->perl.self)
457 return false; 471 return false;
458 472
459 if (htype == HOOK_INIT) // first hook ever called 473 // pre-handling of some events
460 { 474 if (htype == HOOK_REFRESH_END)
461 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 475 swap_overlays (term);
462 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 476
463 } 477 swap (perl_environ, environ);
464 else if (!term->perl.self) 478
465 return false; // perl not initialized for this instance 479 bool event_consumed;
466 else if (htype == HOOK_DESTROY) 480
467 { 481 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
468 // handled later 482 || term->perl.should_invoke [htype])
469 } 483 try
470 else
471 {
472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
473 { 484 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 485 dSP;
486 va_list ap;
475 487
476 if (HvKEYS (hv)) 488 va_start (ap, htype);
489
490 ENTER;
491 SAVETMPS;
492
493 PUSHMARK (SP);
494
495 XPUSHs (sv_2mortal (newSVterm (term)));
496 XPUSHs (sv_2mortal (newSViv (htype)));
497
498 for (;;) {
499 data_type dt = (data_type)va_arg (ap, int);
500
501 switch (dt)
477 { 502 {
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: 503 case DT_INT:
513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 504 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
514 break; 505 break;
515 506
516 case DT_LONG: 507 case DT_LONG:
517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
518 break; 509 break;
519 510
520 case DT_STR: 511 case DT_STR:
521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 512 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
522 break; 513 break;
523 514
524 case DT_STR_LEN: 515 case DT_STR_LEN:
525 { 516 {
526 char *str = va_arg (ap, char *); 517 char *str = va_arg (ap, char *);
527 int len = va_arg (ap, int); 518 int len = va_arg (ap, int);
528 519
529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 520 XPUSHs (sv_2mortal (newSVpvn (str, len)));
530 } 521 }
531 break; 522 break;
532 523
533 case DT_WCS_LEN: 524 case DT_WCS_LEN:
534 { 525 {
535 wchar_t *wstr = va_arg (ap, wchar_t *); 526 wchar_t *wstr = va_arg (ap, wchar_t *);
536 int wlen = va_arg (ap, int); 527 int wlen = va_arg (ap, int);
537 528
538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
539 } 530 }
540 break; 531 break;
541 532
542 case DT_XEVENT: 533 case DT_XEVENT:
543 { 534 {
544 XEvent *xe = va_arg (ap, XEvent *); 535 XEvent *xe = va_arg (ap, XEvent *);
545 HV *hv = newHV (); 536 HV *hv = newHV ();
546 537
547# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 538# 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) 539# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
549# undef set 540# undef set
550 541
551 setiv (type, xe->type); 542 setiv (type, xe->type);
552 setiv (send_event, xe->xany.send_event); 543 setiv (send_event, xe->xany.send_event);
553 setiv (serial, xe->xany.serial); 544 setiv (serial, xe->xany.serial);
554 545
555 switch (xe->type) 546 switch (xe->type)
556 { 547 {
557 case KeyPress: 548 case KeyPress:
558 case KeyRelease: 549 case KeyRelease:
559 case ButtonPress: 550 case ButtonPress:
560 case ButtonRelease: 551 case ButtonRelease:
561 case MotionNotify: 552 case MotionNotify:
562 setiv (time, xe->xmotion.time); 553 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x); 554 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y); 555 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight); 556 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth); 557 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root); 558 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root); 559 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state); 560 setiv (state, xe->xmotion.state);
570 break; 561 break;
571 } 562 }
572 563
573 switch (xe->type) 564 switch (xe->type)
574 { 565 {
575 case KeyPress: 566 case KeyPress:
576 case KeyRelease: 567 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode); 568 setiv (keycode, xe->xkey.keycode);
578 break; 569 break;
579 570
580 case ButtonPress: 571 case ButtonPress:
581 case ButtonRelease: 572 case ButtonRelease:
582 setiv (button, xe->xbutton.button); 573 setiv (button, xe->xbutton.button);
583 break; 574 break;
584 575
585 case MotionNotify: 576 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint); 577 setiv (is_hint, xe->xmotion.is_hint);
587 break; 578 break;
588 } 579 }
589 580
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 581 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 } 582 }
592 break; 583 break;
593 584
594 case DT_END: 585 case DT_END:
595 { 586 goto call;
596 va_end (ap);
597 587
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: 588 default:
629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 589 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 } 590 }
591 }
592
593 call:
594 va_end (ap);
595
596 PUTBACK;
597 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
598 SPAGAIN;
599
600 if (count)
601 {
602 SV *status = POPs;
603 count = SvTRUE (status);
604 }
605
606 PUTBACK;
607 FREETMPS;
608 LEAVE;
609
610 if (SvTRUE (ERRSV))
611 {
612 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
613 ungrab (term); // better lose the grab than the session
614 }
615
616 event_consumed = !!count;
631 } 617 }
618 catch (...)
619 {
620 swap (perl_environ, environ);
621 throw;
622 }
623 else
624 event_consumed = false;
625
626 // post-handling of some events
627 if (htype == HOOK_REFRESH_BEGIN)
628 swap_overlays (term);
629 else if (htype == HOOK_DESTROY)
630 {
631 clearSVptr ((SV *)term->perl.self);
632 SvREFCNT_dec ((SV *)term->perl.self);
632 } 633 }
633 catch (...) 634
634 {
635 swap (perl_environ, environ); 635 swap (perl_environ, environ);
636 throw; 636
637 } 637 return event_consumed;
638} 638}
639 639
640///////////////////////////////////////////////////////////////////////////// 640/////////////////////////////////////////////////////////////////////////////
641 641
642MODULE = urxvt PACKAGE = urxvt 642MODULE = urxvt PACKAGE = urxvt
… …
771void 771void
772fatal (const char *msg) 772fatal (const char *msg)
773 CODE: 773 CODE:
774 rxvt_fatal ("%s", msg); 774 rxvt_fatal ("%s", msg);
775 775
776SV *
777untaint (SV *sv)
778 CODE:
779 RETVAL = newSVsv (sv);
780 SvTAINTED_off (RETVAL);
781 OUTPUT:
782 RETVAL
783
784void 776void
785_exit (int status) 777_exit (int status)
786
787bool
788safe ()
789 CODE:
790 RETVAL = !rxvt_tainted ();
791 OUTPUT:
792 RETVAL
793 778
794NV 779NV
795NOW () 780NOW ()
796 CODE: 781 CODE:
797 RETVAL = NOW; 782 RETVAL = NOW;
… …
968 RETVAL 953 RETVAL
969 954
970void 955void
971rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0) 956rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
972 CODE: 957 CODE:
973 XReparentWindow (THIS->display->display, window, parent, x, y); 958 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
959
960void
961rxvt_term::XMapWindow (U32 window)
962 CODE:
963 XMapWindow (THIS->display->display, (Window)window);
964
965void
966rxvt_term::XUnmapWindow (U32 window)
967 CODE:
968 XUnmapWindow (THIS->display->display, (Window)window);
974 969
975#endif 970#endif
976 971
977void 972void
978rxvt_term::set_should_invoke (int htype, int inc) 973rxvt_term::set_should_invoke (int htype, int inc)
… …
1053 char *mbstr = rxvt_wcstombs (wstr); 1048 char *mbstr = rxvt_wcstombs (wstr);
1054 rxvt_pop_locale (); 1049 rxvt_pop_locale ();
1055 1050
1056 free (wstr); 1051 free (wstr);
1057 1052
1058 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1053 RETVAL = newSVpv (mbstr, 0);
1059 free (mbstr); 1054 free (mbstr);
1060} 1055}
1061 OUTPUT: 1056 OUTPUT:
1062 RETVAL 1057 RETVAL
1063 1058
… …
1070 1065
1071 rxvt_push_locale (THIS->locale); 1066 rxvt_push_locale (THIS->locale);
1072 wchar_t *wstr = rxvt_mbstowcs (data, len); 1067 wchar_t *wstr = rxvt_mbstowcs (data, len);
1073 rxvt_pop_locale (); 1068 rxvt_pop_locale ();
1074 1069
1075 RETVAL = taint_if (wcs2sv (wstr), octets); 1070 RETVAL = wcs2sv (wstr);
1076 free (wstr); 1071 free (wstr);
1077} 1072}
1078 OUTPUT: 1073 OUTPUT:
1079 RETVAL 1074 RETVAL
1080 1075
… …
1089#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1084#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1090#define TERM_OFFSET_focus TERM_OFFSET(focus) 1085#define TERM_OFFSET_focus TERM_OFFSET(focus)
1091#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1086#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1092#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1087#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1093#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1088#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1094#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1089#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1095 1090
1096int 1091int
1097rxvt_term::width () 1092rxvt_term::width ()
1098 ALIAS: 1093 ALIAS:
1099 width = TERM_OFFSET_width 1094 width = TERM_OFFSET_width
… …
1105 ncol = TERM_OFFSET_ncol 1100 ncol = TERM_OFFSET_ncol
1106 focus = TERM_OFFSET_focus 1101 focus = TERM_OFFSET_focus
1107 mapped = TERM_OFFSET_mapped 1102 mapped = TERM_OFFSET_mapped
1108 saveLines = TERM_OFFSET_saveLines 1103 saveLines = TERM_OFFSET_saveLines
1109 total_rows = TERM_OFFSET_total_rows 1104 total_rows = TERM_OFFSET_total_rows
1110 nsaved = TERM_OFFSET_nsaved 1105 top_row = TERM_OFFSET_top_row
1111 CODE: 1106 CODE:
1112 RETVAL = *(int *)((char *)THIS + ix); 1107 RETVAL = *(int *)((char *)THIS + ix);
1113 OUTPUT: 1108 OUTPUT:
1114 RETVAL 1109 RETVAL
1115 1110
… …
1199 THIS->rstyle = new_rstyle; 1194 THIS->rstyle = new_rstyle;
1200 OUTPUT: 1195 OUTPUT:
1201 RETVAL 1196 RETVAL
1202 1197
1203int 1198int
1204rxvt_term::view_start (int newval = -1) 1199rxvt_term::view_start (int newval = 1)
1205 PROTOTYPE: $;$ 1200 PROTOTYPE: $;$
1206 CODE: 1201 CODE:
1207{ 1202{
1208 RETVAL = THIS->view_start; 1203 RETVAL = THIS->view_start;
1209 1204
1210 if (newval >= 0) 1205 if (newval <= 0)
1211 { 1206 THIS->scr_changeview (max (newval, THIS->top_row));
1212 THIS->view_start = min (newval, THIS->nsaved);
1213 THIS->scr_changeview (RETVAL);
1214 }
1215} 1207}
1216 OUTPUT: 1208 OUTPUT:
1217 RETVAL 1209 RETVAL
1218 1210
1219void 1211void
… …
1223 1215
1224void 1216void
1225rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1217rxvt_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: 1218 PPCODE:
1227{ 1219{
1228 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1220 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1229 XSRETURN_EMPTY; 1221 XSRETURN_EMPTY;
1230 1222
1231 line_t &l = ROW(row_number); 1223 line_t &l = ROW(row_number);
1232 1224
1233 if (GIMME_V != G_VOID) 1225 if (GIMME_V != G_VOID)
… …
1235 wchar_t *wstr = new wchar_t [THIS->ncol]; 1227 wchar_t *wstr = new wchar_t [THIS->ncol];
1236 1228
1237 for (int col = 0; col < THIS->ncol; col++) 1229 for (int col = 0; col < THIS->ncol; col++)
1238 wstr [col] = l.t [col]; 1230 wstr [col] = l.t [col];
1239 1231
1240 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1232 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1241 1233
1242 delete [] wstr; 1234 delete [] wstr;
1243 } 1235 }
1244 1236
1245 if (new_text) 1237 if (new_text)
… …
1266 1258
1267void 1259void
1268rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1260rxvt_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: 1261 PPCODE:
1270{ 1262{
1271 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1263 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1272 XSRETURN_EMPTY; 1264 XSRETURN_EMPTY;
1273 1265
1274 line_t &l = ROW(row_number); 1266 line_t &l = ROW(row_number);
1275 1267
1276 if (GIMME_V != G_VOID) 1268 if (GIMME_V != G_VOID)
… …
1306 1298
1307int 1299int
1308rxvt_term::ROW_l (int row_number, int new_length = -1) 1300rxvt_term::ROW_l (int row_number, int new_length = -1)
1309 CODE: 1301 CODE:
1310{ 1302{
1311 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1303 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1312 XSRETURN_EMPTY; 1304 XSRETURN_EMPTY;
1313 1305
1314 line_t &l = ROW(row_number); 1306 line_t &l = ROW(row_number);
1315 RETVAL = l.l; 1307 RETVAL = l.l;
1316 1308
… …
1322 1314
1323bool 1315bool
1324rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1316rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1325 CODE: 1317 CODE:
1326{ 1318{
1327 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1319 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1328 XSRETURN_EMPTY; 1320 XSRETURN_EMPTY;
1329 1321
1330 line_t &l = ROW(row_number); 1322 line_t &l = ROW(row_number);
1331 RETVAL = l.is_longer (); 1323 RETVAL = l.is_longer ();
1332 1324
… …
1366 else 1358 else
1367 *r++ = *s; 1359 *r++ = *s;
1368 1360
1369 rxvt_pop_locale (); 1361 rxvt_pop_locale ();
1370 1362
1371 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1363 RETVAL = wcs2sv (rstr, r - rstr);
1372 1364
1373 delete [] rstr; 1365 delete [] rstr;
1374} 1366}
1375 OUTPUT: 1367 OUTPUT:
1376 RETVAL 1368 RETVAL
… …
1402 else if (IS_COMPOSE (*s)) 1394 else if (IS_COMPOSE (*s))
1403 r += rxvt_composite.expand (*s, r); 1395 r += rxvt_composite.expand (*s, r);
1404 else 1396 else
1405 *r++ = *s; 1397 *r++ = *s;
1406 1398
1407 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1399 RETVAL = wcs2sv (rstr, r - rstr);
1408 1400
1409 delete [] rstr; 1401 delete [] rstr;
1410} 1402}
1411 OUTPUT: 1403 OUTPUT:
1412 RETVAL 1404 RETVAL
… …
1434 1426
1435 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1427 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1436 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1428 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1437 1429
1438 if (GIMME_V != G_VOID) 1430 if (GIMME_V != G_VOID)
1439 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1431 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1440 1432
1441 if (newval) 1433 if (newval)
1442 { 1434 {
1443 if (SvOK (newval)) 1435 if (SvOK (newval))
1444 { 1436 {
… …
1451 } 1443 }
1452} 1444}
1453 1445
1454const char * 1446const char *
1455rxvt_term::x_resource (const char *name) 1447rxvt_term::x_resource (const char *name)
1456 CLEANUP:
1457 SvTAINTED_on (ST (0));
1458 1448
1459bool 1449bool
1460rxvt_term::option (U32 optval, int set = -1) 1450rxvt_term::option (U32 optval, int set = -1)
1461 CODE: 1451 CODE:
1462{ 1452{
… …
1522 PUSHs (sv_2mortal (newSViv (rc.col))); 1512 PUSHs (sv_2mortal (newSViv (rc.col)));
1523 } 1513 }
1524 1514
1525 if (items == 3) 1515 if (items == 3)
1526 { 1516 {
1527 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1517 rc.row = SvIV (ST (1));
1528 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1518 rc.col = SvIV (ST (2));
1519
1520 if (ix == 2 && rc.col == 0)
1521 {
1522 rc.row--;
1523 rc.col = THIS->ncol;
1524 }
1525
1526 clamp_it (rc.col, 0, THIS->ncol);
1527 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1529 1528
1530 if (ix) 1529 if (ix)
1531 THIS->want_refresh = 1; 1530 THIS->want_refresh = 1;
1532 } 1531 }
1533} 1532}
… …
1556rxvt_term::selection (SV *newtext = 0) 1555rxvt_term::selection (SV *newtext = 0)
1557 PPCODE: 1556 PPCODE:
1558{ 1557{
1559 if (GIMME_V != G_VOID) 1558 if (GIMME_V != G_VOID)
1560 XPUSHs (THIS->selection.text 1559 XPUSHs (THIS->selection.text
1561 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1560 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1562 : &PL_sv_undef); 1561 : &PL_sv_undef);
1563 1562
1564 if (newtext) 1563 if (newtext)
1565 { 1564 {
1566 free (THIS->selection.text); 1565 free (THIS->selection.text);

Diff Legend

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