ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.172 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.176 by root, Tue Dec 20 20:58:31 2005 UTC

… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 87
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
88/* 91/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 92 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 95 */
… …
116 119
117/* Fill part/all of a line with blanks. */ 120/* Fill part/all of a line with blanks. */
118void 121void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 122rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120{ 123{
124 if (!l.t)
125 {
126 lalloc (l);
127 col = 0;
128 width = ncol;
129 }
130
121 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 133
124 text_t *et = l.t + col; 134 text_t *et = l.t + col;
125 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
134/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
135/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
136void 146void
137rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
138{ 148{
139 if (!l.t)
140 lalloc (l);
141
142 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
143} 150}
144 151
145/* ------------------------------------------------------------------------- * 152/* ------------------------------------------------------------------------- *
146 * SCREEN INITIALISATION * 153 * SCREEN INITIALISATION *
… …
170 // we need at least two lines for wrapping to work correctly 177 // we need at least two lines for wrapping to work correctly
171 if (nrow + saveLines < 2) 178 if (nrow + saveLines < 2)
172 { 179 {
173 saveLines++; 180 saveLines++;
174 prev_nrow--; 181 prev_nrow--;
175 nscrolled++; 182 nsaved++;
176 } 183 }
177 184
178 want_refresh = 1; 185 want_refresh = 1;
179 186
180 int prev_total_rows = prev_nrow + saveLines; 187 int prev_total_rows = prev_nrow + saveLines;
181 int total_rows = nrow + saveLines; 188 total_rows = nrow + saveLines;
182 189
183 screen.tscroll = 0; 190 screen.tscroll = 0;
184 screen.bscroll = nrow - 1; 191 screen.bscroll = nrow - 1;
185 192
186 if (!save) 193 if (!save)
187 { 194 {
188 /* 195 /*
189 * first time called so just malloc everything: don't rely on realloc 196 * first time called so just malloc everything: don't rely on realloc
190 * Note: this is still needed so that all the scrollback lines are NULL 197 * Note: this is still needed so that all the scrollback lines are NULL
191 */ 198 */
192 nscrolled = 0; /* no saved lines */ 199 nsaved = 0; /* no saved lines */
193 term_start = 0; 200 term_start = 0;
194 nsaved = 0;
195 201
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 202 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 204
199 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
201 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
202 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
203 209
204 screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206 scr_update_term ();
207
208 for (p = nrow; p--; ) 210 for (p = nrow; p--; )
209 { 211 {
210 scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
213 } 215 }
214 216
215 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
… …
247 rxvt_salloc *old_ra; 249 rxvt_salloc *old_ra;
248 250
249 if (nrow < prev_nrow) 251 if (nrow < prev_nrow)
250 { 252 {
251 /* delete rows */ 253 /* delete rows */
252 k = min (nscrolled, prev_nrow - nrow); 254 k = min (nsaved, prev_nrow - nrow);
253 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO 255 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
254 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 256 scr_scroll_text (0, (int)prev_nrow - 1, k);
255 257
256 for (p = nrow; p < prev_nrow; p++) 258 for (p = nrow; p < prev_nrow; p++)
257 { 259 {
258 lfree (save[p + saveLines]); 260 lfree (ROW(p));
259 lfree (swap_save[p]); 261 lfree (swap_save[p]);
260 lfree (drawn[p]); 262 lfree (drawn[p]);
261 } 263 }
262 264
263 /* we have fewer rows so fix up cursor position */ 265 /* we have fewer rows so fix up cursor position */
… …
271 scr_reset_realloc (); /* realloc _first_ */ 273 scr_reset_realloc (); /* realloc _first_ */
272 274
273 int ocol = ncol; 275 int ocol = ncol;
274 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
275 277
276 k = min (nscrolled, nrow - prev_nrow); 278 k = min (nsaved, nrow - prev_nrow);
277 279
278 for (p = prev_total_rows; p < total_rows; p++) 280 for (p = prev_total_rows; p < total_rows; p++)
279 save[p].clear (); 281 save[p].clear ();
280 282
281 for (p = prev_total_rows; p < total_rows - k; p++) 283 for (p = prev_total_rows; p < total_rows - k; p++)
282 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE); 284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
283
284 scr_update_term ();
285 285
286 for (p = prev_nrow; p < nrow; p++) 286 for (p = prev_nrow; p < nrow; p++)
287 { 287 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 } 290 }
291 291
292 if (k > 0) 292 if (k > 0)
293 { 293 {
294 scr_scroll_text (0, (int)nrow - 1, -k, 1); 294 scr_scroll_text (0, (int)nrow - 1, -k);
295 screen.cur.row += k; 295 screen.cur.row += k;
296 screen.s_cur.row += k; 296 screen.s_cur.row += k;
297 nscrolled -= k; 297 nsaved -= k;
298 } 298 }
299 299
300#ifdef DEBUG_STRICT 300#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 301 assert (screen.cur.row < nrow);
302#else /* drive with your eyes closed */ 302#else /* drive with your eyes closed */
… …
370 { 370 {
371 if (qrow >= 0) 371 if (qrow >= 0)
372 { 372 {
373 tp [qrow] = (text_t *)ta->alloc (); 373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc (); 374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = -1; 375 tl [qrow] = LINE_CONT1;
376 376
377 int qcol = 0; 377 int qcol = 0;
378 378
379 for (;;) 379 for (;;)
380 { 380 {
… …
437} 437}
438 438
439void 439void
440rxvt_term::scr_reset_realloc () 440rxvt_term::scr_reset_realloc ()
441{ 441{
442 unsigned int total_rows = nrow + saveLines;
443
444 screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *));
445 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t)); 442 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
446 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); 443 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
444 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
447 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t)); 445 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
448 buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t));
449} 446}
450 447
451/* ------------------------------------------------------------------------- */ 448/* ------------------------------------------------------------------------- */
452/* 449/*
453 * Free everything. That way malloc debugging can find leakage. 450 * Free everything. That way malloc debugging can find leakage.
454 */ 451 */
455void 452void
456rxvt_term::scr_release () 453rxvt_term::scr_release ()
457{ 454{
458 unsigned int total_rows;
459
460 total_rows = nrow + saveLines;
461
462 delete talloc; talloc = 0; 455 delete talloc; talloc = 0;
463 delete ralloc; ralloc = 0; 456 delete ralloc; ralloc = 0;
464 457
465 free (screen.line);
466 free (save); 458 free (save);
467 free (swap_save); 459 free (swap_save);
468 free (drawn); 460 free (drawn);
469 free (buf); 461 free (buf);
470 free (tabs); 462 free (tabs);
… …
546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 538 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547 */ 539 */
548int 540int
549rxvt_term::scr_change_screen (int scrn) 541rxvt_term::scr_change_screen (int scrn)
550{ 542{
551 int i;
552#if NSCREENS
553 int offset;
554#endif
555
556 want_refresh = 1; 543 want_refresh = 1;
557
558 view_start = 0; 544 view_start = 0;
559 545
560 if (current_screen == scrn) 546 if (current_screen == scrn)
561 return scrn; 547 return scrn;
562 548
563 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
564 550
565 i = current_screen; current_screen = scrn; scrn = i; 551 SWAP_IT (scrn, current_screen, int);
566 552
567 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 553 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
568 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 554 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
569 MAX_IT (screen.cur.row, 0); 555 MAX_IT (screen.cur.row, 0);
570 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 556 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
… …
573 559
574#if NSCREENS 560#if NSCREENS
575 if (options & Opt_secondaryScreen) 561 if (options & Opt_secondaryScreen)
576 { 562 {
577 num_scr = 0; 563 num_scr = 0;
578 offset = saveLines;
579 564
580 for (i = prev_nrow; i--;) 565 for (int i = nrow; i--; )
581 SWAP_IT (*(screen.line[i]), swap_save[i], line_t); 566 SWAP_IT (ROW(i), swap_save[i], line_t);
582 567
583 SWAP_IT (screen.charset, swap.charset, int16_t); 568 SWAP_IT (screen.charset, swap.charset, int16_t);
584 SWAP_IT (screen.flags, swap.flags, int); 569 SWAP_IT (screen.flags, swap.flags, int);
585 screen.flags |= Screen_VisibleCursor; 570 screen.flags |= Screen_VisibleCursor;
586 swap.flags |= Screen_VisibleCursor; 571 swap.flags |= Screen_VisibleCursor;
587 } 572 }
588 else 573 else
589#endif 574#endif
590 if (options & Opt_secondaryScroll) 575 if (options & Opt_secondaryScroll)
591 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 576 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592 577
593 return scrn; 578 return scrn;
594} 579}
595 580
596// clear WrapNext indicator, solidifying position on next line 581// clear WrapNext indicator, solidifying position on next line
… …
603 screen.flags &= ~Screen_WrapNext; 588 screen.flags &= ~Screen_WrapNext;
604 589
605 screen.cur.col = 0; 590 screen.cur.col = 0;
606 591
607 if (screen.cur.row == screen.bscroll) 592 if (screen.cur.row == screen.bscroll)
608 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 593 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609 else if (screen.cur.row < nrow - 1) 594 else if (screen.cur.row < nrow - 1)
610 screen.cur.row++; 595 screen.cur.row++;
611} 596}
612 597
613/* ------------------------------------------------------------------------- */ 598/* ------------------------------------------------------------------------- */
… …
639 rstyle = DEFAULT_RSTYLE; 624 rstyle = DEFAULT_RSTYLE;
640 else 625 else
641 rstyle &= ~style; 626 rstyle &= ~style;
642 } 627 }
643 628
644// set screen.line pointers to the actual lines in the save buffer
645void
646rxvt_term::scr_update_term ()
647{
648 for (int i = nrow; i--; )
649 screen.line[i] = save + saveLines + i;
650}
651
652/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
653/* 630/*
654 * Scroll text between <row1> and <row2> inclusive, by <count> lines 631 * Scroll text between <row1> and <row2> inclusive, by <count> lines
655 * count positive ==> scroll up 632 * count positive ==> scroll up
656 * count negative ==> scroll down 633 * count negative ==> scroll down
657 * spec == 0 for normal routines
658 */ 634 */
659int 635int
660rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 636rxvt_term::scr_scroll_text (int row1, int row2, int count)
661{ 637{
662 int i, j;
663
664 if (count == 0 || (row1 > row2)) 638 if (count == 0 || (row1 > row2))
665 return 0; 639 return 0;
666 640
667 want_refresh = 1; 641 want_refresh = 1;
642 num_scr += count;
668 643
669 if (row1 == 0 && count > 0 644 if (row1 == 0 && count > 0
670 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 645 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
671 { 646 {
672 nscrolled += count; 647 nsaved = min (nsaved + count, saveLines);
648 term_start = (term_start + count) % total_rows;
673 649
674 if (nscrolled > saveLines) 650 if (selection.op && current_screen == selection.screen)
675 nscrolled = saveLines; 651 {
652 selection.beg.row -= count;
653 selection.end.row -= count;
654 selection.mark.row -= count;
676 655
656 selection_check (0);
657 }
658
659 for (int i = count; i--; )
660 scr_blank_screen_mem (ROW(row2 - i), rstyle);
661
677 if ((options & Opt_scrollWithBuffer) 662 if ((options & Opt_scrollWithBuffer)
678 && view_start != 0 663 && view_start != 0
679 && view_start != saveLines) 664 && view_start != saveLines)
680 scr_page (UP, count); 665 scr_page (UP, count);
681 } 666 }
682 else if (!spec) 667 else
683 row1 += saveLines; 668 {
684
685 row2 += saveLines;
686
687 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
688 { 670 {
689 i = selection.beg.row + saveLines; 671 int i = selection.beg.row;
690 j = selection.end.row + saveLines; 672 int j = selection.end.row;
691 673
692 if ((i < row1 && j > row1) 674 if ((i < row1 && j > row1)
693 || (i < row2 && j > row2) 675 || (i < row2 && j > row2)
694 || (i - count < row1 && i >= row1) 676 || (i - count < row1 && i >= row1)
695 || (i - count > row2 && i <= row2) 677 || (i - count > row2 && i <= row2)
696 || (j - count < row1 && j >= row1) 678 || (j - count < row1 && j >= row1)
697 || (j - count > row2 && j <= row2)) 679 || (j - count > row2 && j <= row2))
698 { 680 {
699 CLEAR_ALL_SELECTION (); 681 CLEAR_ALL_SELECTION ();
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 682 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
701 } 683 }
702 else if (j >= row1 && j <= row2) 684 else if (j >= row1 && j <= row2)
703 { 685 {
704 /* move selected region too */ 686 /* move selected region too */
705 selection.beg.row -= count; 687 selection.beg.row -= count;
706 selection.end.row -= count; 688 selection.end.row -= count;
707 selection.mark.row -= count; 689 selection.mark.row -= count;
690
691 selection_check (0);
692 }
693 }
694
695 // use a simple and robust scrolling algorithm, this
696 // part of scr_scroll_text is not time-critical.
697
698 int rows = row2 - row1 + 1;
699
700 for (int row = 0; row < rows; row++)
708 } 701 {
709 } 702 buf [row] = ROW(row1 + (row + count + rows) % rows);
710 703
711 selection_check (0); /* _after_ nscrolled update */ 704 if (!IN_RANGE_EXC (row + count, 0, rows))
712
713 num_scr += count;
714 j = count;
715
716 if (count < 0)
717 count = -count;
718
719 i = row2 - row1 + 1;
720 MIN_IT (count, i);
721
722 if (j > 0)
723 {
724 /* scroll up */
725
726 /* Copy lines that will get clobbered by the rotation */
727 memcpy (buf, save + row1, count * sizeof (line_t));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
732
733 j = row2 - count + 1, i = count;
734 }
735 else /* if (j < 0) */
736 {
737 /* scroll down */
738
739 /* Copy lines that will get clobbered by the rotation */
740 for (i = 0, j = row2; i < count; i++, j--)
741 buf[i] = save[j];
742
743 /* Rotate lines */
744 for (j = row2, i = j - count; i >= row1; i--, j--)
745 save[j] = save[i];
746
747 j = row1, i = count;
748 count = -count;
749 }
750
751 /* Resurrect lines */
752 memcpy (save + j, buf, i * sizeof (line_t));
753
754 scr_update_term ();
755
756 if (!spec) /* line length may not equal ncol */
757 for (; i--; j++)
758 scr_blank_screen_mem (save[j], rstyle); 705 scr_blank_screen_mem (buf [row], rstyle);
706 }
707
708 for (int row = 0; row < rows; row++)
709 ROW(row1 + row) = buf [row];
710 }
759 711
760 return count; 712 return count;
761} 713}
762 714
763/* ------------------------------------------------------------------------- */ 715/* ------------------------------------------------------------------------- */
… …
785 if ((nlines > 0) 737 if ((nlines > 0)
786 && (screen.tscroll == 0) 738 && (screen.tscroll == 0)
787 && (screen.bscroll == (nrow - 1))) 739 && (screen.bscroll == (nrow - 1)))
788 { 740 {
789 /* _at least_ this many lines need to be scrolled */ 741 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 742 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
791 screen.cur.row -= nlines; 743 screen.cur.row -= nlines;
792 } 744 }
793 } 745 }
794 746
795#ifdef DEBUG_STRICT 747#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 748 assert (screen.cur.col < last_col);
797 assert ((screen.cur.row < nrow) 749 assert ((screen.cur.row < nrow)
798 && (screen.cur.row >= - (int32_t)nscrolled)); 750 && (screen.cur.row >= - (int32_t)nsaved));
799#else /* drive with your eyes closed */ 751#else /* drive with your eyes closed */
800 MIN_IT (screen.cur.col, last_col - 1); 752 MIN_IT (screen.cur.col, last_col - 1);
801 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 753 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)nscrolled); 754 MAX_IT (screen.cur.row, - (int32_t)nsaved);
803#endif 755#endif
804 row = screen.cur.row + saveLines; 756 row = screen.cur.row;
805 757
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 758 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 759
808 line_t *line = save + row; 760 line_t *line = &ROW(row);
809 761
810 while (str < strend) 762 while (str < strend)
811 { 763 {
812 c = *str++; 764 c = *str++;
813 765
814 if (c < 0x20) 766 if (c < 0x20)
815 if (c == C0_LF) 767 if (c == C0_LF)
816 { 768 {
817 if (line->l != -1) /* XXX: think about this */ 769 if (!line->is_longer ()) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col); 770 MAX_IT (line->l, screen.cur.col);
819 771
820 screen.flags &= ~Screen_WrapNext; 772 screen.flags &= ~Screen_WrapNext;
821 773
822 if (screen.cur.row == screen.bscroll) 774 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 775 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 776 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 777 row = ++screen.cur.row;
826 778
827 line = save + row; /* _must_ refresh */ 779 line = &ROW(row); /* _must_ refresh */
828 continue; 780 continue;
829 } 781 }
830 else if (c == C0_CR) 782 else if (c == C0_CR)
831 { 783 {
832 if (line->l != -1) /* XXX: think about this */ 784 if (!line->is_longer ()) /* XXX: think about this */
833 MAX_IT (line->l, screen.cur.col); 785 MAX_IT (line->l, screen.cur.col);
834 786
835 screen.flags &= ~Screen_WrapNext; 787 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 788 screen.cur.col = 0;
837 continue; 789 continue;
… …
855 CLEAR_SELECTION (); 807 CLEAR_SELECTION ();
856 } 808 }
857 809
858 if (screen.flags & Screen_WrapNext) 810 if (screen.flags & Screen_WrapNext)
859 { 811 {
860 line->l = -1; 812 line->set_is_longer ();
861 813
862 scr_do_wrap (); 814 scr_do_wrap ();
863 815
864 row = screen.cur.row + saveLines; 816 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 817 line = &ROW(row); /* _must_ refresh */
866 } 818 }
867 819
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 820 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 821 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870 c = 0xfffd; 822 c = 0xfffd;
871 823
872 // rely on wcwidth to tell us the character width, at least for non-latin1 824 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth might return -1 825 // do wcwidth before further replacements, as wcwidth might return -1
874 // for the line drawing characters below as they might be invalid in the current 826 // for the line drawing characters below as they might be invalid in the current
… …
989 941
990 while (*tp == NOCHAR && tp > line->t) 942 while (*tp == NOCHAR && tp > line->t)
991 tp--, rp--; 943 tp--, rp--;
992 } 944 }
993 else if (screen.cur.row > 0 945 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].l == -1) 946 && ROW(screen.cur.row - 1).is_longer ())
995 { 947 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines); 948 line_t *line = &ROW(screen.cur.row - 1);
997 949
998 tp = line->t + last_col - 1; 950 tp = line->t + last_col - 1;
999 rp = line->r + last_col - 1; 951 rp = line->r + last_col - 1;
1000 952
1001 while (*tp == NOCHAR && tp > line->t) 953 while (*tp == NOCHAR && tp > line->t)
… …
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 965 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014#endif 966#endif
1015 } 967 }
1016 } 968 }
1017 969
1018 if (line->l != -1) /* XXX: think about this */ 970 if (!line->is_longer ()) /* XXX: think about this */
1019 MAX_IT (line->l, screen.cur.col); 971 MAX_IT (line->l, screen.cur.col);
1020 972
1021#ifdef DEBUG_STRICT 973#ifdef DEBUG_STRICT
1022 assert (screen.cur.row >= 0); 974 assert (screen.cur.row >= 0);
1023#else /* drive with your eyes closed */ 975#else /* drive with your eyes closed */
… …
1068 1020
1069 if (count == 0) 1021 if (count == 0)
1070 return; 1022 return;
1071 else if (count > 0) 1023 else if (count > 0)
1072 { 1024 {
1073 int row = saveLines + screen.cur.row; 1025 int row = screen.cur.row;
1074 1026
1075 line_t &l = save[row]; 1027 line_t &l = ROW(row);
1076 rend_t base_rend = l.r[i]; 1028 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 1029 ht &= l.t[i] == ' ';
1078 1030
1079 for (; ++i < ncol; ) 1031 for (; ++i < ncol; )
1080 if (tabs[i]) 1032 if (tabs[i])
… …
1094 // buffer so they can be selected and pasted. 1046 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs) 1047 if (ht && options & Opt_pastableTabs)
1096 { 1048 {
1097 base_rend = SET_FONT (base_rend, 0); 1049 base_rend = SET_FONT (base_rend, 0);
1098 1050
1099 if (l.l != -1) /* XXX: think about this */ 1051 if (!l.is_longer ()) /* XXX: think about this */
1100 MAX_IT (l.l, x); 1052 MAX_IT (l.l, x);
1101 1053
1102 i = screen.cur.col; 1054 i = screen.cur.col;
1103 1055
1104 l.t[i] = '\t'; 1056 l.t[i] = '\t';
… …
1141rxvt_term::scr_backindex () 1093rxvt_term::scr_backindex ()
1142{ 1094{
1143 if (screen.cur.col > 0) 1095 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1096 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1097 else
1146 {
1147 if (save[screen.cur.row + saveLines].l == 0)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1098 scr_insdel_chars (1, INSERT);
1151 }
1152} 1099}
1153#endif 1100#endif
1154/* ------------------------------------------------------------------------- */ 1101/* ------------------------------------------------------------------------- */
1155/* 1102/*
1156 * Process DEC Forward Index 1103 * Process DEC Forward Index
… …
1166 1113
1167 if (screen.cur.col < ncol - 1) 1114 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1115 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1116 else
1170 { 1117 {
1171 row = screen.cur.row + saveLines; 1118 row = screen.cur.row;
1172 1119
1173 if (save[row].l == 0) 1120 if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1174 return; /* um, yeah? */
1175 else if (save[row].l == -1)
1176 save[row].l = ncol; 1121 ROW(row).l = ncol;
1177 1122
1178 scr_gotorc (0, 0, R_RELATIVE); 1123 scr_gotorc (0, 0, R_RELATIVE);
1179 scr_insdel_chars (1, DELETE); 1124 scr_insdel_chars (1, DELETE);
1180 scr_gotorc (0, ncol - 1, R_RELATIVE); 1125 scr_gotorc (0, ncol - 1, R_RELATIVE);
1181 } 1126 }
… …
1248 1193
1249 screen.flags &= ~Screen_WrapNext; 1194 screen.flags &= ~Screen_WrapNext;
1250 1195
1251 if ((screen.cur.row == screen.bscroll && direction == UP) 1196 if ((screen.cur.row == screen.bscroll && direction == UP)
1252 || (screen.cur.row == screen.tscroll && direction == DN)) 1197 || (screen.cur.row == screen.tscroll && direction == DN))
1253 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1198 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1254 else 1199 else
1255 screen.cur.row += dirn; 1200 screen.cur.row += dirn;
1256 1201
1257 MAX_IT (screen.cur.row, 0); 1202 MAX_IT (screen.cur.row, 0);
1258 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 1203 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
… …
1274 want_refresh = 1; 1219 want_refresh = 1;
1275 ZERO_SCROLLBACK (); 1220 ZERO_SCROLLBACK ();
1276 1221
1277 selection_check (1); 1222 selection_check (1);
1278 1223
1279 row = saveLines + screen.cur.row; 1224 row = screen.cur.row;
1280 1225
1281 switch (mode) 1226 switch (mode)
1282 { 1227 {
1283 case 0: /* erase to end of line */ 1228 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1229 col = screen.cur.col;
1285 num = ncol - col; 1230 num = ncol - col;
1286 MIN_IT (save[row].l, (int16_t)col); 1231 MIN_IT (ROW(row).l, (int16_t)col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1232 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1233 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1234 CLEAR_SELECTION ();
1290 break; 1235 break;
1291 case 1: /* erase to beginning of line */ 1236 case 1: /* erase to beginning of line */
… …
1296 CLEAR_SELECTION (); 1241 CLEAR_SELECTION ();
1297 break; 1242 break;
1298 case 2: /* erase whole line */ 1243 case 2: /* erase whole line */
1299 col = 0; 1244 col = 0;
1300 num = ncol; 1245 num = ncol;
1301 save[row].l = 0; 1246 ROW(row).l = 0;
1302 if (selection.beg.row <= screen.cur.row 1247 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1248 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1249 CLEAR_SELECTION ();
1305 break; 1250 break;
1306 default: 1251 default:
1307 return; 1252 return;
1308 } 1253 }
1309 1254
1310 if (save[row].t)
1311 scr_blank_line (save[row], col, num, rstyle); 1255 scr_blank_line (ROW(row), col, num, rstyle);
1312 else
1313 scr_blank_screen_mem (save[row], rstyle);
1314} 1256}
1315 1257
1316/* ------------------------------------------------------------------------- */ 1258/* ------------------------------------------------------------------------- */
1317/* 1259/*
1318 * Erase part of whole of the screen 1260 * Erase part of whole of the screen
… …
1322 */ 1264 */
1323void 1265void
1324rxvt_term::scr_erase_screen (int mode) 1266rxvt_term::scr_erase_screen (int mode)
1325{ 1267{
1326 int num; 1268 int num;
1327 int32_t row, row_offset; 1269 int32_t row;
1328 rend_t ren; 1270 rend_t ren;
1329 XGCValues gcvalue; 1271 XGCValues gcvalue;
1330 1272
1331 want_refresh = 1; 1273 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1274 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)saveLines;
1335 1275
1336 switch (mode) 1276 switch (mode)
1337 { 1277 {
1338 case 0: /* erase to end of screen */ 1278 case 0: /* erase to end of screen */
1339 selection_check (1); 1279 selection_check (1);
… …
1384 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1324 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1325 }
1386 1326
1387 for (; num--; row++) 1327 for (; num--; row++)
1388 { 1328 {
1389 scr_blank_screen_mem (save[row + row_offset], rstyle); 1329 scr_blank_screen_mem (ROW (row), rstyle);
1390 save[row + row_offset].l = 0; 1330 ROW (row).l = 0;
1391 scr_blank_line (drawn[row], 0, ncol, ren); 1331 scr_blank_line (drawn[row], 0, ncol, ren);
1392 } 1332 }
1393} 1333}
1394 1334
1395#if ENABLE_FRILLS 1335#if ENABLE_FRILLS
… …
1397rxvt_term::scr_erase_savelines () 1337rxvt_term::scr_erase_savelines ()
1398{ 1338{
1399 want_refresh = 1; 1339 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1340 ZERO_SCROLLBACK ();
1401 1341
1402 nscrolled = 0; 1342 nsaved = 0;
1403} 1343}
1404#endif 1344#endif
1405 1345
1406/* ------------------------------------------------------------------------- */ 1346/* ------------------------------------------------------------------------- */
1407/* 1347/*
… …
1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1349 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1410 */ 1350 */
1411void 1351void
1412rxvt_term::scr_E () 1352rxvt_term::scr_E ()
1413{ 1353{
1414 int i, j, k;
1415 rend_t *r1, fs; 1354 rend_t fs;
1416 1355
1417 want_refresh = 1; 1356 want_refresh = 1;
1418 ZERO_SCROLLBACK (); 1357 ZERO_SCROLLBACK ();
1419 1358
1420 num_scr_allow = 0; 1359 num_scr_allow = 0;
1421 selection_check (3); 1360 selection_check (3);
1422 1361
1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1362 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424 for (k = saveLines, i = nrow; i--; k++) 1363 for (int row = nrow; row--; )
1425 { 1364 {
1426 save[k].l = ncol; /* make the `E's selectable */ 1365 line_t &line = ROW(row);
1366
1427 fill_text (save[k].t, 'E', ncol); 1367 fill_text (line.t, 'E', ncol);
1428 for (r1 = save[k].r, j = ncol; j--; ) 1368 rend_t *r1 = line.r;
1369
1370 for (int j = ncol; j--; )
1429 *r1++ = fs; 1371 *r1++ = fs;
1372
1373 line.l = ncol; /* make the `E's selectable */
1430 } 1374 }
1431} 1375}
1432 1376
1433/* ------------------------------------------------------------------------- */ 1377/* ------------------------------------------------------------------------- */
1434/* 1378/*
… …
1455 count = end; 1399 count = end;
1456 } 1400 }
1457 1401
1458 scr_do_wrap (); 1402 scr_do_wrap ();
1459 1403
1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1404 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461} 1405}
1462 1406
1463/* ------------------------------------------------------------------------- */ 1407/* ------------------------------------------------------------------------- */
1464/* 1408/*
1465 * Insert/Delete <count> characters from the current position 1409 * Insert/Delete <count> characters from the current position
… …
1479 scr_do_wrap (); 1423 scr_do_wrap ();
1480 1424
1481 selection_check (1); 1425 selection_check (1);
1482 MIN_IT (count, (ncol - screen.cur.col)); 1426 MIN_IT (count, (ncol - screen.cur.col));
1483 1427
1484 row = screen.cur.row + saveLines; 1428 row = screen.cur.row;
1485 1429
1486 line_t *line = save + row; 1430 line_t *line = &ROW(row);
1487 1431
1488 switch (insdel) 1432 switch (insdel)
1489 { 1433 {
1490 case INSERT: 1434 case INSERT:
1491 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1435 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1492 { 1436 {
1493 line->t[col] = line->t[col - count]; 1437 line->t[col] = line->t[col - count];
1494 line->r[col] = line->r[col - count]; 1438 line->r[col] = line->r[col - count];
1495 } 1439 }
1496 1440
1497 if (line->l != -1) 1441 if (!line->is_longer ())
1498 { 1442 {
1499 line->l += count; 1443 line->l += count;
1500 MIN_IT (line->l, ncol); 1444 MIN_IT (line->l, ncol);
1501 } 1445 }
1502 1446
… …
1512 selection.mark.col += count; /* XXX: yes? */ 1456 selection.mark.col += count; /* XXX: yes? */
1513 selection.end.col += count; 1457 selection.end.col += count;
1514 } 1458 }
1515 } 1459 }
1516 1460
1517 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1461 scr_blank_line (*line, screen.cur.col, count, rstyle);
1518 break; 1462 break;
1519 1463
1520 case ERASE: 1464 case ERASE:
1521 screen.cur.col += count; /* don't worry if > ncol */ 1465 screen.cur.col += count; /* don't worry if > ncol */
1522 selection_check (1); 1466 selection_check (1);
1523 screen.cur.col -= count; 1467 screen.cur.col -= count;
1524 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1468 scr_blank_line (*line, screen.cur.col, count, rstyle);
1525 break; 1469 break;
1526 1470
1527 case DELETE: 1471 case DELETE:
1528 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1472 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1529 1473
… …
1533 line->r[col] = line->r[col + count]; 1477 line->r[col] = line->r[col + count];
1534 } 1478 }
1535 1479
1536 scr_blank_line (*line, ncol - count, count, tr); 1480 scr_blank_line (*line, ncol - count, count, tr);
1537 1481
1538 if (line->l == -1) /* break line continuation */ 1482 if (line->is_longer ()) /* break line continuation */
1539 line->l = ncol; 1483 line->l = ncol;
1540 1484
1541 line->l -= count; 1485 line->l = max (line->l - count, 0);
1542 MAX_IT (line->l, 0);
1543 1486
1544 if (selection.op && current_screen == selection.screen 1487 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1489 {
1547 if (selection.end.row != screen.cur.row 1490 if (selection.end.row != screen.cur.row
… …
1874 1817
1875 oldviewstart = view_start; 1818 oldviewstart = view_start;
1876 1819
1877 if (y < len) 1820 if (y < len)
1878 { 1821 {
1879 p = (nrow + nscrolled) * (len - y) / len; 1822 p = (nrow + nsaved) * (len - y) / len;
1880 p -= (long) (nrow - 1); 1823 p -= (long) (nrow - 1);
1881 p = max (p, 0); 1824 p = max (p, 0);
1882 } 1825 }
1883 1826
1884 view_start = (unsigned int)min (p, nscrolled); 1827 view_start = (unsigned int)min (p, nsaved);
1885 1828
1886 return scr_changeview (oldviewstart); 1829 return scr_changeview (oldviewstart);
1887} 1830}
1888 1831
1889/* ------------------------------------------------------------------------- */ 1832/* ------------------------------------------------------------------------- */
… …
1900 oldviewstart = view_start; 1843 oldviewstart = view_start;
1901 1844
1902 if (direction == UP) 1845 if (direction == UP)
1903 { 1846 {
1904 n = view_start + nlines; 1847 n = view_start + nlines;
1905 view_start = min (n, nscrolled); 1848 view_start = min (n, nsaved);
1906 } 1849 }
1907 else 1850 else
1908 { 1851 {
1909 n = view_start - nlines; 1852 n = view_start - nlines;
1910 view_start = max (n, 0); 1853 view_start = max (n, 0);
… …
1954/* ARGSUSED */ 1897/* ARGSUSED */
1955void 1898void
1956rxvt_term::scr_printscreen (int fullhist) 1899rxvt_term::scr_printscreen (int fullhist)
1957{ 1900{
1958#ifdef PRINTPIPE 1901#ifdef PRINTPIPE
1959 int i, r1, nrows, row_offset; 1902 int nrows, row_start;
1960 FILE *fd; 1903 FILE *fd;
1961 1904
1962 if ((fd = popen_printer ()) == NULL) 1905 if ((fd = popen_printer ()) == NULL)
1963 return; 1906 return;
1964 1907
1965 nrows = nrow;
1966 row_offset = saveLines;
1967
1968 if (!fullhist) 1908 if (fullhist)
1969 row_offset -= view_start; 1909 {
1910 nrows = nrow + nsaved;
1911 row_start = -nsaved;
1912 }
1970 else 1913 else
1971 { 1914 {
1972 nrows += nscrolled; 1915 nrows = nrow;
1973 row_offset -= nscrolled; 1916 row_start = -view_start;
1974 } 1917 }
1975 1918
1976 wctomb (0, 0); 1919 wctomb (0, 0);
1977 1920
1978 for (r1 = 0; r1 < nrows; r1++) 1921 for (int r1 = 0; r1 < nrows; r1++)
1979 { 1922 {
1980 text_t *tp = save[r1 + row_offset].t; 1923 text_t *tp = ROW(r1).t;
1981 int len = save[r1 + row_offset].l; 1924 int len = ROW(r1).l;
1982 1925
1983 for (i = len >= 0 ? len : ncol - 1; i--; ) 1926 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1984 { 1927 {
1985 char mb[MB_LEN_MAX]; 1928 char mb[MB_LEN_MAX];
1986 text_t t = *tp++; 1929 text_t t = *tp++;
1987 if (t == NOCHAR) 1930 if (t == NOCHAR)
1988 continue; 1931 continue;
… …
2034 * A: set up vars 1977 * A: set up vars
2035 */ 1978 */
2036 must_clear = 0; 1979 must_clear = 0;
2037 refresh_count = 0; 1980 refresh_count = 0;
2038 1981
2039 row_offset = saveLines - view_start; 1982 row_offset = term_start - view_start;
2040 1983
2041#if XPM_BACKGROUND 1984#if XPM_BACKGROUND
2042 must_clear |= bgPixmap.pixmap != None; 1985 must_clear |= bgPixmap.pixmap != None;
2043#endif 1986#endif
2044#if TRANSPARENT 1987#if TRANSPARENT
… …
2067 2010
2068 if (showcursor) 2011 if (showcursor)
2069 { 2012 {
2070 int col = screen.cur.col; 2013 int col = screen.cur.col;
2071 2014
2072 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 2015 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2073 col--; 2016 col--;
2074 2017
2075 crp = &screen.line[screen.cur.row]->r[col]; 2018 crp = &ROW(screen.cur.row).r[col];
2076 2019
2077 if (showcursor && focus) 2020 if (showcursor && focus)
2078 { 2021 {
2079 if (options & Opt_cursorUnderline) 2022 if (options & Opt_cursorUnderline)
2080 *crp ^= RS_Uline; 2023 *crp ^= RS_Uline;
… …
2148 * D: CopyArea pass - very useful for slower links 2091 * D: CopyArea pass - very useful for slower links
2149 * This has been deliberately kept simple. 2092 * This has been deliberately kept simple.
2150 */ 2093 */
2151 i = num_scr; 2094 i = num_scr;
2152 if (!display->is_local 2095 if (!display->is_local
2153 && refresh_type == FAST_REFRESH && num_scr_allow && i 2096 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2154 && abs (i) < nrow && !must_clear) 2097 && abs (num_scr) < nrow && !must_clear)
2155 { 2098 {
2156 int16_t nits; 2099 int16_t nits;
2157 int j; 2100 int j;
2158 int len, wlen; 2101 int len, wlen;
2159 2102
… …
2162 row = i > 0 ? 0 : j - 1; 2105 row = i > 0 ? 0 : j - 1;
2163 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2164 { 2107 {
2165 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2166 { 2109 {
2167 line_t s = save[row + row_offset]; 2110 line_t s = save[(row + row_offset) % total_rows];
2168 line_t d = drawn[row]; 2111 line_t d = drawn[row];
2169 line_t d2 = drawn[row + i]; 2112 line_t d2 = drawn[row + i];
2170 2113
2171 for (nits = 0, col = ncol; col--; ) 2114 for (nits = 0, col = ncol; col--; )
2172 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2115 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2210 /* 2153 /*
2211 * E: main pass across every character 2154 * E: main pass across every character
2212 */ 2155 */
2213 for (row = 0; row < nrow; row++) 2156 for (row = 0; row < nrow; row++)
2214 { 2157 {
2215 text_t *stp = save[row + row_offset].t; 2158 text_t *stp = save[(row + row_offset) % total_rows].t;
2216 rend_t *srp = save[row + row_offset].r; 2159 rend_t *srp = save[(row + row_offset) % total_rows].r;
2217 text_t *dtp = drawn[row].t; 2160 text_t *dtp = drawn[row].t;
2218 rend_t *drp = drawn[row].r; 2161 rend_t *drp = drawn[row].r;
2219 2162
2220 /* 2163 /*
2221 * E2: OK, now the real pass 2164 * E2: OK, now the real pass
… …
2432 else if (oldcursor.row >= 0) 2375 else if (oldcursor.row >= 0)
2433 { 2376 {
2434 int cursorwidth = 1; 2377 int cursorwidth = 1;
2435 int col = oldcursor.col; 2378 int col = oldcursor.col;
2436 2379
2437 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2380 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2438 col--; 2381 col--;
2439 2382
2440 while (col + cursorwidth < ncol 2383 while (col + cursorwidth < ncol
2441 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2384 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442 cursorwidth++; 2385 cursorwidth++;
… …
2477} 2420}
2478 2421
2479void 2422void
2480rxvt_term::scr_remap_chars () 2423rxvt_term::scr_remap_chars ()
2481{ 2424{
2482 for (int i = nrow + saveLines; i--; ) 2425 for (int i = total_rows; i--; )
2483 scr_remap_chars (save[i]); 2426 scr_remap_chars (save[i]);
2484 2427
2485 for (int i = nrow; i--; ) 2428 for (int i = nrow; i--; )
2486 { 2429 {
2487 scr_remap_chars (drawn[i]); 2430 scr_remap_chars (drawn[i]);
… …
2535 2478
2536/* ------------------------------------------------------------------------- */ 2479/* ------------------------------------------------------------------------- */
2537void 2480void
2538rxvt_term::scr_reverse_selection () 2481rxvt_term::scr_reverse_selection ()
2539{ 2482{
2483 if (selection.op
2540 if (selection.op && current_screen == selection.screen) 2484 && current_screen == selection.screen
2485 && selection.end.row >= -view_start)
2541 { 2486 {
2542 int end_row = saveLines - view_start; 2487 int view_end = -view_start + nrow;
2543 int i = selection.beg.row + saveLines; 2488 int row, col;
2544 int col, row = selection.end.row + saveLines;
2545 rend_t *srp;
2546 2489
2547#if ENABLE_FRILLS 2490#if ENABLE_FRILLS
2548 if (selection.rect) 2491 if (selection.rect)
2549 { 2492 {
2550 end_row += nrow; 2493 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2551
2552 for (; i <= row && i <= end_row; i++)
2553 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) 2494 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2554 srp[col] ^= RS_RVid; 2495 srp[col] ^= RS_RVid;
2555 } 2496 }
2556 else 2497 else
2557#endif 2498#endif
2558 { 2499 {
2559 if (i >= end_row) 2500 if (selection.beg.row >= -view_start)
2501 {
2560 col = selection.beg.col; 2502 col = selection.beg.col;
2503 row = selection.beg.row;
2504 }
2561 else 2505 else
2562 { 2506 {
2563 col = 0; 2507 col = 0;
2564 i = end_row; 2508 row = view_start;
2565 } 2509 }
2566 2510
2567 end_row += nrow; 2511 for (; row < min (selection.end.row, view_end); row++, col = 0)
2568
2569 for (; i < row && i < end_row; i++, col = 0)
2570 for (srp = save[i].r; col < ncol; col++) 2512 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2571 srp[col] ^= RS_RVid; 2513 srp[col] ^= RS_RVid;
2572 2514
2573 if (i == row && i < end_row) 2515 if (row == selection.end.row)
2574 for (srp = save[i].r; col < selection.end.col; col++) 2516 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2575 srp[col] ^= RS_RVid; 2517 srp[col] ^= RS_RVid;
2576 } 2518 }
2577 } 2519 }
2578} 2520}
2579 2521
… …
2588{ 2530{
2589 int row, wrote; 2531 int row, wrote;
2590 unsigned int width, towrite; 2532 unsigned int width, towrite;
2591 char r1[] = "\n"; 2533 char r1[] = "\n";
2592 2534
2593 for (row = saveLines - nscrolled; 2535 for (row = saveLines - nsaved;
2594 row < saveLines + nrow - 1; row++) 2536 row < saveLines + nrow - 1; row++)
2595 { 2537 {
2596 width = save[row].l >= 0 ? save[row].l 2538 width = save[row].l >= 0 ? save[row].l
2597 : ncol; 2539 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2540 for (towrite = width; towrite; towrite -= wrote)
… …
2610#endif 2552#endif
2611 2553
2612/* ------------------------------------------------------------------------- * 2554/* ------------------------------------------------------------------------- *
2613 * CHARACTER SELECTION * 2555 * CHARACTER SELECTION *
2614 * ------------------------------------------------------------------------- */ 2556 * ------------------------------------------------------------------------- */
2615
2616/*
2617 * -nscrolled <= (selection row) <= nrow - 1
2618 */
2619void 2557void
2620rxvt_term::selection_check (int check_more) 2558rxvt_term::selection_check (int check_more)
2621{ 2559{
2622 row_col_t pos; 2560 row_col_t pos;
2623 2561
2624 if (!selection.op) 2562 if (!selection.op)
2625 return; 2563 return;
2626 2564
2627 pos.row = pos.col = 0; 2565 pos.row = pos.col = 0;
2628 if ((selection.beg.row < - (int32_t)nscrolled) 2566 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2629 || (selection.beg.row >= nrow) 2567 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2630 || (selection.mark.row < - (int32_t)nscrolled) 2568 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2631 || (selection.mark.row >= nrow)
2632 || (selection.end.row < - (int32_t)nscrolled)
2633 || (selection.end.row >= nrow)
2634 || (check_more == 1 2569 || (check_more == 1
2635 && current_screen == selection.screen 2570 && current_screen == selection.screen
2636 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2571 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2637 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2572 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2638 || (check_more == 2 2573 || (check_more == 2
… …
2944 * EXT: button 1 or 3 release 2879 * EXT: button 1 or 3 release
2945 */ 2880 */
2946void 2881void
2947rxvt_term::selection_make (Time tm) 2882rxvt_term::selection_make (Time tm)
2948{ 2883{
2949 int i, col, end_col, row, end_row; 2884 int i;
2950 wchar_t *new_selection_text; 2885 wchar_t *new_selection_text;
2951 text_t *t; 2886 text_t *t;
2952 2887
2953 switch (selection.op) 2888 switch (selection.op)
2954 { 2889 {
… …
2970 return; /* nothing selected, go away */ 2905 return; /* nothing selected, go away */
2971 2906
2972 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2907 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2973 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2908 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2974 2909
2975 col = selection.beg.col;
2976 row = selection.beg.row + saveLines;
2977 end_row = selection.end.row + saveLines;
2978 int ofs = 0; 2910 int ofs = 0;
2979 int extra = 0; 2911 int extra = 0;
2980 2912
2913 int col = selection.beg.col;
2914 int row = selection.beg.row;
2915
2916 int end_col;
2917
2981 for (; row <= end_row; row++, col = 0) 2918 for (; row <= selection.end.row; row++, col = 0)
2982 { 2919 {
2983 end_col = save[row].l;
2984
2985#if ENABLE_FRILLS 2920#if ENABLE_FRILLS
2986 if (selection.rect) 2921 if (selection.rect)
2987 { 2922 {
2988 col = selection.beg.col; 2923 col = selection.beg.col;
2989 end_col = ncol + 1; 2924 end_col = ncol + 1;
2990 } 2925 }
2926 else
2991#endif 2927#endif
2928 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2992 2929
2993 MAX_IT (col, 0); 2930 col = max (col, 0);
2994 2931
2995 if (end_col == -1)
2996 end_col = ncol;
2997
2998 if (row == end_row || selection.rect) 2932 if (row == selection.end.row || selection.rect)
2999 MIN_IT (end_col, selection.end.col); 2933 end_col = min (end_col, selection.end.col);
3000 2934
3001 t = &save[row].t[col]; 2935 t = ROW(row).t + col;
3002 for (; col < end_col; col++) 2936 for (; col < end_col; col++)
3003 { 2937 {
3004 if (*t == NOCHAR) 2938 if (*t == NOCHAR)
3005 t++; 2939 t++;
3006#if ENABLE_COMBINING 2940#if ENABLE_COMBINING
… …
3022#endif 2956#endif
3023 else 2957 else
3024 new_selection_text[ofs++] = *t++; 2958 new_selection_text[ofs++] = *t++;
3025 } 2959 }
3026 2960
3027 if (save[row].l != -1 && row != end_row) 2961 if (!ROW(row).is_longer () && row != selection.end.row)
3028 new_selection_text[ofs++] = C0_LF; 2962 new_selection_text[ofs++] = C0_LF;
3029 } 2963 }
3030 2964
3031 if (end_col != selection.end.col) 2965 if (end_col != selection.end.col)
3032 new_selection_text[ofs++] = C0_LF; 2966 new_selection_text[ofs++] = C0_LF;
… …
3091 */ 3025 */
3092void 3026void
3093rxvt_term::selection_start_colrow (int col, int row) 3027rxvt_term::selection_start_colrow (int col, int row)
3094{ 3028{
3095 want_refresh = 1; 3029 want_refresh = 1;
3030
3031 selection.mark.row = row - view_start;
3096 selection.mark.col = col; 3032 selection.mark.col = col;
3097 selection.mark.row = row - view_start;
3098 3033
3099 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3034 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);
3100 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3035 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);
3101 MAX_IT (selection.mark.col, 0);
3102 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3103 3036
3104 while (selection.mark.col > 0 3037 while (selection.mark.col > 0
3105 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3038 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3106 --selection.mark.col; 3039 --selection.mark.col;
3107 3040
3108 if (selection.op) 3041 if (selection.op)
3109 { /* clear the old selection */ 3042 { /* clear the old selection */
3110 selection.beg.row = selection.end.row = selection.mark.row; 3043 selection.beg.row = selection.end.row = selection.mark.row;
… …
3134 text_t *stp; 3067 text_t *stp;
3135 rend_t *srp; 3068 rend_t *srp;
3136 3069
3137 if (dirn == UP) 3070 if (dirn == UP)
3138 { 3071 {
3139 bound.row = saveLines - nscrolled - 1; 3072 bound.row = - nsaved - 1;
3140 bound.col = 0; 3073 bound.col = 0;
3141 dirnadd = -1; 3074 dirnadd = -1;
3142 } 3075 }
3143 else 3076 else
3144 { 3077 {
3145 bound.row = saveLines + nrow; 3078 bound.row = nrow;
3146 bound.col = ncol - 1; 3079 bound.col = ncol - 1;
3147 dirnadd = 1; 3080 dirnadd = 1;
3148 } 3081 }
3149 3082
3150 row = mark->row + saveLines; 3083 row = mark->row;
3151 col = mark->col; 3084 col = max (mark->col, 0);
3152 MAX_IT (col, 0); 3085
3153 /* find the edge of a word */ 3086 /* find the edge of a word */
3154 stp = &save[row].t[col]; 3087 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3155 w1 = DELIMIT_TEXT (*stp); 3088 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3156
3157 srp = &save[row].r[col];
3158 w2 = DELIMIT_REND (*srp);
3159 3089
3160 for (;;) 3090 for (;;)
3161 { 3091 {
3162 for (; col != bound.col; col += dirnadd) 3092 for (; col != bound.col; col += dirnadd)
3163 { 3093 {
… …
3173 break; 3103 break;
3174 } 3104 }
3175 3105
3176 if ((col == bound.col) && (row != bound.row)) 3106 if ((col == bound.col) && (row != bound.row))
3177 { 3107 {
3178 if (save[ (row - (dirn == UP ? 1 : 0))].l == -1) 3108 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3179 { 3109 {
3180 trow = row + dirnadd; 3110 trow = row + dirnadd;
3181 tcol = dirn == UP ? ncol - 1 : 0; 3111 tcol = dirn == UP ? ncol - 1 : 0;
3182 3112
3183 if (save[trow].t == NULL) 3113 if (!ROW(trow).t)
3184 break; 3114 break;
3185 3115
3186 stp = & (save[trow].t[tcol]); 3116 stp = ROW(trow).t + tcol;
3187 srp = & (save[trow].r[tcol]); 3117 srp = ROW(trow).r + tcol;
3188 3118
3189 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3119 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3190 break; 3120 break;
3191 3121
3192 row = trow; 3122 row = trow;
… …
3200Old_Word_Selection_You_Die: 3130Old_Word_Selection_You_Die:
3201 if (dirn == DN) 3131 if (dirn == DN)
3202 col++; /* put us on one past the end */ 3132 col++; /* put us on one past the end */
3203 3133
3204 /* Poke the values back in */ 3134 /* Poke the values back in */
3205 ret->row = row - saveLines; 3135 ret->row = row;
3206 ret->col = col; 3136 ret->col = col;
3207} 3137}
3208 3138
3209/* ------------------------------------------------------------------------- */ 3139/* ------------------------------------------------------------------------- */
3210/* 3140/*
… …
3215 * flag == 2 ==> button 3 motion 3145 * flag == 2 ==> button 3 motion
3216 */ 3146 */
3217void 3147void
3218rxvt_term::selection_extend (int x, int y, int flag) 3148rxvt_term::selection_extend (int x, int y, int flag)
3219{ 3149{
3220 int col, row; 3150 int col = min (max (Pixel2Col (x), 0), nrow - 1);
3221 3151 int row = min (max (Pixel2Row (y), 0), ncol);
3222 col = Pixel2Col (x);
3223 row = Pixel2Row (y);
3224 MAX_IT (row, 0);
3225 MIN_IT (row, (int)nrow - 1);
3226 MAX_IT (col, 0);
3227 MIN_IT (col, (int)ncol);
3228 3152
3229 /* 3153 /*
3230 * If we're selecting characters (single click) then we must check first 3154 * If we're selecting characters (single click) then we must check first
3231 * if we are at the same place as the original mark. If we are then 3155 * if we are at the same place as the original mark. If we are then
3232 * select nothing. Otherwise, if we're to the right of the mark, you have to 3156 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3257 * Extend the selection to the specified col/row 3181 * Extend the selection to the specified col/row
3258 */ 3182 */
3259void 3183void
3260rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3184rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3261{ 3185{
3262 int end_col;
3263 row_col_t pos; 3186 row_col_t pos;
3264 enum { 3187 enum {
3265 LEFT, RIGHT 3188 LEFT, RIGHT
3266 } closeto = RIGHT; 3189 } closeto = RIGHT;
3267 3190
… …
3298 selection.beg.col = selection.end.col = selection.mark.col; 3221 selection.beg.col = selection.end.col = selection.mark.col;
3299 selection.beg.row = selection.end.row = selection.mark.row; 3222 selection.beg.row = selection.end.row = selection.mark.row;
3300 } 3223 }
3301 3224
3302 pos.col = col; 3225 pos.col = col;
3303 pos.row = row; 3226 pos.row = row - view_start;
3304
3305 pos.row -= view_start; /* adjust for scroll */
3306 3227
3307 /* 3228 /*
3308 * This is mainly xterm style selection with a couple of differences, mainly 3229 * This is mainly xterm style selection with a couple of differences, mainly
3309 * in the way button3 drag extension works. 3230 * in the way button3 drag extension works.
3310 * We're either doing: button1 drag; button3 press; or button3 drag 3231 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3369 } 3290 }
3370 } 3291 }
3371 3292
3372 if (selection.clicks == 1) 3293 if (selection.clicks == 1)
3373 { 3294 {
3374 end_col = save[selection.beg.row + saveLines].l; 3295 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3375 3296 && !ROW(selection.beg.row).is_longer ()
3376 if (selection.beg.col > end_col
3377 && end_col != -1
3378#if ENABLE_FRILLS 3297#if ENABLE_FRILLS
3379 && !selection.rect 3298 && !selection.rect
3380#endif 3299#endif
3381 ) 3300 )
3382 selection.beg.col = ncol; 3301 selection.beg.col = ncol;
3383 3302
3384 end_col = save[selection.end.row + saveLines].l;
3385
3386 if ( 3303 if (
3387 selection.end.col > end_col 3304 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3388 && end_col != -1 3305 && !ROW(selection.end.row).is_longer ()
3389#if ENABLE_FRILLS 3306#if ENABLE_FRILLS
3390 && !selection.rect 3307 && !selection.rect
3391#endif 3308#endif
3392 ) 3309 )
3393 selection.end.col = ncol; 3310 selection.end.col = ncol;
… …
3403 else if (selection.clicks == 3) 3320 else if (selection.clicks == 3)
3404 { 3321 {
3405#if ENABLE_FRILLS 3322#if ENABLE_FRILLS
3406 if (options & Opt_tripleclickwords) 3323 if (options & Opt_tripleclickwords)
3407 { 3324 {
3408 int end_row;
3409
3410 selection_delimit_word (UP, &selection.beg, &selection.beg); 3325 selection_delimit_word (UP, &selection.beg, &selection.beg);
3411 end_row = save[selection.mark.row + saveLines].l;
3412 3326
3413 for (end_row = selection.mark.row; end_row < nrow; end_row++) 3327 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3414 { 3328 {
3415 end_col = save[end_row + saveLines].l; 3329 if (!ROW(end_row).is_longer ())
3416
3417 if (end_col != -1)
3418 { 3330 {
3419 selection.end.row = end_row; 3331 selection.end.row = end_row;
3420 selection.end.col = end_col; 3332 selection.end.col = ROW(end_row).l;
3421 selection_remove_trailing_spaces (); 3333 selection_remove_trailing_spaces ();
3422 break; 3334 break;
3423 } 3335 }
3424 } 3336 }
3425 } 3337 }
… …
3432 selection.beg.col = 0; 3344 selection.beg.col = 0;
3433 selection.end.col = ncol; 3345 selection.end.col = ncol;
3434 3346
3435 // select a complete logical line 3347 // select a complete logical line
3436 while (selection.beg.row > -saveLines 3348 while (selection.beg.row > -saveLines
3437 && save[selection.beg.row - 1 + saveLines].l == -1) 3349 && ROW(selection.beg.row - 1).is_longer ())
3438 selection.beg.row--; 3350 selection.beg.row--;
3439 3351
3440 while (selection.end.row < nrow 3352 while (selection.end.row < nrow
3441 && save[selection.end.row + saveLines].l == -1) 3353 && ROW(selection.end.row).is_longer ())
3442 selection.end.row++; 3354 selection.end.row++;
3443 } 3355 }
3444 } 3356 }
3445 3357
3446 if (button3 && buttonpress) 3358 if (button3 && buttonpress)
… …
3471 text_t *stp; 3383 text_t *stp;
3472 3384
3473 end_col = selection.end.col; 3385 end_col = selection.end.col;
3474 end_row = selection.end.row; 3386 end_row = selection.end.row;
3475 3387
3476 for ( ; end_row >= selection.beg.row; ) 3388 for (; end_row >= selection.beg.row; )
3477 { 3389 {
3478 stp = save[end_row + saveLines].t; 3390 stp = ROW(end_row).t;
3479 3391
3480 while (--end_col >= 0) 3392 while (--end_col >= 0)
3481 { 3393 {
3482 if (stp[end_col] != ' ' 3394 if (stp[end_col] != ' '
3483 && stp[end_col] != '\t' 3395 && stp[end_col] != '\t'
3484 && stp[end_col] != NOCHAR) 3396 && stp[end_col] != NOCHAR)
3485 break; 3397 break;
3486 } 3398 }
3487 3399
3488 if (end_col >= 0 3400 if (end_col >= 0
3489 || save[end_row - 1 + saveLines].l != -1) 3401 || !ROW(end_row - 1).is_longer ())
3490 { 3402 {
3491 selection.end.col = end_col + 1; 3403 selection.end.col = end_col + 1;
3492 selection.end.row = end_row; 3404 selection.end.row = end_row;
3493 break; 3405 break;
3494 } 3406 }
… …
3802rxvt_term::scr_swap_overlay () 3714rxvt_term::scr_swap_overlay ()
3803{ 3715{
3804 if (!ov_text) 3716 if (!ov_text)
3805 return; 3717 return;
3806 3718
3807 int row_offset = ov_y + saveLines - view_start;
3808
3809 // swap screen mem with overlay 3719 // swap screen mem with overlay
3810 for (int y = ov_h; y--; ) 3720 for (int y = ov_h; y--; )
3811 { 3721 {
3812 text_t *t1 = ov_text[y]; 3722 text_t *t1 = ov_text[y];
3813 rend_t *r1 = ov_rend[y]; 3723 rend_t *r1 = ov_rend[y];
3814 3724
3815 text_t *t2 = save[y + row_offset].t + ov_x; 3725 text_t *t2 = ROW(y - view_start).t + ov_x;
3816 rend_t *r2 = save[y + row_offset].r + ov_x; 3726 rend_t *r2 = ROW(y - view_start).r + ov_x;
3817 3727
3818 for (int x = ov_w; x--; ) 3728 for (int x = ov_w; x--; )
3819 { 3729 {
3820 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3730 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3821 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3731 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3823 } 3733 }
3824} 3734}
3825 3735
3826#endif 3736#endif
3827/* ------------------------------------------------------------------------- */ 3737/* ------------------------------------------------------------------------- */
3738

Diff Legend

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