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.227 by root, Sun Jan 15 05:14:12 2006 UTC vs.
Revision 1.233 by root, Mon Jan 16 06:37:52 2006 UTC

… …
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* 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 */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150 150
151 l.l = 0; 151 l.l = 0;
152 l.f = 0; 152 l.f = 0;
… …
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;
… …
615 615
616 if (count > 0 616 if (count > 0
617 && row1 == 0 617 && row1 == 0
618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
619 { 619 {
620 nsaved = min (nsaved + count, saveLines); 620 top_row = max (top_row - count, -saveLines);
621 621
622 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));
623 623
624 // scroll everything up 'count' lines 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 { 627 {
… …
661 { 661 {
662 selection.beg.row -= count; 662 selection.beg.row -= count;
663 selection.end.row -= count; 663 selection.end.row -= count;
664 selection.mark.row -= count; 664 selection.mark.row -= count;
665 665
666 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
667 || selection.end.row < -nsaved 667 || selection.end.row < top_row
668 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
669 { 669 {
670 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
672 } 672 }
673 } 673 }
674 674
675 // finally move the view window, if desired 675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0 677 && view_start != 0
678 && view_start != saveLines) 678 && view_start != -saveLines)
679 scr_page (UP, count); 679 scr_page (UP, count);
680 } 680 }
681 else 681 else
682 { 682 {
683 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
… …
760 } 760 }
761 761
762#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
763 assert (screen.cur.col < ncol); 763 assert (screen.cur.col < ncol);
764 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
765 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= top_row);
766#endif 766#endif
767 int row = screen.cur.row; 767 int row = screen.cur.row;
768 768
769 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
770 770
… …
1345rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1346{ 1346{
1347 want_refresh = 1; 1347 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1349 1349
1350 nsaved = 0; 1350 top_row = 0;
1351} 1351}
1352#endif 1352#endif
1353 1353
1354/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1355/* 1355/*
… …
1808/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1809/* 1809/*
1810 * 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
1811 * the top of the screen 1811 * the top of the screen
1812 */ 1812 */
1813int 1813void
1814rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1815{ 1815{
1816 long p = 0; 1816 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1817 unsigned int oldviewstart;
1818
1819 oldviewstart = view_start;
1820
1821 if (y < len)
1822 {
1823 p = (nrow + nsaved) * (len - y) / len;
1824 p -= (long) (nrow - 1);
1825 p = max (p, 0);
1826 }
1827
1828 view_start = (unsigned int)min (p, nsaved);
1829
1830 return scr_changeview (oldviewstart);
1831} 1817}
1832 1818
1833/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1834/* 1820/*
1835 * Page the screen up/down nlines 1821 * Page the screen up/down nlines
1836 * direction should be UP or DN 1822 * direction should be UP or DN
1837 */ 1823 */
1838int 1824bool
1839rxvt_term::scr_page (enum page_dirn direction, int nlines) 1825rxvt_term::scr_page (enum page_dirn direction, int nlines)
1840{ 1826{
1841 int n; 1827 int new_view_start =
1842 unsigned int oldviewstart;
1843
1844 oldviewstart = view_start;
1845
1846 if (direction == UP)
1847 {
1848 n = view_start + nlines;
1849 view_start = min (n, nsaved);
1850 }
1851 else
1852 {
1853 n = view_start - nlines; 1828 direction == UP ? view_start - nlines
1854 view_start = max (n, 0); 1829 : view_start + nlines;
1855 }
1856 1830
1857 return scr_changeview (oldviewstart); 1831 return scr_changeview (new_view_start);
1858} 1832}
1859 1833
1860int 1834bool
1861rxvt_term::scr_changeview (unsigned int oldviewstart) 1835rxvt_term::scr_changeview (int new_view_start)
1862{ 1836{
1837 clamp_it (new_view_start, top_row, 0);
1838
1863 if (view_start != oldviewstart) 1839 if (new_view_start == view_start)
1864 { 1840 return false;
1841
1842 num_scr += new_view_start - view_start;
1843 view_start = new_view_start;
1865 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1866
1867 want_refresh = 1; 1845 want_refresh = 1;
1868 num_scr -= (view_start - oldviewstart);
1869 }
1870 1846
1871 return (int)view_start - (int)oldviewstart; 1847 return true;
1872} 1848}
1873 1849
1874/* ------------------------------------------------------------------------- */ 1850/* ------------------------------------------------------------------------- */
1875void 1851void
1876rxvt_term::scr_bell () 1852rxvt_term::scr_bell ()
… …
1909 if ((fd = popen_printer ()) == NULL) 1885 if ((fd = popen_printer ()) == NULL)
1910 return; 1886 return;
1911 1887
1912 if (fullhist) 1888 if (fullhist)
1913 { 1889 {
1914 nrows = nrow + nsaved; 1890 nrows = nrow - top_row;
1915 row_start = -nsaved; 1891 row_start = top_row;
1916 } 1892 }
1917 else 1893 else
1918 { 1894 {
1919 nrows = nrow; 1895 nrows = nrow;
1920 row_start = -view_start; 1896 row_start = view_start;
1921 } 1897 }
1922 1898
1923 wctomb (0, 0); 1899 wctomb (0, 0);
1924 1900
1925 for (int r1 = 0; r1 < nrows; r1++) 1901 for (int r1 = 0; r1 < nrows; r1++)
… …
2053 2029
2054 /* make sure no outline cursor is left around */ 2030 /* make sure no outline cursor is left around */
2055 setoldcursor = 0; 2031 setoldcursor = 0;
2056 if (ocrow != -1) 2032 if (ocrow != -1)
2057 { 2033 {
2058 if (screen.cur.row + view_start != ocrow 2034 if (screen.cur.row - view_start != ocrow
2059 || screen.cur.col != oldcursor.col) 2035 || screen.cur.col != oldcursor.col)
2060 { 2036 {
2061 if (ocrow < nrow 2037 if (ocrow < nrow
2062 && oldcursor.col < ncol) 2038 && oldcursor.col < ncol)
2063 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2039 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2071 else if (!focus) 2047 else if (!focus)
2072 setoldcursor = 1; 2048 setoldcursor = 1;
2073 2049
2074 if (setoldcursor) 2050 if (setoldcursor)
2075 { 2051 {
2076 if (screen.cur.row + view_start >= nrow) 2052 if (screen.cur.row - view_start >= nrow)
2077 oldcursor.row = -1; 2053 oldcursor.row = -1;
2078 else 2054 else
2079 { 2055 {
2080 oldcursor.row = screen.cur.row + view_start; 2056 oldcursor.row = screen.cur.row - view_start;
2081 oldcursor.col = screen.cur.col; 2057 oldcursor.col = screen.cur.col;
2082 } 2058 }
2083 } 2059 }
2084 } 2060 }
2085 2061
… …
2107 row = i > 0 ? 0 : j - 1; 2083 row = i > 0 ? 0 : j - 1;
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2084 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2085 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2086 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2087 {
2112 line_t s = ROW(row - view_start); 2088 line_t s = ROW(view_start + row);
2113 line_t d = drawn_buf[row]; 2089 line_t d = drawn_buf[row];
2114 line_t d2 = drawn_buf[row + i]; 2090 line_t d2 = drawn_buf[row + i];
2115 2091
2116 for (nits = 0, col = ncol; col--; ) 2092 for (nits = 0, col = ncol; col--; )
2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2093 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2155 /* 2131 /*
2156 * E: main pass across every character 2132 * E: main pass across every character
2157 */ 2133 */
2158 for (row = 0; row < nrow; row++) 2134 for (row = 0; row < nrow; row++)
2159 { 2135 {
2160 text_t *stp = ROW(row - view_start).t; 2136 text_t *stp = ROW(view_start + row).t;
2161 rend_t *srp = ROW(row - view_start).r; 2137 rend_t *srp = ROW(view_start + row).r;
2162 text_t *dtp = drawn_buf[row].t; 2138 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn_buf[row].r; 2139 rend_t *drp = drawn_buf[row].r;
2164 2140
2165 /* 2141 /*
2166 * E2: OK, now the real pass 2142 * E2: OK, now the real pass
… …
2479} 2455}
2480 2456
2481void 2457void
2482rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2458rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2483{ 2459{
2484 int view_end = -view_start + nrow; 2460 int view_end = view_start + nrow;
2485 int row, col; 2461 int row, col;
2486 2462
2487 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2463 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2488 { 2464 {
2489 text_t *stp = ROW(row).t; 2465 text_t *stp = ROW(row).t;
2490 rend_t *srp = ROW(row).r; 2466 rend_t *srp = ROW(row).r;
2491 2467
2492 for (col = beg_col; col < end_col; col++) 2468 for (col = beg_col; col < end_col; col++)
… …
2501} 2477}
2502 2478
2503void 2479void
2504rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2480rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2505{ 2481{
2506 int view_end = -view_start + nrow; 2482 int view_end = view_start + nrow;
2507 int row, col; 2483 int row, col;
2508 2484
2509 if (beg_row >= -view_start) 2485 if (beg_row >= view_start)
2510 { 2486 {
2511 col = beg_col; 2487 col = beg_col;
2512 row = beg_row; 2488 row = beg_row;
2513 } 2489 }
2514 else 2490 else
2515 { 2491 {
2516 col = 0; 2492 col = 0;
2517 row = -view_start; 2493 row = view_start;
2518 } 2494 }
2519 2495
2520 for (; row < min (end_row, view_end); row++, col = 0) 2496 for (; row < min (end_row, view_end); row++, col = 0)
2521 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2522 srp[col] ^= rstyle; 2498 srp[col] ^= rstyle;
… …
2530void 2506void
2531rxvt_term::scr_reverse_selection () 2507rxvt_term::scr_reverse_selection ()
2532{ 2508{
2533 if (selection.op 2509 if (selection.op
2534 && current_screen == selection.screen 2510 && current_screen == selection.screen
2535 && selection.end.row >= -view_start) 2511 && selection.end.row >= view_start)
2536 { 2512 {
2537#if ENABLE_FRILLS 2513#if ENABLE_FRILLS
2538 if (selection.rect) 2514 if (selection.rect)
2539 scr_xor_rect (selection.beg.row, selection.beg.col, 2515 scr_xor_rect (selection.beg.row, selection.beg.col,
2540 selection.end.row, selection.end.col, 2516 selection.end.row, selection.end.col,
… …
2589 2565
2590 if (!selection.op) 2566 if (!selection.op)
2591 return; 2567 return;
2592 2568
2593 pos.row = pos.col = 0; 2569 pos.row = pos.col = 0;
2594 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2570 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2595 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2571 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2596 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2572 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2597 || (check_more == 1 2573 || (check_more == 1
2598 && current_screen == selection.screen 2574 && current_screen == selection.screen
2599 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2575 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2600 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2576 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2601 || (check_more == 2 2577 || (check_more == 2
… …
3083 3059
3084 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3060 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3085 3061
3086 if (clicks == 2 || clicks == 3) 3062 if (clicks == 2 || clicks == 3)
3087 selection_extend_colrow (selection.mark.col, 3063 selection_extend_colrow (selection.mark.col,
3088 selection.mark.row + view_start, 3064 selection.mark.row - view_start,
3089 0, /* button 3 */ 3065 0, /* button 3 */
3090 1, /* button press */ 3066 1, /* button press */
3091 0); /* click change */ 3067 0); /* click change */
3092} 3068}
3093 3069
… …
3098void 3074void
3099rxvt_term::selection_start_colrow (int col, int row) 3075rxvt_term::selection_start_colrow (int col, int row)
3100{ 3076{
3101 want_refresh = 1; 3077 want_refresh = 1;
3102 3078
3103 selection.mark.row = row - view_start; 3079 selection.mark.row = row + view_start;
3104 selection.mark.col = col; 3080 selection.mark.col = col;
3105 3081
3106 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3082 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3107 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3083 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3108 3084
3109 while (selection.mark.col > 0 3085 while (selection.mark.col > 0
3110 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3086 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3111 --selection.mark.col; 3087 --selection.mark.col;
… …
3139 text_t *stp; 3115 text_t *stp;
3140 rend_t *srp; 3116 rend_t *srp;
3141 3117
3142 if (dirn == UP) 3118 if (dirn == UP)
3143 { 3119 {
3144 bound.row = - nsaved - 1; 3120 bound.row = top_row - 1;
3145 bound.col = 0; 3121 bound.col = 0;
3146 dirnadd = -1; 3122 dirnadd = -1;
3147 } 3123 }
3148 else 3124 else
3149 { 3125 {
… …
3227 * select nothing. Otherwise, if we're to the right of the mark, you have to 3203 * select nothing. Otherwise, if we're to the right of the mark, you have to
3228 * be _past_ a character for it to be selected. 3204 * be _past_ a character for it to be selected.
3229 */ 3205 */
3230 if (((selection.clicks % 3) == 1) && !flag 3206 if (((selection.clicks % 3) == 1) && !flag
3231 && (col == selection.mark.col 3207 && (col == selection.mark.col
3232 && (row == selection.mark.row + view_start))) 3208 && (row == selection.mark.row - view_start)))
3233 { 3209 {
3234 /* select nothing */ 3210 /* select nothing */
3235 selection.beg.row = selection.end.row = 0; 3211 selection.beg.row = selection.end.row = 0;
3236 selection.beg.col = selection.end.col = 0; 3212 selection.beg.col = selection.end.col = 0;
3237 selection.clicks = 4; 3213 selection.clicks = 4;
… …
3292 selection.beg.col = selection.end.col = selection.mark.col; 3268 selection.beg.col = selection.end.col = selection.mark.col;
3293 selection.beg.row = selection.end.row = selection.mark.row; 3269 selection.beg.row = selection.end.row = selection.mark.row;
3294 } 3270 }
3295 3271
3296 pos.col = col; 3272 pos.col = col;
3297 pos.row = row - view_start; 3273 pos.row = view_start + row;
3298 3274
3299 /* 3275 /*
3300 * This is mainly xterm style selection with a couple of differences, mainly 3276 * This is mainly xterm style selection with a couple of differences, mainly
3301 * in the way button3 drag extension works. 3277 * in the way button3 drag extension works.
3302 * We're either doing: button1 drag; button3 press; or button3 drag 3278 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3787 for (int y = ov_h; y--; ) 3763 for (int y = ov_h; y--; )
3788 { 3764 {
3789 text_t *t1 = ov_text[y]; 3765 text_t *t1 = ov_text[y];
3790 rend_t *r1 = ov_rend[y]; 3766 rend_t *r1 = ov_rend[y];
3791 3767
3792 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3768 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3793 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3769 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3794 3770
3795 for (int x = ov_w; x--; ) 3771 for (int x = ov_w; x--; )
3796 { 3772 {
3797 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3773 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3798 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3774 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