--- rxvt-unicode/src/init.C	2007/08/03 23:15:34	1.200
+++ rxvt-unicode/src/init.C	2007/09/08 21:25:56	1.210
@@ -168,7 +168,7 @@
     COLOR_SCROLLBAR,
     COLOR_SCROLLTROUGH,
 #endif                          /* KEEP_SCROLLCOLOR */
-#if TINTING
+#if ENABLE_TRANSPARENCY
     NULL,
 #endif
 #if OFF_FOCUS_FADING
@@ -213,7 +213,6 @@
   bgPixmap.flags = 0;
   bgPixmap.pixmap = None;
 #endif
-
   last_bot = last_state = -1;
 
   set_option (Opt_scrollBar);
@@ -297,7 +296,7 @@
       cmd_argv[i] = NULL;
     }
 
-  rs[Rs_name] = rxvt_r_basename (argv[0]);
+  rs[Rs_name] = rxvt_basename (argv[0]);
 
   /*
    * Open display, get options/resources and create the window
@@ -350,7 +349,7 @@
   if (cmd_argv && cmd_argv[0])
     {
       if (!rs[Rs_title])
-        rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
+        rs[Rs_title] = rxvt_basename (cmd_argv[0]);
       if (!rs[Rs_iconName])
         rs[Rs_iconName] = rs[Rs_title];
     }
@@ -405,8 +404,6 @@
   else
     {
       val = strdup (rs[Rs_backspace_key]);
-      rxvt_Str_trim (val);
-      rxvt_Str_escaped (val);
       key_backspace = val;
     }
 #endif
@@ -421,16 +418,9 @@
   else
     {
       val = strdup (rs[Rs_delete_key]);
-      rxvt_Str_trim (val);
-      rxvt_Str_escaped (val);
       key_delete = val;
     }
 #endif
-  if (rs[Rs_answerbackstring])
-    {
-      rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
-      rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
-    }
 
 #ifdef HAVE_SCROLLBARS
   setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
@@ -485,7 +475,6 @@
 rxvt_term::init_env ()
 {
   int i;
-  unsigned int u;
   char *val;
 
 #ifdef DISPLAY_IS_IP
@@ -510,7 +499,7 @@
     rs[Rs_display_name] = val;   /* use broken `:0' value */
 
   i = strlen (val);
-  env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
+  env_display = (char *)rxvt_malloc (i + 9);
 
   sprintf (env_display, "DISPLAY=%s", val);
 
@@ -541,7 +530,7 @@
 
   if (rs[Rs_term_name] != NULL)
     {
-      env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char));
+      env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
       sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
       putenv (env_term);
     }
@@ -911,18 +900,14 @@
     {
       if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
         {
-          /*     print_warning("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");*/
+          // rxvt_warn("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");
           attributes.override_redirect = true;
-          mwmhints.flags = 0;
         }
       else
         {
           mwmhints.flags = MWM_HINTS_DECORATIONS;
-          mwmhints.decorations = 0;
         }
     }
-  else
-    mwmhints.flags = 0;
 #endif
 
 #if ENABLE_XEMBED
@@ -1043,22 +1028,6 @@
 
   vt_ev.start (display, vt);
 
-#ifdef XPM_BACKGROUND
-  if (rs[Rs_backgroundPixmap] != NULL)
-    {
-      const char *p = rs[Rs_backgroundPixmap];
-
-      if ((p = strchr (p, ';')) != NULL)
-        {
-          p++;
-          bgPixmap.handle_geometry (p);
-        }
-
-      set_bgPixmap (rs[Rs_backgroundPixmap]);
-      scr_touch (true);
-    }
-#endif
-
   /* graphics context for the vt window */
   gcvalue.foreground         = pix_colors[Color_fg];
   gcvalue.background         = pix_colors[Color_bg];
@@ -1419,11 +1388,11 @@
       if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
         shell = "/bin/sh";
 
-      argv0 = (const char *)rxvt_r_basename (shell);
+      argv0 = (const char *)rxvt_basename (shell);
 
       if (option (Opt_loginShell))
         {
-          login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
+          login = (char *)rxvt_malloc (strlen (argv0) + 2);
 
           login[0] = '-';
           strcpy (&login[1], argv0);