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.181 by root, Wed Dec 21 10:34:35 2005 UTC

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

Diff Legend

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