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.357 by sf-exg, Tue Jan 4 17:51:05 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;
3071 3071
3072 extra -= (len - 1); 3072 extra -= (len - 1);
3073 3073
3074 if (extra < 0) 3074 if (extra < 0)
3075 { 3075 {
3076 extra += i; 3076 extra += size;
3077 i += i; 3077 size += size;
3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3079 } 3079 }
3080 3080
3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082 } 3082 }
3083#endif 3083#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines