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.314 by root, Tue Nov 4 14:34:13 2008 UTC vs.
Revision 1.329 by root, Sat Dec 26 10:24:04 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
296 { 289 {
297 p = MOD (p - 1, prev_total_rows); 290 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 291 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 292 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 293 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 294
304 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 ())
305 { 296 {
… …
399 delete old_ta; 390 delete old_ta;
400 delete old_ra; 391 delete old_ra;
401 392
402 clamp_it (screen.cur.row, 0, nrow - 1); 393 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 394 clamp_it (screen.cur.col, 0, ncol - 1);
395 }
404 396
405 free (tabs); 397 free (tabs);
406 } 398 tabs = (char *)rxvt_malloc (ncol);
399
400 for (int col = ncol; --col; )
401 tabs [col] = col % TABSIZE == 0;
407 402
408 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
409 404
410 prev_nrow = nrow; 405 prev_nrow = nrow;
411 prev_ncol = ncol; 406 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 407
421 tt_winch (); 408 tt_winch ();
422 409
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 410 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 411}
… …
436 delete ralloc; ralloc = 0; 423 delete ralloc; ralloc = 0;
437 424
438 free (row_buf); 425 free (row_buf);
439 free (swap_buf); 426 free (swap_buf);
440 free (drawn_buf); 427 free (drawn_buf);
428 row_buf = 0; // signal that we freed all the arrays above
429
441 free (tabs); 430 free (tabs);
442 431 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 432 }
445} 433}
446 434
447/* ------------------------------------------------------------------------- */ 435/* ------------------------------------------------------------------------- */
448/* 436/*
449 * Hard reset 437 * Hard/Soft reset
450 */ 438 */
451void 439void
452rxvt_term::scr_poweron () 440rxvt_term::scr_poweron ()
453{ 441{
454 scr_release (); 442 scr_release ();
455 prev_nrow = prev_ncol = 0; 443 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false;
445 scr_soft_reset ();
456 scr_reset (); 446 scr_reset ();
457 447
458 scr_clear (true); 448 scr_clear (true);
459 scr_refresh (); 449 scr_refresh ();
450}
451
452void
453rxvt_term::scr_soft_reset ()
454{
455 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY
457 scr_overlay_off ();
458#endif
459
460 if (current_screen != PRIMARY)
461 scr_swap_screen ();
462
463 scr_scroll_region (0, MAX_ROWS - 1);
464 scr_rendition (0, ~RS_None);
465 scr_insert_mode (0);
460} 466}
461 467
462/* ------------------------------------------------------------------------- * 468/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 469 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 470 * ------------------------------------------------------------------------- */
… …
502 } 508 }
503 509
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 510 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 511 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 512 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 513 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 514 assert (s->cur.col >= 0);
510#endif
511} 515}
512 516
513void 517void
514rxvt_term::scr_swap_screen () 518rxvt_term::scr_swap_screen ()
515{ 519{
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 779 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 780 screen.cur.row -= minlines;
777 } 781 }
778 } 782 }
779 783
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 784 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 785 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 786 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 787 int row = screen.cur.row;
786 788
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 789 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 790
789 line_t *line = &ROW(row); 791 line_t *line = &ROW(row);
… …
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907 909
908 // if the character doesn't fit into the remaining columns... 910 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 { 912 {
911 // ...output spaces 913 // ... artificially enlargen the previous one
912 c = ' '; 914 c = NOCHAR;
913 // and try the same character next loop iteration 915 // and try the same character next loop iteration
914 --str; 916 --str;
915 } 917 }
916 918
917 line->touch (); 919 line->touch ();
… …
993#endif 995#endif
994 } 996 }
995 997
996 max_it (line->l, screen.cur.col); 998 max_it (line->l, screen.cur.col);
997 999
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1000 assert (screen.cur.row >= 0);
1000#endif
1001} 1001}
1002 1002
1003/* ------------------------------------------------------------------------- */ 1003/* ------------------------------------------------------------------------- */
1004/* 1004/*
1005 * 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
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1334 return; 1334 return;
1335 1335
1336 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1337 1337
1338 /*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.
1339 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1344 {
1343 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1344 1346
1345 if (mapped) 1347 if (mapped && !view_start)
1346 XClearArea (dpy, vt, 0, 1348 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1349 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1350 (unsigned int)Height2Pixel (num), False);
1349 } 1351 }
1350 else 1352 else
1351 { 1353 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1355
1356 if (mapped && !view_start)
1357 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1360 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1361 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1362 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1363 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1362 } 1367 }
1363 1368
1364 for (; num--; row++) 1369 for (; num--; row++)
1365 { 1370 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (!view_start)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1368 } 1375 }
1369} 1376}
1370 1377
1371#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1372void 1379void
… …
1464 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1465 1472
1466 line->touch (); 1473 line->touch ();
1467 line->is_longer (0); 1474 line->is_longer (0);
1468 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1469 switch (insdel) 1480 switch (insdel)
1470 { 1481 {
1471 case INSERT: 1482 case INSERT:
1472 line->l = min (line->l + count, ncol); 1483 line->l = min (line->l + count, ncol);
1484
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1473 1487
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) 1488 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1475 { 1489 {
1476 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1477 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
… …
1498 case ERASE: 1512 case ERASE:
1499 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1500 selection_check (1); 1514 selection_check (1);
1501 screen.cur.col -= count; 1515 screen.cur.col -= count;
1502 1516
1517 // nuke wide char after the end
1518 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1519 scr_kill_char (*line, screen.cur.col + count);
1520
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1522 break;
1505 1523
1506 case DELETE: 1524 case DELETE:
1507 {
1508 line->l = max (line->l - count, 0); 1525 line->l = max (line->l - count, 0);
1509 1526
1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 // nuke wide char spanning the end
1528 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1529 scr_kill_char (*line, screen.cur.col + count);
1511 1530
1512 for (int col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 { 1532 {
1514 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1516 } 1535 }
1517 1536
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); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1523 1538
1524 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1526 { 1541 {
1527 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
1528 || (screen.cur.col >= selection.beg.col - count) 1543 || (screen.cur.col >= selection.beg.col - count)
1529 || selection.end.col >= ncol) 1544 || selection.end.col >= ncol)
1530 CLEAR_SELECTION (); 1545 CLEAR_SELECTION ();
1531 else 1546 else
1532 { 1547 {
1533 /* shift selection */ 1548 /* shift selection */
1534 selection.beg.col -= count; 1549 selection.beg.col -= count;
1535 selection.mark.col -= count; /* XXX: yes? */ 1550 selection.mark.col -= count; /* XXX: yes? */
1536 selection.end.col -= count; 1551 selection.end.col -= count;
1537 } 1552 }
1538 }
1539 } 1553 }
1540 1554
1541 break; 1555 break;
1542 } 1556 }
1543} 1557}
… …
1986 * screen.text/screen.rend contain what the screen will change to. 2000 * screen.text/screen.rend contain what the screen will change to.
1987 */ 2001 */
1988void 2002void
1989rxvt_term::scr_refresh () NOTHROW 2003rxvt_term::scr_refresh () NOTHROW
1990{ 2004{
1991 unsigned char have_bg,
1992 showcursor; /* show the cursor */
1993 int16_t col, row, /* column/row we're processing */ 2005 int16_t col, row, /* column/row we're processing */
1994 ocrow; /* old cursor row */ 2006 ocrow; /* old cursor row */
1995 int i; /* tmp */ 2007 int i; /* tmp */
1996#ifndef NO_CURSORCOLOR 2008#ifndef NO_CURSORCOLOR
1997 rend_t cc1; /* store colours at cursor position (s) */ 2009 rend_t cc1; /* store colours at cursor position (s) */
… …
2008 /* 2020 /*
2009 * A: set up vars 2021 * A: set up vars
2010 */ 2022 */
2011 refresh_count = 0; 2023 refresh_count = 0;
2012 2024
2025 unsigned int old_screen_flags = screen.flags;
2013 have_bg = 0; 2026 char have_bg = 0;
2014#ifdef HAVE_BG_PIXMAP 2027#ifdef HAVE_BG_PIXMAP
2015 have_bg = bgPixmap.pixmap != None; 2028 have_bg = bgPixmap.pixmap != None;
2016#endif 2029#endif
2017 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2018 2031
2019 /* 2032 /*
2020 * B: reverse any characters which are selected 2033 * B: reverse any characters which are selected
2021 */ 2034 */
2022 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;
2023 2043
2024 /* 2044 /*
2025 * C: set the cursor character (s) 2045 * C: set the cursor character (s)
2026 */ 2046 */
2027 { 2047 {
2028 unsigned char setoldcursor; 2048 unsigned char setoldcursor;
2029 2049
2030 showcursor = (screen.flags & Screen_VisibleCursor);
2031#ifdef CURSOR_BLINK 2050#ifdef CURSOR_BLINK
2032 if (hidden_cursor) 2051 if (hidden_cursor)
2033 showcursor = 0; 2052 showcursor = 0;
2034#endif 2053#endif
2035 2054
… …
2108 oldcursor.col = screen.cur.col; 2127 oldcursor.col = screen.cur.col;
2109 } 2128 }
2110 } 2129 }
2111 } 2130 }
2112 2131
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 2132#ifndef NO_SLOW_LINK_SUPPORT
2119 /* 2133 /*
2120 * D: CopyArea pass - very useful for slower links 2134 * D: CopyArea pass - very useful for slower links
2121 * This has been deliberately kept simple. 2135 * This has been deliberately kept simple.
2122 */ 2136 */
… …
2228 for (i = 0; ++col < ncol; ) 2242 for (i = 0; ++col < ncol; )
2229 { 2243 {
2230 if (stp[col] == NOCHAR) 2244 if (stp[col] == NOCHAR)
2231 { 2245 {
2232 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2233 drp[col] = rend; 2247 drp[col] = srp[col];
2248
2234 count++; 2249 count++;
2235 i++; 2250 i++;
2236 2251
2237 continue; 2252 continue;
2238 } 2253 }
… …
2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2409 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2395 } 2410 }
2396 } /* for (col....) */ 2411 } /* for (col....) */
2397 } /* for (row....) */ 2412 } /* for (row....) */
2398 2413
2399#if ENABLE_OVERLAY
2400 scr_swap_overlay ();
2401#endif
2402 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2403
2404 /* 2414 /*
2405 * G: cleanup cursor and display outline cursor if necessary 2415 * G: cleanup cursor and display outline cursor if necessary
2406 */ 2416 */
2407 if (showcursor) 2417 if (showcursor)
2408 { 2418 {
… …
2446 } 2456 }
2447 2457
2448 /* 2458 /*
2449 * H: cleanup selection 2459 * H: cleanup selection
2450 */ 2460 */
2461#if ENABLE_OVERLAY
2462 scr_swap_overlay ();
2463#endif
2464 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2465
2451 scr_reverse_selection (); 2466 scr_reverse_selection ();
2452 2467
2468 screen.flags = old_screen_flags;
2453 num_scr = 0; 2469 num_scr = 0;
2454 num_scr_allow = 1; 2470 num_scr_allow = 1;
2455} 2471}
2456 2472
2457void 2473void
… …
3716 h += 2; min_it (h, nrow); 3732 h += 2; min_it (h, nrow);
3717 3733
3718 x -= 1; clamp_it (x, 0, ncol - w); 3734 x -= 1; clamp_it (x, 0, ncol - w);
3719 y -= 1; clamp_it (y, 0, nrow - h); 3735 y -= 1; clamp_it (y, 0, nrow - h);
3720 3736
3721 ov_x = x; ov_y = y; 3737 ov.x = x; ov.y = y;
3722 ov_w = w; ov_h = h; 3738 ov.w = w; ov.h = h;
3723 3739
3724 ov_text = new text_t *[h]; 3740 ov.text = new text_t *[h];
3725 ov_rend = new rend_t *[h]; 3741 ov.rend = new rend_t *[h];
3726 3742
3727 for (y = 0; y < h; y++) 3743 for (y = 0; y < h; y++)
3728 { 3744 {
3729 text_t *tp = ov_text[y] = new text_t[w]; 3745 text_t *tp = ov.text[y] = new text_t[w];
3730 rend_t *rp = ov_rend[y] = new rend_t[w]; 3746 rend_t *rp = ov.rend[y] = new rend_t[w];
3731 3747
3732 text_t t0, t1, t2; 3748 text_t t0, t1, t2;
3733 rend_t r = OVERLAY_RSTYLE; 3749 rend_t r = OVERLAY_RSTYLE;
3734 3750
3735 if (y == 0) 3751 if (y == 0)
… …
3754} 3770}
3755 3771
3756void 3772void
3757rxvt_term::scr_overlay_off () NOTHROW 3773rxvt_term::scr_overlay_off () NOTHROW
3758{ 3774{
3759 if (!ov_text) 3775 if (!ov.text)
3760 return; 3776 return;
3761 3777
3762 want_refresh = 1; 3778 want_refresh = 1;
3763 3779
3764 for (int y = 0; y < ov_h; y++) 3780 for (int y = 0; y < ov.h; y++)
3765 { 3781 {
3766 delete [] ov_text[y]; 3782 delete [] ov.text[y];
3767 delete [] ov_rend[y]; 3783 delete [] ov.rend[y];
3768 } 3784 }
3769 3785
3770 delete [] ov_text; ov_text = 0; 3786 delete [] ov.text; ov.text = 0;
3771 delete [] ov_rend; ov_rend = 0; 3787 delete [] ov.rend; ov.rend = 0;
3772} 3788}
3773 3789
3774void 3790void
3775rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3776{ 3792{
3777 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3793 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3778 return; 3794 return;
3779 3795
3780 x++, y++; 3796 x++, y++;
3781 3797
3782 ov_text[y][x] = text; 3798 ov.text[y][x] = text;
3783 ov_rend[y][x] = rend; 3799 ov.rend[y][x] = rend;
3784} 3800}
3785 3801
3786void 3802void
3787rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3803rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3788{ 3804{
… …
3807} 3823}
3808 3824
3809void 3825void
3810rxvt_term::scr_swap_overlay () NOTHROW 3826rxvt_term::scr_swap_overlay () NOTHROW
3811{ 3827{
3812 if (!ov_text) 3828 if (!ov.text)
3813 return; 3829 return;
3814 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
3815 // swap screen mem with overlay 3836 // swap screen mem with overlay
3816 for (int y = ov_h; y--; ) 3837 for (int y = ov.h; y--; )
3817 { 3838 {
3818 text_t *t1 = ov_text[y]; 3839 text_t *t1 = ov.text[y];
3819 rend_t *r1 = ov_rend[y]; 3840 rend_t *r1 = ov.rend[y];
3820 3841
3821 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;
3822 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;
3823 3844
3824 for (int x = ov_w; x--; ) 3845 for (int x = ov.w; x--; )
3825 { 3846 {
3826 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3847 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3827 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));
3828 } 3849 }
3829 } 3850 }

Diff Legend

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