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.343 by sf-exg, Thu Jul 1 21:52:52 2010 UTC vs.
Revision 1.375 by root, Mon Feb 21 07:12:03 2011 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void 35static inline void
36fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
37{ 37{
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 {
908 if (screen.flags & Screen_Autowrap)
909 {
916 // ... artificially enlargen the previous one 910 // ... artificially enlargen the previous one
917 c = NOCHAR; 911 c = NOCHAR;
918 // and try the same character next loop iteration 912 // and try the same character next loop iteration
919 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
920 } 917 }
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);
921 925
922 line->touch (); 926 line->touch ();
923 927
924 do 928 do
925 { 929 {
… …
931 else 935 else
932 { 936 {
933 line->l = ncol; 937 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
936 break; 940
941 goto end_of_line;
937 } 942 }
938 943
939 c = NOCHAR; 944 c = NOCHAR;
940 } 945 }
941 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
942 947
943 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
945 { 950 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 951 line->t[c] = ' ';
951 line->r[c] = rend; 952 line->r[c] = rend;
952 }
953 } 953 }
954
955end_of_line:
956 ;
954 } 957 }
955#if ENABLE_COMBINING 958#if ENABLE_COMBINING
956 else // width == 0 959 else // width == 0
957 { 960 {
958 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
1021 1024
1022 want_refresh = 1; 1025 want_refresh = 1;
1023#endif 1026#endif
1024 } 1027 }
1025 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1026 else 1031 else
1027 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1028} 1033}
1029 1034
1030/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1337 return; 1342 return;
1338 1343
1339 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1340 1345
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1346 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1347 { 1349 {
1348 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1349 1351
1350 if (mapped && !view_start) 1352 if (mapped)
1351 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1354 } 1356 }
1355 else 1357 else
1356 { 1358 {
1357 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1358 1360
1359 if (mapped && !view_start) 1361 if (mapped)
1360 { 1362 {
1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start), 1366 0, Row2Pixel (row - view_start),
… …
1371 1373
1372 for (; num--; row++) 1374 for (; num--; row++)
1373 { 1375 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1375 1377
1376 if (!view_start) 1378 if (row - view_start < nrow)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378 } 1380 }
1379} 1381}
1380 1382
1381#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1382void 1384void
… …
1681 { 1683 {
1682 rvideo_state = on; 1684 rvideo_state = on;
1683 1685
1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1686 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1687#endif 1689#endif
1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1689 1691
1690 XGCValues gcvalue; 1692 XGCValues gcvalue;
1691 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
2027 refresh_count = 0; 2029 refresh_count = 0;
2028 2030
2029 unsigned int old_screen_flags = screen.flags; 2031 unsigned int old_screen_flags = screen.flags;
2030 char have_bg = 0; 2032 char have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2032 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2033#endif 2035#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2037
2036 /* 2038 /*
2037 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
2504 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2505 } 2507 }
2506} 2508}
2507 2509
2508void 2510void
2509rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2510{ 2512{
2513 bool transparent = false;
2514
2511#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2512 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2513#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);
2514 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 {
2515 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
2516 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2518 2541
2519 if (scrollBar.win) 2542 if (scrollBar.win)
2520 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2522 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2523 scrollBar.show (0); 2549 scrollBar.show (0);
2524 } 2550 }
2525 2551
2526#endif 2552 if (refresh)
2527 2553 {
2528 /* bgPixmap.apply () does not do the following : */
2529 scr_clear (); 2554 scr_clear ();
2530 scr_touch (true); 2555 scr_touch (true);
2556 }
2531 want_refresh = 1; 2557 want_refresh = 1;
2532} 2558}
2533 2559
2534/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2535void 2561void
… …
2623void 2649void
2624rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2625{ 2651{
2626 int row, wrote; 2652 int row, wrote;
2627 unsigned int width, towrite; 2653 unsigned int width, towrite;
2628 char r1[] = "\n"; 2654 const char r1[] = "\n";
2629 2655
2630 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2631 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2632 { 2658 {
2633 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2679/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2680/* 2706/*
2681 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2682 */ 2708 */
2683void 2709void
2684rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2685{ 2711{
2686 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2687 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2688 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2689 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2695 2721
2696 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2698} 2724}
2699 2725
2700/* ------------------------------------------------------------------------- */
2701/*
2702 * Respond to a notification that a primary selection has been sent
2703 * EXT: SelectionNotify
2704 */
2705void 2726void
2706rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707{ 2728{
2708 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2709 {
2710 if ((selection_type & Sel_CompoundText))
2711 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = 0;
2715 if (selnum != Sel_direct)
2716 selection_request_other (XA_STRING, selnum);
2717 }
2718
2719 if ((selection_type & Sel_UTF8String))
2720 {
2721 int selnum = selection_type & Sel_whereMask;
2722
2723 selection_type = Sel_CompoundText;
2724 if (selnum != Sel_direct)
2725 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2726 else
2727 selection_type = 0;
2728 }
2729
2730 return;
2731 }
2732
2733 unsigned long bytes_after;
2734 XTextProperty ct;
2735
2736 if (XGetWindowProperty (dpy, win, prop,
2737 0, PROP_SIZE / 4,
2738 delete_prop, AnyPropertyType,
2739 &ct.encoding, &ct.format,
2740 &ct.nitems, &bytes_after,
2741 &ct.value) != Success)
2742 {
2743 ct.value = 0;
2744 goto bailout;
2745 }
2746
2747 if (ct.encoding == None)
2748 goto bailout;
2749
2750 if (bytes_after)
2751 {
2752 // fetch and append remaining data
2753 XTextProperty ct2;
2754
2755 if (XGetWindowProperty (dpy, win, prop,
2756 ct.nitems / 4, (bytes_after + 3) / 4,
2757 delete_prop, AnyPropertyType,
2758 &ct2.encoding, &ct2.format,
2759 &ct2.nitems, &bytes_after,
2760 &ct2.value) != Success)
2761 goto bailout;
2762
2763 // realloc should be compatible to XFree, here, and elsewhere, too
2764 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2765 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2766 ct.nitems += ct2.nitems;
2767
2768 XFree (ct2.value);
2769 }
2770
2771 if (ct.value == 0)
2772 goto bailout;
2773
2774 if (ct.encoding == xa[XA_INCR])
2775 {
2776 // INCR selection, start handshake
2777 if (!delete_prop)
2778 XDeleteProperty (dpy, win, prop);
2779
2780 selection_wait = Sel_incr;
2781 incr_buf_fill = 0;
2782 incr_ev.start (10);
2783
2784 goto bailout;
2785 }
2786
2787 if (ct.nitems == 0)
2788 {
2789 if (selection_wait == Sel_incr)
2790 {
2791 XFree (ct.value);
2792
2793 // finally complete, now paste the whole thing
2794 selection_wait = Sel_normal;
2795 ct.value = (unsigned char *)incr_buf;
2796 ct.nitems = incr_buf_fill;
2797 incr_buf = 0;
2798 incr_buf_size = 0;
2799 incr_ev.stop ();
2800 }
2801 else
2802 {
2803 if (selection_wait == Sel_normal
2804 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2805 {
2806 /*
2807 * pass through again trying CUT_BUFFER0 if we've come from
2808 * XConvertSelection () but nothing was presented
2809 */
2810 selection_paste (display->root, XA_CUT_BUFFER0, False);
2811 }
2812
2813 goto bailout;
2814 }
2815 }
2816 else if (selection_wait == Sel_incr)
2817 {
2818 incr_ev.start (10);
2819
2820 while (incr_buf_fill + ct.nitems > incr_buf_size)
2821 {
2822 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2823 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2824 }
2825
2826 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2827 incr_buf_fill += ct.nitems;
2828
2829 goto bailout;
2830 }
2831
2832 char **cl;
2833 int cr;
2834
2835#if !ENABLE_MINIMAL
2836 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2837 // so recode it manually
2838 if (ct.encoding == xa[XA_UTF8_STRING])
2839 {
2840 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2841 char *s = rxvt_wcstombs (w);
2842 free (w);
2843 // TODO: strlen == only the first element will be converted. well...
2844 paste (s, strlen (s));
2845 free (s);
2846 }
2847 else
2848#endif
2849 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2850 && cl)
2851 {
2852 for (int i = 0; i < cr; i++)
2853 paste (cl[i], strlen (cl[i]));
2854
2855 XFreeStringList (cl);
2856 }
2857 else
2858 paste ((char *)ct.value, ct.nitems); // paste raw
2859
2860bailout:
2861 XFree (ct.value);
2862
2863 if (selection_wait == Sel_normal)
2864 selection_wait = Sel_none;
2865}
2866
2867void
2868rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2869{
2870 selection_wait = Sel_none;
2871
2872 incr_buf_size = 0;
2873 free (incr_buf);
2874
2875 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2876}
2877
2878void
2879rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2880{
2881 if (prop == None || selection_wait != Sel_incr)
2882 return; 2730 return;
2883 2731
2884 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2885} 2733}
2886 2734
2887/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2888/* 2736/*
2889 * Request the current selection: 2737 * Request the current selection:
… …
2903 char *str = rxvt_wcstombs (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2904 paste (str, strlen (str)); 2752 paste (str, strlen (str));
2905 free (str); 2753 free (str);
2906 return; 2754 return;
2907 } 2755 }
2908 else 2756 else if (!selection_req)
2909 {
2910 selection_request_time = tm;
2911 selection_wait = Sel_normal;
2912
2913#if X_HAVE_UTF8_STRING
2914 selection_type = Sel_UTF8String;
2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2916 return;
2917#else
2918 selection_type = Sel_CompoundText;
2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2920 return;
2921#endif
2922 } 2757 {
2923 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2924 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2759 selection_req->run ();
2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
2926}
2927
2928int
2929rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2930{
2931 Atom sel;
2932
2933 selection_type |= selnum;
2934
2935 if (selnum == Sel_Primary)
2936 sel = XA_PRIMARY;
2937 else if (selnum == Sel_Secondary)
2938 sel = XA_SECONDARY;
2939 else
2940 sel = xa[XA_CLIPBOARD];
2941
2942 if (XGetSelectionOwner (dpy, sel) != None)
2943 { 2760 }
2944 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2945 vt, selection_request_time);
2946 return 1;
2947 }
2948
2949 return 0;
2950} 2761}
2951 2762
2952/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2953/* 2764/*
2954 * Clear all selected text 2765 * Clear all selected text
… …
2977 if (display->clipboard_owner == this) 2788 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0; 2789 display->clipboard_owner = 0;
2979 } 2790 }
2980} 2791}
2981 2792
2982void
2983rxvt_term::clipboard_copy (Time tm)
2984{
2985 if (selection.len > 0)
2986 {
2987 free (selection.clip_text);
2988 selection.clip_len = selection.len;
2989 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2990 memcpy (selection.clip_text, selection.text,
2991 sizeof (wchar_t) * selection.clip_len);
2992 selection_grab (tm, true);
2993 }
2994}
2995
2996/* ------------------------------------------------------------------------- */ 2793/* ------------------------------------------------------------------------- */
2997/* 2794/*
2998 * Copy a selection into the cut buffer 2795 * Copy a selection into the cut buffer
2999 * EXT: button 1 or 3 release 2796 * EXT: button 1 or 3 release
3000 */ 2797 */
3001void 2798void
3002rxvt_term::selection_make (Time tm) 2799rxvt_term::selection_make (Time tm)
3003{ 2800{
3004 int i; 2801 int size;
3005 wchar_t *new_selection_text; 2802 wchar_t *new_selection_text;
3006 text_t *t; 2803 text_t *t;
3007 2804
3008 switch (selection.op) 2805 switch (selection.op)
3009 { 2806 {
… …
3025 return; /* nothing selected, go away */ 2822 return; /* nothing selected, go away */
3026 2823
3027 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2824 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3028 return; 2825 return;
3029 2826
3030 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2827 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3031 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2828 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3032 2829
3033 int ofs = 0; 2830 int ofs = 0;
3034 int extra = 0; 2831 int extra = 0;
3035 2832
3036 int col = selection.beg.col; 2833 int col = selection.beg.col;
… …
3042 { 2839 {
3043#if !ENABLE_MINIMAL 2840#if !ENABLE_MINIMAL
3044 if (selection.rect) 2841 if (selection.rect)
3045 { 2842 {
3046 col = selection.beg.col; 2843 col = selection.beg.col;
3047 end_col = ncol + 1; 2844 end_col = selection.end.col;
3048 } 2845 }
3049 else 2846 else
3050#endif 2847#endif
3051 end_col = ROW(row).l; 2848 end_col = ROW(row).l;
3052 2849
3053 col = max (col, 0); 2850 col = max (col, 0);
3054 2851
3055 if (row == selection.end.row 2852 if (row == selection.end.row)
3056#if !ENABLE_MINIMAL
3057 || selection.rect
3058#endif
3059 )
3060 min_it (end_col, selection.end.col); 2853 min_it (end_col, selection.end.col);
3061 2854
3062 t = ROW(row).t + col; 2855 t = ROW(row).t + col;
3063 2856
3064 for (; col < end_col; col++) 2857 for (; col < end_col; col++)
… …
3072 2865
3073 extra -= (len - 1); 2866 extra -= (len - 1);
3074 2867
3075 if (extra < 0) 2868 if (extra < 0)
3076 { 2869 {
3077 extra += i; 2870 extra += size;
3078 i += i; 2871 size += size;
3079 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2872 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3080 } 2873 }
3081 2874
3082 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2875 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3083 } 2876 }
3084#endif 2877#endif
… …
3096 2889
3097 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3098 } 2891 }
3099 else 2892 else
3100#endif 2893#endif
3101 if (!ROW(row).is_longer () && row != selection.end.row) 2894 if (!ROW(row).is_longer ()
2895 && (row != selection.end.row || end_col != selection.end.col)
2896 && (row != selection.beg.row || selection.beg.col < ncol))
3102 new_selection_text[ofs++] = C0_LF; 2897 new_selection_text[ofs++] = C0_LF;
3103 } 2898 }
3104
3105 if (end_col != selection.end.col)
3106 new_selection_text[ofs++] = C0_LF;
3107 2899
3108 new_selection_text[ofs] = 0; 2900 new_selection_text[ofs] = 0;
3109 2901
3110 if (ofs == 0) 2902 if (ofs == 0)
3111 { 2903 {

Diff Legend

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