--- rxvt-unicode/src/screen.C	2011/02/12 00:30:01	1.373
+++ rxvt-unicode/src/screen.C	2011/04/07 12:19:41	1.380
@@ -3,7 +3,7 @@
  *---------------------------------------------------------------------------*
  *
  * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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)
     {
@@ -2742,32 +2746,12 @@
  *     will auto fallback to CUT_BUFFER0
  * EXT: button 2 release
  */
-
-static void
-selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr)
-{
-  rxvt_term *term = (rxvt_term *)ptr;
-
-  if (data)
-    term->paste (data, len);
-  delete rs;
-  term->selection_req = 0;
-}
-
 void
 rxvt_term::selection_request (Time tm, int selnum) NOTHROW
 {
-  if (selection.text && selnum == Sel_Primary)
-    {
-      /* internal selection */
-      char *str = rxvt_wcstombs (selection.text, selection.len);
-      paste (str, strlen (str));
-      free (str);
-      return;
-    }
-  else if (!selection_req)
+  if (!selection_req)
     {
-      selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this);
+      selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
       selection_req->run ();
     }
 }