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.349 by root, Thu Oct 14 23:12:11 2010 UTC vs.
Revision 1.383 by sf-exg, Fri Apr 29 13:08:24 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++;
… …
159 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
160 160
161void 161void
162rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
163{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
164 view_start = 0; 168 view_start = 0;
165 num_scr = 0; 169 num_scr = 0;
166 170
167 if (ncol == 0) 171 if (ncol == 0)
168 ncol = 80; 172 ncol = 80;
… …
398 } 402 }
399 403
400 free (tabs); 404 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
402 406
403 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
405 409
406 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
407 411
408 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
898# else 902# else
899 c = 0xfffd; 903 c = 0xfffd;
900# endif 904# endif
901#endif 905#endif
902 906
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)); 907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 908
913 // if the character doesn't fit into the remaining columns... 909 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 910 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 { 911 {
… …
922 } 918 }
923 else 919 else
924 screen.cur.col = ncol - width; 920 screen.cur.col = ncol - width;
925 } 921 }
926 922
923 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself,
926 // only its tail.
927 if (expect_false (line->t[screen.cur.col] == NOCHAR))
928 scr_kill_char (*line, screen.cur.col);
929
927 line->touch (); 930 line->touch ();
928 931
929 do 932 do
930 { 933 {
931 line->t[screen.cur.col] = c; 934 line->t[screen.cur.col] = c;
… …
936 else 939 else
937 { 940 {
938 line->l = ncol; 941 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
941 break; 944
945 goto end_of_line;
942 } 946 }
943 947
944 c = NOCHAR; 948 c = NOCHAR;
945 } 949 }
946 while (expect_false (--width > 0)); 950 while (expect_false (--width > 0));
947 951
948 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
949 if (expect_false (!width)) 953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
950 { 954 {
951 line->touch ();
952
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 {
955 line->t[c] = ' '; 955 line->t[c] = ' ';
956 line->r[c] = rend; 956 line->r[c] = rend;
957 }
958 } 957 }
958
959end_of_line:
960 ;
959 } 961 }
960#if ENABLE_COMBINING 962#if ENABLE_COMBINING
961 else // width == 0 963 else // width == 0
962 { 964 {
963 if (c != 0xfeff) // ignore BOM 965 if (c != 0xfeff) // ignore BOM
… …
1026 1028
1027 want_refresh = 1; 1029 want_refresh = 1;
1028#endif 1030#endif
1029 } 1031 }
1030 } 1032 }
1031#ifdef TERMCAP_HAS_BW
1032 else if (screen.flags & Screen_WrapNext) 1033 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext; 1034 screen.flags &= ~Screen_WrapNext;
1034#endif
1035 else 1035 else
1036 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1037} 1037}
1038 1038
1039/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1687 { 1687 {
1688 rvideo_state = on; 1688 rvideo_state = on;
1689 1689
1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1692 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1693#endif 1693#endif
1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695 1695
1696 XGCValues gcvalue; 1696 XGCValues gcvalue;
1697 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
1924 1924
1925# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1926# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1927 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1928# endif 1928# endif
1929 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1930# endif 1930# endif
1931 1931
1932# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1933 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1934 set_urgency (1); 1934 set_urgency (1);
… …
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1948#endif
1949} 1949}
1950 1950
1951/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */
1953void 1952void
1954rxvt_term::scr_printscreen (int fullhist) NOTHROW 1953rxvt_term::scr_printscreen (int fullhist) NOTHROW
1955{ 1954{
1956#ifdef PRINTPIPE 1955#ifdef PRINTPIPE
1957 int nrows, row_start; 1956 int nrows, row_start;
… …
2033 refresh_count = 0; 2032 refresh_count = 0;
2034 2033
2035 unsigned int old_screen_flags = screen.flags; 2034 unsigned int old_screen_flags = screen.flags;
2036 char have_bg = 0; 2035 char have_bg = 0;
2037#ifdef HAVE_BG_PIXMAP 2036#ifdef HAVE_BG_PIXMAP
2038 have_bg = bgPixmap.pixmap != None; 2037 have_bg = bg_pixmap != None;
2039#endif 2038#endif
2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2041 2040
2042 /* 2041 /*
2043 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
… …
2510 scr_remap_chars (swap_buf [i]); 2509 scr_remap_chars (swap_buf [i]);
2511 } 2510 }
2512} 2511}
2513 2512
2514void 2513void
2515rxvt_term::scr_recolour () NOTHROW 2514rxvt_term::scr_recolour (bool refresh) NOTHROW
2516{ 2515{
2516 bool transparent = false;
2517
2517#ifdef HAVE_BG_PIXMAP 2518#ifdef HAVE_BG_PIXMAP
2518 bgPixmap.apply (); 2519 if (bg_pixmap != None)
2519#else 2520 {
2521# ifdef ENABLE_TRANSPARENCY
2522 if (bg_flags & BG_IS_TRANSPARENT)
2523 {
2524 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2520 2526
2527 transparent = true;
2528 }
2529 else
2530# endif
2531 {
2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2533 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2534 }
2535 }
2536 else
2537#endif
2538 {
2521 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2539 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2522 XClearWindow (dpy, parent[0]);
2523 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2540 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2541 }
2542
2543 XClearWindow (dpy, parent);
2524 2544
2525 if (scrollBar.win) 2545 if (scrollBar.win)
2526 { 2546 {
2547 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else
2527 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2528 scrollBar.state = STATE_IDLE; 2551 scrollBar.state = STATE_IDLE;
2529 scrollBar.show (0); 2552 scrollBar.show (0);
2530 } 2553 }
2531 2554
2532#endif 2555 if (refresh)
2533 2556 {
2534 /* bgPixmap.apply () does not do the following : */
2535 scr_clear (); 2557 scr_clear ();
2536 scr_touch (true); 2558 scr_touch (true);
2559 }
2537 want_refresh = 1; 2560 want_refresh = 1;
2538} 2561}
2539 2562
2540/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2541void 2564void
… …
2629void 2652void
2630rxvt_term::scr_dump (int fd) NOTHROW 2653rxvt_term::scr_dump (int fd) NOTHROW
2631{ 2654{
2632 int row, wrote; 2655 int row, wrote;
2633 unsigned int width, towrite; 2656 unsigned int width, towrite;
2634 char r1[] = "\n"; 2657 const char r1[] = "\n";
2635 2658
2636 for (row = saveLines + top_row; 2659 for (row = saveLines + top_row;
2637 row < saveLines + nrow - 1; row++) 2660 row < saveLines + nrow - 1; row++)
2638 { 2661 {
2639 width = row_buf[row].l >= 0 ? row_buf[row].l 2662 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2712 tt_paste (data, len); 2735 tt_paste (data, len);
2713} 2736}
2714 2737
2715/* ------------------------------------------------------------------------- */ 2738/* ------------------------------------------------------------------------- */
2716/* 2739/*
2717 * Respond to a notification that a primary selection has been sent 2740 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2718 * EXT: SelectionNotify 2741 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2719 */ 2742 * as fallback
2720void
2721rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2722{
2723 if (prop == None) /* check for failed XConvertSelection */
2724 {
2725 if ((selection_type & Sel_CompoundText))
2726 {
2727 int selnum = selection_type & Sel_whereMask;
2728
2729 selection_type = 0;
2730 if (selnum != Sel_direct)
2731 selection_request_other (XA_STRING, selnum);
2732 }
2733
2734 if ((selection_type & Sel_UTF8String))
2735 {
2736 int selnum = selection_type & Sel_whereMask;
2737
2738 selection_type = Sel_CompoundText;
2739 if (selnum != Sel_direct)
2740 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2741 else
2742 selection_type = 0;
2743 }
2744
2745 return;
2746 }
2747
2748 unsigned long bytes_after;
2749 XTextProperty ct;
2750
2751 if (XGetWindowProperty (dpy, win, prop,
2752 0, PROP_SIZE / 4,
2753 delete_prop, AnyPropertyType,
2754 &ct.encoding, &ct.format,
2755 &ct.nitems, &bytes_after,
2756 &ct.value) != Success)
2757 {
2758 ct.value = 0;
2759 goto bailout;
2760 }
2761
2762 if (ct.encoding == None)
2763 goto bailout;
2764
2765 if (bytes_after)
2766 {
2767 // fetch and append remaining data
2768 XTextProperty ct2;
2769
2770 if (XGetWindowProperty (dpy, win, prop,
2771 ct.nitems / 4, (bytes_after + 3) / 4,
2772 delete_prop, AnyPropertyType,
2773 &ct2.encoding, &ct2.format,
2774 &ct2.nitems, &bytes_after,
2775 &ct2.value) != Success)
2776 goto bailout;
2777
2778 // realloc should be compatible to XFree, here, and elsewhere, too
2779 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2780 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2781 ct.nitems += ct2.nitems;
2782
2783 XFree (ct2.value);
2784 }
2785
2786 if (ct.value == 0)
2787 goto bailout;
2788
2789 if (ct.encoding == xa[XA_INCR])
2790 {
2791 // INCR selection, start handshake
2792 if (!delete_prop)
2793 XDeleteProperty (dpy, win, prop);
2794
2795 selection_wait = Sel_incr;
2796 incr_buf_fill = 0;
2797 incr_ev.start (10);
2798
2799 goto bailout;
2800 }
2801
2802 if (ct.nitems == 0)
2803 {
2804 if (selection_wait == Sel_incr)
2805 {
2806 XFree (ct.value);
2807
2808 // finally complete, now paste the whole thing
2809 selection_wait = Sel_normal;
2810 ct.value = (unsigned char *)incr_buf;
2811 ct.nitems = incr_buf_fill;
2812 incr_buf = 0;
2813 incr_buf_size = 0;
2814 incr_ev.stop ();
2815 }
2816 else
2817 {
2818 if (selection_wait == Sel_normal
2819 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2820 {
2821 /*
2822 * pass through again trying CUT_BUFFER0 if we've come from
2823 * XConvertSelection () but nothing was presented
2824 */
2825 selection_paste (display->root, XA_CUT_BUFFER0, False);
2826 }
2827
2828 goto bailout;
2829 }
2830 }
2831 else if (selection_wait == Sel_incr)
2832 {
2833 incr_ev.start (10);
2834
2835 while (incr_buf_fill + ct.nitems > incr_buf_size)
2836 {
2837 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2838 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2839 }
2840
2841 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2842 incr_buf_fill += ct.nitems;
2843
2844 goto bailout;
2845 }
2846
2847 char **cl;
2848 int cr;
2849
2850#if !ENABLE_MINIMAL
2851 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2852 // so recode it manually
2853 if (ct.encoding == xa[XA_UTF8_STRING])
2854 {
2855 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2856 char *s = rxvt_wcstombs (w);
2857 free (w);
2858 // TODO: strlen == only the first element will be converted. well...
2859 paste (s, strlen (s));
2860 free (s);
2861 }
2862 else
2863#endif
2864 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2865 && cl)
2866 {
2867 for (int i = 0; i < cr; i++)
2868 paste (cl[i], strlen (cl[i]));
2869
2870 XFreeStringList (cl);
2871 }
2872 else
2873 paste ((char *)ct.value, ct.nitems); // paste raw
2874
2875bailout:
2876 XFree (ct.value);
2877
2878 if (selection_wait == Sel_normal)
2879 selection_wait = Sel_none;
2880}
2881
2882void
2883rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2884{
2885 selection_wait = Sel_none;
2886
2887 incr_buf_size = 0;
2888 free (incr_buf);
2889
2890 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2891}
2892
2893void
2894rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2895{
2896 if (prop == None || selection_wait != Sel_incr)
2897 return;
2898
2899 selection_paste (win, prop, true);
2900}
2901
2902/* ------------------------------------------------------------------------- */
2903/*
2904 * Request the current selection:
2905 * Order: > internal selection if available
2906 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2907 * > CUT_BUFFER0
2908 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2909 * will auto fallback to CUT_BUFFER0
2910 * EXT: button 2 release 2743 * EXT: button 2 release
2911 */ 2744 */
2912void 2745void
2913rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2914{ 2747{
2915 if (selection.text && selnum == Sel_Primary) 2748 if (!selection_req)
2916 {
2917 /* internal selection */
2918 char *str = rxvt_wcstombs (selection.text, selection.len);
2919 paste (str, strlen (str));
2920 free (str);
2921 return;
2922 } 2749 {
2923 else 2750 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2751 selection_req->run ();
2924 { 2752 }
2925 selection_request_time = tm;
2926 selection_wait = Sel_normal;
2927
2928#if X_HAVE_UTF8_STRING
2929 selection_type = Sel_UTF8String;
2930 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2931 return;
2932#else
2933 selection_type = Sel_CompoundText;
2934 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2935 return;
2936#endif
2937 }
2938
2939 selection_wait = Sel_none; /* don't loop in selection_paste () */
2940 selection_paste (display->root, XA_CUT_BUFFER0, false);
2941}
2942
2943int
2944rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2945{
2946 Atom sel;
2947
2948 selection_type |= selnum;
2949
2950 if (selnum == Sel_Primary)
2951 sel = XA_PRIMARY;
2952 else if (selnum == Sel_Secondary)
2953 sel = XA_SECONDARY;
2954 else
2955 sel = xa[XA_CLIPBOARD];
2956
2957 if (XGetSelectionOwner (dpy, sel) != None)
2958 {
2959 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2960 vt, selection_request_time);
2961 return 1;
2962 }
2963
2964 return 0;
2965} 2753}
2966 2754
2967/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2968/* 2756/*
2969 * Clear all selected text 2757 * Clear all selected text
… …
3000 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
3001 */ 2789 */
3002void 2790void
3003rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
3004{ 2792{
3005 int i; 2793 int size;
3006 wchar_t *new_selection_text; 2794 wchar_t *new_selection_text;
3007 text_t *t; 2795 text_t *t;
3008 2796
3009 switch (selection.op) 2797 switch (selection.op)
3010 { 2798 {
… …
3026 return; /* nothing selected, go away */ 2814 return; /* nothing selected, go away */
3027 2815
3028 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)))
3029 return; 2817 return;
3030 2818
3031 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2819 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3032 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));
3033 2821
3034 int ofs = 0; 2822 int ofs = 0;
3035 int extra = 0; 2823 int extra = 0;
3036 2824
3037 int col = selection.beg.col; 2825 int col = selection.beg.col;
… …
3043 { 2831 {
3044#if !ENABLE_MINIMAL 2832#if !ENABLE_MINIMAL
3045 if (selection.rect) 2833 if (selection.rect)
3046 { 2834 {
3047 col = selection.beg.col; 2835 col = selection.beg.col;
3048 end_col = ncol + 1; 2836 end_col = selection.end.col;
3049 } 2837 }
3050 else 2838 else
3051#endif 2839#endif
3052 end_col = ROW(row).l; 2840 end_col = ROW(row).l;
3053 2841
3054 col = max (col, 0); 2842 col = max (col, 0);
3055 2843
3056 if (row == selection.end.row 2844 if (row == selection.end.row)
3057#if !ENABLE_MINIMAL
3058 || selection.rect
3059#endif
3060 )
3061 min_it (end_col, selection.end.col); 2845 min_it (end_col, selection.end.col);
3062 2846
3063 t = ROW(row).t + col; 2847 t = ROW(row).t + col;
3064 2848
3065 for (; col < end_col; col++) 2849 for (; col < end_col; col++)
… …
3073 2857
3074 extra -= (len - 1); 2858 extra -= (len - 1);
3075 2859
3076 if (extra < 0) 2860 if (extra < 0)
3077 { 2861 {
3078 extra += i; 2862 extra += size;
3079 i += i; 2863 size += size;
3080 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));
3081 } 2865 }
3082 2866
3083 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2867 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3084 } 2868 }
3085#endif 2869#endif
… …
3097 2881
3098 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3099 } 2883 }
3100 else 2884 else
3101#endif 2885#endif
3102 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))
3103 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3104 } 2890 }
3105
3106 if (end_col != selection.end.col)
3107 new_selection_text[ofs++] = C0_LF;
3108 2891
3109 new_selection_text[ofs] = 0; 2892 new_selection_text[ofs] = 0;
3110 2893
3111 if (ofs == 0) 2894 if (ofs == 0)
3112 { 2895 {
… …
3618 * EXT: SelectionRequest 3401 * EXT: SelectionRequest
3619 */ 3402 */
3620void 3403void
3621rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3404rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3622{ 3405{
3406 Atom property = rq.property == None ? rq.target : rq.property;
3623 XSelectionEvent ev; 3407 XSelectionEvent ev;
3624 3408
3625 ev.type = SelectionNotify; 3409 ev.type = SelectionNotify;
3626 ev.property = None; 3410 ev.property = None;
3627 ev.display = rq.display; 3411 ev.display = rq.display;
… …
3642 *target++ = xa[XA_COMPOUND_TEXT]; 3426 *target++ = xa[XA_COMPOUND_TEXT];
3643#if X_HAVE_UTF8_STRING 3427#if X_HAVE_UTF8_STRING
3644 *target++ = xa[XA_UTF8_STRING]; 3428 *target++ = xa[XA_UTF8_STRING];
3645#endif 3429#endif
3646 3430
3647 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3431 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3648 32, PropModeReplace, 3432 32, PropModeReplace,
3649 (unsigned char *)target_list, target - target_list); 3433 (unsigned char *)target_list, target - target_list);
3650 ev.property = rq.property; 3434 ev.property = property;
3651 } 3435 }
3652#if TODO // TODO 3436#if TODO // TODO
3653 else if (rq.target == xa[XA_MULTIPLE]) 3437 else if (rq.target == xa[XA_MULTIPLE])
3654 { 3438 {
3655 /* TODO: Handle MULTIPLE */ 3439 /* TODO: Handle MULTIPLE */
3656 } 3440 }
3657#endif 3441#endif
3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3442 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3659 { 3443 {
3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3444 XChangeProperty (dpy, rq.requestor, property, rq.target,
3661 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3445 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3662 ev.property = rq.property; 3446 ev.property = property;
3663 } 3447 }
3664 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3665 { 3449 {
3666 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3667 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3451 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3668 ev.property = rq.property; 3452 ev.property = property;
3669 } 3453 }
3670 else if (rq.target == XA_STRING 3454 else if (rq.target == XA_STRING
3671 || rq.target == xa[XA_TEXT] 3455 || rq.target == xa[XA_TEXT]
3672 || rq.target == xa[XA_COMPOUND_TEXT] 3456 || rq.target == xa[XA_COMPOUND_TEXT]
3673 || rq.target == xa[XA_UTF8_STRING] 3457 || rq.target == xa[XA_UTF8_STRING]
… …
3744 ct.value = (unsigned char *)cl; 3528 ct.value = (unsigned char *)cl;
3745 ct.nitems = selectlen; 3529 ct.nitems = selectlen;
3746 ct.encoding = target; 3530 ct.encoding = target;
3747 } 3531 }
3748 3532
3749 XChangeProperty (dpy, rq.requestor, rq.property, 3533 XChangeProperty (dpy, rq.requestor, property,
3750 ct.encoding, 8, PropModeReplace, 3534 ct.encoding, 8, PropModeReplace,
3751 ct.value, (int)ct.nitems); 3535 ct.value, (int)ct.nitems);
3752 ev.property = rq.property; 3536 ev.property = property;
3753 3537
3754 if (freect) 3538 if (freect)
3755 XFree (ct.value); 3539 XFree (ct.value);
3756 } 3540 }
3757 3541

Diff Legend

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