ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvttoolkit.C
(Generate patch)

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.122 by root, Mon Feb 21 08:10:10 2011 UTC vs.
Revision 1.124 by sf-exg, Thu Apr 21 00:16:25 2011 UTC

… …
703 c.color.red = color.r; 703 c.color.red = color.r;
704 c.color.green = color.g; 704 c.color.green = color.g;
705 c.color.blue = color.b; 705 c.color.blue = color.b;
706 c.color.alpha = alpha; 706 c.color.alpha = alpha;
707 707
708 // ARGB visuals use premultiplied alpha
709 if (format->direct.alphaMask)
710 {
711 c.color.red = c.color.red * alpha / 0xffff;
712 c.color.green = c.color.green * alpha / 0xffff;
713 c.color.blue = c.color.blue * alpha / 0xffff;
714 }
715
708 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 716 c.pixel = insert_component (c.color.red , format->direct.redMask , format->direct.red )
709 | insert_component (color.g, format->direct.greenMask, format->direct.green) 717 | insert_component (c.color.green, format->direct.greenMask, format->direct.green)
710 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 718 | insert_component (c.color.blue , format->direct.blueMask , format->direct.blue )
711 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha); 719 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
712 720
713 return true; 721 return true;
714 } 722 }
715 else 723 else
716 { 724 {
… …
926void 934void
927rxvt_selection::run () 935rxvt_selection::run ()
928{ 936{
929 int selnum = selection_type; 937 int selnum = selection_type;
930 938
939#if ENABLE_FRILLS
940 if (selnum == Sel_Primary && display->selection_owner)
941 {
942 /* internal selection */
943 char *str = rxvt_wcstombs (display->selection_owner->selection.text, display->selection_owner->selection.len);
944 finish (str, strlen (str));
945 free (str);
946 return;
947 }
948#endif
949
931#if X_HAVE_UTF8_STRING 950#if X_HAVE_UTF8_STRING
932 selection_type = Sel_UTF8String; 951 selection_type = Sel_UTF8String;
933 if (request (display->xa[XA_UTF8_STRING], selnum)) 952 if (request (display->xa[XA_UTF8_STRING], selnum))
934 return; 953 return;
935#else 954#else

Diff Legend

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