--- rxvt-unicode/src/main.C	2011/07/09 13:40:13	1.358
+++ rxvt-unicode/src/main.C	2012/01/09 21:12:08	1.366
@@ -107,7 +107,7 @@
     }
 
   // check to see whether this combination already exists otherwise
-  for (cc = v.end (); cc-- > v.begin (); )
+  for (cc = v.begin (); cc < v.end (); cc++)
     if (cc->c1 == c1 && cc->c2 == c2)
       return COMPOSE_LO + (cc - v.begin ());
 
@@ -269,9 +269,6 @@
 
   free (selection.text);
   free (selection.clip_text);
-  // TODO: manage env vars in child only(!)
-  free (env_display);
-  free (env_term);
   free (locale);
   free (v_buffer);
 
@@ -708,6 +705,15 @@
 
   ncol = width  / fwidth;
   nrow = height / fheight;
+
+  // When the size of the vt window is not a multiple of the cell
+  // size, i.e., when the wm does not honour our size hints, there are
+  // extra areas not covered by the terminal screen. Such gaps, when a
+  // bg pixmap is set, would have to be cleared manually to properly
+  // refresh the background. We take the simpler route and shrink the
+  // vt window so as to avoid creating gaps.
+  vt_width  = ncol * fwidth;
+  vt_height = nrow * fheight;
 }
 
 /*----------------------------------------------------------------------*/
@@ -725,8 +731,8 @@
 
   ws.ws_col = ncol;
   ws.ws_row = nrow;
-  ws.ws_xpixel = width;
-  ws.ws_ypixel = height;
+  ws.ws_xpixel = vt_width;
+  ws.ws_ypixel = vt_height;
   ioctl (pty->pty, TIOCSWINSZ, &ws);
 
 #if 0
@@ -940,13 +946,14 @@
 /*
  * find if fg/bg matches any of the normal (low-intensity) colors
  */
-void
-rxvt_term::set_colorfgbg ()
+char *
+rxvt_term::get_colorfgbg ()
 {
   unsigned int i;
   const char *xpmb = "";
   char fstr[] = "default";
   char bstr[] = "default";
+  char *env_colorfgbg;
 
   for (i = Color_Black; i <= Color_White; i++)
     if (pix_colors[Color_fg] == pix_colors[i])
@@ -965,7 +972,9 @@
         break;
       }
 
+  env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
   sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
+  return env_colorfgbg;
 }
 
 /*----------------------------------------------------------------------*/
@@ -1068,7 +1077,7 @@
 
       XMoveResizeWindow (dpy, vt,
                          window_vt_x, window_vt_y,
-                         width, height);
+                         vt_width, vt_height);
 
 #ifdef HAVE_BG_PIXMAP
       if (bg_window_size_sensitive ())
@@ -1103,7 +1112,7 @@
         newheight = wattr.height - szHint.base_height;
     }
 
-  if (newwidth != width || newheight != height)
+  if (newwidth != vt_width || newheight != vt_height)
     {
       newwidth += szHint.base_width;
       newheight += szHint.base_height;
@@ -1652,6 +1661,9 @@
 
   bg_invalidate ();
 
+  if (!mapped)
+    return;
+
   ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
 
   if (to_wait <= 0.)