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.349 by root, Thu Oct 14 23:12:11 2010 UTC vs.
Revision 1.361 by sf-exg, Thu Jan 6 10:19:29 2011 UTC

… …
144 col--; 144 col--;
145 145
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148 148
149 l.touch ();
150
149 // found start, nuke 151 // found start, nuke
150 do { 152 do {
151 l.t[col] = ' '; 153 l.t[col] = ' ';
152 l.r[col] = rend; 154 l.r[col] = rend;
153 col++; 155 col++;
… …
398 } 400 }
399 401
400 free (tabs); 402 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
402 404
403 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
405 407
406 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
407 409
408 prev_nrow = nrow; 410 prev_nrow = nrow;
… …
898# else 900# else
899 c = 0xfffd; 901 c = 0xfffd;
900# endif 902# endif
901#endif 903#endif
902 904
903 // nuke the character at this position, if required
904 if (expect_false (
905 line->t[screen.cur.col] == NOCHAR
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 906
913 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 { 909 {
… …
922 } 916 }
923 else 917 else
924 screen.cur.col = ncol - width; 918 screen.cur.col = ncol - width;
925 } 919 }
926 920
921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
927
927 line->touch (); 928 line->touch ();
928 929
929 do 930 do
930 { 931 {
931 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
… …
936 else 937 else
937 { 938 {
938 line->l = ncol; 939 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
941 break; 942
943 goto end_of_line;
942 } 944 }
943 945
944 c = NOCHAR; 946 c = NOCHAR;
945 } 947 }
946 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
947 949
948 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
949 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
950 { 952 {
951 line->touch ();
952
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 {
955 line->t[c] = ' '; 953 line->t[c] = ' ';
956 line->r[c] = rend; 954 line->r[c] = rend;
957 }
958 } 955 }
956
957end_of_line:
958 ;
959 } 959 }
960#if ENABLE_COMBINING 960#if ENABLE_COMBINING
961 else // width == 0 961 else // width == 0
962 { 962 {
963 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1026 1026
1027 want_refresh = 1; 1027 want_refresh = 1;
1028#endif 1028#endif
1029 } 1029 }
1030 } 1030 }
1031#ifdef TERMCAP_HAS_BW
1032 else if (screen.flags & Screen_WrapNext) 1031 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext; 1032 screen.flags &= ~Screen_WrapNext;
1034#endif
1035 else 1033 else
1036 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1037} 1035}
1038 1036
1039/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
2629void 2627void
2630rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2631{ 2629{
2632 int row, wrote; 2630 int row, wrote;
2633 unsigned int width, towrite; 2631 unsigned int width, towrite;
2634 char r1[] = "\n"; 2632 const char r1[] = "\n";
2635 2633
2636 for (row = saveLines + top_row; 2634 for (row = saveLines + top_row;
2637 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2638 { 2636 {
2639 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
3000 * EXT: button 1 or 3 release 2998 * EXT: button 1 or 3 release
3001 */ 2999 */
3002void 3000void
3003rxvt_term::selection_make (Time tm) 3001rxvt_term::selection_make (Time tm)
3004{ 3002{
3005 int i; 3003 int size;
3006 wchar_t *new_selection_text; 3004 wchar_t *new_selection_text;
3007 text_t *t; 3005 text_t *t;
3008 3006
3009 switch (selection.op) 3007 switch (selection.op)
3010 { 3008 {
… …
3026 return; /* nothing selected, go away */ 3024 return; /* nothing selected, go away */
3027 3025
3028 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3029 return; 3027 return;
3030 3028
3031 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3029 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3032 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3030 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3033 3031
3034 int ofs = 0; 3032 int ofs = 0;
3035 int extra = 0; 3033 int extra = 0;
3036 3034
3037 int col = selection.beg.col; 3035 int col = selection.beg.col;
… …
3043 { 3041 {
3044#if !ENABLE_MINIMAL 3042#if !ENABLE_MINIMAL
3045 if (selection.rect) 3043 if (selection.rect)
3046 { 3044 {
3047 col = selection.beg.col; 3045 col = selection.beg.col;
3048 end_col = ncol + 1; 3046 end_col = selection.end.col;
3049 } 3047 }
3050 else 3048 else
3051#endif 3049#endif
3052 end_col = ROW(row).l; 3050 end_col = ROW(row).l;
3053 3051
3054 col = max (col, 0); 3052 col = max (col, 0);
3055 3053
3056 if (row == selection.end.row 3054 if (row == selection.end.row)
3057#if !ENABLE_MINIMAL
3058 || selection.rect
3059#endif
3060 )
3061 min_it (end_col, selection.end.col); 3055 min_it (end_col, selection.end.col);
3062 3056
3063 t = ROW(row).t + col; 3057 t = ROW(row).t + col;
3064 3058
3065 for (; col < end_col; col++) 3059 for (; col < end_col; col++)
… …
3073 3067
3074 extra -= (len - 1); 3068 extra -= (len - 1);
3075 3069
3076 if (extra < 0) 3070 if (extra < 0)
3077 { 3071 {
3078 extra += i; 3072 extra += size;
3079 i += i; 3073 size += size;
3080 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3081 } 3075 }
3082 3076
3083 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3084 } 3078 }
3085#endif 3079#endif
… …
3097 3091
3098 new_selection_text[ofs++] = C0_LF; 3092 new_selection_text[ofs++] = C0_LF;
3099 } 3093 }
3100 else 3094 else
3101#endif 3095#endif
3102 if (!ROW(row).is_longer () && row != selection.end.row) 3096 if (!ROW(row).is_longer ()
3097 && (row != selection.end.row || end_col != selection.end.col)
3098 && (row != selection.beg.row || selection.beg.col < ncol))
3103 new_selection_text[ofs++] = C0_LF; 3099 new_selection_text[ofs++] = C0_LF;
3104 } 3100 }
3105
3106 if (end_col != selection.end.col)
3107 new_selection_text[ofs++] = C0_LF;
3108 3101
3109 new_selection_text[ofs] = 0; 3102 new_selection_text[ofs] = 0;
3110 3103
3111 if (ofs == 0) 3104 if (ofs == 0)
3112 { 3105 {

Diff Legend

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