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.367 by sf-exg, Mon Jan 31 15:40:22 2011 UTC vs.
Revision 1.372 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

… …
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 * ------------------------------------------------------------------------- */
… …
2734 tt_paste (data, len); 2732 tt_paste (data, len);
2735} 2733}
2736 2734
2737/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2738/* 2736/*
2739 * Respond to a notification that a primary selection has been sent
2740 * EXT: SelectionNotify
2741 */
2742void
2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2744{
2745 if (prop == None) /* check for failed XConvertSelection */
2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2752 if ((selection_type & Sel_CompoundText))
2753 {
2754 selection_type = 0;
2755 selection_request_other (XA_STRING, selnum);
2756 }
2757
2758 if ((selection_type & Sel_UTF8String))
2759 {
2760 selection_type = Sel_CompoundText;
2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2762 }
2763
2764 return;
2765 }
2766
2767 unsigned long bytes_after;
2768 XTextProperty ct;
2769
2770 if (XGetWindowProperty (dpy, win, prop,
2771 0, PROP_SIZE / 4,
2772 delete_prop, AnyPropertyType,
2773 &ct.encoding, &ct.format,
2774 &ct.nitems, &bytes_after,
2775 &ct.value) != Success)
2776 {
2777 ct.value = 0;
2778 goto bailout;
2779 }
2780
2781 if (ct.encoding == None)
2782 goto bailout;
2783
2784 if (bytes_after)
2785 {
2786 // fetch and append remaining data
2787 XTextProperty ct2;
2788
2789 if (XGetWindowProperty (dpy, win, prop,
2790 ct.nitems / 4, (bytes_after + 3) / 4,
2791 delete_prop, AnyPropertyType,
2792 &ct2.encoding, &ct2.format,
2793 &ct2.nitems, &bytes_after,
2794 &ct2.value) != Success)
2795 goto bailout;
2796
2797 // realloc should be compatible to XFree, here, and elsewhere, too
2798 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2800 ct.nitems += ct2.nitems;
2801
2802 XFree (ct2.value);
2803 }
2804
2805 if (ct.value == 0)
2806 goto bailout;
2807
2808 if (ct.encoding == xa[XA_INCR])
2809 {
2810 // INCR selection, start handshake
2811 if (!delete_prop)
2812 XDeleteProperty (dpy, win, prop);
2813
2814 selection_wait = Sel_incr;
2815 incr_buf_fill = 0;
2816 incr_ev.start (10);
2817
2818 goto bailout;
2819 }
2820
2821 if (ct.nitems == 0)
2822 {
2823 if (selection_wait == Sel_incr)
2824 {
2825 XFree (ct.value);
2826
2827 // finally complete, now paste the whole thing
2828 selection_wait = Sel_normal;
2829 ct.value = (unsigned char *)incr_buf;
2830 ct.nitems = incr_buf_fill;
2831 incr_buf = 0;
2832 incr_buf_size = 0;
2833 incr_ev.stop ();
2834 }
2835 else
2836 {
2837 if (selection_wait == Sel_normal
2838 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2839 {
2840 /*
2841 * pass through again trying CUT_BUFFER0 if we've come from
2842 * XConvertSelection () but nothing was presented
2843 */
2844 selection_paste (display->root, XA_CUT_BUFFER0, False);
2845 }
2846
2847 goto bailout;
2848 }
2849 }
2850 else if (selection_wait == Sel_incr)
2851 {
2852 incr_ev.start (10);
2853
2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2855 {
2856 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2858 }
2859
2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2861 incr_buf_fill += ct.nitems;
2862
2863 goto bailout;
2864 }
2865
2866 char **cl;
2867 int cr;
2868
2869#if !ENABLE_MINIMAL
2870 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2871 // so recode it manually
2872 if (ct.encoding == xa[XA_UTF8_STRING])
2873 {
2874 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2875 char *s = rxvt_wcstombs (w);
2876 free (w);
2877 // TODO: strlen == only the first element will be converted. well...
2878 paste (s, strlen (s));
2879 free (s);
2880 }
2881 else
2882#endif
2883 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2884 && cl)
2885 {
2886 for (int i = 0; i < cr; i++)
2887 paste (cl[i], strlen (cl[i]));
2888
2889 XFreeStringList (cl);
2890 }
2891 else
2892 paste ((char *)ct.value, ct.nitems); // paste raw
2893
2894bailout:
2895 XFree (ct.value);
2896
2897 if (selection_wait == Sel_normal)
2898 selection_wait = Sel_none;
2899}
2900
2901void
2902rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2903{
2904 selection_wait = Sel_none;
2905
2906 incr_buf_size = 0;
2907 free (incr_buf);
2908
2909 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2910}
2911
2912void
2913rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2914{
2915 if (prop == None || selection_wait != Sel_incr)
2916 return;
2917
2918 selection_paste (win, prop, true);
2919}
2920
2921/* ------------------------------------------------------------------------- */
2922/*
2923 * Request the current selection: 2737 * Request the current selection:
2924 * Order: > internal selection if available 2738 * Order: > internal selection if available
2925 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2926 * > CUT_BUFFER0 2740 * > CUT_BUFFER0
2927 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2928 * will auto fallback to CUT_BUFFER0 2742 * will auto fallback to CUT_BUFFER0
2929 * EXT: button 2 release 2743 * EXT: button 2 release
2930 */ 2744 */
2745
2746static void
2747selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr)
2748{
2749 if (data)
2750 {
2751 rxvt_term *term = (rxvt_term *)ptr;
2752 term->paste (data, len);
2753 }
2754 delete rs;
2755}
2756
2931void 2757void
2932rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2758rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2933{ 2759{
2934 if (selection.text && selnum == Sel_Primary) 2760 if (selection.text && selnum == Sel_Primary)
2935 { 2761 {
… …
2939 free (str); 2765 free (str);
2940 return; 2766 return;
2941 } 2767 }
2942 else 2768 else
2943 { 2769 {
2944 selection_request_time = tm; 2770 new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this);
2945 selection_wait = Sel_normal;
2946
2947#if X_HAVE_UTF8_STRING
2948 selection_type = Sel_UTF8String;
2949 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2950 return;
2951#else
2952 selection_type = Sel_CompoundText;
2953 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2954 return;
2955#endif
2956 }
2957
2958 selection_wait = Sel_none; /* don't loop in selection_paste () */
2959 selection_paste (display->root, XA_CUT_BUFFER0, false);
2960}
2961
2962int
2963rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2964{
2965 Atom sel;
2966
2967 selection_type |= selnum;
2968
2969 if (selnum == Sel_Primary)
2970 sel = XA_PRIMARY;
2971 else if (selnum == Sel_Secondary)
2972 sel = XA_SECONDARY;
2973 else
2974 sel = xa[XA_CLIPBOARD];
2975
2976 if (XGetSelectionOwner (dpy, sel) != None)
2977 { 2771 }
2978 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2979 vt, selection_request_time);
2980 return 1;
2981 }
2982
2983 return 0;
2984} 2772}
2985 2773
2986/* ------------------------------------------------------------------------- */ 2774/* ------------------------------------------------------------------------- */
2987/* 2775/*
2988 * Clear all selected text 2776 * Clear all selected text

Diff Legend

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