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.66 by root, Sat Jan 14 09:28:57 2006 UTC vs.
Revision 1.74 by root, Wed Jan 18 10:31:37 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", 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
474 if (htype == HOOK_REFRESH_END)
475 swap_overlays (term);
476
477 swap (perl_environ, environ);
478
479 bool event_consumed;
480
481 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
482 || term->perl.should_invoke [htype])
483 try
460 { 484 {
461 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 485 dSP;
462 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 486 va_list ap;
487
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)
502 {
503 case DT_INT:
504 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
505 break;
506
507 case DT_LONG:
508 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
509 break;
510
511 case DT_STR:
512 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
513 break;
514
515 case DT_STR_LEN:
516 {
517 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int);
519
520 XPUSHs (sv_2mortal (newSVpvn (str, len)));
521 }
522 break;
523
524 case DT_WCS_LEN:
525 {
526 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int);
528
529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
530 }
531 break;
532
533 case DT_XEVENT:
534 {
535 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV ();
537
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
539# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
540# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
541# undef set
542
543 setiv (type, xe->type);
544 setiv (send_event, xe->xany.send_event);
545 setiv (serial, xe->xany.serial);
546
547 switch (xe->type)
548 {
549 case KeyPress:
550 case KeyRelease:
551 case ButtonPress:
552 case ButtonRelease:
553 case MotionNotify:
554 setuv (window, xe->xmotion.window);
555 setuv (root, xe->xmotion.root);
556 setuv (subwindow, xe->xmotion.subwindow);
557 setuv (time, xe->xmotion.time);
558 setiv (x, xe->xmotion.x);
559 setiv (y, xe->xmotion.y);
560 setiv (row, xe->xmotion.y / term->fheight);
561 setiv (col, xe->xmotion.x / term->fwidth);
562 setiv (x_root, xe->xmotion.x_root);
563 setiv (y_root, xe->xmotion.y_root);
564 setuv (state, xe->xmotion.state);
565
566 switch (xe->type)
567 {
568 case KeyPress:
569 case KeyRelease:
570 setuv (keycode, xe->xkey.keycode);
571 break;
572
573 case ButtonPress:
574 case ButtonRelease:
575 setuv (button, xe->xbutton.button);
576 break;
577
578 case MotionNotify:
579 setiv (is_hint, xe->xmotion.is_hint);
580 break;
581 }
582
583 break;
584
585 case MapNotify:
586 case UnmapNotify:
587 case ConfigureNotify:
588 setuv (event, xe->xconfigure.event);
589 setuv (window, xe->xconfigure.window);
590
591 switch (xe->type)
592 {
593 case ConfigureNotify:
594 setiv (x, xe->xconfigure.x);
595 setiv (y, xe->xconfigure.y);
596 setiv (width, xe->xconfigure.width);
597 setiv (height, xe->xconfigure.height);
598 setuv (above, xe->xconfigure.above);
599 break;
600 }
601
602 break;
603 }
604
605 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
606 }
607 break;
608
609 case DT_END:
610 goto call;
611
612 default:
613 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
614 }
615 }
616
617 call:
618 va_end (ap);
619
620 PUTBACK;
621 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
622 SPAGAIN;
623
624 if (count)
625 {
626 SV *status = POPs;
627 count = SvTRUE (status);
628 }
629
630 PUTBACK;
631 FREETMPS;
632 LEAVE;
633
634 if (SvTRUE (ERRSV))
635 {
636 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
637 ungrab (term); // better lose the grab than the session
638 }
639
640 event_consumed = !!count;
463 } 641 }
464 else if (!term->perl.self) 642 catch (...)
465 return false; // perl not initialized for this instance 643 {
644 swap (perl_environ, environ);
645 throw;
646 }
647 else
648 event_consumed = false;
649
650 // post-handling of some events
651 if (htype == HOOK_REFRESH_BEGIN)
652 swap_overlays (term);
466 else if (htype == HOOK_DESTROY) 653 else if (htype == HOOK_DESTROY)
467 { 654 {
468 // handled later 655 clearSVptr ((SV *)term->perl.self);
656 SvREFCNT_dec ((SV *)term->perl.self);
469 } 657 }
470 else
471 {
472 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
473 {
474 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
475
476 if (HvKEYS (hv))
477 {
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 658
490 swap (perl_environ, environ); 659 swap (perl_environ, environ);
491 660
492 try 661 return event_consumed;
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:
513 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
514 break;
515
516 case DT_LONG:
517 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
518 break;
519
520 case DT_STR:
521 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
522 break;
523
524 case DT_STR_LEN:
525 {
526 char *str = va_arg (ap, char *);
527 int len = va_arg (ap, int);
528
529 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
530 }
531 break;
532
533 case DT_WCS_LEN:
534 {
535 wchar_t *wstr = va_arg (ap, wchar_t *);
536 int wlen = va_arg (ap, int);
537
538 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
539 }
540 break;
541
542 case DT_XEVENT:
543 {
544 XEvent *xe = va_arg (ap, XEvent *);
545 HV *hv = newHV ();
546
547# 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)
549# undef set
550
551 setiv (type, xe->type);
552 setiv (send_event, xe->xany.send_event);
553 setiv (serial, xe->xany.serial);
554
555 switch (xe->type)
556 {
557 case KeyPress:
558 case KeyRelease:
559 case ButtonPress:
560 case ButtonRelease:
561 case MotionNotify:
562 setiv (time, xe->xmotion.time);
563 setiv (x, xe->xmotion.x);
564 setiv (y, xe->xmotion.y);
565 setiv (row, xe->xmotion.y / term->fheight);
566 setiv (col, xe->xmotion.x / term->fwidth);
567 setiv (x_root, xe->xmotion.x_root);
568 setiv (y_root, xe->xmotion.y_root);
569 setiv (state, xe->xmotion.state);
570 break;
571 }
572
573 switch (xe->type)
574 {
575 case KeyPress:
576 case KeyRelease:
577 setiv (keycode, xe->xkey.keycode);
578 break;
579
580 case ButtonPress:
581 case ButtonRelease:
582 setiv (button, xe->xbutton.button);
583 break;
584
585 case MotionNotify:
586 setiv (is_hint, xe->xmotion.is_hint);
587 break;
588 }
589
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
591 }
592 break;
593
594 case DT_END:
595 {
596 va_end (ap);
597
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:
629 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
630 }
631 }
632 }
633 catch (...)
634 {
635 swap (perl_environ, environ);
636 throw;
637 }
638} 662}
639 663
640///////////////////////////////////////////////////////////////////////////// 664/////////////////////////////////////////////////////////////////////////////
641 665
642MODULE = urxvt PACKAGE = urxvt 666MODULE = urxvt PACKAGE = urxvt
… …
771void 795void
772fatal (const char *msg) 796fatal (const char *msg)
773 CODE: 797 CODE:
774 rxvt_fatal ("%s", msg); 798 rxvt_fatal ("%s", msg);
775 799
776SV *
777untaint (SV *sv)
778 CODE:
779 RETVAL = newSVsv (sv);
780 SvTAINTED_off (RETVAL);
781 OUTPUT:
782 RETVAL
783
784void 800void
785_exit (int status) 801_exit (int status)
786
787bool
788safe ()
789 CODE:
790 RETVAL = !rxvt_tainted ();
791 OUTPUT:
792 RETVAL
793 802
794NV 803NV
795NOW () 804NOW ()
796 CODE: 805 CODE:
797 RETVAL = NOW; 806 RETVAL = NOW;
… …
1063 char *mbstr = rxvt_wcstombs (wstr); 1072 char *mbstr = rxvt_wcstombs (wstr);
1064 rxvt_pop_locale (); 1073 rxvt_pop_locale ();
1065 1074
1066 free (wstr); 1075 free (wstr);
1067 1076
1068 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1077 RETVAL = newSVpv (mbstr, 0);
1069 free (mbstr); 1078 free (mbstr);
1070} 1079}
1071 OUTPUT: 1080 OUTPUT:
1072 RETVAL 1081 RETVAL
1073 1082
… …
1080 1089
1081 rxvt_push_locale (THIS->locale); 1090 rxvt_push_locale (THIS->locale);
1082 wchar_t *wstr = rxvt_mbstowcs (data, len); 1091 wchar_t *wstr = rxvt_mbstowcs (data, len);
1083 rxvt_pop_locale (); 1092 rxvt_pop_locale ();
1084 1093
1085 RETVAL = taint_if (wcs2sv (wstr), octets); 1094 RETVAL = wcs2sv (wstr);
1086 free (wstr); 1095 free (wstr);
1087} 1096}
1088 OUTPUT: 1097 OUTPUT:
1089 RETVAL 1098 RETVAL
1090 1099
… …
1099#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1108#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1100#define TERM_OFFSET_focus TERM_OFFSET(focus) 1109#define TERM_OFFSET_focus TERM_OFFSET(focus)
1101#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1110#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1102#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1111#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1103#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1112#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1104#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1113#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1105 1114
1106int 1115int
1107rxvt_term::width () 1116rxvt_term::width ()
1108 ALIAS: 1117 ALIAS:
1109 width = TERM_OFFSET_width 1118 width = TERM_OFFSET_width
… …
1115 ncol = TERM_OFFSET_ncol 1124 ncol = TERM_OFFSET_ncol
1116 focus = TERM_OFFSET_focus 1125 focus = TERM_OFFSET_focus
1117 mapped = TERM_OFFSET_mapped 1126 mapped = TERM_OFFSET_mapped
1118 saveLines = TERM_OFFSET_saveLines 1127 saveLines = TERM_OFFSET_saveLines
1119 total_rows = TERM_OFFSET_total_rows 1128 total_rows = TERM_OFFSET_total_rows
1120 nsaved = TERM_OFFSET_nsaved 1129 top_row = TERM_OFFSET_top_row
1121 CODE: 1130 CODE:
1122 RETVAL = *(int *)((char *)THIS + ix); 1131 RETVAL = *(int *)((char *)THIS + ix);
1123 OUTPUT: 1132 OUTPUT:
1124 RETVAL 1133 RETVAL
1125 1134
… …
1209 THIS->rstyle = new_rstyle; 1218 THIS->rstyle = new_rstyle;
1210 OUTPUT: 1219 OUTPUT:
1211 RETVAL 1220 RETVAL
1212 1221
1213int 1222int
1214rxvt_term::view_start (int newval = -1) 1223rxvt_term::view_start (int newval = 1)
1215 PROTOTYPE: $;$ 1224 PROTOTYPE: $;$
1216 CODE: 1225 CODE:
1217{ 1226{
1218 RETVAL = THIS->view_start; 1227 RETVAL = THIS->view_start;
1219 1228
1220 if (newval >= 0) 1229 if (newval <= 0)
1221 { 1230 THIS->scr_changeview (max (newval, THIS->top_row));
1222 THIS->view_start = min (newval, THIS->nsaved);
1223 THIS->scr_changeview (RETVAL);
1224 }
1225} 1231}
1226 OUTPUT: 1232 OUTPUT:
1227 RETVAL 1233 RETVAL
1228 1234
1229void 1235void
… …
1233 1239
1234void 1240void
1235rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1241rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1236 PPCODE: 1242 PPCODE:
1237{ 1243{
1238 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1244 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1239 XSRETURN_EMPTY; 1245 XSRETURN_EMPTY;
1240 1246
1241 line_t &l = ROW(row_number); 1247 line_t &l = ROW(row_number);
1242 1248
1243 if (GIMME_V != G_VOID) 1249 if (GIMME_V != G_VOID)
… …
1245 wchar_t *wstr = new wchar_t [THIS->ncol]; 1251 wchar_t *wstr = new wchar_t [THIS->ncol];
1246 1252
1247 for (int col = 0; col < THIS->ncol; col++) 1253 for (int col = 0; col < THIS->ncol; col++)
1248 wstr [col] = l.t [col]; 1254 wstr [col] = l.t [col];
1249 1255
1250 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1256 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1251 1257
1252 delete [] wstr; 1258 delete [] wstr;
1253 } 1259 }
1254 1260
1255 if (new_text) 1261 if (new_text)
… …
1276 1282
1277void 1283void
1278rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1284rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1279 PPCODE: 1285 PPCODE:
1280{ 1286{
1281 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1287 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1282 XSRETURN_EMPTY; 1288 XSRETURN_EMPTY;
1283 1289
1284 line_t &l = ROW(row_number); 1290 line_t &l = ROW(row_number);
1285 1291
1286 if (GIMME_V != G_VOID) 1292 if (GIMME_V != G_VOID)
… …
1316 1322
1317int 1323int
1318rxvt_term::ROW_l (int row_number, int new_length = -1) 1324rxvt_term::ROW_l (int row_number, int new_length = -1)
1319 CODE: 1325 CODE:
1320{ 1326{
1321 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1327 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1322 XSRETURN_EMPTY; 1328 XSRETURN_EMPTY;
1323 1329
1324 line_t &l = ROW(row_number); 1330 line_t &l = ROW(row_number);
1325 RETVAL = l.l; 1331 RETVAL = l.l;
1326 1332
… …
1332 1338
1333bool 1339bool
1334rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1340rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1335 CODE: 1341 CODE:
1336{ 1342{
1337 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1343 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1338 XSRETURN_EMPTY; 1344 XSRETURN_EMPTY;
1339 1345
1340 line_t &l = ROW(row_number); 1346 line_t &l = ROW(row_number);
1341 RETVAL = l.is_longer (); 1347 RETVAL = l.is_longer ();
1342 1348
… …
1376 else 1382 else
1377 *r++ = *s; 1383 *r++ = *s;
1378 1384
1379 rxvt_pop_locale (); 1385 rxvt_pop_locale ();
1380 1386
1381 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1387 RETVAL = wcs2sv (rstr, r - rstr);
1382 1388
1383 delete [] rstr; 1389 delete [] rstr;
1384} 1390}
1385 OUTPUT: 1391 OUTPUT:
1386 RETVAL 1392 RETVAL
… …
1412 else if (IS_COMPOSE (*s)) 1418 else if (IS_COMPOSE (*s))
1413 r += rxvt_composite.expand (*s, r); 1419 r += rxvt_composite.expand (*s, r);
1414 else 1420 else
1415 *r++ = *s; 1421 *r++ = *s;
1416 1422
1417 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1423 RETVAL = wcs2sv (rstr, r - rstr);
1418 1424
1419 delete [] rstr; 1425 delete [] rstr;
1420} 1426}
1421 OUTPUT: 1427 OUTPUT:
1422 RETVAL 1428 RETVAL
… …
1444 1450
1445 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1451 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1446 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1452 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1447 1453
1448 if (GIMME_V != G_VOID) 1454 if (GIMME_V != G_VOID)
1449 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1455 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1450 1456
1451 if (newval) 1457 if (newval)
1452 { 1458 {
1453 if (SvOK (newval)) 1459 if (SvOK (newval))
1454 { 1460 {
… …
1461 } 1467 }
1462} 1468}
1463 1469
1464const char * 1470const char *
1465rxvt_term::x_resource (const char *name) 1471rxvt_term::x_resource (const char *name)
1466 CLEANUP:
1467 SvTAINTED_on (ST (0));
1468 1472
1469bool 1473bool
1470rxvt_term::option (U32 optval, int set = -1) 1474rxvt_term::option (U32 optval, int set = -1)
1471 CODE: 1475 CODE:
1472{ 1476{
… …
1532 PUSHs (sv_2mortal (newSViv (rc.col))); 1536 PUSHs (sv_2mortal (newSViv (rc.col)));
1533 } 1537 }
1534 1538
1535 if (items == 3) 1539 if (items == 3)
1536 { 1540 {
1537 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1541 rc.row = SvIV (ST (1));
1538 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1542 rc.col = SvIV (ST (2));
1543
1544 if (ix == 2 && rc.col == 0)
1545 {
1546 rc.row--;
1547 rc.col = THIS->ncol;
1548 }
1549
1550 clamp_it (rc.col, 0, THIS->ncol);
1551 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1539 1552
1540 if (ix) 1553 if (ix)
1541 THIS->want_refresh = 1; 1554 THIS->want_refresh = 1;
1542 } 1555 }
1543} 1556}
… …
1566rxvt_term::selection (SV *newtext = 0) 1579rxvt_term::selection (SV *newtext = 0)
1567 PPCODE: 1580 PPCODE:
1568{ 1581{
1569 if (GIMME_V != G_VOID) 1582 if (GIMME_V != G_VOID)
1570 XPUSHs (THIS->selection.text 1583 XPUSHs (THIS->selection.text
1571 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1584 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1572 : &PL_sv_undef); 1585 : &PL_sv_undef);
1573 1586
1574 if (newtext) 1587 if (newtext)
1575 { 1588 {
1576 free (THIS->selection.text); 1589 free (THIS->selection.text);

Diff Legend

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