--- rxvt-unicode/src/main.C	2012/06/05 11:10:50	1.378
+++ rxvt-unicode/src/main.C	2013/02/17 00:52:04	1.389
@@ -170,7 +170,7 @@
 #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
   slip_wheel_ev.set       <rxvt_term, &rxvt_term::slip_wheel_cb>   (this);
 #endif
-#if ENABLE_TRANSPARENCY || ENABLE_PERL
+#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
   rootwin_ev.set          <rxvt_term, &rxvt_term::rootwin_cb> (this),
 #endif
   scrollbar_ev.set        <rxvt_term, &rxvt_term::x_cb>       (this),
@@ -228,6 +228,10 @@
   bg_destroy ();
 #endif
 
+#if HAVE_IMG
+  delete bg_img;
+#endif
+
   if (display)
     {
       selection_clear ();
@@ -237,9 +241,12 @@
       im_destroy ();
 #endif
       scrollBar.destroy ();
-      if (gc)   XFreeGC (dpy, gc);
+
+      if (gc)
+        XFreeGC (dpy, gc);
 
       delete drawable;
+
       // destroy all windows
       if (parent)
         XDestroyWindow (dpy, parent);
@@ -313,7 +320,7 @@
       im_ev.stop (display);
 #endif
       scrollbar_ev.stop (display);
-#if ENABLE_TRANSPARENCY || ENABLE_PERL
+#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
       rootwin_ev.stop (display);
 #endif
       termwin_ev.stop (display);
@@ -364,7 +371,6 @@
 /*----------------------------------------------------------------------*/
 /*
  * Exit gracefully, clearing the utmp entry and restoring tty attributes
- * TODO: if debugging, this should free up any known resources if we can
  */
 static XErrorHandler old_xerror_handler;
 
@@ -382,22 +388,73 @@
     char buffer[BUFSIZ];
     char mesg[BUFSIZ];
     char number[32];
-    const char mtype[] = "XlibMessage";
 
-    XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
-    XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
     rxvt_warn ("An X Error occurred, trying to continue after report.\n");
-    rxvt_warn ("%s:  %s\n", mesg, buffer);
-    XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
-    rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
-    sprintf (number, "%d", event->request_code);
-    XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
-    rxvt_warn ("(which is %s)\n", buffer);
+
+    XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
+    snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
+
+    XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
+    XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
+    rxvt_warn ("+ %s: %s\n", mesg, buffer);
+
+    XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
+    snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
 
     if (event->request_code >= 128)
       {
-        XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
-        rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
+#if 0
+        /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
+        int nexts;
+        char **exts = XListExtensions (dpy, &nexts);
+
+        while (nexts)
+          {
+            char *extname = exts [nexts - 1];
+            int major, first_event, first_error;
+
+            if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
+              {
+                XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
+                rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
+
+                snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
+                XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
+                rxvt_warn ("+ (which is %s)\n", buffer);
+
+                break;
+              }
+
+            printf ("nextss %d %s\n", nexts, extname);//D
+            --nexts;
+            ++exts;
+          }
+#else
+        int nexts = 0;
+        char **exts = 0;
+#endif
+
+        if (!nexts)
+          {
+            rxvt_warn ("+ (which is an unknown extension)\n", buffer);
+
+            XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
+            snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
+
+#if 0
+            sprintf (number, "RENDER.%d", event->minor_code);
+            XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
+            rxvt_warn ("+ (which is %s)\n", buffer);
+#endif
+          }
+
+        XFreeExtensionList (exts);
+      }
+    else
+      {
+        sprintf (number, "%d", event->request_code);
+        XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
+        rxvt_warn ("+ (which is %s)\n", buffer);
       }
 
     if (event->error_code == BadWindow
@@ -412,17 +469,14 @@
         || event->error_code == BadAtom)
       {
         if (event->error_code == BadValue)
-          XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);
+          XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
         else if (event->error_code == BadAtom)
-          XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
+          XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
         else
-          XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
+          XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
 
-        rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
+        snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
     }
-
-    XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
-    rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
 }
 #endif
 
@@ -772,7 +826,7 @@
   fontset[0] = fs;
 
   prop = (*fs)[rxvt_fontset::firstFont]->properties ();
-  prop.width += letterSpace;
+  prop.width = max (prop.width + letterSpace, 1);
 
   fs->set_prop (prop, false);
 
@@ -1320,7 +1374,7 @@
 
   set_environ (envv);
 
-  if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
+  if (!((p = XSetLocaleModifiers (modifiers)) && *p))
     return false;
 
   input_method = display->get_xim (locale, modifiers);
@@ -1638,11 +1692,6 @@
   if (update_background_ev.is_active ())
     return;
 
-  bg_invalidate ();
-
-  if (!mapped)
-    return;
-
   ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
 
   if (to_wait <= 0.)