--- rxvt-unicode/src/init.C	2007/06/26 00:40:18	1.189
+++ rxvt-unicode/src/init.C	2007/09/12 21:06:08	1.212
@@ -168,7 +168,7 @@
     COLOR_SCROLLBAR,
     COLOR_SCROLLTROUGH,
 #endif                          /* KEEP_SCROLLCOLOR */
-#if TINTING
+#if ENABLE_TRANSPARENCY
     NULL,
 #endif
 #if OFF_FOCUS_FADING
@@ -185,9 +185,6 @@
   pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
 #endif
 
-#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
-  pixmap = None;
-#endif
 
   MEvent.time = CurrentTime;
   MEvent.button = AnyButton;
@@ -204,12 +201,6 @@
   refresh_type = SLOW_REFRESH;
 
   oldcursor.row = oldcursor.col = -1;
-#ifdef XPM_BACKGROUND
-  /*  bgPixmap.w = bgPixmap.h = 0; */
-  bgPixmap.x = bgPixmap.y = 0;
-  bgPixmap.pixmap = None;
-#endif
-
   last_bot = last_state = -1;
 
   set_option (Opt_scrollBar);
@@ -264,7 +255,6 @@
 rxvt_term::init_resources (int argc, const char *const *argv)
 {
   int i, r_argc;
-  char *val;
   const char **cmd_argv, **r_argv;
 
   /*
@@ -293,7 +283,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
@@ -318,6 +308,9 @@
     select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
 
+#ifdef HAVE_AFTERIMAGE
+  asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
+#endif
   free (r_argv);
 
   for (int i = NUM_RESOURCES; i--; )
@@ -343,7 +336,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];
     }
@@ -391,39 +384,20 @@
 #ifndef NO_BACKSPACE_KEY
   if (!rs[Rs_backspace_key])
 # ifdef DEFAULT_BACKSPACE
-    key_backspace = DEFAULT_BACKSPACE;
+    rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
 # else
-    key_backspace = "DEC";       /* can toggle between \010 or \177 */
+    rs[Rs_backspace_key] = "DEC";       /* can toggle between \010 or \177 */
 # endif
-  else
-    {
-      val = strdup (rs[Rs_backspace_key]);
-      rxvt_Str_trim (val);
-      rxvt_Str_escaped (val);
-      key_backspace = val;
-    }
 #endif
 
 #ifndef NO_DELETE_KEY
   if (!rs[Rs_delete_key])
 # ifdef DEFAULT_DELETE
-    key_delete = DEFAULT_DELETE;
+    rs[Rs_delete_key] = DEFAULT_DELETE;
 # else
-    key_delete = "\033[3~";
+    rs[Rs_delete_key] = "\033[3~";
 # endif
-  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]);
@@ -478,7 +452,6 @@
 rxvt_term::init_env ()
 {
   int i;
-  unsigned int u;
   char *val;
 
 #ifdef DISPLAY_IS_IP
@@ -503,7 +476,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);
 
@@ -534,7 +507,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);
     }
@@ -644,7 +617,7 @@
     priv_modes |= PrivMode_smoothScroll;
 
 #ifndef NO_BACKSPACE_KEY
-  if (strcmp (key_backspace, "DEC") == 0)
+  if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
     priv_modes |= PrivMode_HaveBackSpace;
 #endif
 
@@ -881,7 +854,7 @@
   XClassHint classHint;
   XWMHints wmHint;
 #if ENABLE_FRILLS
-  MWMHints mwmhints;
+  MWMHints mwmhints = { };
 #endif
   XGCValues gcvalue;
   XSetWindowAttributes attributes;
@@ -904,18 +877,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
@@ -1036,26 +1005,6 @@
 
   vt_ev.start (display, vt);
 
-#ifdef XPM_BACKGROUND
-  if (rs[Rs_backgroundPixmap] != NULL
-#ifndef HAVE_AFTERIMAGE  
-      && !option (Opt_transparent)
-#endif	  
-    )
-    {
-      const char *p = rs[Rs_backgroundPixmap];
-
-      if ((p = strchr (p, ';')) != NULL)
-        {
-          p++;
-          scale_pixmap (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];
@@ -1281,9 +1230,9 @@
   int er;
 
 #ifndef NO_BACKSPACE_KEY
-  if (key_backspace[0] && !key_backspace[1])
-    er = key_backspace[0];
-  else if (strcmp (key_backspace, "DEC") == 0)
+  if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
+    er = rs[Rs_backspace_key][0];
+  else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
     er = '\177';            /* the initial state anyway */
   else
 #endif
@@ -1416,11 +1365,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);