--- rxvt-unicode/src/main.C	2011/08/21 20:13:58	1.361
+++ rxvt-unicode/src/main.C	2012/06/03 10:42:34	1.374
@@ -38,9 +38,9 @@
 
 #include <limits>
 
-#include <cassert>
-#include <csignal>
-#include <cstring>
+#include <assert.h>
+#include <signal.h>
+#include <string.h>
 
 #include <termios.h>
 
@@ -48,9 +48,7 @@
 # define X_LOCALE
 # include <X11/Xlocale.h>
 #else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
-# endif
+# include <locale.h>
 #endif
 
 struct termios rxvt_term::def_tio;
@@ -269,9 +267,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);
 
@@ -355,7 +350,7 @@
 }
 
 void
-rxvt_term::set_option (uint8_t opt, bool set)
+rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
 {
   if (!opt)
     return;
@@ -381,7 +376,7 @@
 }
 
 #if !ENABLE_MINIMAL
-static void
+static void ecb_cold
 print_x_error (Display *dpy, XErrorEvent *event)
 {
     char buffer[BUFSIZ];
@@ -429,7 +424,7 @@
 }
 #endif
 
-int
+int ecb_cold
 rxvt_xerror_handler (Display *display, XErrorEvent *event)
 {
   if (GET_R->allowedxerror == -1)
@@ -448,7 +443,7 @@
   return 0;
 }
 
-int
+int ecb_cold
 rxvt_xioerror_handler (Display *display)
 {
   rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
@@ -578,6 +573,10 @@
   XSetIOErrorHandler (rxvt_xioerror_handler);
 
   XrmInitialize ();
+
+#ifdef HAVE_PIXBUF
+  g_type_init ();
+#endif
 }
 
 /*----------------------------------------------------------------------*/
@@ -715,8 +714,8 @@
   // 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.
-  width  = ncol * fwidth;
-  height = nrow * fheight;
+  vt_width  = ncol * fwidth;
+  vt_height = nrow * fheight;
 }
 
 /*----------------------------------------------------------------------*/
@@ -734,8 +733,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
@@ -771,13 +770,12 @@
   fontset[0] = fs;
 
   prop = (*fs)[rxvt_fontset::firstFont]->properties ();
-  prop.height += lineSpace;
   prop.width += letterSpace;
 
   fs->set_prop (prop, false);
 
   fwidth  = prop.width;
-  fheight = prop.height;
+  fheight = prop.height + lineSpace;
   fbase   = prop.ascent;
 
   for (int style = 1; style < 4; style++)
@@ -949,13 +947,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])
@@ -974,7 +973,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;
 }
 
 /*----------------------------------------------------------------------*/
@@ -1077,7 +1078,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 ())
@@ -1112,7 +1113,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;
@@ -1530,10 +1531,8 @@
   if (Input_Context)
     return;
 
-#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
   if (rs[Rs_imLocale])
     SET_LOCALE (rs[Rs_imLocale]);
-#endif
 
   p = rs[Rs_inputMethod];
   if (p && *p)
@@ -1571,10 +1570,8 @@
     goto done;
 
 done:
-#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
   if (rs[Rs_imLocale])
     SET_LOCALE (locale);
-#endif
 }
 
 void