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.192 by root, Thu Dec 22 19:25:58 2005 UTC vs.
Revision 1.200 by root, Tue Dec 27 01:54:08 2005 UTC

… …
351 lofs += len; 351 lofs += len;
352 qcol += len; 352 qcol += len;
353 } 353 }
354 } 354 }
355 355
356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 356 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
357#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
358 if (qline->l < 0)
359 {
360 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
361 qline->l = 0;
362 }
363#endif
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
358 } 365 }
359 while (p != pend && q > 0); 366 while (p != pend && q > 0);
360 367
361 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
… …
385 } 392 }
386 393
387 term_start = 0; 394 term_start = 0;
388 } 395 }
389 396
390#ifdef DEBUG_STRICT 397#ifdef DEBUG_STRICT //TODO: remove
391 for (int i = -nsaved; i < nrow; i++) 398 for (int i = -nsaved; i < nrow; i++)
392 assert (ROW (i).t); 399 assert (ROW (i).t);
393#endif 400#endif
394 401
395 free (old_buf); 402 free (old_buf);
… …
620 { 627 {
621 selection.beg.row -= count; 628 selection.beg.row -= count;
622 selection.end.row -= count; 629 selection.end.row -= count;
623 selection.mark.row -= count; 630 selection.mark.row -= count;
624 631
625 selection_check (0); 632 if (selection.beg.row < -nsaved
633 || selection.end.row < -nsaved
634 || selection.mark.row < -nsaved)
635 {
636 CLEAR_ALL_SELECTION ();
637 selection.op = SELECTION_CLEAR;
638 }
626 } 639 }
627 640
628 for (int i = count; i--; ) 641 for (int i = count; i--; )
642 {
643 ROW(row2 - i).l = 0;
629 scr_blank_screen_mem (ROW(row2 - i), rstyle); 644 scr_blank_screen_mem (ROW(row2 - i), rstyle);
645 }
630 646
631 if ((options & Opt_scrollWithBuffer) 647 if ((options & Opt_scrollWithBuffer)
632 && view_start != 0 648 && view_start != 0
633 && view_start != saveLines) 649 && view_start != saveLines)
634 scr_page (UP, count); 650 scr_page (UP, count);
635 } 651 }
636 else 652 else
637 { 653 {
638 if (selection.op && current_screen == selection.screen) 654 if (selection.op && current_screen == selection.screen)
639 { 655 {
640 int i = selection.beg.row; 656 if ((selection.beg.row < row1 && selection.end.row > row1)
641 int j = selection.end.row; 657 || (selection.beg.row < row2 && selection.end.row > row2)
642
643 if ((i < row1 && j > row1)
644 || (i < row2 && j > row2)
645 || (i - count < row1 && i >= row1) 658 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
646 || (i - count > row2 && i <= row2) 659 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
647 || (j - count < row1 && j >= row1) 660 || (selection.end.row - count < row1 && selection.end.row >= row1)
648 || (j - count > row2 && j <= row2)) 661 || (selection.end.row - count > row2 && selection.end.row <= row2))
649 { 662 {
650 CLEAR_ALL_SELECTION (); 663 CLEAR_ALL_SELECTION ();
651 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 664 selection.op = SELECTION_CLEAR;
652 } 665 }
653 else if (j >= row1 && j <= row2) 666 else if (selection.end.row >= row1 && selection.end.row <= row2)
654 { 667 {
655 /* move selected region too */ 668 /* move selected region too */
656 selection.beg.row -= count; 669 selection.beg.row -= count;
657 selection.end.row -= count; 670 selection.end.row -= count;
658 selection.mark.row -= count; 671 selection.mark.row -= count;
… …
693 if (len <= 0) /* sanity */ 706 if (len <= 0) /* sanity */
694 return; 707 return;
695 708
696 unsigned char checksel; 709 unsigned char checksel;
697 unicode_t c; 710 unicode_t c;
698 int row, last_col; 711 int last_col;
699 const unicode_t *strend = str + len; 712 const unicode_t *strend = str + len;
700 713
701 want_refresh = 1; 714 want_refresh = 1;
702 ZERO_SCROLLBACK (); 715 ZERO_SCROLLBACK ();
703 last_col = ncol; 716 last_col = ncol;
… …
718#ifdef DEBUG_STRICT 731#ifdef DEBUG_STRICT
719 assert (screen.cur.col < last_col); 732 assert (screen.cur.col < last_col);
720 assert (screen.cur.row < nrow 733 assert (screen.cur.row < nrow
721 && screen.cur.row >= -nsaved); 734 && screen.cur.row >= -nsaved);
722#endif 735#endif
723 row = screen.cur.row; 736 int row = screen.cur.row;
724 737
725 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 738 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
726 739
727 line_t *line = &ROW(row); 740 line_t *line = &ROW(row);
728 741
… …
730 { 743 {
731 c = *str++; 744 c = *str++;
732 745
733 if (c < 0x20) 746 if (c < 0x20)
734 if (c == C0_LF) 747 if (c == C0_LF)
735 { 748 {
736 if (!line->is_longer ()) /* XXX: think about this */ 749 if (!line->is_longer ()) /* XXX: think about this */
737 max_it (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
738 751
739 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
740 753
… …
985 998
986 if (count == 0) 999 if (count == 0)
987 return; 1000 return;
988 else if (count > 0) 1001 else if (count > 0)
989 { 1002 {
990 int row = screen.cur.row;
991
992 line_t &l = ROW(row); 1003 line_t &l = ROW(screen.cur.row);
993 rend_t base_rend = l.r[i]; 1004 rend_t base_rend = l.r[i];
994 ht &= l.t[i] == ' '; 1005 ht &= l.t[i] == ' ';
995 1006
996 for (; ++i < ncol; ) 1007 for (; ++i < ncol; )
997 if (tabs[i]) 1008 if (tabs[i])
… …
1072 */ 1083 */
1073#if ENABLE_FRILLS 1084#if ENABLE_FRILLS
1074void 1085void
1075rxvt_term::scr_forwardindex () 1086rxvt_term::scr_forwardindex ()
1076{ 1087{
1077 int row;
1078
1079 if (screen.cur.col < ncol - 1) 1088 if (screen.cur.col < ncol - 1)
1080 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1081 else 1090 else
1082 { 1091 {
1083 row = screen.cur.row;
1084
1085 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1092 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1086 ROW(row).l = ncol; 1093 ROW(screen.cur.row).l = ncol;
1087 1094
1088 scr_gotorc (0, 0, R_RELATIVE); 1095 scr_gotorc (0, 0, R_RELATIVE);
1089 scr_insdel_chars (1, DELETE); 1096 scr_insdel_chars (1, DELETE);
1090 scr_gotorc (0, ncol - 1, R_RELATIVE); 1097 scr_gotorc (0, ncol - 1, R_RELATIVE);
1091 } 1098 }
… …
1174 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1181 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1175 */ 1182 */
1176void 1183void
1177rxvt_term::scr_erase_line (int mode) 1184rxvt_term::scr_erase_line (int mode)
1178{ 1185{
1179 unsigned int row, col, num; 1186 unsigned int col, num;
1180 1187
1181 want_refresh = 1; 1188 want_refresh = 1;
1182 ZERO_SCROLLBACK (); 1189 ZERO_SCROLLBACK ();
1183 1190
1184 selection_check (1); 1191 selection_check (1);
1185 1192
1186 row = screen.cur.row; 1193 line_t &line = ROW(screen.cur.row);
1187 1194
1188 switch (mode) 1195 switch (mode)
1189 { 1196 {
1190 case 0: /* erase to end of line */ 1197 case 0: /* erase to end of line */
1191 col = screen.cur.col; 1198 col = screen.cur.col;
1192 num = ncol - col; 1199 num = ncol - col;
1193 min_it (ROW(row).l, col); 1200 min_it (line.l, col);
1194 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1201 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1195 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1202 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1196 CLEAR_SELECTION (); 1203 CLEAR_SELECTION ();
1197 break; 1204 break;
1198 case 1: /* erase to beginning of line */ 1205 case 1: /* erase to beginning of line */
… …
1203 CLEAR_SELECTION (); 1210 CLEAR_SELECTION ();
1204 break; 1211 break;
1205 case 2: /* erase whole line */ 1212 case 2: /* erase whole line */
1206 col = 0; 1213 col = 0;
1207 num = ncol; 1214 num = ncol;
1208 ROW(row).l = 0; 1215 line.l = 0;
1209 if (selection.beg.row <= screen.cur.row 1216 if (selection.beg.row <= screen.cur.row
1210 && selection.end.row >= screen.cur.row) 1217 && selection.end.row >= screen.cur.row)
1211 CLEAR_SELECTION (); 1218 CLEAR_SELECTION ();
1212 break; 1219 break;
1213 default: 1220 default:
1214 return; 1221 return;
1215 } 1222 }
1216 1223
1217 scr_blank_line (ROW(row), col, num, rstyle); 1224 scr_blank_line (line, col, num, rstyle);
1218} 1225}
1219 1226
1220/* ------------------------------------------------------------------------- */ 1227/* ------------------------------------------------------------------------- */
1221/* 1228/*
1222 * Erase part of whole of the screen 1229 * Erase part of whole of the screen
… …
1286 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1293 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1287 } 1294 }
1288 1295
1289 for (; num--; row++) 1296 for (; num--; row++)
1290 { 1297 {
1298 ROW (row).l = 0;
1291 scr_blank_screen_mem (ROW (row), rstyle); 1299 scr_blank_screen_mem (ROW (row), rstyle);
1292 ROW (row).l = 0;
1293 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1300 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1294 } 1301 }
1295} 1302}
1296 1303
1297#if ENABLE_FRILLS 1304#if ENABLE_FRILLS
… …
2183 * Determine the attributes for the string 2190 * Determine the attributes for the string
2184 */ 2191 */
2185 int fore = GET_FGCOLOR (rend); // desired foreground 2192 int fore = GET_FGCOLOR (rend); // desired foreground
2186 int back = GET_BGCOLOR (rend); // desired background 2193 int back = GET_BGCOLOR (rend); // desired background
2187 2194
2188 // only do special processing if any attributes are set, which is rare 2195 // only do special processing if any attributes are set, which is unlikely
2189 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2196 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2190 { 2197 {
2191#if ENABLE_STYLES 2198#if ENABLE_STYLES
2192 // force redraw after "careful" characters to avoid pixel droppings 2199 // force redraw after "careful" characters to avoid pixel droppings
2193 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2200 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2441 2448
2442#if ENABLE_FRILLS 2449#if ENABLE_FRILLS
2443 if (selection.rect) 2450 if (selection.rect)
2444 { 2451 {
2445 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2452 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2453 {
2454 text_t *stp = ROW(row).t;
2455 rend_t *srp = ROW(row).r;
2456
2446 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2457 for (col = selection.beg.col; col < selection.end.col; col++)
2447 srp[col] ^= RS_RVid; 2458 srp[col] ^= RS_RVid;
2459
2460 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2461 srp[col] ^= RS_RVid | RS_Uline;
2462 }
2448 } 2463 }
2449 else 2464 else
2450#endif 2465#endif
2451 { 2466 {
2452 if (selection.beg.row >= -view_start) 2467 if (selection.beg.row >= -view_start)
… …
2455 row = selection.beg.row; 2470 row = selection.beg.row;
2456 } 2471 }
2457 else 2472 else
2458 { 2473 {
2459 col = 0; 2474 col = 0;
2460 row = view_start; 2475 row = -view_start;
2461 } 2476 }
2462 2477
2463 for (; row < min (selection.end.row, view_end); row++, col = 0) 2478 for (; row < min (selection.end.row, view_end); row++, col = 0)
2464 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2479 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2465 srp[col] ^= RS_RVid; 2480 srp[col] ^= RS_RVid;
… …
2879#endif 2894#endif
2880 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2895 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2881 2896
2882 col = max (col, 0); 2897 col = max (col, 0);
2883 2898
2884 if (row == selection.end.row || selection.rect) 2899 if (row == selection.end.row
2900#if ENABLE_FRILLS
2901 || selection.rect
2902#endif
2903 )
2885 end_col = min (end_col, selection.end.col); 2904 min_it (end_col, selection.end.col);
2886 2905
2887 t = ROW(row).t + col; 2906 t = ROW(row).t + col;
2888 for (; col < end_col; col++) 2907 for (; col < end_col; col++)
2889 { 2908 {
2890 if (*t == NOCHAR) 2909 if (*t == NOCHAR)
… …
2908#endif 2927#endif
2909 else 2928 else
2910 new_selection_text[ofs++] = *t++; 2929 new_selection_text[ofs++] = *t++;
2911 } 2930 }
2912 2931
2932#if ENABLE_FRILLS
2933 if (selection.rect)
2934 {
2935 while (ofs
2936 && new_selection_text[ofs - 1] != C0_LF
2937 && unicode::is_space (new_selection_text[ofs - 1]))
2938 --ofs;
2939
2940 new_selection_text[ofs++] = C0_LF;
2941 }
2942 else
2943#endif
2913 if (!ROW(row).is_longer () && row != selection.end.row) 2944 if (!ROW(row).is_longer () && row != selection.end.row)
2914 new_selection_text[ofs++] = C0_LF; 2945 new_selection_text[ofs++] = C0_LF;
2915 } 2946 }
2916 2947
2917 if (end_col != selection.end.col) 2948 if (end_col != selection.end.col)
2918 new_selection_text[ofs++] = C0_LF; 2949 new_selection_text[ofs++] = C0_LF;
2919 2950
… …
3341 { 3372 {
3342 stp = ROW(end_row).t; 3373 stp = ROW(end_row).t;
3343 3374
3344 while (--end_col >= 0) 3375 while (--end_col >= 0)
3345 { 3376 {
3346 if (stp[end_col] != ' ' 3377 if (stp[end_col] != NOCHAR
3347 && stp[end_col] != '\t' 3378 && !unicode::is_space (stp[end_col]))
3348 && stp[end_col] != NOCHAR)
3349 break; 3379 break;
3350 } 3380 }
3351 3381
3352 if (end_col >= 0 3382 if (end_col >= 0
3353 || !ROW(end_row - 1).is_longer ()) 3383 || !ROW(end_row - 1).is_longer ())
… …
3669 for (int y = ov_h; y--; ) 3699 for (int y = ov_h; y--; )
3670 { 3700 {
3671 text_t *t1 = ov_text[y]; 3701 text_t *t1 = ov_text[y];
3672 rend_t *r1 = ov_rend[y]; 3702 rend_t *r1 = ov_rend[y];
3673 3703
3674 text_t *t2 = ROW(y - view_start).t + ov_x; 3704 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3675 rend_t *r2 = ROW(y - view_start).r + ov_x; 3705 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3676 3706
3677 for (int x = ov_w; x--; ) 3707 for (int x = ov_w; x--; )
3678 { 3708 {
3679 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3709 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3680 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3710 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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