--- rxvt-unicode/src/main.C	2007/12/14 05:25:25	1.283
+++ rxvt-unicode/src/main.C	2008/01/12 22:13:46	1.298
@@ -172,7 +172,7 @@
   slip_wheel_ev.set       <rxvt_term, &rxvt_term::slip_wheel_cb>   (this);
 #endif
 #if ENABLE_TRANSPARENCY || ENABLE_PERL
-  rootwin_ev.set          <rxvt_term, &rxvt_term::x_cb>       (this),
+  rootwin_ev.set          <rxvt_term, &rxvt_term::rootwin_cb> (this),
 #endif
 #ifdef HAVE_SCROLLBARS
   scrollbar_ev.set        <rxvt_term, &rxvt_term::x_cb>       (this),
@@ -278,14 +278,10 @@
       clear ();
     }
 
-  delete [] pix_colors_focused;
-#if OFF_FOCUS_FADING
-  delete [] pix_colors_unfocused;
-#endif
-
 #ifdef HAVE_BG_PIXMAP
   bgPixmap.destroy ();
 #endif
+  display->flush (); /* ideally .put should do this */
   displays.put (display);
 
   scr_release ();
@@ -522,12 +518,14 @@
     if (option (Opt_transparent))
       {
         bgPixmap.set_transparent ();
+
 #ifdef HAVE_AFTERIMAGE
         if (rs [Rs_blurradius])
           bgPixmap.set_blur_radius (rs [Rs_blurradius]);
 #endif
         if (ISSET_PIXCOLOR (Color_tint))
           bgPixmap.set_tint (pix_colors_focused [Color_tint]);
+
         if (rs [Rs_shade])
           bgPixmap.set_shade (rs [Rs_shade]);
 
@@ -538,11 +536,11 @@
 #endif
 
 #ifdef BG_IMAGE_FROM_FILE
-    if (rs[Rs_backgroundPixmap] != NULL)
+    if (rs[Rs_backgroundPixmap])
       {
         const char *p = rs[Rs_backgroundPixmap];
 
-        if ((p = strchr (p, ';')) != NULL)
+        if ((p = strchr (p, ';')) != 0)
           {
             p++;
             bgPixmap.set_geometry (p);
@@ -585,6 +583,8 @@
 
   XMapWindow (dpy, vt);
   XMapWindow (dpy, parent[0]);
+
+  refresh_check ();
 }
 
 static struct sig_handlers
@@ -639,42 +639,6 @@
   XrmInitialize ();
 }
 
-/* ------------------------------------------------------------------------- *
- *                         MEMORY ALLOCATION WRAPPERS                        *
- * ------------------------------------------------------------------------- */
-void *
-rxvt_malloc (size_t size)
-{
-  void *p = malloc (size);
-
-  if (!p)
-    rxvt_fatal ("memory allocation failure. aborting.\n");
-
-  return p;
-}
-
-void *
-rxvt_calloc (size_t number, size_t size)
-{
-  void *p = calloc (number, size);
-
-  if (!p)
-    rxvt_fatal ("memory allocation failure. aborting.\n");
-
-  return p;
-}
-
-void *
-rxvt_realloc (void *ptr, size_t size)
-{
-  void *p = realloc (ptr, size);
-
-  if (!p)
-    rxvt_fatal ("memory allocation failure. aborting.\n");
-
-  return p;
-}
-
 /*----------------------------------------------------------------------*/
 /*
  * window size/position calculations for XSizeHint and other storage.
@@ -1714,7 +1678,7 @@
 {
   Window cr;
   XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
-/*  fprintf( stderr, "origin is %+d%+d\n", x, y);*/
+/*  fprintf (stderr, "origin is %+d%+d\n", x, y);*/
 }
 
 Pixmap
@@ -1731,50 +1695,47 @@
                                          0L, 1L, False, XA_PIXMAP, &atype, &aformat,
                                          &nitems, &bytes_after, &prop);
         if (result == Success && prop && atype == XA_PIXMAP)
-          {
-            return *(Pixmap *)prop;
-          }
+          return *(Pixmap *)prop;
       }
+
   return None;
 }
 
 #ifdef HAVE_BG_PIXMAP
 # if TRACE_PIXMAPS
 #  undef update_background
-int rxvt_term::trace_update_background (const char *file, int line)
+void
+rxvt_term::trace_update_background (const char *file, int line)
 {
   fprintf (stderr, "%s:%d:update_background()\n", file, line);
   update_background ();
 }
 # endif
 
-int
+void
 rxvt_term::update_background ()
 {
+  if (update_background_ev.is_active ())
+    return;
+
   bgPixmap.invalidate ();
 
-  /* no chance of real time refresh if we are blurring! */
-  if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
+  ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
+
+  if (to_wait <= 0.)
     bgPixmap.render ();
   else
-    {
-      update_background_ev.stop ();
-
-      if (!bgPixmap.need_client_side_rendering())
-        update_background_ev.start (.05);
-      else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
-        update_background_ev.start (.20); /* very slow !!! */
-      else
-        update_background_ev.start (.07);
-    }
-
-  return 0;
+    update_background_ev.start (to_wait);
 }
 
 void
 rxvt_term::update_background_cb (ev::timer &w, int revents)
 {
+  make_current ();
+
+  update_background_ev.stop ();
   bgPixmap.render ();
+  refresh_check ();
 }
 
 #endif /* HAVE_BG_PIXMAP */