| … | |
… | |
| 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 | if (expect_false ( |
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. |
| 923 | line->t[screen.cur.col] == NOCHAR |
925 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
| 924 | || (screen.cur.col < ncol - 1 |
|
|
| 925 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
| 926 | )) |
|
|
| 927 | scr_kill_char (*line, screen.cur.col); |
926 | scr_kill_char (*line, screen.cur.col); |
| 928 | |
927 | |
| 929 | line->touch (); |
928 | line->touch (); |
| 930 | |
929 | |
| 931 | do |
930 | do |
| … | |
… | |
| 2628 | void |
2627 | void |
| 2629 | rxvt_term::scr_dump (int fd) NOTHROW |
2628 | rxvt_term::scr_dump (int fd) NOTHROW |
| 2630 | { |
2629 | { |
| 2631 | int row, wrote; |
2630 | int row, wrote; |
| 2632 | unsigned int width, towrite; |
2631 | unsigned int width, towrite; |
| 2633 | char r1[] = "\n"; |
2632 | const char r1[] = "\n"; |
| 2634 | |
2633 | |
| 2635 | for (row = saveLines + top_row; |
2634 | for (row = saveLines + top_row; |
| 2636 | row < saveLines + nrow - 1; row++) |
2635 | row < saveLines + nrow - 1; row++) |
| 2637 | { |
2636 | { |
| 2638 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2637 | width = row_buf[row].l >= 0 ? row_buf[row].l |
| … | |
… | |
| 2999 | * EXT: button 1 or 3 release |
2998 | * EXT: button 1 or 3 release |
| 3000 | */ |
2999 | */ |
| 3001 | void |
3000 | void |
| 3002 | rxvt_term::selection_make (Time tm) |
3001 | rxvt_term::selection_make (Time tm) |
| 3003 | { |
3002 | { |
| 3004 | int i; |
3003 | int size; |
| 3005 | wchar_t *new_selection_text; |
3004 | wchar_t *new_selection_text; |
| 3006 | text_t *t; |
3005 | text_t *t; |
| 3007 | |
3006 | |
| 3008 | switch (selection.op) |
3007 | switch (selection.op) |
| 3009 | { |
3008 | { |
| … | |
… | |
| 3025 | return; /* nothing selected, go away */ |
3024 | return; /* nothing selected, go away */ |
| 3026 | |
3025 | |
| 3027 | 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))) |
| 3028 | return; |
3027 | return; |
| 3029 | |
3028 | |
| 3030 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3029 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
| 3031 | 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)); |
| 3032 | |
3031 | |
| 3033 | int ofs = 0; |
3032 | int ofs = 0; |
| 3034 | int extra = 0; |
3033 | int extra = 0; |
| 3035 | |
3034 | |
| 3036 | int col = selection.beg.col; |
3035 | int col = selection.beg.col; |
| … | |
… | |
| 3072 | |
3071 | |
| 3073 | extra -= (len - 1); |
3072 | extra -= (len - 1); |
| 3074 | |
3073 | |
| 3075 | if (extra < 0) |
3074 | if (extra < 0) |
| 3076 | { |
3075 | { |
| 3077 | extra += i; |
3076 | extra += size; |
| 3078 | i += i; |
3077 | size += size; |
| 3079 | 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)); |
| 3080 | } |
3079 | } |
| 3081 | |
3080 | |
| 3082 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3081 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
| 3083 | } |
3082 | } |
| 3084 | #endif |
3083 | #endif |
