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.354 by root, Fri Oct 15 21:14:12 2010 UTC vs.
Revision 1.358 by sf-exg, Tue Jan 4 18:22:11 2011 UTC

… …
917 else 917 else
918 screen.cur.col = ncol - width; 918 screen.cur.col = ncol - width;
919 } 919 }
920 920
921 // nuke the character at this position, if required 921 // nuke the character at this position, if required
922 // due to wonderful coincidents everywhere else in this loop 922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 923 // we never have to check for overwriting a wide char itself,
924 // only its tail. 924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 926 scr_kill_char (*line, screen.cur.col);
927 927
… …
2627void 2627void
2628rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2629{ 2629{
2630 int row, wrote; 2630 int row, wrote;
2631 unsigned int width, towrite; 2631 unsigned int width, towrite;
2632 char r1[] = "\n"; 2632 const char r1[] = "\n";
2633 2633
2634 for (row = saveLines + top_row; 2634 for (row = saveLines + top_row;
2635 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2636 { 2636 {
2637 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
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
… …
3095 3095
3096 new_selection_text[ofs++] = C0_LF; 3096 new_selection_text[ofs++] = C0_LF;
3097 } 3097 }
3098 else 3098 else
3099#endif 3099#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row) 3100 if (!ROW(row).is_longer () && row != selection.end.row
3101 && (row != selection.beg.row || selection.beg.col < ncol))
3101 new_selection_text[ofs++] = C0_LF; 3102 new_selection_text[ofs++] = C0_LF;
3102 } 3103 }
3103 3104
3104 if (end_col != selection.end.col) 3105 if (end_col != selection.end.col)
3105 new_selection_text[ofs++] = C0_LF; 3106 new_selection_text[ofs++] = C0_LF;

Diff Legend

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