--- rxvt-unicode/src/main.C	2007/12/12 09:33:48	1.279
+++ rxvt-unicode/src/main.C	2007/12/24 10:58:09	1.292
@@ -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-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
  *
  * 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
@@ -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),
@@ -187,7 +187,6 @@
   bell_ev.set             <rxvt_term, &rxvt_term::bell_cb>    (this);
 #endif
   child_ev.set            <rxvt_term, &rxvt_term::child_cb>   (this);
-  prepare_ev.set          <rxvt_term, &rxvt_term::prepare_cb> (this);
   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);
@@ -287,6 +286,7 @@
 #ifdef HAVE_BG_PIXMAP
   bgPixmap.destroy ();
 #endif
+  display->flush (); /* ideally .put should do this */
   displays.put (display);
 
   scr_release ();
@@ -329,7 +329,7 @@
 void
 rxvt_term::destroy ()
 {
-  if (ev_is_active (&destroy_ev))
+  if (destroy_ev.is_active ())
     return;
 
   HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
@@ -354,7 +354,7 @@
       vt_ev.stop (display);
     }
 
-  prepare_ev.stop ();
+  flush_ev.stop ();
   pty_ev.stop ();
 #ifdef CURSOR_BLINK
   cursor_blink_ev.stop ();
@@ -475,7 +475,7 @@
 }
 
 /*----------------------------------------------------------------------*/
-bool
+void
 rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 {
   this->envv = envv;
@@ -523,12 +523,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]);
 
@@ -539,11 +541,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);
@@ -572,8 +574,6 @@
   if (pty->pty >= 0)
     pty_ev.start (pty->pty, ev::READ);
 
-  prepare_ev.start ();
-
   HOOK_INVOKE ((this, HOOK_START, DT_END));
 
 #if ENABLE_XEMBED
@@ -588,8 +588,6 @@
 
   XMapWindow (dpy, vt);
   XMapWindow (dpy, parent[0]);
-
-  return true;
 }
 
 static struct sig_handlers
@@ -644,42 +642,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.
@@ -1719,7 +1681,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
@@ -1736,50 +1698,56 @@
                                          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 ()
 {
   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))
-    bgPixmap.render ();
-  else
+  if (bgPixmap.invalid_since + 0.50 < ev::now ()
+      && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
     {
       update_background_ev.stop ();
+      bgPixmap.render ();
+    }
+  else
+    {
+      ev_tstamp refresh;
 
-      if (!bgPixmap.need_client_side_rendering())
-        update_background_ev.start (.05);
+      if (!bgPixmap.need_client_side_rendering ())
+        refresh = .05;
       else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
-        update_background_ev.start (.20); /* very slow !!! */
+        refresh = .20; /* very slow !!! */
       else
-        update_background_ev.start (.07);
-    }
+        refresh = .07;
 
-  return 0;
+      update_background_ev.start (refresh);
+    }
 }
 
 void
 rxvt_term::update_background_cb (ev::timer &w, int revents)
 {
+  make_current ();
   bgPixmap.render ();
+  refresh_check ();
 }
 
 #endif /* HAVE_BG_PIXMAP */