… | |
… | |
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 | |
160 | void |
160 | void |
161 | rxvt_term::scr_reset () |
161 | rxvt_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 | */ |
451 | void |
441 | void |
452 | rxvt_term::scr_poweron () |
442 | rxvt_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 | |
|
|
454 | void |
|
|
455 | rxvt_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 |
1372 | void |
1387 | void |
… | |
… | |
1464 | line_t *line = &ROW(row); |
1479 | line_t *line = &ROW(row); |
1465 | |
1480 | |
1466 | line->touch (); |
1481 | line->touch (); |
1467 | line->is_longer (0); |
1482 | line->is_longer (0); |
1468 | |
1483 | |
|
|
1484 | // nuke wide spanning the start |
|
|
1485 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1486 | scr_kill_char (*line, screen.cur.col); |
|
|
1487 | |
1469 | switch (insdel) |
1488 | switch (insdel) |
1470 | { |
1489 | { |
1471 | case INSERT: |
1490 | case INSERT: |
1472 | line->l = min (line->l + count, ncol); |
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); |
1473 | |
1495 | |
1474 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1496 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1475 | { |
1497 | { |
1476 | line->t[col] = line->t[col - count]; |
1498 | line->t[col] = line->t[col - count]; |
1477 | line->r[col] = line->r[col - count]; |
1499 | line->r[col] = line->r[col - count]; |
… | |
… | |
1498 | case ERASE: |
1520 | case ERASE: |
1499 | screen.cur.col += count; /* don't worry if > ncol */ |
1521 | screen.cur.col += count; /* don't worry if > ncol */ |
1500 | selection_check (1); |
1522 | selection_check (1); |
1501 | screen.cur.col -= count; |
1523 | screen.cur.col -= count; |
1502 | |
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 | |
1503 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1529 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1504 | break; |
1530 | break; |
1505 | |
1531 | |
1506 | case DELETE: |
1532 | case DELETE: |
1507 | { |
|
|
1508 | line->l = max (line->l - count, 0); |
1533 | line->l = max (line->l - count, 0); |
1509 | |
1534 | |
1510 | rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
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); |
1511 | |
1538 | |
1512 | for (int 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 | // nuke wide char at the end |
|
|
1519 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1520 | scr_kill_char (*line, screen.cur.col); |
|
|
1521 | |
|
|
1522 | scr_blank_line (*line, ncol - count, count, tr); |
1545 | scr_blank_line (*line, ncol - count, count, rstyle); |
1523 | |
1546 | |
1524 | if (selection.op && current_screen == selection.screen |
1547 | if (selection.op && current_screen == selection.screen |
1525 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1548 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1526 | { |
1549 | { |
1527 | if (selection.end.row != screen.cur.row |
1550 | if (selection.end.row != screen.cur.row |
1528 | || (screen.cur.col >= selection.beg.col - count) |
1551 | || (screen.cur.col >= selection.beg.col - count) |
1529 | || selection.end.col >= ncol) |
1552 | || selection.end.col >= ncol) |
1530 | CLEAR_SELECTION (); |
1553 | CLEAR_SELECTION (); |
1531 | else |
1554 | else |
1532 | { |
1555 | { |
1533 | /* shift selection */ |
1556 | /* shift selection */ |
1534 | selection.beg.col -= count; |
1557 | selection.beg.col -= count; |
1535 | selection.mark.col -= count; /* XXX: yes? */ |
1558 | selection.mark.col -= count; /* XXX: yes? */ |
1536 | selection.end.col -= count; |
1559 | selection.end.col -= count; |
1537 | } |
1560 | } |
1538 | } |
|
|
1539 | } |
1561 | } |
1540 | |
1562 | |
1541 | break; |
1563 | break; |
1542 | } |
1564 | } |
1543 | } |
1565 | } |
… | |
… | |
1986 | * screen.text/screen.rend contain what the screen will change to. |
2008 | * screen.text/screen.rend contain what the screen will change to. |
1987 | */ |
2009 | */ |
1988 | void |
2010 | void |
1989 | rxvt_term::scr_refresh () NOTHROW |
2011 | rxvt_term::scr_refresh () NOTHROW |
1990 | { |
2012 | { |
1991 | unsigned char have_bg, |
|
|
1992 | showcursor; /* show the cursor */ |
|
|
1993 | int16_t col, row, /* column/row we're processing */ |
2013 | int16_t col, row, /* column/row we're processing */ |
1994 | ocrow; /* old cursor row */ |
2014 | ocrow; /* old cursor row */ |
1995 | int i; /* tmp */ |
2015 | int i; /* tmp */ |
1996 | #ifndef NO_CURSORCOLOR |
2016 | #ifndef NO_CURSORCOLOR |
1997 | rend_t cc1; /* store colours at cursor position (s) */ |
2017 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2008 | /* |
2028 | /* |
2009 | * A: set up vars |
2029 | * A: set up vars |
2010 | */ |
2030 | */ |
2011 | refresh_count = 0; |
2031 | refresh_count = 0; |
2012 | |
2032 | |
|
|
2033 | unsigned int old_screen_flags = screen.flags; |
2013 | have_bg = 0; |
2034 | char have_bg = 0; |
2014 | #ifdef HAVE_BG_PIXMAP |
2035 | #ifdef HAVE_BG_PIXMAP |
2015 | have_bg = bgPixmap.pixmap != None; |
2036 | have_bg = bgPixmap.pixmap != None; |
2016 | #endif |
2037 | #endif |
2017 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2038 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2018 | |
2039 | |
2019 | /* |
2040 | /* |
2020 | * B: reverse any characters which are selected |
2041 | * B: reverse any characters which are selected |
2021 | */ |
2042 | */ |
2022 | 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; |
2023 | |
2051 | |
2024 | /* |
2052 | /* |
2025 | * C: set the cursor character (s) |
2053 | * C: set the cursor character (s) |
2026 | */ |
2054 | */ |
2027 | { |
2055 | { |
2028 | unsigned char setoldcursor; |
2056 | unsigned char setoldcursor; |
2029 | |
2057 | |
2030 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2031 | #ifdef CURSOR_BLINK |
2058 | #ifdef CURSOR_BLINK |
2032 | if (hidden_cursor) |
2059 | if (hidden_cursor) |
2033 | showcursor = 0; |
2060 | showcursor = 0; |
2034 | #endif |
2061 | #endif |
2035 | |
2062 | |
… | |
… | |
2108 | oldcursor.col = screen.cur.col; |
2135 | oldcursor.col = screen.cur.col; |
2109 | } |
2136 | } |
2110 | } |
2137 | } |
2111 | } |
2138 | } |
2112 | |
2139 | |
2113 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2114 | #if ENABLE_OVERLAY |
|
|
2115 | scr_swap_overlay (); |
|
|
2116 | #endif |
|
|
2117 | |
|
|
2118 | #ifndef NO_SLOW_LINK_SUPPORT |
2140 | #ifndef NO_SLOW_LINK_SUPPORT |
2119 | /* |
2141 | /* |
2120 | * D: CopyArea pass - very useful for slower links |
2142 | * D: CopyArea pass - very useful for slower links |
2121 | * This has been deliberately kept simple. |
2143 | * This has been deliberately kept simple. |
2122 | */ |
2144 | */ |
… | |
… | |
2394 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2416 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2395 | } |
2417 | } |
2396 | } /* for (col....) */ |
2418 | } /* for (col....) */ |
2397 | } /* for (row....) */ |
2419 | } /* for (row....) */ |
2398 | |
2420 | |
2399 | #if ENABLE_OVERLAY |
|
|
2400 | scr_swap_overlay (); |
|
|
2401 | #endif |
|
|
2402 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2403 | |
|
|
2404 | /* |
2421 | /* |
2405 | * G: cleanup cursor and display outline cursor if necessary |
2422 | * G: cleanup cursor and display outline cursor if necessary |
2406 | */ |
2423 | */ |
2407 | if (showcursor) |
2424 | if (showcursor) |
2408 | { |
2425 | { |
… | |
… | |
2446 | } |
2463 | } |
2447 | |
2464 | |
2448 | /* |
2465 | /* |
2449 | * H: cleanup selection |
2466 | * H: cleanup selection |
2450 | */ |
2467 | */ |
|
|
2468 | #if ENABLE_OVERLAY |
|
|
2469 | scr_swap_overlay (); |
|
|
2470 | #endif |
|
|
2471 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2472 | |
2451 | scr_reverse_selection (); |
2473 | scr_reverse_selection (); |
2452 | |
2474 | |
|
|
2475 | screen.flags = old_screen_flags; |
2453 | num_scr = 0; |
2476 | num_scr = 0; |
2454 | num_scr_allow = 1; |
2477 | num_scr_allow = 1; |
2455 | } |
2478 | } |
2456 | |
2479 | |
2457 | void |
2480 | void |
… | |
… | |
3716 | h += 2; min_it (h, nrow); |
3739 | h += 2; min_it (h, nrow); |
3717 | |
3740 | |
3718 | x -= 1; clamp_it (x, 0, ncol - w); |
3741 | x -= 1; clamp_it (x, 0, ncol - w); |
3719 | y -= 1; clamp_it (y, 0, nrow - h); |
3742 | y -= 1; clamp_it (y, 0, nrow - h); |
3720 | |
3743 | |
3721 | ov_x = x; ov_y = y; |
3744 | ov.x = x; ov.y = y; |
3722 | ov_w = w; ov_h = h; |
3745 | ov.w = w; ov.h = h; |
3723 | |
3746 | |
3724 | ov_text = new text_t *[h]; |
3747 | ov.text = new text_t *[h]; |
3725 | ov_rend = new rend_t *[h]; |
3748 | ov.rend = new rend_t *[h]; |
3726 | |
3749 | |
3727 | for (y = 0; y < h; y++) |
3750 | for (y = 0; y < h; y++) |
3728 | { |
3751 | { |
3729 | text_t *tp = ov_text[y] = new text_t[w]; |
3752 | text_t *tp = ov.text[y] = new text_t[w]; |
3730 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3753 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3731 | |
3754 | |
3732 | text_t t0, t1, t2; |
3755 | text_t t0, t1, t2; |
3733 | rend_t r = OVERLAY_RSTYLE; |
3756 | rend_t r = OVERLAY_RSTYLE; |
3734 | |
3757 | |
3735 | if (y == 0) |
3758 | if (y == 0) |
… | |
… | |
3754 | } |
3777 | } |
3755 | |
3778 | |
3756 | void |
3779 | void |
3757 | rxvt_term::scr_overlay_off () NOTHROW |
3780 | rxvt_term::scr_overlay_off () NOTHROW |
3758 | { |
3781 | { |
3759 | if (!ov_text) |
3782 | if (!ov.text) |
3760 | return; |
3783 | return; |
3761 | |
3784 | |
3762 | want_refresh = 1; |
3785 | want_refresh = 1; |
3763 | |
3786 | |
3764 | for (int y = 0; y < ov_h; y++) |
3787 | for (int y = 0; y < ov.h; y++) |
3765 | { |
3788 | { |
3766 | delete [] ov_text[y]; |
3789 | delete [] ov.text[y]; |
3767 | delete [] ov_rend[y]; |
3790 | delete [] ov.rend[y]; |
3768 | } |
3791 | } |
3769 | |
3792 | |
3770 | delete [] ov_text; ov_text = 0; |
3793 | delete [] ov.text; ov.text = 0; |
3771 | delete [] ov_rend; ov_rend = 0; |
3794 | delete [] ov.rend; ov.rend = 0; |
3772 | } |
3795 | } |
3773 | |
3796 | |
3774 | void |
3797 | void |
3775 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3798 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3776 | { |
3799 | { |
3777 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3800 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3778 | return; |
3801 | return; |
3779 | |
3802 | |
3780 | x++, y++; |
3803 | x++, y++; |
3781 | |
3804 | |
3782 | ov_text[y][x] = text; |
3805 | ov.text[y][x] = text; |
3783 | ov_rend[y][x] = rend; |
3806 | ov.rend[y][x] = rend; |
3784 | } |
3807 | } |
3785 | |
3808 | |
3786 | void |
3809 | void |
3787 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3810 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3788 | { |
3811 | { |
… | |
… | |
3807 | } |
3830 | } |
3808 | |
3831 | |
3809 | void |
3832 | void |
3810 | rxvt_term::scr_swap_overlay () NOTHROW |
3833 | rxvt_term::scr_swap_overlay () NOTHROW |
3811 | { |
3834 | { |
3812 | if (!ov_text) |
3835 | if (!ov.text) |
3813 | return; |
3836 | return; |
3814 | |
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 | |
3815 | // swap screen mem with overlay |
3843 | // swap screen mem with overlay |
3816 | for (int y = ov_h; y--; ) |
3844 | for (int y = ov.h; y--; ) |
3817 | { |
3845 | { |
3818 | text_t *t1 = ov_text[y]; |
3846 | text_t *t1 = ov.text[y]; |
3819 | rend_t *r1 = ov_rend[y]; |
3847 | rend_t *r1 = ov.rend[y]; |
3820 | |
3848 | |
3821 | 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; |
3822 | 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; |
3823 | |
3851 | |
3824 | for (int x = ov_w; x--; ) |
3852 | for (int x = ov.w; x--; ) |
3825 | { |
3853 | { |
3826 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3854 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3827 | 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)); |
3828 | } |
3856 | } |
3829 | } |
3857 | } |