--- rxvt-unicode/src/screen.C	2011/03/24 23:55:31	1.378
+++ rxvt-unicode/src/screen.C	2011/04/26 16:19:45	1.382
@@ -161,6 +161,10 @@
 void
 rxvt_term::scr_reset ()
 {
+#if ENABLE_OVERLAY
+  scr_overlay_off ();
+#endif
+
   view_start = 0;
   num_scr = 0;
 
@@ -1922,7 +1926,7 @@
 #  ifdef MAPALERT_OPTION
   if (option (Opt_mapAlert))
 #  endif
-    XMapWindow (dpy, parent[0]);
+    XMapWindow (dpy, parent);
 # endif
 
 # if ENABLE_FRILLS
@@ -2518,7 +2522,7 @@
 # ifdef ENABLE_TRANSPARENCY
       if (bg_flags & BG_IS_TRANSPARENT)
         {
-          XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
+          XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
           XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
 
           transparent = true;
@@ -2526,18 +2530,18 @@
       else
 # endif
         {
-          XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
+          XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
           XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
         }
     }
   else
 #endif
     {
-      XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
+      XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
       XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
     }
 
-  XClearWindow (dpy, parent[0]);
+  XClearWindow (dpy, parent);
 
   if (scrollBar.win)
     {
@@ -2734,12 +2738,9 @@
 
 /* ------------------------------------------------------------------------- */
 /*
- * Request the current selection:
- * Order: > internal selection if available
- *        > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
- *        > CUT_BUFFER0
- * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
- *     will auto fallback to CUT_BUFFER0
+ * Request PRIMARY, SECONDARY or CLIPBOARD selection.
+ * if the requested selection has no owner or is empty CUT_BUFFER0 is used
+ * as fallback
  * EXT: button 2 release
  */
 void
@@ -3403,6 +3404,7 @@
 void
 rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
 {
+  Atom property = rq.property == None ? rq.target : rq.property;
   XSelectionEvent ev;
 
   ev.type = SelectionNotify;
@@ -3427,10 +3429,10 @@
       *target++ = xa[XA_UTF8_STRING];
 #endif
 
-      XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
+      XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
                        32, PropModeReplace,
                        (unsigned char *)target_list, target - target_list);
-      ev.property = rq.property;
+      ev.property = property;
     }
 #if TODO // TODO
   else if (rq.target == xa[XA_MULTIPLE])
@@ -3440,15 +3442,15 @@
 #endif
   else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
     {
-      XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
+      XChangeProperty (dpy, rq.requestor, property, rq.target,
                        32, PropModeReplace, (unsigned char *)&selection_time, 1);
-      ev.property = rq.property;
+      ev.property = property;
     }
   else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
     {
-      XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
+      XChangeProperty (dpy, rq.requestor, property, rq.target,
                        32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
-      ev.property = rq.property;
+      ev.property = property;
     }
   else if (rq.target == XA_STRING
            || rq.target == xa[XA_TEXT]
@@ -3529,10 +3531,10 @@
           ct.encoding = target;
         }
 
-      XChangeProperty (dpy, rq.requestor, rq.property,
+      XChangeProperty (dpy, rq.requestor, property,
                        ct.encoding, 8, PropModeReplace,
                        ct.value, (int)ct.nitems);
-      ev.property = rq.property;
+      ev.property = property;
 
       if (freect)
         XFree (ct.value);