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.252 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.256 by root, Mon Jan 30 20:12:37 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
… …
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 { 645 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i); 646 line_t &l = ROW(nrow - 1 - i);
649 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 {
650 scr_blank_line (l, 0, l.l, rstyle); 652 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 653 l.l = 0;
653 l.f = 0; 654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
654 } 658 }
655 659
656 // now copy lines below the scroll region bottom to the 660 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 661 // bottom of the screen again, so they look as if they
658 // hadn't moved. 662 // hadn't moved.
… …
1110 * Process DEC Back Index 1114 * Process DEC Back Index
1111 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1112 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1113 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1114 */ 1118 */
1115#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1116void 1120void
1117rxvt_term::scr_backindex () NOTHROW 1121rxvt_term::scr_backindex () NOTHROW
1118{ 1122{
1119 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1127 * Process DEC Forward Index 1131 * Process DEC Forward Index
1128 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1129 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1130 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1131 */ 1135 */
1132#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1133void 1137void
1134rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_term::scr_forwardindex () NOTHROW
1135{ 1139{
1136 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1351 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1352 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1353 } 1357 }
1354} 1358}
1355 1359
1356#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1357void 1361void
1358rxvt_term::scr_erase_savelines () NOTHROW 1362rxvt_term::scr_erase_savelines () NOTHROW
1359{ 1363{
1360 want_refresh = 1; 1364 want_refresh = 1;
1361 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
… …
1750{ 1754{
1751 bool found = false; 1755 bool found = false;
1752 1756
1753 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1754 { 1758 {
1755 int col = 0;
1756 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1757 1760
1758 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1759 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1760 { 1763 {
1761 found = true; 1764 found = true;
1762 *drp = ~value; 1765 *drp = ~value;
1763 } 1766 }
… …
2254 && RS_SAME (rend, srp[text - stp - 1])) 2257 && RS_SAME (rend, srp[text - stp - 1]))
2255 text--, count++, xpixel -= fwidth; 2258 text--, count++, xpixel -= fwidth;
2256 2259
2257 // force redraw after "careful" characters to avoid pixel droppings 2260 // force redraw after "careful" characters to avoid pixel droppings
2258 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++)
2259 drp[col + i + 1] = ~srp[col + i + 1]; 2262 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2260 2263
2261 // force redraw before "careful" characters to avoid pixel droppings 2264 // force redraw before "careful" characters to avoid pixel droppings
2262 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++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; 2266 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2264#endif 2267#endif
2265 2268
2266 bool invert = rend & RS_RVid; 2269 bool invert = rend & RS_RVid;
2267 2270
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2271#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2545{ 2548{
2546 if (selection.op 2549 if (selection.op
2547 && current_screen == selection.screen 2550 && current_screen == selection.screen
2548 && selection.end.row >= view_start) 2551 && selection.end.row >= view_start)
2549 { 2552 {
2550#if ENABLE_FRILLS 2553#if !ENABLE_MINIMAL
2551 if (selection.rect) 2554 if (selection.rect)
2552 scr_xor_rect (selection.beg.row, selection.beg.col, 2555 scr_xor_rect (selection.beg.row, selection.beg.col,
2553 selection.end.row, selection.end.col, 2556 selection.end.row, selection.end.col,
2554 RS_RVid, RS_RVid | RS_Uline); 2557 RS_RVid, RS_RVid | RS_Uline);
2555 else 2558 else
… …
2770 } 2773 }
2771 2774
2772 char **cl; 2775 char **cl;
2773 int cr; 2776 int cr;
2774 2777
2775#if ENABLE_FRILLS 2778#if !ENABLE_MINIMAL
2776 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2779 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2777 // so recode it manually 2780 // so recode it manually
2778 if (ct.encoding == xa[XA_UTF8_STRING]) 2781 if (ct.encoding == xa[XA_UTF8_STRING])
2779 { 2782 {
2780 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2783 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2951 2954
2952 int end_col; 2955 int end_col;
2953 2956
2954 for (; row <= selection.end.row; row++, col = 0) 2957 for (; row <= selection.end.row; row++, col = 0)
2955 { 2958 {
2956#if ENABLE_FRILLS 2959#if !ENABLE_MINIMAL
2957 if (selection.rect) 2960 if (selection.rect)
2958 { 2961 {
2959 col = selection.beg.col; 2962 col = selection.beg.col;
2960 end_col = ncol + 1; 2963 end_col = ncol + 1;
2961 } 2964 }
… …
2964 end_col = ROW(row).l; 2967 end_col = ROW(row).l;
2965 2968
2966 col = max (col, 0); 2969 col = max (col, 0);
2967 2970
2968 if (row == selection.end.row 2971 if (row == selection.end.row
2969#if ENABLE_FRILLS 2972#if !ENABLE_MINIMAL
2970 || selection.rect 2973 || selection.rect
2971#endif 2974#endif
2972 ) 2975 )
2973 min_it (end_col, selection.end.col); 2976 min_it (end_col, selection.end.col);
2974 2977
… …
2997#endif 3000#endif
2998 else 3001 else
2999 new_selection_text[ofs++] = *t++; 3002 new_selection_text[ofs++] = *t++;
3000 } 3003 }
3001 3004
3002#if ENABLE_FRILLS 3005#if !ENABLE_MINIMAL
3003 if (selection.rect) 3006 if (selection.rect)
3004 { 3007 {
3005 while (ofs 3008 while (ofs
3006 && new_selection_text[ofs - 1] != C0_LF 3009 && new_selection_text[ofs - 1] != C0_LF
3007 && unicode::is_space (new_selection_text[ofs - 1])) 3010 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3368 3371
3369 if (selection.clicks == 1) 3372 if (selection.clicks == 1)
3370 { 3373 {
3371 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3374 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.beg.row).is_longer () 3375 && !ROW(selection.beg.row).is_longer ()
3373#if ENABLE_FRILLS 3376#if !ENABLE_MINIMAL
3374 && !selection.rect 3377 && !selection.rect
3375#endif 3378#endif
3376 ) 3379 )
3377 selection.beg.col = ncol; 3380 selection.beg.col = ncol;
3378 3381
3379 if ( 3382 if (
3380 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3383 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3381 && !ROW(selection.end.row).is_longer () 3384 && !ROW(selection.end.row).is_longer ()
3382#if ENABLE_FRILLS 3385#if !ENABLE_MINIMAL
3383 && !selection.rect 3386 && !selection.rect
3384#endif 3387#endif
3385 ) 3388 )
3386 selection.end.col = ncol; 3389 selection.end.col = ncol;
3387 } 3390 }
… …
3404 { 3407 {
3405 if (!ROW(end_row).is_longer ()) 3408 if (!ROW(end_row).is_longer ())
3406 { 3409 {
3407 selection.end.row = end_row; 3410 selection.end.row = end_row;
3408 selection.end.col = ROW(end_row).l; 3411 selection.end.col = ROW(end_row).l;
3412# if !ENABLE_MINIMAL
3409 selection_remove_trailing_spaces (); 3413 selection_remove_trailing_spaces ();
3414# endif
3410 break; 3415 break;
3411 } 3416 }
3412 } 3417 }
3413 } 3418 }
3414 else 3419 else
… …
3443 selection.mark.row = selection.beg.row; 3448 selection.mark.row = selection.beg.row;
3444 selection.mark.col = selection.beg.col; 3449 selection.mark.col = selection.beg.col;
3445 } 3450 }
3446 } 3451 }
3447 3452
3448#if ENABLE_FRILLS 3453#if !ENABLE_MINIMAL
3449 if (selection.rect && selection.beg.col > selection.end.col) 3454 if (selection.rect && selection.beg.col > selection.end.col)
3450 ::swap (selection.beg.col, selection.end.col); 3455 ::swap (selection.beg.col, selection.end.col);
3451#endif 3456#endif
3452} 3457}
3453 3458
3454#if ENABLE_FRILLS 3459#if !ENABLE_MINIMAL
3455void 3460void
3456rxvt_term::selection_remove_trailing_spaces () NOTHROW 3461rxvt_term::selection_remove_trailing_spaces () NOTHROW
3457{ 3462{
3458 int32_t end_col, end_row; 3463 int32_t end_col, end_row;
3459 text_t *stp; 3464 text_t *stp;
… …
3584 style = enc_string; 3589 style = enc_string;
3585 else if (target == xa[XA_TEXT]) 3590 else if (target == xa[XA_TEXT])
3586 style = enc_text; 3591 style = enc_text;
3587 else if (target == xa[XA_COMPOUND_TEXT]) 3592 else if (target == xa[XA_COMPOUND_TEXT])
3588 style = enc_compound_text; 3593 style = enc_compound_text;
3589#if ENABLE_FRILLS 3594#if !ENABLE_MINIMAL
3590 else if (target == xa[XA_UTF8_STRING]) 3595 else if (target == xa[XA_UTF8_STRING])
3591 style = enc_utf8; 3596 style = enc_utf8;
3592#endif 3597#endif
3593 else 3598 else
3594 { 3599 {
… …
3605 { 3610 {
3606 cl = L""; 3611 cl = L"";
3607 selectlen = 0; 3612 selectlen = 0;
3608 } 3613 }
3609 3614
3610#if ENABLE_FRILLS 3615#if !ENABLE_MINIMAL
3611 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3616 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3612 // so recode it manually 3617 // so recode it manually
3613 if (style == enc_utf8) 3618 if (style == enc_utf8)
3614 { 3619 {
3615 freect = 1; 3620 freect = 1;

Diff Legend

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