--- rxvt-unicode/src/main.C	2011/01/20 16:41:23	1.348
+++ rxvt-unicode/src/main.C	2011/02/21 07:41:02	1.354
@@ -13,7 +13,7 @@
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - extensive modifications
- * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2010 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
@@ -189,7 +189,6 @@
   flush_ev.set            <rxvt_term, &rxvt_term::flush_cb>   (this);
   destroy_ev.set          <rxvt_term, &rxvt_term::destroy_cb> (this);
   pty_ev.set              <rxvt_term, &rxvt_term::pty_cb>     (this);
-  incr_ev.set             <rxvt_term, &rxvt_term::incr_cb>    (this);
   termwin_ev.set          <rxvt_term, &rxvt_term::x_cb>       (this);
   vt_ev.set               <rxvt_term, &rxvt_term::x_cb>       (this);
 
@@ -228,13 +227,7 @@
   delete fontset[0];
 
 #ifdef HAVE_BG_PIXMAP
-  bgPixmap.destroy ();
-#endif
-#ifdef HAVE_AFTERIMAGE
-  if (asv)
-    destroy_asvisual (asv, 0);
-  if (asimman)
-    destroy_image_manager (asimman, 0);
+  bg_destroy ();
 #endif
 
   if (display)
@@ -281,7 +274,8 @@
   free (env_term);
   free (locale);
   free (v_buffer);
-  free (incr_buf);
+
+  delete selection_req;
 
   delete envv;
   delete argv;
@@ -327,7 +321,6 @@
 #if ENABLE_TRANSPARENCY || ENABLE_PERL
       rootwin_ev.stop (display);
 #endif
-      incr_ev.stop ();
       termwin_ev.stop (display);
       vt_ev.stop (display);
     }
@@ -1084,7 +1077,7 @@
                          width, height);
 
 #ifdef HAVE_BG_PIXMAP
-      if (bgPixmap.window_size_sensitive ())
+      if (bg_window_size_sensitive ())
         update_background ();
 #endif
     }
@@ -1183,10 +1176,10 @@
       win = XGetSelectionOwner (dpy, atom);
 
       if (win != None)
-        return True;
+        return true;
     }
 
-  return False;
+  return false;
 }
 
 void
@@ -1664,12 +1657,12 @@
   if (update_background_ev.is_active ())
     return;
 
-  bgPixmap.invalidate ();
+  bg_invalidate ();
 
-  ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
+  ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
 
   if (to_wait <= 0.)
-    bgPixmap.render ();
+    bg_render ();
   else
     update_background_ev.start (to_wait);
 }
@@ -1680,7 +1673,7 @@
   make_current ();
 
   update_background_ev.stop ();
-  bgPixmap.render ();
+  bg_render ();
   refresh_check ();
 }