--- rxvt-unicode/src/rxvttoolkit.C	2011/02/21 08:10:10	1.122
+++ rxvt-unicode/src/rxvttoolkit.C	2011/04/21 00:16:25	1.124
@@ -705,10 +705,18 @@
       c.color.blue  = color.b;
       c.color.alpha = alpha;
 
-      c.pixel = insert_component (color.r, format->direct.redMask  , format->direct.red  )
-              | insert_component (color.g, format->direct.greenMask, format->direct.green)
-              | insert_component (color.b, format->direct.blueMask , format->direct.blue )
-              | insert_component (alpha  , format->direct.alphaMask, format->direct.alpha);
+      // ARGB visuals use premultiplied alpha
+      if (format->direct.alphaMask)
+        {
+          c.color.red   = c.color.red   * alpha / 0xffff;
+          c.color.green = c.color.green * alpha / 0xffff;
+          c.color.blue  = c.color.blue  * alpha / 0xffff;
+        }
+
+      c.pixel = insert_component (c.color.red  , format->direct.redMask  , format->direct.red  )
+              | insert_component (c.color.green, format->direct.greenMask, format->direct.green)
+              | insert_component (c.color.blue , format->direct.blueMask , format->direct.blue )
+              | insert_component (alpha        , format->direct.alphaMask, format->direct.alpha);
 
       return true;
     }
@@ -928,6 +936,17 @@
 {
   int selnum = selection_type;
 
+#if ENABLE_FRILLS
+  if (selnum == Sel_Primary && display->selection_owner)
+    {
+      /* internal selection */
+      char *str = rxvt_wcstombs (display->selection_owner->selection.text, display->selection_owner->selection.len);
+      finish (str, strlen (str));
+      free (str);
+      return;
+    }
+#endif
+
 #if X_HAVE_UTF8_STRING
   selection_type = Sel_UTF8String;
   if (request (display->xa[XA_UTF8_STRING], selnum))