… | |
… | |
144 | col--; |
144 | col--; |
145 | |
145 | |
146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
148 | |
148 | |
|
|
149 | l.touch (); |
|
|
150 | |
149 | // found start, nuke |
151 | // found start, nuke |
150 | do { |
152 | do { |
151 | l.t[col] = ' '; |
153 | l.t[col] = ' '; |
152 | l.r[col] = rend; |
154 | l.r[col] = rend; |
153 | col++; |
155 | col++; |
… | |
… | |
398 | } |
400 | } |
399 | |
401 | |
400 | free (tabs); |
402 | free (tabs); |
401 | tabs = (char *)rxvt_malloc (ncol); |
403 | tabs = (char *)rxvt_malloc (ncol); |
402 | |
404 | |
403 | for (int col = ncol; --col; ) |
405 | for (int col = ncol; col--; ) |
404 | tabs [col] = col % TABSIZE == 0; |
406 | tabs [col] = col % TABSIZE == 0; |
405 | |
407 | |
406 | CLEAR_ALL_SELECTION (); |
408 | CLEAR_ALL_SELECTION (); |
407 | |
409 | |
408 | prev_nrow = nrow; |
410 | prev_nrow = nrow; |
… | |
… | |
898 | # else |
900 | # else |
899 | c = 0xfffd; |
901 | c = 0xfffd; |
900 | # endif |
902 | # endif |
901 | #endif |
903 | #endif |
902 | |
904 | |
903 | // nuke the character at this position, if required |
|
|
904 | if (expect_false ( |
|
|
905 | line->t[screen.cur.col] == NOCHAR |
|
|
906 | || (screen.cur.col < ncol - 1 |
|
|
907 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
908 | )) |
|
|
909 | scr_kill_char (*line, screen.cur.col); |
|
|
910 | |
|
|
911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
905 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
912 | |
906 | |
913 | // if the character doesn't fit into the remaining columns... |
907 | // if the character doesn't fit into the remaining columns... |
914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
908 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
915 | { |
909 | { |
… | |
… | |
922 | } |
916 | } |
923 | else |
917 | else |
924 | screen.cur.col = ncol - width; |
918 | screen.cur.col = ncol - width; |
925 | } |
919 | } |
926 | |
920 | |
|
|
921 | // nuke the character at this position, if required |
|
|
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. |
|
|
925 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
|
|
926 | scr_kill_char (*line, screen.cur.col); |
|
|
927 | |
927 | line->touch (); |
928 | line->touch (); |
928 | |
929 | |
929 | do |
930 | do |
930 | { |
931 | { |
931 | line->t[screen.cur.col] = c; |
932 | line->t[screen.cur.col] = c; |
… | |
… | |
936 | else |
937 | else |
937 | { |
938 | { |
938 | line->l = ncol; |
939 | line->l = ncol; |
939 | if (screen.flags & Screen_Autowrap) |
940 | if (screen.flags & Screen_Autowrap) |
940 | screen.flags |= Screen_WrapNext; |
941 | screen.flags |= Screen_WrapNext; |
941 | break; |
942 | |
|
|
943 | goto end_of_line; |
942 | } |
944 | } |
943 | |
945 | |
944 | c = NOCHAR; |
946 | c = NOCHAR; |
945 | } |
947 | } |
946 | while (expect_false (--width > 0)); |
948 | while (expect_false (--width > 0)); |
947 | |
949 | |
948 | // pad with spaces when overwriting wide character with smaller one |
950 | // pad with spaces when overwriting wide character with smaller one |
949 | if (expect_false (!width)) |
951 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
950 | { |
952 | { |
951 | line->touch (); |
|
|
952 | |
|
|
953 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
954 | { |
|
|
955 | line->t[c] = ' '; |
953 | line->t[c] = ' '; |
956 | line->r[c] = rend; |
954 | line->r[c] = rend; |
957 | } |
|
|
958 | } |
955 | } |
|
|
956 | |
|
|
957 | end_of_line: |
|
|
958 | ; |
959 | } |
959 | } |
960 | #if ENABLE_COMBINING |
960 | #if ENABLE_COMBINING |
961 | else // width == 0 |
961 | else // width == 0 |
962 | { |
962 | { |
963 | if (c != 0xfeff) // ignore BOM |
963 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1685 | { |
1685 | { |
1686 | rvideo_state = on; |
1686 | rvideo_state = on; |
1687 | |
1687 | |
1688 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1688 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1689 | #ifdef HAVE_BG_PIXMAP |
1689 | #ifdef HAVE_BG_PIXMAP |
1690 | if (bgPixmap.pixmap == None) |
1690 | if (bg_pixmap == None) |
1691 | #endif |
1691 | #endif |
1692 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1692 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1693 | |
1693 | |
1694 | XGCValues gcvalue; |
1694 | XGCValues gcvalue; |
1695 | gcvalue.foreground = pix_colors[Color_fg]; |
1695 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
2031 | refresh_count = 0; |
2031 | refresh_count = 0; |
2032 | |
2032 | |
2033 | unsigned int old_screen_flags = screen.flags; |
2033 | unsigned int old_screen_flags = screen.flags; |
2034 | char have_bg = 0; |
2034 | char have_bg = 0; |
2035 | #ifdef HAVE_BG_PIXMAP |
2035 | #ifdef HAVE_BG_PIXMAP |
2036 | have_bg = bgPixmap.pixmap != None; |
2036 | have_bg = bg_pixmap != None; |
2037 | #endif |
2037 | #endif |
2038 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2038 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2039 | |
2039 | |
2040 | /* |
2040 | /* |
2041 | * B: reverse any characters which are selected |
2041 | * B: reverse any characters which are selected |
… | |
… | |
2508 | scr_remap_chars (swap_buf [i]); |
2508 | scr_remap_chars (swap_buf [i]); |
2509 | } |
2509 | } |
2510 | } |
2510 | } |
2511 | |
2511 | |
2512 | void |
2512 | void |
2513 | rxvt_term::scr_recolour () NOTHROW |
2513 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2514 | { |
2514 | { |
|
|
2515 | bool transparent = false; |
|
|
2516 | |
2515 | #ifdef HAVE_BG_PIXMAP |
2517 | #ifdef HAVE_BG_PIXMAP |
2516 | bgPixmap.apply (); |
2518 | if (bg_pixmap != None) |
2517 | #else |
2519 | { |
|
|
2520 | # ifdef ENABLE_TRANSPARENCY |
|
|
2521 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2522 | { |
|
|
2523 | XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); |
|
|
2524 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2518 | |
2525 | |
|
|
2526 | transparent = true; |
|
|
2527 | } |
|
|
2528 | else |
|
|
2529 | # endif |
|
|
2530 | { |
|
|
2531 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2532 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2533 | } |
|
|
2534 | } |
|
|
2535 | else |
|
|
2536 | #endif |
|
|
2537 | { |
2519 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2538 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2539 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2540 | } |
|
|
2541 | |
2520 | XClearWindow (dpy, parent[0]); |
2542 | XClearWindow (dpy, parent[0]); |
2521 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2522 | |
2543 | |
2523 | if (scrollBar.win) |
2544 | if (scrollBar.win) |
2524 | { |
2545 | { |
|
|
2546 | if (transparent) |
|
|
2547 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2548 | else |
2525 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2549 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2526 | scrollBar.state = STATE_IDLE; |
2550 | scrollBar.state = STATE_IDLE; |
2527 | scrollBar.show (0); |
2551 | scrollBar.show (0); |
2528 | } |
2552 | } |
2529 | |
2553 | |
2530 | #endif |
2554 | if (refresh) |
2531 | |
2555 | { |
2532 | /* bgPixmap.apply () does not do the following : */ |
|
|
2533 | scr_clear (); |
2556 | scr_clear (); |
2534 | scr_touch (true); |
2557 | scr_touch (true); |
|
|
2558 | } |
2535 | want_refresh = 1; |
2559 | want_refresh = 1; |
2536 | } |
2560 | } |
2537 | |
2561 | |
2538 | /* ------------------------------------------------------------------------- */ |
2562 | /* ------------------------------------------------------------------------- */ |
2539 | void |
2563 | void |
… | |
… | |
2627 | void |
2651 | void |
2628 | rxvt_term::scr_dump (int fd) NOTHROW |
2652 | rxvt_term::scr_dump (int fd) NOTHROW |
2629 | { |
2653 | { |
2630 | int row, wrote; |
2654 | int row, wrote; |
2631 | unsigned int width, towrite; |
2655 | unsigned int width, towrite; |
2632 | char r1[] = "\n"; |
2656 | const char r1[] = "\n"; |
2633 | |
2657 | |
2634 | for (row = saveLines + top_row; |
2658 | for (row = saveLines + top_row; |
2635 | row < saveLines + nrow - 1; row++) |
2659 | row < saveLines + nrow - 1; row++) |
2636 | { |
2660 | { |
2637 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2661 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2718 | void |
2742 | void |
2719 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2743 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2720 | { |
2744 | { |
2721 | if (prop == None) /* check for failed XConvertSelection */ |
2745 | if (prop == None) /* check for failed XConvertSelection */ |
2722 | { |
2746 | { |
|
|
2747 | int selnum = selection_type & Sel_whereMask; |
|
|
2748 | |
|
|
2749 | if (selnum == Sel_direct) |
|
|
2750 | selection_type = 0; |
|
|
2751 | |
2723 | if ((selection_type & Sel_CompoundText)) |
2752 | if ((selection_type & Sel_CompoundText)) |
2724 | { |
2753 | { |
2725 | int selnum = selection_type & Sel_whereMask; |
|
|
2726 | |
|
|
2727 | selection_type = 0; |
2754 | selection_type = 0; |
2728 | if (selnum != Sel_direct) |
|
|
2729 | selection_request_other (XA_STRING, selnum); |
2755 | selection_request_other (XA_STRING, selnum); |
2730 | } |
2756 | } |
2731 | |
2757 | |
2732 | if ((selection_type & Sel_UTF8String)) |
2758 | if ((selection_type & Sel_UTF8String)) |
2733 | { |
2759 | { |
2734 | int selnum = selection_type & Sel_whereMask; |
|
|
2735 | |
|
|
2736 | selection_type = Sel_CompoundText; |
2760 | selection_type = Sel_CompoundText; |
2737 | if (selnum != Sel_direct) |
|
|
2738 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2761 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2739 | else |
|
|
2740 | selection_type = 0; |
|
|
2741 | } |
2762 | } |
2742 | |
2763 | |
2743 | return; |
2764 | return; |
2744 | } |
2765 | } |
2745 | |
2766 | |
… | |
… | |
2772 | &ct2.nitems, &bytes_after, |
2793 | &ct2.nitems, &bytes_after, |
2773 | &ct2.value) != Success) |
2794 | &ct2.value) != Success) |
2774 | goto bailout; |
2795 | goto bailout; |
2775 | |
2796 | |
2776 | // realloc should be compatible to XFree, here, and elsewhere, too |
2797 | // realloc should be compatible to XFree, here, and elsewhere, too |
2777 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
2798 | ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1); |
2778 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
2799 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
2779 | ct.nitems += ct2.nitems; |
2800 | ct.nitems += ct2.nitems; |
2780 | |
2801 | |
2781 | XFree (ct2.value); |
2802 | XFree (ct2.value); |
2782 | } |
2803 | } |
… | |
… | |
2818 | { |
2839 | { |
2819 | /* |
2840 | /* |
2820 | * pass through again trying CUT_BUFFER0 if we've come from |
2841 | * pass through again trying CUT_BUFFER0 if we've come from |
2821 | * XConvertSelection () but nothing was presented |
2842 | * XConvertSelection () but nothing was presented |
2822 | */ |
2843 | */ |
2823 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2844 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2824 | } |
2845 | } |
2825 | |
2846 | |
2826 | goto bailout; |
2847 | goto bailout; |
2827 | } |
2848 | } |
2828 | } |
2849 | } |
… | |
… | |
2831 | incr_ev.start (10); |
2852 | incr_ev.start (10); |
2832 | |
2853 | |
2833 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2854 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2834 | { |
2855 | { |
2835 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2856 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2836 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2857 | incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size); |
2837 | } |
2858 | } |
2838 | |
2859 | |
2839 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2860 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2840 | incr_buf_fill += ct.nitems; |
2861 | incr_buf_fill += ct.nitems; |
2841 | |
2862 | |
… | |
… | |
2998 | * EXT: button 1 or 3 release |
3019 | * EXT: button 1 or 3 release |
2999 | */ |
3020 | */ |
3000 | void |
3021 | void |
3001 | rxvt_term::selection_make (Time tm) |
3022 | rxvt_term::selection_make (Time tm) |
3002 | { |
3023 | { |
3003 | int i; |
3024 | int size; |
3004 | wchar_t *new_selection_text; |
3025 | wchar_t *new_selection_text; |
3005 | text_t *t; |
3026 | text_t *t; |
3006 | |
3027 | |
3007 | switch (selection.op) |
3028 | switch (selection.op) |
3008 | { |
3029 | { |
… | |
… | |
3024 | return; /* nothing selected, go away */ |
3045 | return; /* nothing selected, go away */ |
3025 | |
3046 | |
3026 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3047 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3027 | return; |
3048 | return; |
3028 | |
3049 | |
3029 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3050 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3030 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
3051 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
3031 | |
3052 | |
3032 | int ofs = 0; |
3053 | int ofs = 0; |
3033 | int extra = 0; |
3054 | int extra = 0; |
3034 | |
3055 | |
3035 | int col = selection.beg.col; |
3056 | int col = selection.beg.col; |
… | |
… | |
3041 | { |
3062 | { |
3042 | #if !ENABLE_MINIMAL |
3063 | #if !ENABLE_MINIMAL |
3043 | if (selection.rect) |
3064 | if (selection.rect) |
3044 | { |
3065 | { |
3045 | col = selection.beg.col; |
3066 | col = selection.beg.col; |
3046 | end_col = ncol + 1; |
3067 | end_col = selection.end.col; |
3047 | } |
3068 | } |
3048 | else |
3069 | else |
3049 | #endif |
3070 | #endif |
3050 | end_col = ROW(row).l; |
3071 | end_col = ROW(row).l; |
3051 | |
3072 | |
3052 | col = max (col, 0); |
3073 | col = max (col, 0); |
3053 | |
3074 | |
3054 | if (row == selection.end.row |
3075 | if (row == selection.end.row) |
3055 | #if !ENABLE_MINIMAL |
|
|
3056 | || selection.rect |
|
|
3057 | #endif |
|
|
3058 | ) |
|
|
3059 | min_it (end_col, selection.end.col); |
3076 | min_it (end_col, selection.end.col); |
3060 | |
3077 | |
3061 | t = ROW(row).t + col; |
3078 | t = ROW(row).t + col; |
3062 | |
3079 | |
3063 | for (; col < end_col; col++) |
3080 | for (; col < end_col; col++) |
… | |
… | |
3071 | |
3088 | |
3072 | extra -= (len - 1); |
3089 | extra -= (len - 1); |
3073 | |
3090 | |
3074 | if (extra < 0) |
3091 | if (extra < 0) |
3075 | { |
3092 | { |
3076 | extra += i; |
3093 | extra += size; |
3077 | i += i; |
3094 | size += size; |
3078 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
3095 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3079 | } |
3096 | } |
3080 | |
3097 | |
3081 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3098 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3082 | } |
3099 | } |
3083 | #endif |
3100 | #endif |
… | |
… | |
3095 | |
3112 | |
3096 | new_selection_text[ofs++] = C0_LF; |
3113 | new_selection_text[ofs++] = C0_LF; |
3097 | } |
3114 | } |
3098 | else |
3115 | else |
3099 | #endif |
3116 | #endif |
3100 | if (!ROW(row).is_longer () && row != selection.end.row) |
3117 | if (!ROW(row).is_longer () |
|
|
3118 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
3119 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3101 | new_selection_text[ofs++] = C0_LF; |
3120 | new_selection_text[ofs++] = C0_LF; |
3102 | } |
3121 | } |
3103 | |
|
|
3104 | if (end_col != selection.end.col) |
|
|
3105 | new_selection_text[ofs++] = C0_LF; |
|
|
3106 | |
3122 | |
3107 | new_selection_text[ofs] = 0; |
3123 | new_selection_text[ofs] = 0; |
3108 | |
3124 | |
3109 | if (ofs == 0) |
3125 | if (ofs == 0) |
3110 | { |
3126 | { |