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.312 by root, Tue Nov 4 13:30:41 2008 UTC vs.
Revision 1.327 by root, Wed Nov 5 14:43:54 2008 UTC

… …
132 132
133 l.l = 0; 133 l.l = 0;
134 l.f = 0; 134 l.f = 0;
135} 135}
136 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
137/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
140 159
141void 160void
142rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
143{ 162{
144#if ENABLE_OVERLAY
145 scr_overlay_off ();
146#endif
147
148 rvideo_mode = false;
149 view_start = 0; 163 view_start = 0;
150 num_scr = 0; 164 num_scr = 0;
151 165
152 if (ncol == 0) 166 if (ncol == 0)
153 ncol = 80; 167 ncol = 80;
… …
155 if (nrow == 0) 169 if (nrow == 0)
156 nrow = 24; 170 nrow = 24;
157 171
158 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 173 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 174
164 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
166 { 177 {
167 //TODO//FIXME 178 //TODO//FIXME
… …
267 278
268 if (top_row) 279 if (top_row)
269 { 280 {
270 // 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
271 // 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
272 284
273 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 287
276 do 288 do
… …
380 delete old_ta; 392 delete old_ta;
381 delete old_ra; 393 delete old_ra;
382 394
383 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
385 398
386 free (tabs); 399 free (tabs);
387 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
388 404
389 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
390 406
391 prev_nrow = nrow; 407 prev_nrow = nrow;
392 prev_ncol = ncol; 408 prev_ncol = ncol;
393
394 tabs = (char *)rxvt_malloc (ncol);
395
396 for (int col = ncol; --col; )
397 tabs [col] = col % TABSIZE == 0;
398
399 if (current_screen != PRIMARY)
400 scr_swap_screen ();
401 409
402 tt_winch (); 410 tt_winch ();
403 411
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 413}
… …
417 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
418 426
419 free (row_buf); 427 free (row_buf);
420 free (swap_buf); 428 free (swap_buf);
421 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
422 free (tabs); 432 free (tabs);
423 433 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 434 }
426} 435}
427 436
428/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
429/* 438/*
430 * Hard reset 439 * Hard/Soft reset
431 */ 440 */
432void 441void
433rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
434{ 443{
435 scr_release (); 444 scr_release ();
436 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
437 scr_reset (); 448 scr_reset ();
438 449
439 scr_clear (true); 450 scr_clear (true);
440 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);
441} 468}
442 469
443/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
880 if (expect_false ( 907 if (expect_false (
881 line->t[screen.cur.col] == NOCHAR 908 line->t[screen.cur.col] == NOCHAR
882 || (screen.cur.col < ncol - 1 909 || (screen.cur.col < ncol - 1
883 && line->t[screen.cur.col + 1] == NOCHAR) 910 && line->t[screen.cur.col + 1] == NOCHAR)
884 )) 911 ))
885 { 912 scr_kill_char (*line, screen.cur.col);
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901 913
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 915
904 // if the character doesn't fit into the remaining columns... 916 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 918 {
907 // ...output spaces 919 // ... artificially enlargen the previous one
908 c = ' '; 920 c = NOCHAR;
909 // and try the same character next loop iteration 921 // and try the same character next loop iteration
910 --str; 922 --str;
911 } 923 }
912 924
913 line->touch (); 925 line->touch ();
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1330 return; 1342 return;
1331 1343
1332 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1333 1345
1334 /*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.
1335 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1352 {
1339 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1340 1354
1341 if (mapped) 1355 if (mapped && !view_start)
1342 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1345 } 1359 }
1346 else 1360 else
1347 { 1361 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1363
1364 if (mapped && !view_start)
1365 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1369 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1370 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1371 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1358 } 1375 }
1359 1376
1360 for (; num--; row++) 1377 for (; num--; row++)
1361 { 1378 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1364 } 1383 }
1365} 1384}
1366 1385
1367#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1368void 1387void
… …
1442 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1443 */ 1462 */
1444void 1463void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1465{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1466 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1452 1468
1453 if (count <= 0) 1469 if (count <= 0)
1454 return; 1470 return;
… …
1456 scr_do_wrap (); 1472 scr_do_wrap ();
1457 1473
1458 selection_check (1); 1474 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1475 min_it (count, ncol - screen.cur.col);
1460 1476
1461 row = screen.cur.row; 1477 int row = screen.cur.row;
1462 1478
1463 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1464 1480
1465 line->touch (); 1481 line->touch ();
1466 line->is_longer (0); 1482 line->is_longer (0);
1467 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1468 switch (insdel) 1488 switch (insdel)
1469 { 1489 {
1470 case INSERT: 1490 case INSERT:
1471 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--)
1472 { 1497 {
1473 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
1475 } 1500 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1501
1479 if (selection.op && current_screen == selection.screen 1502 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1503 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1504 {
1482 if (selection.end.row != screen.cur.row 1505 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1520 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1522 selection_check (1);
1500 screen.cur.col -= count; 1523 screen.cur.col -= count;
1501 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
1502 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1503 break; 1530 break;
1504 1531
1505 case DELETE: 1532 case DELETE:
1506 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 line->l = max (line->l - count, 0);
1507 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
1508 for (col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1509 { 1540 {
1510 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1511 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1512 } 1543 }
1513 1544
1514 line->l = max (line->l - count, 0);
1515 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1516 1546
1517 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1518 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1519 { 1549 {
1520 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1978 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2009 */
1980void 2010void
1981rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1982{ 2012{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2015 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2000 /* 2028 /*
2001 * A: set up vars 2029 * A: set up vars
2002 */ 2030 */
2003 refresh_count = 0; 2031 refresh_count = 0;
2004 2032
2033 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2034 char have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2007 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2008#endif 2037#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2039
2011 /* 2040 /*
2012 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2013 */ 2042 */
2014 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;
2015 2051
2016 /* 2052 /*
2017 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2018 */ 2054 */
2019 { 2055 {
2020 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2021 2057
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2059 if (hidden_cursor)
2025 showcursor = 0; 2060 showcursor = 0;
2026#endif 2061#endif
2027 2062
… …
2100 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2101 } 2136 }
2102 } 2137 }
2103 } 2138 }
2104 2139
2105 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2106#if ENABLE_OVERLAY
2107 scr_swap_overlay ();
2108#endif
2109
2110#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2141 /*
2112 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2114 */ 2144 */
… …
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2417 }
2388 } /* for (col....) */ 2418 } /* for (col....) */
2389 } /* for (row....) */ 2419 } /* for (row....) */
2390 2420
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395
2396 /* 2421 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2422 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2423 */
2399 if (showcursor) 2424 if (showcursor)
2400 { 2425 {
… …
2438 } 2463 }
2439 2464
2440 /* 2465 /*
2441 * H: cleanup selection 2466 * H: cleanup selection
2442 */ 2467 */
2468#if ENABLE_OVERLAY
2469 scr_swap_overlay ();
2470#endif
2471 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2472
2443 scr_reverse_selection (); 2473 scr_reverse_selection ();
2444 2474
2475 screen.flags = old_screen_flags;
2445 num_scr = 0; 2476 num_scr = 0;
2446 num_scr_allow = 1; 2477 num_scr_allow = 1;
2447} 2478}
2448 2479
2449void 2480void
… …
3708 h += 2; min_it (h, nrow); 3739 h += 2; min_it (h, nrow);
3709 3740
3710 x -= 1; clamp_it (x, 0, ncol - w); 3741 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3742 y -= 1; clamp_it (y, 0, nrow - h);
3712 3743
3713 ov_x = x; ov_y = y; 3744 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3745 ov.w = w; ov.h = h;
3715 3746
3716 ov_text = new text_t *[h]; 3747 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3748 ov.rend = new rend_t *[h];
3718 3749
3719 for (y = 0; y < h; y++) 3750 for (y = 0; y < h; y++)
3720 { 3751 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3752 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3753 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3754
3724 text_t t0, t1, t2; 3755 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3756 rend_t r = OVERLAY_RSTYLE;
3726 3757
3727 if (y == 0) 3758 if (y == 0)
… …
3746} 3777}
3747 3778
3748void 3779void
3749rxvt_term::scr_overlay_off () NOTHROW 3780rxvt_term::scr_overlay_off () NOTHROW
3750{ 3781{
3751 if (!ov_text) 3782 if (!ov.text)
3752 return; 3783 return;
3753 3784
3754 want_refresh = 1; 3785 want_refresh = 1;
3755 3786
3756 for (int y = 0; y < ov_h; y++) 3787 for (int y = 0; y < ov.h; y++)
3757 { 3788 {
3758 delete [] ov_text[y]; 3789 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3790 delete [] ov.rend[y];
3760 } 3791 }
3761 3792
3762 delete [] ov_text; ov_text = 0; 3793 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3794 delete [] ov.rend; ov.rend = 0;
3764} 3795}
3765 3796
3766void 3797void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3798rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768{ 3799{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3800 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3801 return;
3771 3802
3772 x++, y++; 3803 x++, y++;
3773 3804
3774 ov_text[y][x] = text; 3805 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3806 ov.rend[y][x] = rend;
3776} 3807}
3777 3808
3778void 3809void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3810rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780{ 3811{
… …
3799} 3830}
3800 3831
3801void 3832void
3802rxvt_term::scr_swap_overlay () NOTHROW 3833rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3834{
3804 if (!ov_text) 3835 if (!ov.text)
3805 return; 3836 return;
3806 3837
3838 // hide cursor if it is within the overlay area
3839 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3840 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3841 screen.flags &= ~Screen_VisibleCursor;
3842
3807 // swap screen mem with overlay 3843 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3844 for (int y = ov.h; y--; )
3809 { 3845 {
3810 text_t *t1 = ov_text[y]; 3846 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3847 rend_t *r1 = ov.rend[y];
3812 3848
3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3849 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3814 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3850 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815 3851
3816 for (int x = ov_w; x--; ) 3852 for (int x = ov.w; x--; )
3817 { 3853 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3854 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3855 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820 } 3856 }
3821 } 3857 }

Diff Legend

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