--- rxvt-unicode/src/main.C	2007/08/15 22:41:52	1.242
+++ rxvt-unicode/src/main.C	2007/09/12 20:29:24	1.249
@@ -153,8 +153,8 @@
 #if ENABLE_TRANSPARENCY || ENABLE_PERL
     rootwin_ev (this, &rxvt_term::rootwin_cb),
 #endif
-#if ENABLE_TRANSPARENCY
-    check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
+#if HAVE_BG_PIXMAP
+    update_background_ev(this, &rxvt_term::update_background_cb),
 #endif
 #ifdef HAVE_SCROLLBARS
     scrollbar_ev (this, &rxvt_term::x_cb),
@@ -508,7 +508,6 @@
 #endif
 #ifdef HAVE_BG_PIXMAP
   {
-    bool changed = false;
     bgPixmap.set_target (this);
 
 #ifdef ENABLE_TRANSPARENCY
@@ -523,7 +522,6 @@
           bgPixmap.set_tint (pix_colors_focused [Color_tint]);
         if (rs [Rs_shade])
           bgPixmap.set_shade (rs [Rs_shade]);
-        changed = true;
 
         bgPixmap.set_root_pixmap ();
         XSelectInput (dpy, display->root, PropertyChangeMask);
@@ -544,14 +542,11 @@
         else
           bgPixmap.set_defaultGeometry ();
 
-        changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
+        if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
+          if (!bgPixmap.window_position_sensitive ())
+            update_background ();
       }
 #endif
-    if (changed)
-      {
-        bgPixmap.render ();
-        scr_touch (true);
-      }
   }
 #endif
 
@@ -1151,10 +1146,9 @@
                          window_vt_x, window_vt_y,
                          width, height);
 
-#ifdef XPM_BACKGROUND
-                /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
+#ifdef HAVE_BG_PIXMAP
       if (bgPixmap.window_size_sensitive ())
-          bgPixmap.render ();
+        update_background ();
 #endif
 
       scr_clear ();
@@ -1708,4 +1702,63 @@
 }
 #endif                          /* USE_XIM */
 
+void
+rxvt_term::get_window_origin (int &x, int &y)
+{
+  Window cr;
+  XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
+/*  fprintf( stderr, "origin is %+d%+d\n", x, y);*/
+}
+
+Pixmap
+rxvt_term::get_pixmap_property (int prop_id)
+{
+  if (prop_id > 0 && prop_id < NUM_XA)
+    if (xa[prop_id])
+      {
+        int aformat;
+        unsigned long nitems, bytes_after;
+        Atom atype;
+        unsigned char *prop = NULL;
+        int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
+                                         0L, 1L, False, XA_PIXMAP, &atype, &aformat,
+                                         &nitems, &bytes_after, &prop);
+        if (result == Success && prop && atype == XA_PIXMAP)
+          {
+            return *(Pixmap *)prop;
+          }
+      }
+  return None;
+}
+
+#ifdef HAVE_BG_PIXMAP
+int
+rxvt_term::update_background ()
+{
+  bgPixmap.invalidate();
+
+  /* no chance of real time refresh if we are blurring ! */
+  if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
+    bgPixmap.render();
+  else
+    {
+      update_background_ev.stop ();
+      if (!bgPixmap.need_client_side_rendering())
+        update_background_ev.start (NOW + .05);
+      else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
+        update_background_ev.start (NOW + .2); /* very slow !!! */
+      else
+        update_background_ev.start (NOW + .07);
+    }
+  return 0;
+}
+
+void
+rxvt_term::update_background_cb (time_watcher &w)
+{
+  bgPixmap.render ();
+}
+
+#endif /* HAVE_BG_PIXMAP */
+
 /*----------------------- end-of-file (C source) -----------------------*/