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.365 by sf-exg, Thu Jan 27 17:37:19 2011 UTC vs.
Revision 1.384 by sf-exg, Mon May 30 18:39:04 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 * ------------------------------------------------------------------------- */
… …
161 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
162 160
163void 161void
164rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
165{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
166 view_start = 0; 168 view_start = 0;
167 num_scr = 0; 169 num_scr = 0;
168 170
169 if (ncol == 0) 171 if (ncol == 0)
170 ncol = 80; 172 ncol = 80;
… …
797 799
798 while (str < strend) 800 while (str < strend)
799 { 801 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 803
802 if (expect_false (c < 0x20)) 804 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 805 if (c == C0_LF)
804 { 806 {
805 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
806 808
807 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
826 { 828 {
827 scr_tab (1, true); 829 scr_tab (1, true);
828 continue; 830 continue;
829 } 831 }
830 832
831 if (expect_false ( 833 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 837 ))
836 { 838 {
… …
841 * should be a similar check. 843 * should be a similar check.
842 */ 844 */
843 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
844 } 846 }
845 847
846 if (expect_false (screen.flags & Screen_WrapNext)) 848 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 849 {
848 scr_do_wrap (); 850 scr_do_wrap ();
849 851
850 line->l = ncol; 852 line->l = ncol;
851 line->is_longer (1); 853 line->is_longer (1);
… …
853 row = screen.cur.row; 855 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
855 } 857 }
856 858
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 860 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 861 c = 0xfffd;
860 862
861 // rely on wcwidth to tell us the character width, do wcwidth before 863 // rely on wcwidth to tell us the character width, do wcwidth before
862 // further replacements, as wcwidth might return -1 for the line 864 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 865 // drawing characters below as they might be invalid in the current
864 // locale. 866 // locale.
865 int width = WCWIDTH (c); 867 int width = WCWIDTH (c);
866 868
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 869 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 870 {
869 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 872 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
887 } 889 }
888 } 890 }
889 891
890 if (expect_false (screen.flags & Screen_Insert)) 892 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
892 894
893 if (width != 0) 895 if (width != 0)
894 { 896 {
895#if !UNICODE_3 897#if !UNICODE_3
… …
903#endif 905#endif
904 906
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 908
907 // if the character doesn't fit into the remaining columns... 909 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 910 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 911 {
910 if (screen.flags & Screen_Autowrap) 912 if (screen.flags & Screen_Autowrap)
911 { 913 {
912 // ... artificially enlargen the previous one 914 // ... artificially enlargen the previous one
913 c = NOCHAR; 915 c = NOCHAR;
… …
920 922
921 // nuke the character at this position, if required 923 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop 924 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 925 // we never have to check for overwriting a wide char itself,
924 // only its tail. 926 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 927 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 928 scr_kill_char (*line, screen.cur.col);
927 929
928 line->touch (); 930 line->touch ();
929 931
930 do 932 do
931 { 933 {
932 line->t[screen.cur.col] = c; 934 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 935 line->r[screen.cur.col] = rend;
934 936
935 if (expect_true (screen.cur.col < ncol - 1)) 937 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 938 screen.cur.col++;
937 else 939 else
938 { 940 {
939 line->l = ncol; 941 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
… …
943 goto end_of_line; 945 goto end_of_line;
944 } 946 }
945 947
946 c = NOCHAR; 948 c = NOCHAR;
947 } 949 }
948 while (expect_false (--width > 0)); 950 while (ecb_unlikely (--width > 0));
949 951
950 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 953 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952 { 954 {
953 line->t[c] = ' '; 955 line->t[c] = ' ';
954 line->r[c] = rend; 956 line->r[c] = rend;
955 } 957 }
956 958
… …
1922 1924
1923# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1926# endif 1928# endif
1927 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1928# endif 1930# endif
1929 1931
1930# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1934 set_urgency (1);
… …
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1948#endif
1947} 1949}
1948 1950
1949/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */
1951void 1952void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1953rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1954{
1954#ifdef PRINTPIPE 1955#ifdef PRINTPIPE
1955 int nrows, row_start; 1956 int nrows, row_start;
… …
2233 continue; 2234 continue;
2234 2235
2235 // redraw one or more characters 2236 // redraw one or more characters
2236 2237
2237 // seek to the beginning of wide characters 2238 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2239 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2240 --col;
2240 2241
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2243 text_t *text = stp + col;
2243 int count = 1; 2244 int count = 1;
… …
2281 2282
2282 col--; /* went one too far. move back */ 2283 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2284 count -= i; /* dump any matching trailing chars */
2284 2285
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2286 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2287 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2288 count++, i--;
2288 2289
2289 /* 2290 /*
2290 * Determine the attributes for the string 2291 * Determine the attributes for the string
2291 */ 2292 */
2292 int fore = fgcolor_of (rend); // desired foreground 2293 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2294 int back = bgcolor_of (rend); // desired background
2294 2295
2295 // only do special processing if any attributes are set, which is unlikely 2296 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2297 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2298 {
2298 bool invert = rend & RS_RVid; 2299 bool invert = rend & RS_RVid;
2299 2300
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2301#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2302 if (rend & RS_Bold && fore == Color_fg)
… …
2390 /* 2391 /*
2391 * Actually do the drawing of the string here 2392 * Actually do the drawing of the string here
2392 */ 2393 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2394 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2395
2395 if (expect_true (have_bg && back == Color_bg)) 2396 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2397 {
2397 // this is very ugly, maybe push it into ->draw? 2398 // this is very ugly, maybe push it into ->draw?
2398 2399
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2400 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2401 if (text[i] != ' ')
… …
2407 did_clear: ; 2408 did_clear: ;
2408 } 2409 }
2409 else 2410 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2411 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2412
2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2413 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2414 {
2414#if ENABLE_FRILLS 2415#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2416 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2417 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2418 else
… …
2516 2517
2517#ifdef HAVE_BG_PIXMAP 2518#ifdef HAVE_BG_PIXMAP
2518 if (bg_pixmap != None) 2519 if (bg_pixmap != None)
2519 { 2520 {
2520# ifdef ENABLE_TRANSPARENCY 2521# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & isTransparent) 2522 if (bg_flags & BG_IS_TRANSPARENT)
2522 { 2523 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2524 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525 2526
2526 transparent = true; 2527 transparent = true;
2527 } 2528 }
2528 else 2529 else
2529# endif 2530# endif
2530 { 2531 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2533 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 } 2534 }
2534 } 2535 }
2535 else 2536 else
2536#endif 2537#endif
2537 { 2538 {
2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2539 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2540 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 } 2541 }
2541 2542
2542 XClearWindow (dpy, parent[0]); 2543 XClearWindow (dpy, parent);
2543 2544
2544 if (scrollBar.win) 2545 if (scrollBar.win)
2545 { 2546 {
2546 if (transparent) 2547 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
… …
2734 tt_paste (data, len); 2735 tt_paste (data, len);
2735} 2736}
2736 2737
2737/* ------------------------------------------------------------------------- */ 2738/* ------------------------------------------------------------------------- */
2738/* 2739/*
2739 * Respond to a notification that a primary selection has been sent 2740 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2740 * EXT: SelectionNotify 2741 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2741 */ 2742 * as fallback
2742void
2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2744{
2745 if (prop == None) /* check for failed XConvertSelection */
2746 {
2747 if ((selection_type & Sel_CompoundText))
2748 {
2749 int selnum = selection_type & Sel_whereMask;
2750
2751 selection_type = 0;
2752 if (selnum != Sel_direct)
2753 selection_request_other (XA_STRING, selnum);
2754 }
2755
2756 if ((selection_type & Sel_UTF8String))
2757 {
2758 int selnum = selection_type & Sel_whereMask;
2759
2760 selection_type = Sel_CompoundText;
2761 if (selnum != Sel_direct)
2762 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2763 else
2764 selection_type = 0;
2765 }
2766
2767 return;
2768 }
2769
2770 unsigned long bytes_after;
2771 XTextProperty ct;
2772
2773 if (XGetWindowProperty (dpy, win, prop,
2774 0, PROP_SIZE / 4,
2775 delete_prop, AnyPropertyType,
2776 &ct.encoding, &ct.format,
2777 &ct.nitems, &bytes_after,
2778 &ct.value) != Success)
2779 {
2780 ct.value = 0;
2781 goto bailout;
2782 }
2783
2784 if (ct.encoding == None)
2785 goto bailout;
2786
2787 if (bytes_after)
2788 {
2789 // fetch and append remaining data
2790 XTextProperty ct2;
2791
2792 if (XGetWindowProperty (dpy, win, prop,
2793 ct.nitems / 4, (bytes_after + 3) / 4,
2794 delete_prop, AnyPropertyType,
2795 &ct2.encoding, &ct2.format,
2796 &ct2.nitems, &bytes_after,
2797 &ct2.value) != Success)
2798 goto bailout;
2799
2800 // realloc should be compatible to XFree, here, and elsewhere, too
2801 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2802 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2803 ct.nitems += ct2.nitems;
2804
2805 XFree (ct2.value);
2806 }
2807
2808 if (ct.value == 0)
2809 goto bailout;
2810
2811 if (ct.encoding == xa[XA_INCR])
2812 {
2813 // INCR selection, start handshake
2814 if (!delete_prop)
2815 XDeleteProperty (dpy, win, prop);
2816
2817 selection_wait = Sel_incr;
2818 incr_buf_fill = 0;
2819 incr_ev.start (10);
2820
2821 goto bailout;
2822 }
2823
2824 if (ct.nitems == 0)
2825 {
2826 if (selection_wait == Sel_incr)
2827 {
2828 XFree (ct.value);
2829
2830 // finally complete, now paste the whole thing
2831 selection_wait = Sel_normal;
2832 ct.value = (unsigned char *)incr_buf;
2833 ct.nitems = incr_buf_fill;
2834 incr_buf = 0;
2835 incr_buf_size = 0;
2836 incr_ev.stop ();
2837 }
2838 else
2839 {
2840 if (selection_wait == Sel_normal
2841 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2842 {
2843 /*
2844 * pass through again trying CUT_BUFFER0 if we've come from
2845 * XConvertSelection () but nothing was presented
2846 */
2847 selection_paste (display->root, XA_CUT_BUFFER0, False);
2848 }
2849
2850 goto bailout;
2851 }
2852 }
2853 else if (selection_wait == Sel_incr)
2854 {
2855 incr_ev.start (10);
2856
2857 while (incr_buf_fill + ct.nitems > incr_buf_size)
2858 {
2859 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2860 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2861 }
2862
2863 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2864 incr_buf_fill += ct.nitems;
2865
2866 goto bailout;
2867 }
2868
2869 char **cl;
2870 int cr;
2871
2872#if !ENABLE_MINIMAL
2873 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2874 // so recode it manually
2875 if (ct.encoding == xa[XA_UTF8_STRING])
2876 {
2877 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2878 char *s = rxvt_wcstombs (w);
2879 free (w);
2880 // TODO: strlen == only the first element will be converted. well...
2881 paste (s, strlen (s));
2882 free (s);
2883 }
2884 else
2885#endif
2886 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2887 && cl)
2888 {
2889 for (int i = 0; i < cr; i++)
2890 paste (cl[i], strlen (cl[i]));
2891
2892 XFreeStringList (cl);
2893 }
2894 else
2895 paste ((char *)ct.value, ct.nitems); // paste raw
2896
2897bailout:
2898 XFree (ct.value);
2899
2900 if (selection_wait == Sel_normal)
2901 selection_wait = Sel_none;
2902}
2903
2904void
2905rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2906{
2907 selection_wait = Sel_none;
2908
2909 incr_buf_size = 0;
2910 free (incr_buf);
2911
2912 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2913}
2914
2915void
2916rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2917{
2918 if (prop == None || selection_wait != Sel_incr)
2919 return;
2920
2921 selection_paste (win, prop, true);
2922}
2923
2924/* ------------------------------------------------------------------------- */
2925/*
2926 * Request the current selection:
2927 * Order: > internal selection if available
2928 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2929 * > CUT_BUFFER0
2930 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2931 * will auto fallback to CUT_BUFFER0
2932 * EXT: button 2 release 2743 * EXT: button 2 release
2933 */ 2744 */
2934void 2745void
2935rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2936{ 2747{
2937 if (selection.text && selnum == Sel_Primary) 2748 if (!selection_req)
2938 {
2939 /* internal selection */
2940 char *str = rxvt_wcstombs (selection.text, selection.len);
2941 paste (str, strlen (str));
2942 free (str);
2943 return;
2944 } 2749 {
2945 else 2750 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2751 selection_req->run ();
2946 { 2752 }
2947 selection_request_time = tm;
2948 selection_wait = Sel_normal;
2949
2950#if X_HAVE_UTF8_STRING
2951 selection_type = Sel_UTF8String;
2952 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2953 return;
2954#else
2955 selection_type = Sel_CompoundText;
2956 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2957 return;
2958#endif
2959 }
2960
2961 selection_wait = Sel_none; /* don't loop in selection_paste () */
2962 selection_paste (display->root, XA_CUT_BUFFER0, false);
2963}
2964
2965int
2966rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2967{
2968 Atom sel;
2969
2970 selection_type |= selnum;
2971
2972 if (selnum == Sel_Primary)
2973 sel = XA_PRIMARY;
2974 else if (selnum == Sel_Secondary)
2975 sel = XA_SECONDARY;
2976 else
2977 sel = xa[XA_CLIPBOARD];
2978
2979 if (XGetSelectionOwner (dpy, sel) != None)
2980 {
2981 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2982 vt, selection_request_time);
2983 return 1;
2984 }
2985
2986 return 0;
2987} 2753}
2988 2754
2989/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2990/* 2756/*
2991 * Clear all selected text 2757 * Clear all selected text
… …
3635 * EXT: SelectionRequest 3401 * EXT: SelectionRequest
3636 */ 3402 */
3637void 3403void
3638rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3404rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3639{ 3405{
3406 Atom property = rq.property == None ? rq.target : rq.property;
3640 XSelectionEvent ev; 3407 XSelectionEvent ev;
3641 3408
3642 ev.type = SelectionNotify; 3409 ev.type = SelectionNotify;
3643 ev.property = None; 3410 ev.property = None;
3644 ev.display = rq.display; 3411 ev.display = rq.display;
… …
3659 *target++ = xa[XA_COMPOUND_TEXT]; 3426 *target++ = xa[XA_COMPOUND_TEXT];
3660#if X_HAVE_UTF8_STRING 3427#if X_HAVE_UTF8_STRING
3661 *target++ = xa[XA_UTF8_STRING]; 3428 *target++ = xa[XA_UTF8_STRING];
3662#endif 3429#endif
3663 3430
3664 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3431 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3665 32, PropModeReplace, 3432 32, PropModeReplace,
3666 (unsigned char *)target_list, target - target_list); 3433 (unsigned char *)target_list, target - target_list);
3667 ev.property = rq.property; 3434 ev.property = property;
3668 } 3435 }
3669#if TODO // TODO 3436#if TODO // TODO
3670 else if (rq.target == xa[XA_MULTIPLE]) 3437 else if (rq.target == xa[XA_MULTIPLE])
3671 { 3438 {
3672 /* TODO: Handle MULTIPLE */ 3439 /* TODO: Handle MULTIPLE */
3673 } 3440 }
3674#endif 3441#endif
3675 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)
3676 { 3443 {
3677 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3444 XChangeProperty (dpy, rq.requestor, property, rq.target,
3678 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3445 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3679 ev.property = rq.property; 3446 ev.property = property;
3680 } 3447 }
3681 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)
3682 { 3449 {
3683 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3684 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3451 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3685 ev.property = rq.property; 3452 ev.property = property;
3686 } 3453 }
3687 else if (rq.target == XA_STRING 3454 else if (rq.target == XA_STRING
3688 || rq.target == xa[XA_TEXT] 3455 || rq.target == xa[XA_TEXT]
3689 || rq.target == xa[XA_COMPOUND_TEXT] 3456 || rq.target == xa[XA_COMPOUND_TEXT]
3690 || rq.target == xa[XA_UTF8_STRING] 3457 || rq.target == xa[XA_UTF8_STRING]
… …
3761 ct.value = (unsigned char *)cl; 3528 ct.value = (unsigned char *)cl;
3762 ct.nitems = selectlen; 3529 ct.nitems = selectlen;
3763 ct.encoding = target; 3530 ct.encoding = target;
3764 } 3531 }
3765 3532
3766 XChangeProperty (dpy, rq.requestor, rq.property, 3533 XChangeProperty (dpy, rq.requestor, property,
3767 ct.encoding, 8, PropModeReplace, 3534 ct.encoding, 8, PropModeReplace,
3768 ct.value, (int)ct.nitems); 3535 ct.value, (int)ct.nitems);
3769 ev.property = rq.property; 3536 ev.property = property;
3770 3537
3771 if (freect) 3538 if (freect)
3772 XFree (ct.value); 3539 XFree (ct.value);
3773 } 3540 }
3774 3541

Diff Legend

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