--- rxvt-unicode/src/main.C	2007/08/16 21:26:20	1.243
+++ rxvt-unicode/src/main.C	2007/10/18 09:11:42	1.254
@@ -40,14 +40,19 @@
 #include <csignal>
 #include <cstring>
 
-#ifdef TTY_GID_SUPPORT
-# include <grp.h>
-#endif
-
 #ifdef HAVE_TERMIOS_H
 # include <termios.h>
 #endif
 
+#ifdef HAVE_XSETLOCALE
+# define X_LOCALE
+# include <X11/Xlocale.h>
+#else
+# ifdef HAVE_SETLOCALE
+#  include <clocale>
+# endif
+#endif
+
 vector<rxvt_term *> rxvt_term::termlist;
 
 // used to tell global functions which terminal instance is "active"
@@ -203,7 +208,8 @@
 
 // clean up the most important stuff, do *not* call x or free mem etc.
 // for use before an emergency exit
-void rxvt_term::emergency_cleanup ()
+void
+rxvt_term::emergency_cleanup ()
 {
   if (cmd_pid)
     kill (-cmd_pid, SIGHUP);
@@ -529,7 +535,7 @@
       }
 #endif
 
-#ifdef XPM_BACKGROUND
+#ifdef BG_IMAGE_FROM_FILE
     if (rs[Rs_backgroundPixmap] != NULL)
       {
         const char *p = rs[Rs_backgroundPixmap];
@@ -542,12 +548,10 @@
         else
           bgPixmap.set_defaultGeometry ();
 
-        bgPixmap.set_file (rs[Rs_backgroundPixmap]);
+        if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
+          if (!bgPixmap.window_position_sensitive ())
+            update_background ();
       }
-    /* do not want to render Pixmap yet if we are size/position dependant - 
-     * wait for ConfigureNotify at least */
-    if (!bgPixmap.window_size_sensitive ())
-      update_background();
 #endif
   }
 #endif
@@ -905,14 +909,16 @@
   return true;
 }
 
-void rxvt_term::set_string_property (Atom prop, const char *str, int len)
+void
+rxvt_term::set_string_property (Atom prop, const char *str, int len)
 {
   XChangeProperty (dpy, parent[0],
                    prop, XA_STRING, 8, PropModeReplace,
                    (const unsigned char *)str, len >= 0 ? len : strlen (str));
 }
 
-void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
+void
+rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
 {
   wchar_t *ws = rxvt_mbstowcs (str, len);
   char *s = rxvt_wcstoutf8 (ws);
@@ -946,10 +952,10 @@
 #endif
 }
 
-#ifdef XTERM_COLOR_CHANGE
 void
 rxvt_term::set_window_color (int idx, const char *color)
 {
+#ifdef XTERM_COLOR_CHANGE
   rxvt_color xcol;
   int i;
   
@@ -996,11 +1002,8 @@
   update_fade_color (idx);
   recolour_cursor ();
   scr_recolour ();
-}
-
-#else
-# define set_window_color (idx,color)   ((void)0)
 #endif                          /* XTERM_COLOR_CHANGE */
+}
 
 void
 rxvt_term::recolour_cursor ()
@@ -1042,7 +1045,7 @@
     if (pix_colors[Color_bg] == pix_colors[i])
       {
         sprintf (bstr, "%d", (i - Color_Black));
-#ifdef XPM_BACKGROUND
+#ifdef BG_IMAGE_FROM_FILE
         xpmb = "default;";
 #endif
         break;
@@ -1148,10 +1151,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 ())
-          update_background ();
+        update_background ();
 #endif
 
       scr_clear ();
@@ -1705,4 +1707,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) -----------------------*/