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

Diff Legend

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