… | |
… | |
278 | |
278 | |
279 | if (top_row) |
279 | if (top_row) |
280 | { |
280 | { |
281 | // 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 |
282 | // 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 |
283 | |
284 | |
284 | row_col_t ocur = screen.cur; |
285 | row_col_t ocur = screen.cur; |
285 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
286 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
286 | |
287 | |
287 | do |
288 | do |
288 | { |
289 | { |
289 | p = MOD (p - 1, prev_total_rows); |
290 | p = MOD (p - 1, prev_total_rows); |
290 | #ifdef DEBUG_STRICT |
|
|
291 | assert (old_buf [MOD (p, prev_total_rows)].t); |
291 | assert (old_buf [MOD (p, prev_total_rows)].t); |
292 | #endif |
|
|
293 | int plines = 1; |
292 | int plines = 1; |
294 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
293 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
295 | |
294 | |
296 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
295 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
297 | { |
296 | { |
… | |
… | |
393 | |
392 | |
394 | clamp_it (screen.cur.row, 0, nrow - 1); |
393 | clamp_it (screen.cur.row, 0, nrow - 1); |
395 | clamp_it (screen.cur.col, 0, ncol - 1); |
394 | clamp_it (screen.cur.col, 0, ncol - 1); |
396 | } |
395 | } |
397 | |
396 | |
|
|
397 | free (tabs); |
|
|
398 | tabs = (char *)rxvt_malloc (ncol); |
|
|
399 | |
|
|
400 | for (int col = ncol; --col; ) |
|
|
401 | tabs [col] = col % TABSIZE == 0; |
|
|
402 | |
398 | CLEAR_ALL_SELECTION (); |
403 | CLEAR_ALL_SELECTION (); |
399 | |
404 | |
400 | prev_nrow = nrow; |
405 | prev_nrow = nrow; |
401 | prev_ncol = ncol; |
406 | prev_ncol = ncol; |
402 | |
407 | |
… | |
… | |
434 | void |
439 | void |
435 | rxvt_term::scr_poweron () |
440 | rxvt_term::scr_poweron () |
436 | { |
441 | { |
437 | scr_release (); |
442 | scr_release (); |
438 | prev_nrow = prev_ncol = 0; |
443 | prev_nrow = prev_ncol = 0; |
|
|
444 | rvideo_mode = false; |
439 | scr_soft_reset (); |
445 | scr_soft_reset (); |
440 | scr_reset (); |
446 | scr_reset (); |
441 | |
447 | |
442 | scr_clear (true); |
448 | scr_clear (true); |
443 | scr_refresh (); |
449 | scr_refresh (); |
… | |
… | |
448 | { |
454 | { |
449 | /* only affects modes, nothing drastic such as clearing the screen */ |
455 | /* only affects modes, nothing drastic such as clearing the screen */ |
450 | #if ENABLE_OVERLAY |
456 | #if ENABLE_OVERLAY |
451 | scr_overlay_off (); |
457 | scr_overlay_off (); |
452 | #endif |
458 | #endif |
453 | |
|
|
454 | rvideo_mode = false; |
|
|
455 | |
|
|
456 | if (current_screen != PRIMARY) |
|
|
457 | scr_swap_screen (); |
|
|
458 | |
|
|
459 | free (tabs); |
|
|
460 | tabs = (char *)rxvt_malloc (ncol); |
|
|
461 | |
|
|
462 | for (int col = ncol; --col; ) |
|
|
463 | tabs [col] = col % TABSIZE == 0; |
|
|
464 | |
459 | |
465 | if (current_screen != PRIMARY) |
460 | if (current_screen != PRIMARY) |
466 | scr_swap_screen (); |
461 | scr_swap_screen (); |
467 | |
462 | |
468 | scr_scroll_region (0, MAX_ROWS - 1); |
463 | scr_scroll_region (0, MAX_ROWS - 1); |
… | |
… | |
513 | } |
508 | } |
514 | |
509 | |
515 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
510 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
516 | min_it (s->cur.row, nrow - 1); |
511 | min_it (s->cur.row, nrow - 1); |
517 | min_it (s->cur.col, ncol - 1); |
512 | min_it (s->cur.col, ncol - 1); |
518 | #ifdef DEBUG_STRICT |
|
|
519 | assert (s->cur.row >= 0); |
513 | assert (s->cur.row >= 0); |
520 | assert (s->cur.col >= 0); |
514 | assert (s->cur.col >= 0); |
521 | #endif |
|
|
522 | } |
515 | } |
523 | |
516 | |
524 | void |
517 | void |
525 | rxvt_term::scr_swap_screen () |
518 | rxvt_term::scr_swap_screen () |
526 | { |
519 | { |
… | |
… | |
786 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
779 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
787 | screen.cur.row -= minlines; |
780 | screen.cur.row -= minlines; |
788 | } |
781 | } |
789 | } |
782 | } |
790 | |
783 | |
791 | #ifdef DEBUG_STRICT |
|
|
792 | assert (screen.cur.col < ncol); |
784 | assert (screen.cur.col < ncol); |
793 | assert (screen.cur.row < nrow |
785 | assert (screen.cur.row < nrow |
794 | && screen.cur.row >= top_row); |
786 | && screen.cur.row >= top_row); |
795 | #endif |
|
|
796 | int row = screen.cur.row; |
787 | int row = screen.cur.row; |
797 | |
788 | |
798 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
789 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
799 | |
790 | |
800 | line_t *line = &ROW(row); |
791 | line_t *line = &ROW(row); |
… | |
… | |
1004 | #endif |
995 | #endif |
1005 | } |
996 | } |
1006 | |
997 | |
1007 | max_it (line->l, screen.cur.col); |
998 | max_it (line->l, screen.cur.col); |
1008 | |
999 | |
1009 | #ifdef DEBUG_STRICT |
|
|
1010 | assert (screen.cur.row >= 0); |
1000 | assert (screen.cur.row >= 0); |
1011 | #endif |
|
|
1012 | } |
1001 | } |
1013 | |
1002 | |
1014 | /* ------------------------------------------------------------------------- */ |
1003 | /* ------------------------------------------------------------------------- */ |
1015 | /* |
1004 | /* |
1016 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1005 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1344 | if (row >= nrow) /* Out Of Bounds */ |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1345 | return; |
1334 | return; |
1346 | |
1335 | |
1347 | min_it (num, nrow - row); |
1336 | min_it (num, nrow - row); |
1348 | |
1337 | |
1349 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1338 | // TODO: the code below does not work when view_start != 0 |
|
|
1339 | // the workaround is to disable the clear and use a normal refresh |
|
|
1340 | // when view_start != 0. mysterious. |
1350 | if (rstyle & (RS_RVid | RS_Uline)) |
1341 | if (rstyle & (RS_RVid | RS_Uline)) |
1351 | ren = (rend_t) ~RS_None; |
1342 | ren = (rend_t) ~RS_None; |
1352 | else if (GET_BASEBG (rstyle) == Color_bg) |
1343 | else if (GET_BASEBG (rstyle) == Color_bg) |
1353 | { |
1344 | { |
1354 | ren = DEFAULT_RSTYLE; |
1345 | ren = DEFAULT_RSTYLE; |
1355 | |
1346 | |
1356 | if (mapped) |
1347 | if (mapped && !view_start) |
1357 | XClearArea (dpy, vt, 0, |
1348 | XClearArea (dpy, vt, 0, |
1358 | Row2Pixel (row), (unsigned int)width, |
1349 | Row2Pixel (row - view_start), (unsigned int)width, |
1359 | (unsigned int)Height2Pixel (num), False); |
1350 | (unsigned int)Height2Pixel (num), False); |
1360 | } |
1351 | } |
1361 | else |
1352 | else |
1362 | { |
1353 | { |
1363 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1354 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1364 | |
1355 | |
|
|
1356 | if (mapped && !view_start) |
|
|
1357 | { |
1365 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1358 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1366 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1359 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1367 | XFillRectangle (dpy, vt, gc, |
1360 | XFillRectangle (dpy, vt, gc, |
1368 | 0, Row2Pixel (row), |
1361 | 0, Row2Pixel (row - view_start), |
1369 | (unsigned int)width, |
1362 | (unsigned int)width, |
1370 | (unsigned int)Height2Pixel (num)); |
1363 | (unsigned int)Height2Pixel (num)); |
1371 | gcvalue.foreground = pix_colors[Color_fg]; |
1364 | gcvalue.foreground = pix_colors[Color_fg]; |
1372 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1365 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1366 | } |
1373 | } |
1367 | } |
1374 | |
1368 | |
1375 | for (; num--; row++) |
1369 | for (; num--; row++) |
1376 | { |
1370 | { |
1377 | scr_blank_screen_mem (ROW(row), rstyle); |
1371 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1372 | |
|
|
1373 | if (!view_start) |
1378 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1374 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1379 | } |
1375 | } |
1380 | } |
1376 | } |
1381 | |
1377 | |
1382 | #if !ENABLE_MINIMAL |
1378 | #if !ENABLE_MINIMAL |
1383 | void |
1379 | void |
… | |
… | |
1536 | { |
1532 | { |
1537 | line->t[col] = line->t[col + count]; |
1533 | line->t[col] = line->t[col + count]; |
1538 | line->r[col] = line->r[col + count]; |
1534 | line->r[col] = line->r[col + count]; |
1539 | } |
1535 | } |
1540 | |
1536 | |
1541 | scr_blank_line (*line, ncol - count, count, |
1537 | scr_blank_line (*line, ncol - count, count, rstyle); |
1542 | line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask)); |
|
|
1543 | |
1538 | |
1544 | if (selection.op && current_screen == selection.screen |
1539 | if (selection.op && current_screen == selection.screen |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1540 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1546 | { |
1541 | { |
1547 | if (selection.end.row != screen.cur.row |
1542 | if (selection.end.row != screen.cur.row |
… | |
… | |
1966 | row_start = view_start; |
1961 | row_start = view_start; |
1967 | } |
1962 | } |
1968 | |
1963 | |
1969 | wctomb (0, 0); |
1964 | wctomb (0, 0); |
1970 | |
1965 | |
1971 | for (int r1 = 0; r1 < nrows; r1++) |
1966 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1972 | { |
1967 | { |
1973 | text_t *tp = ROW(r1).t; |
1968 | text_t *tp = ROW(r1).t; |
1974 | int len = ROW(r1).l; |
1969 | int len = ROW(r1).l; |
1975 | |
1970 | |
1976 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1971 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
2005 | * screen.text/screen.rend contain what the screen will change to. |
2000 | * screen.text/screen.rend contain what the screen will change to. |
2006 | */ |
2001 | */ |
2007 | void |
2002 | void |
2008 | rxvt_term::scr_refresh () NOTHROW |
2003 | rxvt_term::scr_refresh () NOTHROW |
2009 | { |
2004 | { |
2010 | unsigned char have_bg, |
|
|
2011 | showcursor; /* show the cursor */ |
|
|
2012 | int16_t col, row, /* column/row we're processing */ |
2005 | int16_t col, row, /* column/row we're processing */ |
2013 | ocrow; /* old cursor row */ |
2006 | ocrow; /* old cursor row */ |
2014 | int i; /* tmp */ |
2007 | int i; /* tmp */ |
2015 | #ifndef NO_CURSORCOLOR |
2008 | #ifndef NO_CURSORCOLOR |
2016 | rend_t cc1; /* store colours at cursor position (s) */ |
2009 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2027 | /* |
2020 | /* |
2028 | * A: set up vars |
2021 | * A: set up vars |
2029 | */ |
2022 | */ |
2030 | refresh_count = 0; |
2023 | refresh_count = 0; |
2031 | |
2024 | |
|
|
2025 | unsigned int old_screen_flags = screen.flags; |
2032 | have_bg = 0; |
2026 | char have_bg = 0; |
2033 | #ifdef HAVE_BG_PIXMAP |
2027 | #ifdef HAVE_BG_PIXMAP |
2034 | have_bg = bgPixmap.pixmap != None; |
2028 | have_bg = bgPixmap.pixmap != None; |
2035 | #endif |
2029 | #endif |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2030 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2037 | |
2031 | |
2038 | /* |
2032 | /* |
2039 | * B: reverse any characters which are selected |
2033 | * B: reverse any characters which are selected |
2040 | */ |
2034 | */ |
2041 | scr_reverse_selection (); |
2035 | scr_reverse_selection (); |
|
|
2036 | |
|
|
2037 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2038 | #if ENABLE_OVERLAY |
|
|
2039 | scr_swap_overlay (); |
|
|
2040 | #endif |
|
|
2041 | |
|
|
2042 | char showcursor = screen.flags & Screen_VisibleCursor; |
2042 | |
2043 | |
2043 | /* |
2044 | /* |
2044 | * C: set the cursor character (s) |
2045 | * C: set the cursor character (s) |
2045 | */ |
2046 | */ |
2046 | { |
2047 | { |
2047 | unsigned char setoldcursor; |
2048 | unsigned char setoldcursor; |
2048 | |
2049 | |
2049 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2050 | #ifdef CURSOR_BLINK |
2050 | #ifdef CURSOR_BLINK |
2051 | if (hidden_cursor) |
2051 | if (hidden_cursor) |
2052 | showcursor = 0; |
2052 | showcursor = 0; |
2053 | #endif |
2053 | #endif |
2054 | |
2054 | |
… | |
… | |
2127 | oldcursor.col = screen.cur.col; |
2127 | oldcursor.col = screen.cur.col; |
2128 | } |
2128 | } |
2129 | } |
2129 | } |
2130 | } |
2130 | } |
2131 | |
2131 | |
2132 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2133 | #if ENABLE_OVERLAY |
|
|
2134 | scr_swap_overlay (); |
|
|
2135 | #endif |
|
|
2136 | |
|
|
2137 | #ifndef NO_SLOW_LINK_SUPPORT |
2132 | #ifndef NO_SLOW_LINK_SUPPORT |
2138 | /* |
2133 | /* |
2139 | * D: CopyArea pass - very useful for slower links |
2134 | * D: CopyArea pass - very useful for slower links |
2140 | * This has been deliberately kept simple. |
2135 | * This has been deliberately kept simple. |
2141 | */ |
2136 | */ |
… | |
… | |
2247 | for (i = 0; ++col < ncol; ) |
2242 | for (i = 0; ++col < ncol; ) |
2248 | { |
2243 | { |
2249 | if (stp[col] == NOCHAR) |
2244 | if (stp[col] == NOCHAR) |
2250 | { |
2245 | { |
2251 | dtp[col] = stp[col]; |
2246 | dtp[col] = stp[col]; |
2252 | drp[col] = rend; |
2247 | drp[col] = srp[col]; |
|
|
2248 | |
2253 | count++; |
2249 | count++; |
2254 | i++; |
2250 | i++; |
2255 | |
2251 | |
2256 | continue; |
2252 | continue; |
2257 | } |
2253 | } |
… | |
… | |
2413 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2409 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2414 | } |
2410 | } |
2415 | } /* for (col....) */ |
2411 | } /* for (col....) */ |
2416 | } /* for (row....) */ |
2412 | } /* for (row....) */ |
2417 | |
2413 | |
2418 | #if ENABLE_OVERLAY |
|
|
2419 | scr_swap_overlay (); |
|
|
2420 | #endif |
|
|
2421 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2422 | |
|
|
2423 | /* |
2414 | /* |
2424 | * G: cleanup cursor and display outline cursor if necessary |
2415 | * G: cleanup cursor and display outline cursor if necessary |
2425 | */ |
2416 | */ |
2426 | if (showcursor) |
2417 | if (showcursor) |
2427 | { |
2418 | { |
… | |
… | |
2465 | } |
2456 | } |
2466 | |
2457 | |
2467 | /* |
2458 | /* |
2468 | * H: cleanup selection |
2459 | * H: cleanup selection |
2469 | */ |
2460 | */ |
|
|
2461 | #if ENABLE_OVERLAY |
|
|
2462 | scr_swap_overlay (); |
|
|
2463 | #endif |
|
|
2464 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2465 | |
2470 | scr_reverse_selection (); |
2466 | scr_reverse_selection (); |
2471 | |
2467 | |
|
|
2468 | screen.flags = old_screen_flags; |
2472 | num_scr = 0; |
2469 | num_scr = 0; |
2473 | num_scr_allow = 1; |
2470 | num_scr_allow = 1; |
2474 | } |
2471 | } |
2475 | |
2472 | |
2476 | void |
2473 | void |
… | |
… | |
3735 | h += 2; min_it (h, nrow); |
3732 | h += 2; min_it (h, nrow); |
3736 | |
3733 | |
3737 | x -= 1; clamp_it (x, 0, ncol - w); |
3734 | x -= 1; clamp_it (x, 0, ncol - w); |
3738 | y -= 1; clamp_it (y, 0, nrow - h); |
3735 | y -= 1; clamp_it (y, 0, nrow - h); |
3739 | |
3736 | |
3740 | ov_x = x; ov_y = y; |
3737 | ov.x = x; ov.y = y; |
3741 | ov_w = w; ov_h = h; |
3738 | ov.w = w; ov.h = h; |
3742 | |
3739 | |
3743 | ov_text = new text_t *[h]; |
3740 | ov.text = new text_t *[h]; |
3744 | ov_rend = new rend_t *[h]; |
3741 | ov.rend = new rend_t *[h]; |
3745 | |
3742 | |
3746 | for (y = 0; y < h; y++) |
3743 | for (y = 0; y < h; y++) |
3747 | { |
3744 | { |
3748 | text_t *tp = ov_text[y] = new text_t[w]; |
3745 | text_t *tp = ov.text[y] = new text_t[w]; |
3749 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3746 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3750 | |
3747 | |
3751 | text_t t0, t1, t2; |
3748 | text_t t0, t1, t2; |
3752 | rend_t r = OVERLAY_RSTYLE; |
3749 | rend_t r = OVERLAY_RSTYLE; |
3753 | |
3750 | |
3754 | if (y == 0) |
3751 | if (y == 0) |
… | |
… | |
3773 | } |
3770 | } |
3774 | |
3771 | |
3775 | void |
3772 | void |
3776 | rxvt_term::scr_overlay_off () NOTHROW |
3773 | rxvt_term::scr_overlay_off () NOTHROW |
3777 | { |
3774 | { |
3778 | if (!ov_text) |
3775 | if (!ov.text) |
3779 | return; |
3776 | return; |
3780 | |
3777 | |
3781 | want_refresh = 1; |
3778 | want_refresh = 1; |
3782 | |
3779 | |
3783 | for (int y = 0; y < ov_h; y++) |
3780 | for (int y = 0; y < ov.h; y++) |
3784 | { |
3781 | { |
3785 | delete [] ov_text[y]; |
3782 | delete [] ov.text[y]; |
3786 | delete [] ov_rend[y]; |
3783 | delete [] ov.rend[y]; |
3787 | } |
3784 | } |
3788 | |
3785 | |
3789 | delete [] ov_text; ov_text = 0; |
3786 | delete [] ov.text; ov.text = 0; |
3790 | delete [] ov_rend; ov_rend = 0; |
3787 | delete [] ov.rend; ov.rend = 0; |
3791 | } |
3788 | } |
3792 | |
3789 | |
3793 | void |
3790 | void |
3794 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3791 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3795 | { |
3792 | { |
3796 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3793 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3797 | return; |
3794 | return; |
3798 | |
3795 | |
3799 | x++, y++; |
3796 | x++, y++; |
3800 | |
3797 | |
3801 | ov_text[y][x] = text; |
3798 | ov.text[y][x] = text; |
3802 | ov_rend[y][x] = rend; |
3799 | ov.rend[y][x] = rend; |
3803 | } |
3800 | } |
3804 | |
3801 | |
3805 | void |
3802 | void |
3806 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3803 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3807 | { |
3804 | { |
… | |
… | |
3826 | } |
3823 | } |
3827 | |
3824 | |
3828 | void |
3825 | void |
3829 | rxvt_term::scr_swap_overlay () NOTHROW |
3826 | rxvt_term::scr_swap_overlay () NOTHROW |
3830 | { |
3827 | { |
3831 | if (!ov_text) |
3828 | if (!ov.text) |
3832 | return; |
3829 | return; |
3833 | |
3830 | |
|
|
3831 | // hide cursor if it is within the overlay area |
|
|
3832 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3833 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3834 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3835 | |
3834 | // swap screen mem with overlay |
3836 | // swap screen mem with overlay |
3835 | for (int y = ov_h; y--; ) |
3837 | for (int y = ov.h; y--; ) |
3836 | { |
3838 | { |
3837 | text_t *t1 = ov_text[y]; |
3839 | text_t *t1 = ov.text[y]; |
3838 | rend_t *r1 = ov_rend[y]; |
3840 | rend_t *r1 = ov.rend[y]; |
3839 | |
3841 | |
3840 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3842 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3841 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3843 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3842 | |
3844 | |
3843 | for (int x = ov_w; x--; ) |
3845 | for (int x = ov.w; x--; ) |
3844 | { |
3846 | { |
3845 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3847 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3846 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3848 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3847 | } |
3849 | } |
3848 | } |
3850 | } |