--- rxvt-unicode/src/init.C	2012/01/09 21:12:08	1.317
+++ rxvt-unicode/src/init.C	2012/12/29 14:23:35	1.330
@@ -40,7 +40,7 @@
 
 #include <limits>
 
-#include <csignal>
+#include <signal.h>
 
 #include <fcntl.h>
 
@@ -48,9 +48,7 @@
 # define X_LOCALE
 # include <X11/Xlocale.h>
 #else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
-# endif
+# include <locale.h>
 #endif
 
 #ifdef HAVE_NL_LANGINFO
@@ -80,7 +78,7 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 
-static char *
+static char * ecb_cold
 rxvt_network_display (const char *display)
 {
   char            buffer[1024], *rval = NULL;
@@ -523,7 +521,7 @@
 #ifdef RXVT_SCROLLBAR
     COLOR_SCROLLTROUGH,
 #endif
-#if ENABLE_TRANSPARENCY
+#if BG_IMAGE_FROM_ROOT
     NULL,
 #endif
 #if OFF_FOCUS_FADING
@@ -592,9 +590,11 @@
   set (display);
   extract_resources ();
 
-#if XFT
-  if (rs[Rs_depth])
-    select_visual (strtol (rs[Rs_depth], 0, 0));
+#if ENABLE_FRILLS
+  if (rs[Rs_visual])
+    select_visual (strtol (rs[Rs_visual], 0, 0));
+  else if (rs[Rs_depth])
+    select_depth (strtol (rs[Rs_depth], 0, 0));
 #endif
 
   for (int i = NUM_RESOURCES; i--; )
@@ -795,16 +795,6 @@
 
   pty = ptytty::create ();
 
-#ifdef HAVE_AFTERIMAGE
-  set_application_name ((char *)rs[Rs_name]);
-  set_output_threshold (OUTPUT_LEVEL_WARNING);
-#endif
-
-  // must be called before create_windows, because the latter may call set_icon
-#ifdef HAVE_PIXBUF
-  g_type_init ();
-#endif
-
   create_windows (argc, argv);
 
   init_xlocale ();
@@ -817,37 +807,9 @@
 
   if (option (Opt_scrollBar))
     scrollBar.resize ();      /* create and map scrollbar */
-#ifdef HAVE_BG_PIXMAP
-  {
-    bg_init ();
-
-#ifdef ENABLE_TRANSPARENCY
-    if (option (Opt_transparent))
-      {
-        bg_set_transparent ();
 
-        if (rs [Rs_blurradius])
-          bg_set_blur (rs [Rs_blurradius]);
-
-        if (ISSET_PIXCOLOR (Color_tint))
-          bg_set_tint (pix_colors_focused [Color_tint]);
-
-        if (rs [Rs_shade])
-          bg_set_shade (rs [Rs_shade]);
-
-        bg_set_root_pixmap ();
-        XSelectInput (dpy, display->root, PropertyChangeMask);
-        rootwin_ev.start (display, display->root);
-      }
-#endif
-
-#ifdef BG_IMAGE_FROM_FILE
-    if (rs[Rs_backgroundPixmap])
-      if (bg_set_file (rs[Rs_backgroundPixmap]))
-        if (!bg_window_position_sensitive ())
-          update_background ();
-#endif
-  }
+#ifdef HAVE_BG_PIXMAP
+  bg_init ();
 #endif
 
 #if ENABLE_PERL
@@ -987,7 +949,6 @@
 {
   set_environ (envv);
 
-#if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
   this->locale = setlocale (LC_CTYPE, locale);
 
@@ -1008,7 +969,6 @@
   this->locale = strdup (this->locale);
   SET_LOCALE (this->locale);
   mbstate.reset ();
-#endif
 
 #if HAVE_NL_LANGINFO
   char *codeset = nl_langinfo (CODESET);
@@ -1027,7 +987,7 @@
 {
   set_environ (envv);
 
-#ifdef USE_XIM
+#if USE_XIM
   if (!locale)
     rxvt_warn ("setting locale failed, continuing without locale support.\n");
   else
@@ -1195,7 +1155,7 @@
 void
 rxvt_term::color_aliases (int idx)
 {
-  if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
+  if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
     {
       int i = atoi (rs[Rs_color + idx]);
 
@@ -1300,58 +1260,7 @@
 void
 rxvt_term::set_icon (const char *file)
 {
-#ifdef HAVE_AFTERIMAGE
-  init_asv ();
-
-  ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
-  if (!im)
-    {
-      rxvt_warn ("Loading image icon failed, continuing without.\n");
-      return;
-    }
-
-  unsigned int w = im->width;
-  unsigned int h = im->height;
-
-  if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
-    {
-      rxvt_warn ("Icon image too big, continuing without.\n");
-      destroy_asimage (&im);
-      return;
-    }
-
-  ASImage *result = scale_asimage (asv, im,
-                                   w, h, ASA_ARGB32,
-                                   100, ASIMAGE_QUALITY_DEFAULT);
-  destroy_asimage (&im);
-
-  if (!result)
-    {
-      rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
-      return;
-    }
-
-  long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
-  if (buffer)
-    {
-      ARGB32 *asbuf = result->alt.argb32;
-      buffer [0] = w;
-      buffer [1] = h;
-
-      for (unsigned int i = 0; i < w * h; ++i)
-        buffer [i + 2] = asbuf [i];
-
-      XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
-                       PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
-      free (buffer);
-    }
-  else
-    rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
-
-  destroy_asimage (&result);
-#endif
-
-#ifdef HAVE_PIXBUF
+#if HAVE_PIXBUF
   GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
   if (!pixbuf)
     {