| … | |
… | |
| 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 (); |
| … | |
… | |
| 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 | |
| … | |
… | |
| 3091 | |
3091 | |
| 3092 | new_selection_text[ofs++] = C0_LF; |
3092 | new_selection_text[ofs++] = C0_LF; |
| 3093 | } |
3093 | } |
| 3094 | else |
3094 | else |
| 3095 | #endif |
3095 | #endif |
| 3096 | 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) |
| 3097 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3098 | && (row != selection.beg.row || selection.beg.col < ncol)) |
| 3098 | new_selection_text[ofs++] = C0_LF; |
3099 | new_selection_text[ofs++] = C0_LF; |
| 3099 | } |
3100 | } |
| 3100 | |
|
|
| 3101 | if (end_col != selection.end.col) |
|
|
| 3102 | new_selection_text[ofs++] = C0_LF; |
|
|
| 3103 | |
3101 | |
| 3104 | new_selection_text[ofs] = 0; |
3102 | new_selection_text[ofs] = 0; |
| 3105 | |
3103 | |
| 3106 | if (ofs == 0) |
3104 | if (ofs == 0) |
| 3107 | { |
3105 | { |
