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.226 by root, Thu Jan 12 09:55:44 2006 UTC vs.
Revision 1.228 by root, Sun Jan 15 06:02:41 2006 UTC

… …
179 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
180 { 180 {
181 //TODO//FIXME 181 //TODO//FIXME
182 saveLines++; 182 saveLines++;
183 prev_nrow--; 183 prev_nrow--;
184 nsaved++; 184 top_row--;
185 } 185 }
186 186
187 want_refresh = 1; 187 want_refresh = 1;
188 188
189 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
195 if (!row_buf) 195 if (!row_buf)
196 { 196 {
197 /* 197 /*
198 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
199 */ 199 */
200 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
201 term_start = 0; 201 term_start = 0;
202 202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 205
… …
276 276
277 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 279
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
283 283
284 if (nsaved) 284 if (top_row)
285 { 285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 288
289 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 363 }
364 while (p != pend && q > 0); 364 while (p != pend && q > 0);
365 365
366 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
367 nsaved = term_start - q; 367 top_row = q - term_start;
368 368
369 // make sure all terminal lines exist 369 // make sure all terminal lines exist
370 while (nsaved < 0) 370 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 372 }
373 else 373 else
374 { 374 {
375 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
376 376
… …
390 390
391 term_start = 0; 391 term_start = 0;
392 } 392 }
393 393
394#ifdef DEBUG_STRICT //TODO: remove 394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++) 395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t); 396 assert (ROW (i).t);
397#endif 397#endif
398 398
399 free (old_buf); 399 free (old_buf);
400 delete old_ta; 400 delete old_ta;
… …
613 want_refresh = 1; 613 want_refresh = 1;
614 num_scr += count; 614 num_scr += count;
615 615
616 if (count > 0 616 if (count > 0
617 && row1 == 0 617 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 { 619 {
621 nsaved = min (nsaved + count, saveLines); 620 top_row = max (top_row - count, -saveLines);
622 621
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
624 623
624 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
626 626
627 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
633
634 // erase newly scorlled-in lines
635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
627 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
628 { 661 {
629 selection.beg.row -= count; 662 selection.beg.row -= count;
630 selection.end.row -= count; 663 selection.end.row -= count;
631 selection.mark.row -= count; 664 selection.mark.row -= count;
632 665
633 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 667 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
636 { 669 {
637 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
639 } 672 }
640 } 673 }
641 674
642 for (int i = count; i--; ) 675 // finally move the view window, if desired
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
654 if (OPTION (Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
655 && view_start != 0 677 && view_start != 0
656 && view_start != saveLines) 678 && view_start != -saveLines)
657 scr_page (UP, count); 679 scr_page (UP, count);
658 } 680 }
659 else 681 else
660 { 682 {
661 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
… …
738 } 760 }
739 761
740#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 763 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= top_row);
744#endif 766#endif
745 int row = screen.cur.row; 767 int row = screen.cur.row;
746 768
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 770
… …
1323rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1324{ 1346{
1325 want_refresh = 1; 1347 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1327 1349
1328 nsaved = 0; 1350 top_row = 0;
1329} 1351}
1330#endif 1352#endif
1331 1353
1332/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1333/* 1355/*
… …
1786/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1787/* 1809/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1810 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1811 * the top of the screen
1790 */ 1812 */
1791int 1813void
1792rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1793{ 1815{
1794 long p = 0; 1816 int p = (top_row - nrow) * (len - y) / len + (nrow - 1);
1795 unsigned int oldviewstart;
1796 1817
1797 oldviewstart = view_start; 1818 scr_changeview (p);
1798
1799 if (y < len)
1800 {
1801 p = (nrow + nsaved) * (len - y) / len;
1802 p -= (long) (nrow - 1);
1803 p = max (p, 0);
1804 }
1805
1806 view_start = (unsigned int)min (p, nsaved);
1807
1808 return scr_changeview (oldviewstart);
1809} 1819}
1810 1820
1811/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1812/* 1822/*
1813 * Page the screen up/down nlines 1823 * Page the screen up/down nlines
1814 * direction should be UP or DN 1824 * direction should be UP or DN
1815 */ 1825 */
1816int 1826bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1827rxvt_term::scr_page (enum page_dirn direction, int nlines)
1818{ 1828{
1819 int n; 1829 int new_view_start =
1820 unsigned int oldviewstart; 1830 direction == UP ? view_start - nlines
1831 : view_start + nlines;
1821 1832
1833 return scr_changeview (new_view_start);
1834}
1835
1836bool
1837rxvt_term::scr_changeview (int new_view_start)
1838{
1839 clamp_it (new_view_start, top_row, 0);
1840
1841 if (new_view_start != view_start)
1842 {
1843 num_scr += new_view_start - view_start;
1822 oldviewstart = view_start; 1844 view_start = new_view_start;
1845 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1846 want_refresh = 1;
1823 1847
1824 if (direction == UP) 1848 return true;
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 } 1849 }
1829 else 1850 else
1830 { 1851 return false;
1831 n = view_start - nlines;
1832 view_start = max (n, 0);
1833 }
1834
1835 return scr_changeview (oldviewstart);
1836}
1837
1838int
1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1840{
1841 if (view_start != oldviewstart)
1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1845 want_refresh = 1;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1852}
1851 1853
1852/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1853void 1855void
1854rxvt_term::scr_bell () 1856rxvt_term::scr_bell ()
… …
1887 if ((fd = popen_printer ()) == NULL) 1889 if ((fd = popen_printer ()) == NULL)
1888 return; 1890 return;
1889 1891
1890 if (fullhist) 1892 if (fullhist)
1891 { 1893 {
1892 nrows = nrow + nsaved; 1894 nrows = nrow - top_row;
1893 row_start = -nsaved; 1895 row_start = top_row;
1894 } 1896 }
1895 else 1897 else
1896 { 1898 {
1897 nrows = nrow; 1899 nrows = nrow;
1898 row_start = -view_start; 1900 row_start = view_start;
1899 } 1901 }
1900 1902
1901 wctomb (0, 0); 1903 wctomb (0, 0);
1902 1904
1903 for (int r1 = 0; r1 < nrows; r1++) 1905 for (int r1 = 0; r1 < nrows; r1++)
… …
2031 2033
2032 /* make sure no outline cursor is left around */ 2034 /* make sure no outline cursor is left around */
2033 setoldcursor = 0; 2035 setoldcursor = 0;
2034 if (ocrow != -1) 2036 if (ocrow != -1)
2035 { 2037 {
2036 if (screen.cur.row + view_start != ocrow 2038 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2039 || screen.cur.col != oldcursor.col)
2038 { 2040 {
2039 if (ocrow < nrow 2041 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2042 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2043 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2049 else if (!focus) 2051 else if (!focus)
2050 setoldcursor = 1; 2052 setoldcursor = 1;
2051 2053
2052 if (setoldcursor) 2054 if (setoldcursor)
2053 { 2055 {
2054 if (screen.cur.row + view_start >= nrow) 2056 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2057 oldcursor.row = -1;
2056 else 2058 else
2057 { 2059 {
2058 oldcursor.row = screen.cur.row + view_start; 2060 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2061 oldcursor.col = screen.cur.col;
2060 } 2062 }
2061 } 2063 }
2062 } 2064 }
2063 2065
… …
2085 row = i > 0 ? 0 : j - 1; 2087 row = i > 0 ? 0 : j - 1;
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2089 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2091 {
2090 line_t s = ROW(row - view_start); 2092 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2093 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2094 line_t d2 = drawn_buf[row + i];
2093 2095
2094 for (nits = 0, col = ncol; col--; ) 2096 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2097 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2133 /* 2135 /*
2134 * E: main pass across every character 2136 * E: main pass across every character
2135 */ 2137 */
2136 for (row = 0; row < nrow; row++) 2138 for (row = 0; row < nrow; row++)
2137 { 2139 {
2138 text_t *stp = ROW(row - view_start).t; 2140 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2141 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2142 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2143 rend_t *drp = drawn_buf[row].r;
2142 2144
2143 /* 2145 /*
2144 * E2: OK, now the real pass 2146 * E2: OK, now the real pass
… …
2457} 2459}
2458 2460
2459void 2461void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{ 2463{
2462 int view_end = -view_start + nrow; 2464 int view_end = view_start + nrow;
2463 int row, col; 2465 int row, col;
2464 2466
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 { 2468 {
2467 text_t *stp = ROW(row).t; 2469 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r; 2470 rend_t *srp = ROW(row).r;
2469 2471
2470 for (col = beg_col; col < end_col; col++) 2472 for (col = beg_col; col < end_col; col++)
… …
2479} 2481}
2480 2482
2481void 2483void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{ 2485{
2484 int view_end = -view_start + nrow; 2486 int view_end = view_start + nrow;
2485 int row, col; 2487 int row, col;
2486 2488
2487 if (beg_row >= -view_start) 2489 if (beg_row >= view_start)
2488 { 2490 {
2489 col = beg_col; 2491 col = beg_col;
2490 row = beg_row; 2492 row = beg_row;
2491 } 2493 }
2492 else 2494 else
2493 { 2495 {
2494 col = 0; 2496 col = 0;
2495 row = -view_start; 2497 row = view_start;
2496 } 2498 }
2497 2499
2498 for (; row < min (end_row, view_end); row++, col = 0) 2500 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2501 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle; 2502 srp[col] ^= rstyle;
… …
2508void 2510void
2509rxvt_term::scr_reverse_selection () 2511rxvt_term::scr_reverse_selection ()
2510{ 2512{
2511 if (selection.op 2513 if (selection.op
2512 && current_screen == selection.screen 2514 && current_screen == selection.screen
2513 && selection.end.row >= -view_start) 2515 && selection.end.row >= view_start)
2514 { 2516 {
2515#if ENABLE_FRILLS 2517#if ENABLE_FRILLS
2516 if (selection.rect) 2518 if (selection.rect)
2517 scr_xor_rect (selection.beg.row, selection.beg.col, 2519 scr_xor_rect (selection.beg.row, selection.beg.col,
2518 selection.end.row, selection.end.col, 2520 selection.end.row, selection.end.col,
… …
2567 2569
2568 if (!selection.op) 2570 if (!selection.op)
2569 return; 2571 return;
2570 2572
2571 pos.row = pos.col = 0; 2573 pos.row = pos.col = 0;
2572 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2574 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2573 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2575 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2574 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2575 || (check_more == 1 2577 || (check_more == 1
2576 && current_screen == selection.screen 2578 && current_screen == selection.screen
2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2579 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2580 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2579 || (check_more == 2 2581 || (check_more == 2
… …
3061 3063
3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3063 3065
3064 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
3065 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
3066 selection.mark.row + view_start, 3068 selection.mark.row - view_start,
3067 0, /* button 3 */ 3069 0, /* button 3 */
3068 1, /* button press */ 3070 1, /* button press */
3069 0); /* click change */ 3071 0); /* click change */
3070} 3072}
3071 3073
… …
3076void 3078void
3077rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
3078{ 3080{
3079 want_refresh = 1; 3081 want_refresh = 1;
3080 3082
3081 selection.mark.row = row - view_start; 3083 selection.mark.row = row + view_start;
3082 selection.mark.col = col; 3084 selection.mark.col = col;
3083 3085
3084 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3086 3088
3087 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3089 --selection.mark.col; 3091 --selection.mark.col;
… …
3117 text_t *stp; 3119 text_t *stp;
3118 rend_t *srp; 3120 rend_t *srp;
3119 3121
3120 if (dirn == UP) 3122 if (dirn == UP)
3121 { 3123 {
3122 bound.row = - nsaved - 1; 3124 bound.row = top_row - 1;
3123 bound.col = 0; 3125 bound.col = 0;
3124 dirnadd = -1; 3126 dirnadd = -1;
3125 } 3127 }
3126 else 3128 else
3127 { 3129 {
… …
3205 * select nothing. Otherwise, if we're to the right of the mark, you have to 3207 * select nothing. Otherwise, if we're to the right of the mark, you have to
3206 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
3207 */ 3209 */
3208 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3209 && (col == selection.mark.col 3211 && (col == selection.mark.col
3210 && (row == selection.mark.row + view_start))) 3212 && (row == selection.mark.row - view_start)))
3211 { 3213 {
3212 /* select nothing */ 3214 /* select nothing */
3213 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3214 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3215 selection.clicks = 4; 3217 selection.clicks = 4;
… …
3270 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3271 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3272 } 3274 }
3273 3275
3274 pos.col = col; 3276 pos.col = col;
3275 pos.row = row - view_start; 3277 pos.row = view_start + row;
3276 3278
3277 /* 3279 /*
3278 * This is mainly xterm style selection with a couple of differences, mainly 3280 * This is mainly xterm style selection with a couple of differences, mainly
3279 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3280 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3765 for (int y = ov_h; y--; ) 3767 for (int y = ov_h; y--; )
3766 { 3768 {
3767 text_t *t1 = ov_text[y]; 3769 text_t *t1 = ov_text[y];
3768 rend_t *r1 = ov_rend[y]; 3770 rend_t *r1 = ov_rend[y];
3769 3771
3770 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3771 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3772 3774
3773 for (int x = ov_w; x--; ) 3775 for (int x = ov_w; x--; )
3774 { 3776 {
3775 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3776 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3778 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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