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.313 by root, Tue Nov 4 14:25:10 2008 UTC vs.
Revision 1.328 by root, Sun Mar 29 13:36:03 2009 UTC

… …
143 col--; 143 col--;
144 144
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 147
148 // found begin, nuke 148 // found start, nuke
149 do { 149 do {
150 l.t[col] = ' '; 150 l.t[col] = ' ';
151 l.r[col] = rend; 151 l.r[col] = rend;
152 col++; 152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
… …
158 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
159 159
160void 160void
161rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
162{ 162{
163#if ENABLE_OVERLAY
164 scr_overlay_off ();
165#endif
166
167 rvideo_mode = false;
168 view_start = 0; 163 view_start = 0;
169 num_scr = 0; 164 num_scr = 0;
170 165
171 if (ncol == 0) 166 if (ncol == 0)
172 ncol = 80; 167 ncol = 80;
… …
174 if (nrow == 0) 169 if (nrow == 0)
175 nrow = 24; 170 nrow = 24;
176 171
177 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 173 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 174
183 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
185 { 177 {
186 //TODO//FIXME 178 //TODO//FIXME
… …
286 278
287 if (top_row) 279 if (top_row)
288 { 280 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change
291 284
292 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 287
295 do 288 do
… …
399 delete old_ta; 392 delete old_ta;
400 delete old_ra; 393 delete old_ra;
401 394
402 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
404 398
405 free (tabs); 399 free (tabs);
406 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
407 404
408 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
409 406
410 prev_nrow = nrow; 407 prev_nrow = nrow;
411 prev_ncol = ncol; 408 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 409
421 tt_winch (); 410 tt_winch ();
422 411
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 413}
… …
436 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
437 426
438 free (row_buf); 427 free (row_buf);
439 free (swap_buf); 428 free (swap_buf);
440 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
441 free (tabs); 432 free (tabs);
442 433 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 434 }
445} 435}
446 436
447/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
448/* 438/*
449 * Hard reset 439 * Hard/Soft reset
450 */ 440 */
451void 441void
452rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
453{ 443{
454 scr_release (); 444 scr_release ();
455 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
456 scr_reset (); 448 scr_reset ();
457 449
458 scr_clear (true); 450 scr_clear (true);
459 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
460} 468}
461 469
462/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907 915
908 // if the character doesn't fit into the remaining columns... 916 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 { 918 {
911 // ...output spaces 919 // ... artificially enlargen the previous one
912 c = ' '; 920 c = NOCHAR;
913 // and try the same character next loop iteration 921 // and try the same character next loop iteration
914 --str; 922 --str;
915 } 923 }
916 924
917 line->touch (); 925 line->touch ();
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1334 return; 1342 return;
1335 1343
1336 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1337 1345
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1339 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1352 {
1343 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1344 1354
1345 if (mapped) 1355 if (mapped && !view_start)
1346 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1349 } 1359 }
1350 else 1360 else
1351 { 1361 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1363
1364 if (mapped && !view_start)
1365 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1369 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1370 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1371 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1362 } 1375 }
1363 1376
1364 for (; num--; row++) 1377 for (; num--; row++)
1365 { 1378 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1368 } 1383 }
1369} 1384}
1370 1385
1371#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1372void 1387void
… …
1446 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1447 */ 1462 */
1448void 1463void
1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1450{ 1465{
1451 int col, row;
1452 rend_t tr;
1453
1454 want_refresh = 1; 1466 want_refresh = 1;
1455 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1456 1468
1457 if (count <= 0) 1469 if (count <= 0)
1458 return; 1470 return;
… …
1460 scr_do_wrap (); 1472 scr_do_wrap ();
1461 1473
1462 selection_check (1); 1474 selection_check (1);
1463 min_it (count, ncol - screen.cur.col); 1475 min_it (count, ncol - screen.cur.col);
1464 1476
1465 row = screen.cur.row; 1477 int row = screen.cur.row;
1466 1478
1467 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1468 1480
1469 line->touch (); 1481 line->touch ();
1470 line->is_longer (0); 1482 line->is_longer (0);
1471 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1472 switch (insdel) 1488 switch (insdel)
1473 { 1489 {
1474 case INSERT: 1490 case INSERT:
1475 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1491 line->l = min (line->l + count, ncol);
1492
1493 if (line->t[screen.cur.col] == NOCHAR)
1494 scr_kill_char (*line, screen.cur.col);
1495
1496 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1476 { 1497 {
1477 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1478 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
1479 } 1500 }
1480
1481 line->l = min (line->l + count, ncol);
1482 1501
1483 if (selection.op && current_screen == selection.screen 1502 if (selection.op && current_screen == selection.screen
1484 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1503 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1485 { 1504 {
1486 if (selection.end.row != screen.cur.row 1505 if (selection.end.row != screen.cur.row
… …
1501 case ERASE: 1520 case ERASE:
1502 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1503 selection_check (1); 1522 selection_check (1);
1504 screen.cur.col -= count; 1523 screen.cur.col -= count;
1505 1524
1525 // nuke wide char after the end
1526 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1527 scr_kill_char (*line, screen.cur.col + count);
1528
1506 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1507 break; 1530 break;
1508 1531
1509 case DELETE: 1532 case DELETE:
1510 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 line->l = max (line->l - count, 0);
1511 1534
1535 // nuke wide char spanning the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1538
1512 for (col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 { 1540 {
1514 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1516 } 1543 }
1517 1544
1518 line->l = max (line->l - count, 0);
1519 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1520 1546
1521 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1522 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1523 { 1549 {
1524 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1982 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1983 */ 2009 */
1984void 2010void
1985rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1986{ 2012{
1987 unsigned char have_bg,
1988 showcursor; /* show the cursor */
1989 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1990 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1991 int i; /* tmp */ 2015 int i; /* tmp */
1992#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1993 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2004 /* 2028 /*
2005 * A: set up vars 2029 * A: set up vars
2006 */ 2030 */
2007 refresh_count = 0; 2031 refresh_count = 0;
2008 2032
2033 unsigned int old_screen_flags = screen.flags;
2009 have_bg = 0; 2034 char have_bg = 0;
2010#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2011 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2012#endif 2037#endif
2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2014 2039
2015 /* 2040 /*
2016 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2017 */ 2042 */
2018 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2019 2051
2020 /* 2052 /*
2021 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2022 */ 2054 */
2023 { 2055 {
2024 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2025 2057
2026 showcursor = (screen.flags & Screen_VisibleCursor);
2027#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2028 if (hidden_cursor) 2059 if (hidden_cursor)
2029 showcursor = 0; 2060 showcursor = 0;
2030#endif 2061#endif
2031 2062
… …
2104 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2105 } 2136 }
2106 } 2137 }
2107 } 2138 }
2108 2139
2109 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2110#if ENABLE_OVERLAY
2111 scr_swap_overlay ();
2112#endif
2113
2114#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2115 /* 2141 /*
2116 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2117 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2118 */ 2144 */
… …
2224 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2225 { 2251 {
2226 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2227 { 2253 {
2228 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2229 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2230 count++; 2257 count++;
2231 i++; 2258 i++;
2232 2259
2233 continue; 2260 continue;
2234 } 2261 }
… …
2390 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2391 } 2418 }
2392 } /* for (col....) */ 2419 } /* for (col....) */
2393 } /* for (row....) */ 2420 } /* for (row....) */
2394 2421
2395#if ENABLE_OVERLAY
2396 scr_swap_overlay ();
2397#endif
2398 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2399
2400 /* 2422 /*
2401 * G: cleanup cursor and display outline cursor if necessary 2423 * G: cleanup cursor and display outline cursor if necessary
2402 */ 2424 */
2403 if (showcursor) 2425 if (showcursor)
2404 { 2426 {
… …
2442 } 2464 }
2443 2465
2444 /* 2466 /*
2445 * H: cleanup selection 2467 * H: cleanup selection
2446 */ 2468 */
2469#if ENABLE_OVERLAY
2470 scr_swap_overlay ();
2471#endif
2472 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2473
2447 scr_reverse_selection (); 2474 scr_reverse_selection ();
2448 2475
2476 screen.flags = old_screen_flags;
2449 num_scr = 0; 2477 num_scr = 0;
2450 num_scr_allow = 1; 2478 num_scr_allow = 1;
2451} 2479}
2452 2480
2453void 2481void
… …
3712 h += 2; min_it (h, nrow); 3740 h += 2; min_it (h, nrow);
3713 3741
3714 x -= 1; clamp_it (x, 0, ncol - w); 3742 x -= 1; clamp_it (x, 0, ncol - w);
3715 y -= 1; clamp_it (y, 0, nrow - h); 3743 y -= 1; clamp_it (y, 0, nrow - h);
3716 3744
3717 ov_x = x; ov_y = y; 3745 ov.x = x; ov.y = y;
3718 ov_w = w; ov_h = h; 3746 ov.w = w; ov.h = h;
3719 3747
3720 ov_text = new text_t *[h]; 3748 ov.text = new text_t *[h];
3721 ov_rend = new rend_t *[h]; 3749 ov.rend = new rend_t *[h];
3722 3750
3723 for (y = 0; y < h; y++) 3751 for (y = 0; y < h; y++)
3724 { 3752 {
3725 text_t *tp = ov_text[y] = new text_t[w]; 3753 text_t *tp = ov.text[y] = new text_t[w];
3726 rend_t *rp = ov_rend[y] = new rend_t[w]; 3754 rend_t *rp = ov.rend[y] = new rend_t[w];
3727 3755
3728 text_t t0, t1, t2; 3756 text_t t0, t1, t2;
3729 rend_t r = OVERLAY_RSTYLE; 3757 rend_t r = OVERLAY_RSTYLE;
3730 3758
3731 if (y == 0) 3759 if (y == 0)
… …
3750} 3778}
3751 3779
3752void 3780void
3753rxvt_term::scr_overlay_off () NOTHROW 3781rxvt_term::scr_overlay_off () NOTHROW
3754{ 3782{
3755 if (!ov_text) 3783 if (!ov.text)
3756 return; 3784 return;
3757 3785
3758 want_refresh = 1; 3786 want_refresh = 1;
3759 3787
3760 for (int y = 0; y < ov_h; y++) 3788 for (int y = 0; y < ov.h; y++)
3761 { 3789 {
3762 delete [] ov_text[y]; 3790 delete [] ov.text[y];
3763 delete [] ov_rend[y]; 3791 delete [] ov.rend[y];
3764 } 3792 }
3765 3793
3766 delete [] ov_text; ov_text = 0; 3794 delete [] ov.text; ov.text = 0;
3767 delete [] ov_rend; ov_rend = 0; 3795 delete [] ov.rend; ov.rend = 0;
3768} 3796}
3769 3797
3770void 3798void
3771rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3799rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3772{ 3800{
3773 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3801 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3774 return; 3802 return;
3775 3803
3776 x++, y++; 3804 x++, y++;
3777 3805
3778 ov_text[y][x] = text; 3806 ov.text[y][x] = text;
3779 ov_rend[y][x] = rend; 3807 ov.rend[y][x] = rend;
3780} 3808}
3781 3809
3782void 3810void
3783rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3811rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3784{ 3812{
… …
3803} 3831}
3804 3832
3805void 3833void
3806rxvt_term::scr_swap_overlay () NOTHROW 3834rxvt_term::scr_swap_overlay () NOTHROW
3807{ 3835{
3808 if (!ov_text) 3836 if (!ov.text)
3809 return; 3837 return;
3810 3838
3839 // hide cursor if it is within the overlay area
3840 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3841 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3842 screen.flags &= ~Screen_VisibleCursor;
3843
3811 // swap screen mem with overlay 3844 // swap screen mem with overlay
3812 for (int y = ov_h; y--; ) 3845 for (int y = ov.h; y--; )
3813 { 3846 {
3814 text_t *t1 = ov_text[y]; 3847 text_t *t1 = ov.text[y];
3815 rend_t *r1 = ov_rend[y]; 3848 rend_t *r1 = ov.rend[y];
3816 3849
3817 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3850 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3818 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3851 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3819 3852
3820 for (int x = ov_w; x--; ) 3853 for (int x = ov.w; x--; )
3821 { 3854 {
3822 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3855 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3823 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3856 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3824 } 3857 }
3825 } 3858 }

Diff Legend

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