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.348 by sf-exg, Sat Oct 9 22:33:45 2010 UTC vs.
Revision 1.362 by sf-exg, Sat Jan 8 10:15:36 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 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1031 else 1033 else
1032 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1033} 1035}
1034 1036
1035/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
2625void 2627void
2626rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2627{ 2629{
2628 int row, wrote; 2630 int row, wrote;
2629 unsigned int width, towrite; 2631 unsigned int width, towrite;
2630 char r1[] = "\n"; 2632 const char r1[] = "\n";
2631 2633
2632 for (row = saveLines + top_row; 2634 for (row = saveLines + top_row;
2633 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2634 { 2636 {
2635 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2770 &ct2.nitems, &bytes_after, 2772 &ct2.nitems, &bytes_after,
2771 &ct2.value) != Success) 2773 &ct2.value) != Success)
2772 goto bailout; 2774 goto bailout;
2773 2775
2774 // realloc should be compatible to XFree, here, and elsewhere, too 2776 // realloc should be compatible to XFree, here, and elsewhere, too
2775 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2777 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2776 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2777 ct.nitems += ct2.nitems; 2779 ct.nitems += ct2.nitems;
2778 2780
2779 XFree (ct2.value); 2781 XFree (ct2.value);
2780 } 2782 }
… …
2829 incr_ev.start (10); 2831 incr_ev.start (10);
2830 2832
2831 while (incr_buf_fill + ct.nitems > incr_buf_size) 2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2832 { 2834 {
2833 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2834 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2836 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2835 } 2837 }
2836 2838
2837 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2838 incr_buf_fill += ct.nitems; 2840 incr_buf_fill += ct.nitems;
2839 2841
… …
2996 * EXT: button 1 or 3 release 2998 * EXT: button 1 or 3 release
2997 */ 2999 */
2998void 3000void
2999rxvt_term::selection_make (Time tm) 3001rxvt_term::selection_make (Time tm)
3000{ 3002{
3001 int i; 3003 int size;
3002 wchar_t *new_selection_text; 3004 wchar_t *new_selection_text;
3003 text_t *t; 3005 text_t *t;
3004 3006
3005 switch (selection.op) 3007 switch (selection.op)
3006 { 3008 {
… …
3022 return; /* nothing selected, go away */ 3024 return; /* nothing selected, go away */
3023 3025
3024 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)))
3025 return; 3027 return;
3026 3028
3027 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3029 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3028 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));
3029 3031
3030 int ofs = 0; 3032 int ofs = 0;
3031 int extra = 0; 3033 int extra = 0;
3032 3034
3033 int col = selection.beg.col; 3035 int col = selection.beg.col;
… …
3039 { 3041 {
3040#if !ENABLE_MINIMAL 3042#if !ENABLE_MINIMAL
3041 if (selection.rect) 3043 if (selection.rect)
3042 { 3044 {
3043 col = selection.beg.col; 3045 col = selection.beg.col;
3044 end_col = ncol + 1; 3046 end_col = selection.end.col;
3045 } 3047 }
3046 else 3048 else
3047#endif 3049#endif
3048 end_col = ROW(row).l; 3050 end_col = ROW(row).l;
3049 3051
3050 col = max (col, 0); 3052 col = max (col, 0);
3051 3053
3052 if (row == selection.end.row 3054 if (row == selection.end.row)
3053#if !ENABLE_MINIMAL
3054 || selection.rect
3055#endif
3056 )
3057 min_it (end_col, selection.end.col); 3055 min_it (end_col, selection.end.col);
3058 3056
3059 t = ROW(row).t + col; 3057 t = ROW(row).t + col;
3060 3058
3061 for (; col < end_col; col++) 3059 for (; col < end_col; col++)
… …
3069 3067
3070 extra -= (len - 1); 3068 extra -= (len - 1);
3071 3069
3072 if (extra < 0) 3070 if (extra < 0)
3073 { 3071 {
3074 extra += i; 3072 extra += size;
3075 i += i; 3073 size += size;
3076 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));
3077 } 3075 }
3078 3076
3079 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3080 } 3078 }
3081#endif 3079#endif
… …
3093 3091
3094 new_selection_text[ofs++] = C0_LF; 3092 new_selection_text[ofs++] = C0_LF;
3095 } 3093 }
3096 else 3094 else
3097#endif 3095#endif
3098 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))
3099 new_selection_text[ofs++] = C0_LF; 3099 new_selection_text[ofs++] = C0_LF;
3100 } 3100 }
3101
3102 if (end_col != selection.end.col)
3103 new_selection_text[ofs++] = C0_LF;
3104 3101
3105 new_selection_text[ofs] = 0; 3102 new_selection_text[ofs] = 0;
3106 3103
3107 if (ofs == 0) 3104 if (ofs == 0)
3108 { 3105 {

Diff Legend

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