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.348 by sf-exg, Sat Oct 9 22:33:45 2010 UTC vs.
Revision 1.378 by sf-exg, Thu Mar 24 23:55:31 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
38 while (len--) 38 while (len--)
39 *start++ = value; 39 *start++ = value;
40} 40}
41 41
42/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
46 44
47/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
144 col--; 142 col--;
145 143
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148 146
147 l.touch ();
148
149 // found start, nuke 149 // found start, nuke
150 do { 150 do {
151 l.t[col] = ' '; 151 l.t[col] = ' ';
152 l.r[col] = rend; 152 l.r[col] = rend;
153 col++; 153 col++;
… …
398 } 398 }
399 399
400 free (tabs); 400 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 401 tabs = (char *)rxvt_malloc (ncol);
402 402
403 for (int col = ncol; --col; ) 403 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 404 tabs [col] = col % TABSIZE == 0;
405 405
406 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
407 407
408 prev_nrow = nrow; 408 prev_nrow = nrow;
… …
898# else 898# else
899 c = 0xfffd; 899 c = 0xfffd;
900# endif 900# endif
901#endif 901#endif
902 902
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)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 904
913 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 { 907 {
… …
922 } 914 }
923 else 915 else
924 screen.cur.col = ncol - width; 916 screen.cur.col = ncol - width;
925 } 917 }
926 918
919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col);
925
927 line->touch (); 926 line->touch ();
928 927
929 do 928 do
930 { 929 {
931 line->t[screen.cur.col] = c; 930 line->t[screen.cur.col] = c;
… …
936 else 935 else
937 { 936 {
938 line->l = ncol; 937 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
941 break; 940
941 goto end_of_line;
942 } 942 }
943 943
944 c = NOCHAR; 944 c = NOCHAR;
945 } 945 }
946 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
947 947
948 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
949 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
950 { 950 {
951 line->touch ();
952
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 {
955 line->t[c] = ' '; 951 line->t[c] = ' ';
956 line->r[c] = rend; 952 line->r[c] = rend;
957 }
958 } 953 }
954
955end_of_line:
956 ;
959 } 957 }
960#if ENABLE_COMBINING 958#if ENABLE_COMBINING
961 else // width == 0 959 else // width == 0
962 { 960 {
963 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
1026 1024
1027 want_refresh = 1; 1025 want_refresh = 1;
1028#endif 1026#endif
1029 } 1027 }
1030 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1031 else 1031 else
1032 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1033} 1033}
1034 1034
1035/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1683 { 1683 {
1684 rvideo_state = on; 1684 rvideo_state = on;
1685 1685
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1688 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1689#endif 1689#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1691
1692 XGCValues gcvalue; 1692 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
2029 refresh_count = 0; 2029 refresh_count = 0;
2030 2030
2031 unsigned int old_screen_flags = screen.flags; 2031 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0; 2032 char have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2034 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2035#endif 2035#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2037
2038 /* 2038 /*
2039 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
2506 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2507 } 2507 }
2508} 2508}
2509 2509
2510void 2510void
2511rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2512{ 2512{
2513 bool transparent = false;
2514
2513#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2514 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2515#else 2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2516 2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2517 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2518 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2519 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2520 2541
2521 if (scrollBar.win) 2542 if (scrollBar.win)
2522 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2523 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2524 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2525 scrollBar.show (0); 2549 scrollBar.show (0);
2526 } 2550 }
2527 2551
2528#endif 2552 if (refresh)
2529 2553 {
2530 /* bgPixmap.apply () does not do the following : */
2531 scr_clear (); 2554 scr_clear ();
2532 scr_touch (true); 2555 scr_touch (true);
2556 }
2533 want_refresh = 1; 2557 want_refresh = 1;
2534} 2558}
2535 2559
2536/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2537void 2561void
… …
2625void 2649void
2626rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2627{ 2651{
2628 int row, wrote; 2652 int row, wrote;
2629 unsigned int width, towrite; 2653 unsigned int width, towrite;
2630 char r1[] = "\n"; 2654 const char r1[] = "\n";
2631 2655
2632 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2633 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2634 { 2658 {
2635 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2708 tt_paste (data, len); 2732 tt_paste (data, len);
2709} 2733}
2710 2734
2711/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2712/* 2736/*
2713 * Respond to a notification that a primary selection has been sent
2714 * EXT: SelectionNotify
2715 */
2716void
2717rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2718{
2719 if (prop == None) /* check for failed XConvertSelection */
2720 {
2721 if ((selection_type & Sel_CompoundText))
2722 {
2723 int selnum = selection_type & Sel_whereMask;
2724
2725 selection_type = 0;
2726 if (selnum != Sel_direct)
2727 selection_request_other (XA_STRING, selnum);
2728 }
2729
2730 if ((selection_type & Sel_UTF8String))
2731 {
2732 int selnum = selection_type & Sel_whereMask;
2733
2734 selection_type = Sel_CompoundText;
2735 if (selnum != Sel_direct)
2736 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2737 else
2738 selection_type = 0;
2739 }
2740
2741 return;
2742 }
2743
2744 unsigned long bytes_after;
2745 XTextProperty ct;
2746
2747 if (XGetWindowProperty (dpy, win, prop,
2748 0, PROP_SIZE / 4,
2749 delete_prop, AnyPropertyType,
2750 &ct.encoding, &ct.format,
2751 &ct.nitems, &bytes_after,
2752 &ct.value) != Success)
2753 {
2754 ct.value = 0;
2755 goto bailout;
2756 }
2757
2758 if (ct.encoding == None)
2759 goto bailout;
2760
2761 if (bytes_after)
2762 {
2763 // fetch and append remaining data
2764 XTextProperty ct2;
2765
2766 if (XGetWindowProperty (dpy, win, prop,
2767 ct.nitems / 4, (bytes_after + 3) / 4,
2768 delete_prop, AnyPropertyType,
2769 &ct2.encoding, &ct2.format,
2770 &ct2.nitems, &bytes_after,
2771 &ct2.value) != Success)
2772 goto bailout;
2773
2774 // realloc should be compatible to XFree, here, and elsewhere, too
2775 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2776 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2777 ct.nitems += ct2.nitems;
2778
2779 XFree (ct2.value);
2780 }
2781
2782 if (ct.value == 0)
2783 goto bailout;
2784
2785 if (ct.encoding == xa[XA_INCR])
2786 {
2787 // INCR selection, start handshake
2788 if (!delete_prop)
2789 XDeleteProperty (dpy, win, prop);
2790
2791 selection_wait = Sel_incr;
2792 incr_buf_fill = 0;
2793 incr_ev.start (10);
2794
2795 goto bailout;
2796 }
2797
2798 if (ct.nitems == 0)
2799 {
2800 if (selection_wait == Sel_incr)
2801 {
2802 XFree (ct.value);
2803
2804 // finally complete, now paste the whole thing
2805 selection_wait = Sel_normal;
2806 ct.value = (unsigned char *)incr_buf;
2807 ct.nitems = incr_buf_fill;
2808 incr_buf = 0;
2809 incr_buf_size = 0;
2810 incr_ev.stop ();
2811 }
2812 else
2813 {
2814 if (selection_wait == Sel_normal
2815 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2816 {
2817 /*
2818 * pass through again trying CUT_BUFFER0 if we've come from
2819 * XConvertSelection () but nothing was presented
2820 */
2821 selection_paste (display->root, XA_CUT_BUFFER0, False);
2822 }
2823
2824 goto bailout;
2825 }
2826 }
2827 else if (selection_wait == Sel_incr)
2828 {
2829 incr_ev.start (10);
2830
2831 while (incr_buf_fill + ct.nitems > incr_buf_size)
2832 {
2833 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2834 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2835 }
2836
2837 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2838 incr_buf_fill += ct.nitems;
2839
2840 goto bailout;
2841 }
2842
2843 char **cl;
2844 int cr;
2845
2846#if !ENABLE_MINIMAL
2847 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2848 // so recode it manually
2849 if (ct.encoding == xa[XA_UTF8_STRING])
2850 {
2851 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2852 char *s = rxvt_wcstombs (w);
2853 free (w);
2854 // TODO: strlen == only the first element will be converted. well...
2855 paste (s, strlen (s));
2856 free (s);
2857 }
2858 else
2859#endif
2860 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2861 && cl)
2862 {
2863 for (int i = 0; i < cr; i++)
2864 paste (cl[i], strlen (cl[i]));
2865
2866 XFreeStringList (cl);
2867 }
2868 else
2869 paste ((char *)ct.value, ct.nitems); // paste raw
2870
2871bailout:
2872 XFree (ct.value);
2873
2874 if (selection_wait == Sel_normal)
2875 selection_wait = Sel_none;
2876}
2877
2878void
2879rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2880{
2881 selection_wait = Sel_none;
2882
2883 incr_buf_size = 0;
2884 free (incr_buf);
2885
2886 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2887}
2888
2889void
2890rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2891{
2892 if (prop == None || selection_wait != Sel_incr)
2893 return;
2894
2895 selection_paste (win, prop, true);
2896}
2897
2898/* ------------------------------------------------------------------------- */
2899/*
2900 * Request the current selection: 2737 * Request the current selection:
2901 * Order: > internal selection if available 2738 * Order: > internal selection if available
2902 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2903 * > CUT_BUFFER0 2740 * > CUT_BUFFER0
2904 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
… …
2906 * EXT: button 2 release 2743 * EXT: button 2 release
2907 */ 2744 */
2908void 2745void
2909rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2910{ 2747{
2911 if (selection.text && selnum == Sel_Primary) 2748 if (!selection_req)
2912 {
2913 /* internal selection */
2914 char *str = rxvt_wcstombs (selection.text, selection.len);
2915 paste (str, strlen (str));
2916 free (str);
2917 return;
2918 } 2749 {
2919 else 2750 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2751 selection_req->run ();
2920 { 2752 }
2921 selection_request_time = tm;
2922 selection_wait = Sel_normal;
2923
2924#if X_HAVE_UTF8_STRING
2925 selection_type = Sel_UTF8String;
2926 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2927 return;
2928#else
2929 selection_type = Sel_CompoundText;
2930 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2931 return;
2932#endif
2933 }
2934
2935 selection_wait = Sel_none; /* don't loop in selection_paste () */
2936 selection_paste (display->root, XA_CUT_BUFFER0, false);
2937}
2938
2939int
2940rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2941{
2942 Atom sel;
2943
2944 selection_type |= selnum;
2945
2946 if (selnum == Sel_Primary)
2947 sel = XA_PRIMARY;
2948 else if (selnum == Sel_Secondary)
2949 sel = XA_SECONDARY;
2950 else
2951 sel = xa[XA_CLIPBOARD];
2952
2953 if (XGetSelectionOwner (dpy, sel) != None)
2954 {
2955 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2956 vt, selection_request_time);
2957 return 1;
2958 }
2959
2960 return 0;
2961} 2753}
2962 2754
2963/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2964/* 2756/*
2965 * Clear all selected text 2757 * Clear all selected text
… …
2996 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
2997 */ 2789 */
2998void 2790void
2999rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
3000{ 2792{
3001 int i; 2793 int size;
3002 wchar_t *new_selection_text; 2794 wchar_t *new_selection_text;
3003 text_t *t; 2795 text_t *t;
3004 2796
3005 switch (selection.op) 2797 switch (selection.op)
3006 { 2798 {
… …
3022 return; /* nothing selected, go away */ 2814 return; /* nothing selected, go away */
3023 2815
3024 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2816 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3025 return; 2817 return;
3026 2818
3027 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2819 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3028 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2820 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3029 2821
3030 int ofs = 0; 2822 int ofs = 0;
3031 int extra = 0; 2823 int extra = 0;
3032 2824
3033 int col = selection.beg.col; 2825 int col = selection.beg.col;
… …
3039 { 2831 {
3040#if !ENABLE_MINIMAL 2832#if !ENABLE_MINIMAL
3041 if (selection.rect) 2833 if (selection.rect)
3042 { 2834 {
3043 col = selection.beg.col; 2835 col = selection.beg.col;
3044 end_col = ncol + 1; 2836 end_col = selection.end.col;
3045 } 2837 }
3046 else 2838 else
3047#endif 2839#endif
3048 end_col = ROW(row).l; 2840 end_col = ROW(row).l;
3049 2841
3050 col = max (col, 0); 2842 col = max (col, 0);
3051 2843
3052 if (row == selection.end.row 2844 if (row == selection.end.row)
3053#if !ENABLE_MINIMAL
3054 || selection.rect
3055#endif
3056 )
3057 min_it (end_col, selection.end.col); 2845 min_it (end_col, selection.end.col);
3058 2846
3059 t = ROW(row).t + col; 2847 t = ROW(row).t + col;
3060 2848
3061 for (; col < end_col; col++) 2849 for (; col < end_col; col++)
… …
3069 2857
3070 extra -= (len - 1); 2858 extra -= (len - 1);
3071 2859
3072 if (extra < 0) 2860 if (extra < 0)
3073 { 2861 {
3074 extra += i; 2862 extra += size;
3075 i += i; 2863 size += size;
3076 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2864 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3077 } 2865 }
3078 2866
3079 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2867 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3080 } 2868 }
3081#endif 2869#endif
… …
3093 2881
3094 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3095 } 2883 }
3096 else 2884 else
3097#endif 2885#endif
3098 if (!ROW(row).is_longer () && row != selection.end.row) 2886 if (!ROW(row).is_longer ()
2887 && (row != selection.end.row || end_col != selection.end.col)
2888 && (row != selection.beg.row || selection.beg.col < ncol))
3099 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3100 } 2890 }
3101
3102 if (end_col != selection.end.col)
3103 new_selection_text[ofs++] = C0_LF;
3104 2891
3105 new_selection_text[ofs] = 0; 2892 new_selection_text[ofs] = 0;
3106 2893
3107 if (ofs == 0) 2894 if (ofs == 0)
3108 { 2895 {

Diff Legend

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