… | |
… | |
400 | } |
400 | } |
401 | |
401 | |
402 | free (tabs); |
402 | free (tabs); |
403 | tabs = (char *)rxvt_malloc (ncol); |
403 | tabs = (char *)rxvt_malloc (ncol); |
404 | |
404 | |
405 | for (int col = ncol; --col; ) |
405 | for (int col = ncol; col--; ) |
406 | tabs [col] = col % TABSIZE == 0; |
406 | tabs [col] = col % TABSIZE == 0; |
407 | |
407 | |
408 | CLEAR_ALL_SELECTION (); |
408 | CLEAR_ALL_SELECTION (); |
409 | |
409 | |
410 | prev_nrow = nrow; |
410 | prev_nrow = nrow; |
… | |
… | |
2519 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2519 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2520 | XClearWindow (dpy, parent[0]); |
2520 | XClearWindow (dpy, parent[0]); |
2521 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2521 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2522 | |
2522 | |
2523 | if (scrollBar.win) |
2523 | if (scrollBar.win) |
2524 | { |
2524 | { |
2525 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2525 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2526 | scrollBar.state = STATE_IDLE; |
2526 | scrollBar.state = STATE_IDLE; |
2527 | scrollBar.show (0); |
2527 | scrollBar.show (0); |
2528 | } |
2528 | } |
2529 | |
2529 | |
2530 | #endif |
2530 | #endif |
2531 | |
2531 | |
2532 | /* bgPixmap.apply () does not do the following : */ |
2532 | /* bgPixmap.apply () does not do the following : */ |
2533 | scr_clear (); |
2533 | scr_clear (); |
… | |
… | |
2627 | void |
2627 | void |
2628 | rxvt_term::scr_dump (int fd) NOTHROW |
2628 | rxvt_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 |
… | |
… | |
2772 | &ct2.nitems, &bytes_after, |
2772 | &ct2.nitems, &bytes_after, |
2773 | &ct2.value) != Success) |
2773 | &ct2.value) != Success) |
2774 | goto bailout; |
2774 | goto bailout; |
2775 | |
2775 | |
2776 | // realloc should be compatible to XFree, here, and elsewhere, too |
2776 | // realloc should be compatible to XFree, here, and elsewhere, too |
2777 | 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); |
2778 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
2778 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
2779 | ct.nitems += ct2.nitems; |
2779 | ct.nitems += ct2.nitems; |
2780 | |
2780 | |
2781 | XFree (ct2.value); |
2781 | XFree (ct2.value); |
2782 | } |
2782 | } |
… | |
… | |
2831 | incr_ev.start (10); |
2831 | incr_ev.start (10); |
2832 | |
2832 | |
2833 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2833 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2834 | { |
2834 | { |
2835 | 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; |
2836 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2836 | incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size); |
2837 | } |
2837 | } |
2838 | |
2838 | |
2839 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2839 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2840 | incr_buf_fill += ct.nitems; |
2840 | incr_buf_fill += ct.nitems; |
2841 | |
2841 | |
… | |
… | |
2998 | * EXT: button 1 or 3 release |
2998 | * EXT: button 1 or 3 release |
2999 | */ |
2999 | */ |
3000 | void |
3000 | void |
3001 | rxvt_term::selection_make (Time tm) |
3001 | rxvt_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 () |
|
|
3097 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
3098 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3101 | new_selection_text[ofs++] = C0_LF; |
3099 | new_selection_text[ofs++] = C0_LF; |
3102 | } |
3100 | } |
3103 | |
|
|
3104 | if (end_col != selection.end.col) |
|
|
3105 | new_selection_text[ofs++] = C0_LF; |
|
|
3106 | |
3101 | |
3107 | new_selection_text[ofs] = 0; |
3102 | new_selection_text[ofs] = 0; |
3108 | |
3103 | |
3109 | if (ofs == 0) |
3104 | if (ofs == 0) |
3110 | { |
3105 | { |