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.345 by sf-exg, Sat Jul 24 10:20:26 2010 UTC vs.
Revision 1.373 by sf-exg, Sat Feb 12 00:30:01 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
… …
2706 tt_paste (data, len); 2732 tt_paste (data, len);
2707} 2733}
2708 2734
2709/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2710/* 2736/*
2711 * Respond to a notification that a primary selection has been sent
2712 * EXT: SelectionNotify
2713 */
2714void
2715rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2716{
2717 if (prop == None) /* check for failed XConvertSelection */
2718 {
2719 if ((selection_type & Sel_CompoundText))
2720 {
2721 int selnum = selection_type & Sel_whereMask;
2722
2723 selection_type = 0;
2724 if (selnum != Sel_direct)
2725 selection_request_other (XA_STRING, selnum);
2726 }
2727
2728 if ((selection_type & Sel_UTF8String))
2729 {
2730 int selnum = selection_type & Sel_whereMask;
2731
2732 selection_type = Sel_CompoundText;
2733 if (selnum != Sel_direct)
2734 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2735 else
2736 selection_type = 0;
2737 }
2738
2739 return;
2740 }
2741
2742 unsigned long bytes_after;
2743 XTextProperty ct;
2744
2745 if (XGetWindowProperty (dpy, win, prop,
2746 0, PROP_SIZE / 4,
2747 delete_prop, AnyPropertyType,
2748 &ct.encoding, &ct.format,
2749 &ct.nitems, &bytes_after,
2750 &ct.value) != Success)
2751 {
2752 ct.value = 0;
2753 goto bailout;
2754 }
2755
2756 if (ct.encoding == None)
2757 goto bailout;
2758
2759 if (bytes_after)
2760 {
2761 // fetch and append remaining data
2762 XTextProperty ct2;
2763
2764 if (XGetWindowProperty (dpy, win, prop,
2765 ct.nitems / 4, (bytes_after + 3) / 4,
2766 delete_prop, AnyPropertyType,
2767 &ct2.encoding, &ct2.format,
2768 &ct2.nitems, &bytes_after,
2769 &ct2.value) != Success)
2770 goto bailout;
2771
2772 // realloc should be compatible to XFree, here, and elsewhere, too
2773 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2774 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2775 ct.nitems += ct2.nitems;
2776
2777 XFree (ct2.value);
2778 }
2779
2780 if (ct.value == 0)
2781 goto bailout;
2782
2783 if (ct.encoding == xa[XA_INCR])
2784 {
2785 // INCR selection, start handshake
2786 if (!delete_prop)
2787 XDeleteProperty (dpy, win, prop);
2788
2789 selection_wait = Sel_incr;
2790 incr_buf_fill = 0;
2791 incr_ev.start (10);
2792
2793 goto bailout;
2794 }
2795
2796 if (ct.nitems == 0)
2797 {
2798 if (selection_wait == Sel_incr)
2799 {
2800 XFree (ct.value);
2801
2802 // finally complete, now paste the whole thing
2803 selection_wait = Sel_normal;
2804 ct.value = (unsigned char *)incr_buf;
2805 ct.nitems = incr_buf_fill;
2806 incr_buf = 0;
2807 incr_buf_size = 0;
2808 incr_ev.stop ();
2809 }
2810 else
2811 {
2812 if (selection_wait == Sel_normal
2813 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2814 {
2815 /*
2816 * pass through again trying CUT_BUFFER0 if we've come from
2817 * XConvertSelection () but nothing was presented
2818 */
2819 selection_paste (display->root, XA_CUT_BUFFER0, False);
2820 }
2821
2822 goto bailout;
2823 }
2824 }
2825 else if (selection_wait == Sel_incr)
2826 {
2827 incr_ev.start (10);
2828
2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2830 {
2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2832 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2833 }
2834
2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2836 incr_buf_fill += ct.nitems;
2837
2838 goto bailout;
2839 }
2840
2841 char **cl;
2842 int cr;
2843
2844#if !ENABLE_MINIMAL
2845 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2846 // so recode it manually
2847 if (ct.encoding == xa[XA_UTF8_STRING])
2848 {
2849 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2850 char *s = rxvt_wcstombs (w);
2851 free (w);
2852 // TODO: strlen == only the first element will be converted. well...
2853 paste (s, strlen (s));
2854 free (s);
2855 }
2856 else
2857#endif
2858 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2859 && cl)
2860 {
2861 for (int i = 0; i < cr; i++)
2862 paste (cl[i], strlen (cl[i]));
2863
2864 XFreeStringList (cl);
2865 }
2866 else
2867 paste ((char *)ct.value, ct.nitems); // paste raw
2868
2869bailout:
2870 XFree (ct.value);
2871
2872 if (selection_wait == Sel_normal)
2873 selection_wait = Sel_none;
2874}
2875
2876void
2877rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2878{
2879 selection_wait = Sel_none;
2880
2881 incr_buf_size = 0;
2882 free (incr_buf);
2883
2884 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2885}
2886
2887void
2888rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2889{
2890 if (prop == None || selection_wait != Sel_incr)
2891 return;
2892
2893 selection_paste (win, prop, true);
2894}
2895
2896/* ------------------------------------------------------------------------- */
2897/*
2898 * Request the current selection: 2737 * Request the current selection:
2899 * Order: > internal selection if available 2738 * Order: > internal selection if available
2900 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2901 * > CUT_BUFFER0 2740 * > CUT_BUFFER0
2902 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2903 * will auto fallback to CUT_BUFFER0 2742 * will auto fallback to CUT_BUFFER0
2904 * EXT: button 2 release 2743 * EXT: button 2 release
2905 */ 2744 */
2745
2746static void
2747selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr)
2748{
2749 rxvt_term *term = (rxvt_term *)ptr;
2750
2751 if (data)
2752 term->paste (data, len);
2753 delete rs;
2754 term->selection_req = 0;
2755}
2756
2906void 2757void
2907rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2758rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2908{ 2759{
2909 if (selection.text && selnum == Sel_Primary) 2760 if (selection.text && selnum == Sel_Primary)
2910 { 2761 {
… …
2912 char *str = rxvt_wcstombs (selection.text, selection.len); 2763 char *str = rxvt_wcstombs (selection.text, selection.len);
2913 paste (str, strlen (str)); 2764 paste (str, strlen (str));
2914 free (str); 2765 free (str);
2915 return; 2766 return;
2916 } 2767 }
2917 else 2768 else if (!selection_req)
2918 {
2919 selection_request_time = tm;
2920 selection_wait = Sel_normal;
2921
2922#if X_HAVE_UTF8_STRING
2923 selection_type = Sel_UTF8String;
2924 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2925 return;
2926#else
2927 selection_type = Sel_CompoundText;
2928 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2929 return;
2930#endif
2931 } 2769 {
2932 2770 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this);
2933 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2771 selection_req->run ();
2934 selection_paste (display->root, XA_CUT_BUFFER0, false);
2935}
2936
2937int
2938rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2939{
2940 Atom sel;
2941
2942 selection_type |= selnum;
2943
2944 if (selnum == Sel_Primary)
2945 sel = XA_PRIMARY;
2946 else if (selnum == Sel_Secondary)
2947 sel = XA_SECONDARY;
2948 else
2949 sel = xa[XA_CLIPBOARD];
2950
2951 if (XGetSelectionOwner (dpy, sel) != None)
2952 { 2772 }
2953 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2954 vt, selection_request_time);
2955 return 1;
2956 }
2957
2958 return 0;
2959} 2773}
2960 2774
2961/* ------------------------------------------------------------------------- */ 2775/* ------------------------------------------------------------------------- */
2962/* 2776/*
2963 * Clear all selected text 2777 * Clear all selected text
… …
2994 * EXT: button 1 or 3 release 2808 * EXT: button 1 or 3 release
2995 */ 2809 */
2996void 2810void
2997rxvt_term::selection_make (Time tm) 2811rxvt_term::selection_make (Time tm)
2998{ 2812{
2999 int i; 2813 int size;
3000 wchar_t *new_selection_text; 2814 wchar_t *new_selection_text;
3001 text_t *t; 2815 text_t *t;
3002 2816
3003 switch (selection.op) 2817 switch (selection.op)
3004 { 2818 {
… …
3020 return; /* nothing selected, go away */ 2834 return; /* nothing selected, go away */
3021 2835
3022 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2836 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3023 return; 2837 return;
3024 2838
3025 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2839 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3026 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2840 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3027 2841
3028 int ofs = 0; 2842 int ofs = 0;
3029 int extra = 0; 2843 int extra = 0;
3030 2844
3031 int col = selection.beg.col; 2845 int col = selection.beg.col;
… …
3037 { 2851 {
3038#if !ENABLE_MINIMAL 2852#if !ENABLE_MINIMAL
3039 if (selection.rect) 2853 if (selection.rect)
3040 { 2854 {
3041 col = selection.beg.col; 2855 col = selection.beg.col;
3042 end_col = ncol + 1; 2856 end_col = selection.end.col;
3043 } 2857 }
3044 else 2858 else
3045#endif 2859#endif
3046 end_col = ROW(row).l; 2860 end_col = ROW(row).l;
3047 2861
3048 col = max (col, 0); 2862 col = max (col, 0);
3049 2863
3050 if (row == selection.end.row 2864 if (row == selection.end.row)
3051#if !ENABLE_MINIMAL
3052 || selection.rect
3053#endif
3054 )
3055 min_it (end_col, selection.end.col); 2865 min_it (end_col, selection.end.col);
3056 2866
3057 t = ROW(row).t + col; 2867 t = ROW(row).t + col;
3058 2868
3059 for (; col < end_col; col++) 2869 for (; col < end_col; col++)
… …
3067 2877
3068 extra -= (len - 1); 2878 extra -= (len - 1);
3069 2879
3070 if (extra < 0) 2880 if (extra < 0)
3071 { 2881 {
3072 extra += i; 2882 extra += size;
3073 i += i; 2883 size += size;
3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2884 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3075 } 2885 }
3076 2886
3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2887 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3078 } 2888 }
3079#endif 2889#endif
… …
3091 2901
3092 new_selection_text[ofs++] = C0_LF; 2902 new_selection_text[ofs++] = C0_LF;
3093 } 2903 }
3094 else 2904 else
3095#endif 2905#endif
3096 if (!ROW(row).is_longer () && row != selection.end.row) 2906 if (!ROW(row).is_longer ()
2907 && (row != selection.end.row || end_col != selection.end.col)
2908 && (row != selection.beg.row || selection.beg.col < ncol))
3097 new_selection_text[ofs++] = C0_LF; 2909 new_selection_text[ofs++] = C0_LF;
3098 } 2910 }
3099
3100 if (end_col != selection.end.col)
3101 new_selection_text[ofs++] = C0_LF;
3102 2911
3103 new_selection_text[ofs] = 0; 2912 new_selection_text[ofs] = 0;
3104 2913
3105 if (ofs == 0) 2914 if (ofs == 0)
3106 { 2915 {

Diff Legend

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