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.368 by sf-exg, Tue Feb 1 00:41:01 2011 UTC

2516 2516
2517#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2518 if (bg_pixmap != None) 2518 if (bg_pixmap != None)
2519 { 2519 {
2520# ifdef ENABLE_TRANSPARENCY 2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & isTransparent) 2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 { 2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525 2525
2526 transparent = true; 2526 transparent = true;
2742void 2742void
2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2744{ 2744{
2745 if (prop == None) /* check for failed XConvertSelection */ 2745 if (prop == None) /* check for failed XConvertSelection */
2746 { 2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2747 if ((selection_type & Sel_CompoundText)) 2752 if ((selection_type & Sel_CompoundText))
2748 { 2753 {
2749 int selnum = selection_type & Sel_whereMask;
2750
2751 selection_type = 0; 2754 selection_type = 0;
2752 if (selnum != Sel_direct)
2753 selection_request_other (XA_STRING, selnum); 2755 selection_request_other (XA_STRING, selnum);
2754 } 2756 }
2755 2757
2756 if ((selection_type & Sel_UTF8String)) 2758 if ((selection_type & Sel_UTF8String))
2757 { 2759 {
2758 int selnum = selection_type & Sel_whereMask;
2759
2760 selection_type = Sel_CompoundText; 2760 selection_type = Sel_CompoundText;
2761 if (selnum != Sel_direct)
2762 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2763 else
2764 selection_type = 0;
2765 } 2762 }
2766 2763
2767 return; 2764 return;
2768 } 2765 }
2769 2766
2842 { 2839 {
2843 /* 2840 /*
2844 * pass through again trying CUT_BUFFER0 if we've come from 2841 * pass through again trying CUT_BUFFER0 if we've come from
2845 * XConvertSelection () but nothing was presented 2842 * XConvertSelection () but nothing was presented
2846 */ 2843 */
2847 selection_paste (display->root, XA_CUT_BUFFER0, False); 2844 selection_paste (display->root, XA_CUT_BUFFER0, false);
2848 } 2845 }
2849 2846
2850 goto bailout; 2847 goto bailout;
2851 } 2848 }
2852 } 2849 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines