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.315 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.332 by sf-exg, Mon Jan 18 10:05:55 2010 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{
… …
540 want_refresh = 1; 544 want_refresh = 1;
541 view_start = 0; 545 view_start = 0;
542 546
543 selection_check (2); /* check for boundary cross */ 547 selection_check (2); /* check for boundary cross */
544 548
545 int i = current_screen; current_screen = scrn; scrn = i; 549 current_screen = scrn;
546 550
547#if NSCREENS 551#if NSCREENS
548 if (option (Opt_secondaryScreen)) 552 if (option (Opt_secondaryScreen))
549 { 553 {
550 num_scr = 0; 554 num_scr = 0;
… …
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
1469 // nuke wide char at beginning 1476 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR) 1477 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col); 1478 scr_kill_char (*line, screen.cur.col);
1472 1479
1473 switch (insdel) 1480 switch (insdel)
1474 { 1481 {
… …
1513 1520
1514 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1515 break; 1522 break;
1516 1523
1517 case DELETE: 1524 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0); 1525 line->l = max (line->l - count, 0);
1520 1526
1521 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);
1522 1530
1523 for (int col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1524 { 1532 {
1525 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1526 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1527 } 1535 }
1528 1536
1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1533 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1534 1538
1535 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1537 { 1541 {
1538 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
1539 || (screen.cur.col >= selection.beg.col - count) 1543 || (screen.cur.col >= selection.beg.col - count)
1540 || selection.end.col >= ncol) 1544 || selection.end.col >= ncol)
1541 CLEAR_SELECTION (); 1545 CLEAR_SELECTION ();
1542 else 1546 else
1543 { 1547 {
1544 /* shift selection */ 1548 /* shift selection */
1545 selection.beg.col -= count; 1549 selection.beg.col -= count;
1546 selection.mark.col -= count; /* XXX: yes? */ 1550 selection.mark.col -= count; /* XXX: yes? */
1547 selection.end.col -= count; 1551 selection.end.col -= count;
1548 } 1552 }
1549 }
1550 } 1553 }
1551 1554
1552 break; 1555 break;
1553 } 1556 }
1554} 1557}
… …
1930 1933
1931 bell_ev.start (VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1932 } 1935 }
1933 else 1936 else
1934 XBell (dpy, 0); 1937 XBell (dpy, 0);
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1935#endif 1939#endif
1936} 1940}
1937 1941
1938/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1939/* ARGSUSED */ 1943/* ARGSUSED */
… …
1958 row_start = view_start; 1962 row_start = view_start;
1959 } 1963 }
1960 1964
1961 wctomb (0, 0); 1965 wctomb (0, 0);
1962 1966
1963 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1964 { 1968 {
1965 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1966 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1967 1971
1968 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1972 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1997 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
1998 */ 2002 */
1999void 2003void
2000rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
2001{ 2005{
2002 unsigned char have_bg,
2003 showcursor; /* show the cursor */
2004 int16_t col, row, /* column/row we're processing */ 2006 int16_t col, row, /* column/row we're processing */
2005 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
2006 int i; /* tmp */ 2008 int i; /* tmp */
2007#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
2008 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
… …
2019 /* 2021 /*
2020 * A: set up vars 2022 * A: set up vars
2021 */ 2023 */
2022 refresh_count = 0; 2024 refresh_count = 0;
2023 2025
2026 unsigned int old_screen_flags = screen.flags;
2024 have_bg = 0; 2027 char have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP 2028#ifdef HAVE_BG_PIXMAP
2026 have_bg = bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
2027#endif 2030#endif
2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2029 2032
2030 /* 2033 /*
2031 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
2032 */ 2035 */
2033 scr_reverse_selection (); 2036 scr_reverse_selection ();
2037
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY
2040 scr_swap_overlay ();
2041#endif
2042
2043 char showcursor = screen.flags & Screen_VisibleCursor;
2034 2044
2035 /* 2045 /*
2036 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2037 */ 2047 */
2038 { 2048 {
2039 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2040 2050
2041 showcursor = (screen.flags & Screen_VisibleCursor);
2042#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2043 if (hidden_cursor) 2052 if (hidden_cursor)
2044 showcursor = 0; 2053 showcursor = 0;
2045#endif 2054#endif
2046 2055
… …
2119 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2120 } 2129 }
2121 } 2130 }
2122 } 2131 }
2123 2132
2124 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2125#if ENABLE_OVERLAY
2126 scr_swap_overlay ();
2127#endif
2128
2129#ifndef NO_SLOW_LINK_SUPPORT 2133#ifndef NO_SLOW_LINK_SUPPORT
2130 /* 2134 /*
2131 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2132 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2133 */ 2137 */
… …
2239 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2240 { 2244 {
2241 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2242 { 2246 {
2243 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2244 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2245 count++; 2250 count++;
2246 i++; 2251 i++;
2247 2252
2248 continue; 2253 continue;
2249 } 2254 }
… …
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 } 2411 }
2407 } /* for (col....) */ 2412 } /* for (col....) */
2408 } /* for (row....) */ 2413 } /* for (row....) */
2409 2414
2410#if ENABLE_OVERLAY
2411 scr_swap_overlay ();
2412#endif
2413 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414
2415 /* 2415 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2416 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2417 */
2418 if (showcursor) 2418 if (showcursor)
2419 { 2419 {
… …
2457 } 2457 }
2458 2458
2459 /* 2459 /*
2460 * H: cleanup selection 2460 * H: cleanup selection
2461 */ 2461 */
2462#if ENABLE_OVERLAY
2463 scr_swap_overlay ();
2464#endif
2465 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2466
2462 scr_reverse_selection (); 2467 scr_reverse_selection ();
2463 2468
2469 screen.flags = old_screen_flags;
2464 num_scr = 0; 2470 num_scr = 0;
2465 num_scr_allow = 1; 2471 num_scr_allow = 1;
2466} 2472}
2467 2473
2468void 2474void
… …
3727 h += 2; min_it (h, nrow); 3733 h += 2; min_it (h, nrow);
3728 3734
3729 x -= 1; clamp_it (x, 0, ncol - w); 3735 x -= 1; clamp_it (x, 0, ncol - w);
3730 y -= 1; clamp_it (y, 0, nrow - h); 3736 y -= 1; clamp_it (y, 0, nrow - h);
3731 3737
3732 ov_x = x; ov_y = y; 3738 ov.x = x; ov.y = y;
3733 ov_w = w; ov_h = h; 3739 ov.w = w; ov.h = h;
3734 3740
3735 ov_text = new text_t *[h]; 3741 ov.text = new text_t *[h];
3736 ov_rend = new rend_t *[h]; 3742 ov.rend = new rend_t *[h];
3737 3743
3738 for (y = 0; y < h; y++) 3744 for (y = 0; y < h; y++)
3739 { 3745 {
3740 text_t *tp = ov_text[y] = new text_t[w]; 3746 text_t *tp = ov.text[y] = new text_t[w];
3741 rend_t *rp = ov_rend[y] = new rend_t[w]; 3747 rend_t *rp = ov.rend[y] = new rend_t[w];
3742 3748
3743 text_t t0, t1, t2; 3749 text_t t0, t1, t2;
3744 rend_t r = OVERLAY_RSTYLE; 3750 rend_t r = OVERLAY_RSTYLE;
3745 3751
3746 if (y == 0) 3752 if (y == 0)
… …
3765} 3771}
3766 3772
3767void 3773void
3768rxvt_term::scr_overlay_off () NOTHROW 3774rxvt_term::scr_overlay_off () NOTHROW
3769{ 3775{
3770 if (!ov_text) 3776 if (!ov.text)
3771 return; 3777 return;
3772 3778
3773 want_refresh = 1; 3779 want_refresh = 1;
3774 3780
3775 for (int y = 0; y < ov_h; y++) 3781 for (int y = 0; y < ov.h; y++)
3776 { 3782 {
3777 delete [] ov_text[y]; 3783 delete [] ov.text[y];
3778 delete [] ov_rend[y]; 3784 delete [] ov.rend[y];
3779 } 3785 }
3780 3786
3781 delete [] ov_text; ov_text = 0; 3787 delete [] ov.text; ov.text = 0;
3782 delete [] ov_rend; ov_rend = 0; 3788 delete [] ov.rend; ov.rend = 0;
3783} 3789}
3784 3790
3785void 3791void
3786rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3787{ 3793{
3788 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3794 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3789 return; 3795 return;
3790 3796
3791 x++, y++; 3797 x++, y++;
3792 3798
3793 ov_text[y][x] = text; 3799 ov.text[y][x] = text;
3794 ov_rend[y][x] = rend; 3800 ov.rend[y][x] = rend;
3795} 3801}
3796 3802
3797void 3803void
3798rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3799{ 3805{
… …
3818} 3824}
3819 3825
3820void 3826void
3821rxvt_term::scr_swap_overlay () NOTHROW 3827rxvt_term::scr_swap_overlay () NOTHROW
3822{ 3828{
3823 if (!ov_text) 3829 if (!ov.text)
3824 return; 3830 return;
3825 3831
3832 // hide cursor if it is within the overlay area
3833 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3834 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3835 screen.flags &= ~Screen_VisibleCursor;
3836
3826 // swap screen mem with overlay 3837 // swap screen mem with overlay
3827 for (int y = ov_h; y--; ) 3838 for (int y = ov.h; y--; )
3828 { 3839 {
3829 text_t *t1 = ov_text[y]; 3840 text_t *t1 = ov.text[y];
3830 rend_t *r1 = ov_rend[y]; 3841 rend_t *r1 = ov.rend[y];
3831 3842
3832 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3843 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3833 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3844 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3834 3845
3835 for (int x = ov_w; x--; ) 3846 for (int x = ov.w; x--; )
3836 { 3847 {
3837 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3848 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3838 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3839 } 3850 }
3840 } 3851 }

Diff Legend

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