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.62 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.70 by root, Tue Jan 17 09:34:21 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
55#define ENABLE_PERL_FRILLS 1
54 56
55///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
56 58
57static SV * 59static SV *
58taint (SV *sv) 60taint (SV *sv)
… …
347 for (int y = ov_h; y--; ) 349 for (int y = ov_h; y--; )
348 { 350 {
349 text_t *t1 = text [y]; 351 text_t *t1 = text [y];
350 rend_t *r1 = rend [y]; 352 rend_t *r1 = rend [y];
351 353
352 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 354 text_t *t2 = ROW(y + ov_y + THIS->view_start).t + ov_x;
353 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 355 rend_t *r2 = ROW(y + ov_y + THIS->view_start).r + ov_x;
354 356
355 for (int x = ov_w; x--; ) 357 for (int x = ov_w; x--; )
356 { 358 {
357 text_t t = *t1; *t1++ = *t2; *t2++ = t; 359 text_t t = *t1; *t1++ = *t2; *t2++ = t;
358 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 360 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
… …
405 perl_free (perl); 407 perl_free (perl);
406 } 408 }
407} 409}
408 410
409void 411void
410rxvt_perl_interp::init () 412rxvt_perl_interp::init (rxvt_term *term)
411{ 413{
412 if (!perl) 414 if (!perl)
413 { 415 {
416 rxvt_push_locale (""); // perl init destroys current locale
417
414 perl_environ = rxvt_environ; 418 perl_environ = rxvt_environ;
415 swap (perl_environ, environ); 419 swap (perl_environ, environ);
416 420
417 char *argv[] = { 421 char *argv[] = {
418 "", 422 "",
… …
432 perl_free (perl); 436 perl_free (perl);
433 perl = 0; 437 perl = 0;
434 } 438 }
435 439
436 swap (perl_environ, environ); 440 swap (perl_environ, environ);
441
442 rxvt_pop_locale ();
443 }
444
445 if (perl)
446 {
447 // runs outside of perls ENV
448 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
449 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
437 } 450 }
438} 451}
439 452
440static void 453static void
441ungrab (rxvt_term *THIS) 454ungrab (rxvt_term *THIS)
… …
446 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 459 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
447 THIS->perl.grabtime = 0; 460 THIS->perl.grabtime = 0;
448 } 461 }
449} 462}
450 463
464static void
465swap_overlays (rxvt_term *term)
466{
467 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
468
469 if (HvKEYS (hv))
470 {
471 hv_iterinit (hv);
472
473 while (HE *he = hv_iternext (hv))
474 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
475 }
476}
477
451bool 478bool
452rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 479rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
453{ 480{
454 if (!perl) 481 if (!perl || !term->perl.self)
455 return false; 482 return false;
456 483
457 if (htype == HOOK_INIT) // first hook ever called 484 // pre-handling of some events
458 { 485 if (htype == HOOK_REFRESH_END)
459 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 486 swap_overlays (term);
460 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 487
461 } 488 swap (perl_environ, environ);
462 else if (!term->perl.self) 489
463 return false; // perl not initialized for this instance 490 bool event_consumed;
464 else if (htype == HOOK_DESTROY) 491
465 { 492 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
466 // handled later 493 || term->perl.should_invoke [htype])
467 } 494 try
468 else
469 {
470 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
471 { 495 {
472 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 496 dSP;
497 va_list ap;
473 498
474 if (HvKEYS (hv)) 499 va_start (ap, htype);
500
501 ENTER;
502 SAVETMPS;
503
504 PUSHMARK (SP);
505
506 XPUSHs (sv_2mortal (newSVterm (term)));
507 XPUSHs (sv_2mortal (newSViv (htype)));
508
509 for (;;) {
510 data_type dt = (data_type)va_arg (ap, int);
511
512 switch (dt)
475 { 513 {
476 hv_iterinit (hv);
477
478 while (HE *he = hv_iternext (hv))
479 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
480 }
481
482 }
483
484 if (!term->perl.should_invoke [htype])
485 return false;
486 }
487
488 swap (perl_environ, environ);
489
490 try
491 {
492 dSP;
493 va_list ap;
494
495 va_start (ap, htype);
496
497 ENTER;
498 SAVETMPS;
499
500 PUSHMARK (SP);
501
502 XPUSHs (sv_2mortal (newSVterm (term)));
503 XPUSHs (sv_2mortal (newSViv (htype)));
504
505 for (;;) {
506 data_type dt = (data_type)va_arg (ap, int);
507
508 switch (dt)
509 {
510 case DT_INT: 514 case DT_INT:
511 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
512 break; 516 break;
513 517
514 case DT_LONG: 518 case DT_LONG:
515 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 519 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
516 break; 520 break;
517 521
518 case DT_STR: 522 case DT_STR:
519 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 523 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
520 break; 524 break;
521 525
522 case DT_STR_LEN: 526 case DT_STR_LEN:
523 { 527 {
524 char *str = va_arg (ap, char *); 528 char *str = va_arg (ap, char *);
525 int len = va_arg (ap, int); 529 int len = va_arg (ap, int);
526 530
527 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 531 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
528 } 532 }
529 break; 533 break;
530 534
531 case DT_WCS_LEN: 535 case DT_WCS_LEN:
532 { 536 {
533 wchar_t *wstr = va_arg (ap, wchar_t *); 537 wchar_t *wstr = va_arg (ap, wchar_t *);
534 int wlen = va_arg (ap, int); 538 int wlen = va_arg (ap, int);
535 539
536 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 540 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
537 } 541 }
538 break; 542 break;
539 543
540 case DT_XEVENT: 544 case DT_XEVENT:
541 { 545 {
542 XEvent *xe = va_arg (ap, XEvent *); 546 XEvent *xe = va_arg (ap, XEvent *);
543 HV *hv = newHV (); 547 HV *hv = newHV ();
544 548
545# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 549# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
546# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 550# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
547# undef set 551# undef set
548 552
549 setiv (type, xe->type); 553 setiv (type, xe->type);
550 setiv (send_event, xe->xany.send_event); 554 setiv (send_event, xe->xany.send_event);
551 setiv (serial, xe->xany.serial); 555 setiv (serial, xe->xany.serial);
552 556
553 switch (xe->type) 557 switch (xe->type)
554 { 558 {
555 case KeyPress: 559 case KeyPress:
556 case KeyRelease: 560 case KeyRelease:
557 case ButtonPress: 561 case ButtonPress:
558 case ButtonRelease: 562 case ButtonRelease:
559 case MotionNotify: 563 case MotionNotify:
560 setiv (time, xe->xmotion.time); 564 setiv (time, xe->xmotion.time);
561 setiv (x, xe->xmotion.x); 565 setiv (x, xe->xmotion.x);
562 setiv (y, xe->xmotion.y); 566 setiv (y, xe->xmotion.y);
563 setiv (row, xe->xmotion.y / term->fheight); 567 setiv (row, xe->xmotion.y / term->fheight);
564 setiv (col, xe->xmotion.x / term->fwidth); 568 setiv (col, xe->xmotion.x / term->fwidth);
565 setiv (x_root, xe->xmotion.x_root); 569 setiv (x_root, xe->xmotion.x_root);
566 setiv (y_root, xe->xmotion.y_root); 570 setiv (y_root, xe->xmotion.y_root);
567 setiv (state, xe->xmotion.state); 571 setiv (state, xe->xmotion.state);
568 break; 572 break;
569 } 573 }
570 574
571 switch (xe->type) 575 switch (xe->type)
572 { 576 {
573 case KeyPress: 577 case KeyPress:
574 case KeyRelease: 578 case KeyRelease:
575 setiv (keycode, xe->xkey.keycode); 579 setiv (keycode, xe->xkey.keycode);
576 break; 580 break;
577 581
578 case ButtonPress: 582 case ButtonPress:
579 case ButtonRelease: 583 case ButtonRelease:
580 setiv (button, xe->xbutton.button); 584 setiv (button, xe->xbutton.button);
581 break; 585 break;
582 586
583 case MotionNotify: 587 case MotionNotify:
584 setiv (is_hint, xe->xmotion.is_hint); 588 setiv (is_hint, xe->xmotion.is_hint);
585 break; 589 break;
586 } 590 }
587 591
588 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 592 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
589 } 593 }
590 break; 594 break;
591 595
592 case DT_END: 596 case DT_END:
593 { 597 goto call;
594 va_end (ap);
595 598
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 if (htype == HOOK_DESTROY)
617 {
618 clearSVptr ((SV *)term->perl.self);
619 SvREFCNT_dec ((SV *)term->perl.self);
620 }
621
622 swap (perl_environ, environ);
623 return count;
624 }
625
626 default: 599 default:
627 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 600 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
628 } 601 }
602 }
603
604 call:
605 va_end (ap);
606
607 PUTBACK;
608 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
609 SPAGAIN;
610
611 if (count)
612 {
613 SV *status = POPs;
614 count = SvTRUE (status);
615 }
616
617 PUTBACK;
618 FREETMPS;
619 LEAVE;
620
621 if (SvTRUE (ERRSV))
622 {
623 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
624 ungrab (term); // better lose the grab than the session
625 }
626
627 event_consumed = !!count;
629 } 628 }
629 catch (...)
630 {
631 swap (perl_environ, environ);
632 throw;
633 }
634 else
635 event_consumed = false;
636
637 // post-handling of some events
638 if (htype == HOOK_REFRESH_BEGIN)
639 swap_overlays (term);
640 else if (htype == HOOK_DESTROY)
641 {
642 clearSVptr ((SV *)term->perl.self);
643 SvREFCNT_dec ((SV *)term->perl.self);
630 } 644 }
631 catch (...) 645
632 {
633 swap (perl_environ, environ); 646 swap (perl_environ, environ);
634 throw; 647
635 } 648 return event_consumed;
636} 649}
637 650
638///////////////////////////////////////////////////////////////////////////// 651/////////////////////////////////////////////////////////////////////////////
639 652
640MODULE = urxvt PACKAGE = urxvt 653MODULE = urxvt PACKAGE = urxvt
… …
891 RETVAL 904 RETVAL
892 905
893void 906void
894rxvt_term::destroy () 907rxvt_term::destroy ()
895 908
909#if ENABLE_PERL_FRILLS
910
911void
912rxvt_term::XListProperties (U32 window)
913 PPCODE:
914{
915 int count;
916 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
917
918 EXTEND (SP, count);
919 while (count--)
920 PUSHs (newSVuv ((U32)props [count]));
921
922 XFree (props);
923}
924
925void
926rxvt_term::XGetWindowProperty (U32 window, U32 property)
927 PPCODE:
928{
929 Atom type;
930 int format;
931 unsigned long nitems;
932 unsigned long bytes_after;
933 unsigned char *prop;
934 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
935 0, 1<<30, 0, AnyPropertyType,
936 &type, &format, &nitems, &bytes_after, &prop);
937 if (type != None)
938 {
939 EXTEND (SP, 3);
940 PUSHs (newSVuv ((U32)type));
941 PUSHs (newSViv (format));
942 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
943 XFree (prop);
944 }
945}
946
947void
948rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
949 CODE:
950{
951 STRLEN len;
952 char *data_ = SvPVbyte (data, len);
953
954 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
955 type, format, PropModeReplace,
956 (unsigned char *)data, len * 8 / format);
957}
958
959void
960rxvt_term::XDeleteProperty (U32 window, U32 property)
961 CODE:
962 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
963
964U32
965rxvt_term::DefaultRootWindow ()
966 CODE:
967 RETVAL = (U32)THIS->display->root;
968 OUTPUT:
969 RETVAL
970
971U32
972rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
973 CODE:
974 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
975 x, y, width, height, 0,
976 THIS->pix_colors_focused[Color_border],
977 THIS->pix_colors_focused[Color_border]);
978 OUTPUT:
979 RETVAL
980
981void
982rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
983 CODE:
984 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
985
986void
987rxvt_term::XMapWindow (U32 window)
988 CODE:
989 XMapWindow (THIS->display->display, (Window)window);
990
991void
992rxvt_term::XUnmapWindow (U32 window)
993 CODE:
994 XUnmapWindow (THIS->display->display, (Window)window);
995
996#endif
997
896void 998void
897rxvt_term::set_should_invoke (int htype, int inc) 999rxvt_term::set_should_invoke (int htype, int inc)
898 CODE: 1000 CODE:
899 THIS->perl.should_invoke [htype] += inc; 1001 THIS->perl.should_invoke [htype] += inc;
900 1002
… …
1008#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1110#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1009#define TERM_OFFSET_focus TERM_OFFSET(focus) 1111#define TERM_OFFSET_focus TERM_OFFSET(focus)
1010#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1112#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1011#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1113#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1012#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1114#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1013#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved) 1115#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1014 1116
1015int 1117int
1016rxvt_term::width () 1118rxvt_term::width ()
1017 ALIAS: 1119 ALIAS:
1018 width = TERM_OFFSET_width 1120 width = TERM_OFFSET_width
… …
1024 ncol = TERM_OFFSET_ncol 1126 ncol = TERM_OFFSET_ncol
1025 focus = TERM_OFFSET_focus 1127 focus = TERM_OFFSET_focus
1026 mapped = TERM_OFFSET_mapped 1128 mapped = TERM_OFFSET_mapped
1027 saveLines = TERM_OFFSET_saveLines 1129 saveLines = TERM_OFFSET_saveLines
1028 total_rows = TERM_OFFSET_total_rows 1130 total_rows = TERM_OFFSET_total_rows
1029 nsaved = TERM_OFFSET_nsaved 1131 top_row = TERM_OFFSET_top_row
1030 CODE: 1132 CODE:
1031 RETVAL = *(int *)((char *)THIS + ix); 1133 RETVAL = *(int *)((char *)THIS + ix);
1032 OUTPUT: 1134 OUTPUT:
1033 RETVAL 1135 RETVAL
1034 1136
… …
1112 THIS->vt_select_input (); 1214 THIS->vt_select_input ();
1113 1215
1114U32 1216U32
1115rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle) 1217rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1116 CODE: 1218 CODE:
1117{
1118 RETVAL = THIS->rstyle; 1219 RETVAL = THIS->rstyle;
1119 THIS->rstyle = new_rstyle; 1220 THIS->rstyle = new_rstyle;
1120}
1121 OUTPUT: 1221 OUTPUT:
1122 RETVAL 1222 RETVAL
1123 1223
1124int 1224int
1125rxvt_term::view_start (int newval = -1) 1225rxvt_term::view_start (int newval = 1)
1126 PROTOTYPE: $;$ 1226 PROTOTYPE: $;$
1127 CODE: 1227 CODE:
1128{ 1228{
1129 RETVAL = THIS->view_start; 1229 RETVAL = THIS->view_start;
1130 1230
1131 if (newval >= 0) 1231 if (newval <= 0)
1132 { 1232 THIS->scr_changeview (max (newval, THIS->top_row));
1133 THIS->view_start = min (newval, THIS->nsaved);
1134 THIS->scr_changeview (RETVAL);
1135 }
1136} 1233}
1137 OUTPUT: 1234 OUTPUT:
1138 RETVAL 1235 RETVAL
1139 1236
1140void 1237void
… …
1144 1241
1145void 1242void
1146rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1243rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1147 PPCODE: 1244 PPCODE:
1148{ 1245{
1149 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1246 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1150 XSRETURN_EMPTY; 1247 XSRETURN_EMPTY;
1151 1248
1152 line_t &l = ROW(row_number); 1249 line_t &l = ROW(row_number);
1153 1250
1154 if (GIMME_V != G_VOID) 1251 if (GIMME_V != G_VOID)
… …
1187 1284
1188void 1285void
1189rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1286rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1190 PPCODE: 1287 PPCODE:
1191{ 1288{
1192 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1289 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1193 XSRETURN_EMPTY; 1290 XSRETURN_EMPTY;
1194 1291
1195 line_t &l = ROW(row_number); 1292 line_t &l = ROW(row_number);
1196 1293
1197 if (GIMME_V != G_VOID) 1294 if (GIMME_V != G_VOID)
… …
1227 1324
1228int 1325int
1229rxvt_term::ROW_l (int row_number, int new_length = -1) 1326rxvt_term::ROW_l (int row_number, int new_length = -1)
1230 CODE: 1327 CODE:
1231{ 1328{
1232 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1329 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1233 XSRETURN_EMPTY; 1330 XSRETURN_EMPTY;
1234 1331
1235 line_t &l = ROW(row_number); 1332 line_t &l = ROW(row_number);
1236 RETVAL = l.l; 1333 RETVAL = l.l;
1237 1334
… …
1243 1340
1244bool 1341bool
1245rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) 1342rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1246 CODE: 1343 CODE:
1247{ 1344{
1248 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1345 if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow))
1249 XSRETURN_EMPTY; 1346 XSRETURN_EMPTY;
1250 1347
1251 line_t &l = ROW(row_number); 1348 line_t &l = ROW(row_number);
1252 RETVAL = l.is_longer (); 1349 RETVAL = l.is_longer ();
1253 1350
… …
1443 PUSHs (sv_2mortal (newSViv (rc.col))); 1540 PUSHs (sv_2mortal (newSViv (rc.col)));
1444 } 1541 }
1445 1542
1446 if (items == 3) 1543 if (items == 3)
1447 { 1544 {
1448 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1545 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1);
1449 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1546 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1450 1547
1451 if (ix) 1548 if (ix)
1452 THIS->want_refresh = 1; 1549 THIS->want_refresh = 1;
1453 } 1550 }

Diff Legend

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