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.356 by sf-exg, Tue Dec 21 10:37:42 2010 UTC vs.
Revision 1.359 by sf-exg, Tue Jan 4 23:06:10 2011 UTC

… …
2998 * EXT: button 1 or 3 release 2998 * EXT: button 1 or 3 release
2999 */ 2999 */
3000void 3000void
3001rxvt_term::selection_make (Time tm) 3001rxvt_term::selection_make (Time tm)
3002{ 3002{
3003 int i; 3003 int size;
3004 wchar_t *new_selection_text; 3004 wchar_t *new_selection_text;
3005 text_t *t; 3005 text_t *t;
3006 3006
3007 switch (selection.op) 3007 switch (selection.op)
3008 { 3008 {
… …
3024 return; /* nothing selected, go away */ 3024 return; /* nothing selected, go away */
3025 3025
3026 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)))
3027 return; 3027 return;
3028 3028
3029 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3029 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3030 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));
3031 3031
3032 int ofs = 0; 3032 int ofs = 0;
3033 int extra = 0; 3033 int extra = 0;
3034 3034
3035 int col = selection.beg.col; 3035 int col = selection.beg.col;
… …
3041 { 3041 {
3042#if !ENABLE_MINIMAL 3042#if !ENABLE_MINIMAL
3043 if (selection.rect) 3043 if (selection.rect)
3044 { 3044 {
3045 col = selection.beg.col; 3045 col = selection.beg.col;
3046 end_col = ncol + 1; 3046 end_col = selection.end.col;
3047 } 3047 }
3048 else 3048 else
3049#endif 3049#endif
3050 end_col = ROW(row).l; 3050 end_col = ROW(row).l;
3051 3051
3052 col = max (col, 0); 3052 col = max (col, 0);
3053 3053
3054 if (row == selection.end.row 3054 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 3055 min_it (end_col, selection.end.col);
3060 3056
3061 t = ROW(row).t + col; 3057 t = ROW(row).t + col;
3062 3058
3063 for (; col < end_col; col++) 3059 for (; col < end_col; col++)
… …
3071 3067
3072 extra -= (len - 1); 3068 extra -= (len - 1);
3073 3069
3074 if (extra < 0) 3070 if (extra < 0)
3075 { 3071 {
3076 extra += i; 3072 extra += size;
3077 i += i; 3073 size += size;
3078 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));
3079 } 3075 }
3080 3076
3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082 } 3078 }
3083#endif 3079#endif
… …
3095 3091
3096 new_selection_text[ofs++] = C0_LF; 3092 new_selection_text[ofs++] = C0_LF;
3097 } 3093 }
3098 else 3094 else
3099#endif 3095#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row) 3096 if (!ROW(row).is_longer () && row != selection.end.row
3097 && (row != selection.beg.row || selection.beg.col < ncol))
3101 new_selection_text[ofs++] = C0_LF; 3098 new_selection_text[ofs++] = C0_LF;
3102 } 3099 }
3103 3100
3104 if (end_col != selection.end.col) 3101 if (end_col != selection.end.col)
3105 new_selection_text[ofs++] = C0_LF; 3102 new_selection_text[ofs++] = C0_LF;

Diff Legend

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