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

Diff Legend

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