--- rxvt-unicode/src/main.C	2011/01/07 21:17:08	1.344
+++ rxvt-unicode/src/main.C	2011/01/27 17:37:19	1.349
@@ -228,7 +228,7 @@
   delete fontset[0];
 
 #ifdef HAVE_BG_PIXMAP
-  bgPixmap.destroy ();
+  bg_destroy ();
 #endif
 #ifdef HAVE_AFTERIMAGE
   if (asv)
@@ -958,21 +958,20 @@
 {
   unsigned int i;
   const char *xpmb = "";
-  char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
+  char fstr[] = "default";
+  char bstr[] = "default";
 
-  strcpy (fstr, "default");
-  strcpy (bstr, "default");
   for (i = Color_Black; i <= Color_White; i++)
     if (pix_colors[Color_fg] == pix_colors[i])
       {
-        sprintf (fstr, "%d", (i - Color_Black));
+        sprintf (fstr, "%d", i - Color_Black);
         break;
       }
 
   for (i = Color_Black; i <= Color_White; i++)
     if (pix_colors[Color_bg] == pix_colors[i])
       {
-        sprintf (bstr, "%d", (i - Color_Black));
+        sprintf (bstr, "%d", i - Color_Black);
 #ifdef BG_IMAGE_FROM_FILE
         xpmb = "default;";
 #endif
@@ -1085,7 +1084,7 @@
                          width, height);
 
 #ifdef HAVE_BG_PIXMAP
-      if (bgPixmap.window_size_sensitive ())
+      if (bg_window_size_sensitive ())
         update_background ();
 #endif
     }
@@ -1093,12 +1092,6 @@
   if (fix_screen || old_height == 0)
     scr_reset ();
 
-#ifdef HAVE_BG_PIXMAP
-//  TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
-//  if (bgPixmap.pixmap)
-//    scr_touch (false);
-#endif
-
 #ifdef USE_XIM
   IMSetPosition ();
 #endif
@@ -1356,7 +1349,7 @@
       if (!p)
         continue;
 
-      s = rxvt_splitcommastring (p);
+      s = rxvt_strsplit (',', p);
 
       for (i = found = 0; !found && s[i]; i++)
         {
@@ -1378,7 +1371,7 @@
           for (j = 0; j < xim_styles->count_styles; j++)
             if (input_style == xim_styles->supported_styles[j])
               {
-                rxvt_freecommastring (s);
+                rxvt_free_strsplit (s);
 
                 found = 1;
                 goto foundpet;
@@ -1386,7 +1379,7 @@
 
         }
 
-      rxvt_freecommastring (s);
+      rxvt_free_strsplit (s);
     }
 
 foundpet:
@@ -1552,7 +1545,7 @@
     {
       bool found = false;
 
-      s = rxvt_splitcommastring (p);
+      s = rxvt_strsplit (',', p);
 
       for (i = 0; s[i]; i++)
         {
@@ -1568,7 +1561,7 @@
             }
         }
 
-      rxvt_freecommastring (s);
+      rxvt_free_strsplit (s);
 
       if (found)
         goto done;
@@ -1671,12 +1664,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);
 }
@@ -1687,7 +1680,7 @@
   make_current ();
 
   update_background_ev.stop ();
-  bgPixmap.render ();
+  bg_render ();
   refresh_check ();
 }