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.253 by root, Fri Jan 27 18:36:43 2006 UTC vs.
Revision 1.255 by root, Mon Jan 30 04:27:17 2006 UTC

126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch (); 129 l.touch ();
130 130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
136 136
640 l.touch (); 640 l.touch ();
641 } 641 }
642 642
643 // erase newly scrolled-in lines 643 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 644 for (int i = count; i--; )
645 {
646 line_t &l = ROW(nrow - 1 - i);
647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask))
651 {
652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0;
654 l.f = 0;
655 }
656 else
645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle); 657 scr_blank_screen_mem (l, rstyle);
658 }
646 659
647 // now copy lines below the scroll region bottom to the 660 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 661 // bottom of the screen again, so they look as if they
649 // hadn't moved. 662 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 663 for (int i = nrow; --i > row2; )
1741{ 1754{
1742 bool found = false; 1755 bool found = false;
1743 1756
1744 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1745 { 1758 {
1746 int col = 0;
1747 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1748 1760
1749 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1750 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1751 { 1763 {
1752 found = true; 1764 found = true;
1753 *drp = ~value; 1765 *drp = ~value;
1754 } 1766 }
2245 && RS_SAME (rend, srp[text - stp - 1])) 2257 && RS_SAME (rend, srp[text - stp - 1]))
2246 text--, count++, xpixel -= fwidth; 2258 text--, count++, xpixel -= fwidth;
2247 2259
2248 // force redraw after "careful" characters to avoid pixel droppings 2260 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) 2261 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1]; 2262 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2251 2263
2252 // force redraw before "careful" characters to avoid pixel droppings 2264 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) 2265 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; 2266 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2255#endif 2267#endif
2256 2268
2257 bool invert = rend & RS_RVid; 2269 bool invert = rend & RS_RVid;
2258 2270
2259#ifndef NO_BOLD_UNDERLINE_REVERSE 2271#ifndef NO_BOLD_UNDERLINE_REVERSE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines