--- rxvt-unicode/src/rxvttoolkit.C	2006/08/07 15:41:05	1.62
+++ rxvt-unicode/src/rxvttoolkit.C	2007/08/27 18:31:00	1.72
@@ -66,7 +66,7 @@
   "WM_LOCALE_NAME",
   "XIM_SERVERS",
 #endif
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
   "_XROOTPMAP_ID",
   "ESETROOT_PMAP_ID",
 #endif
@@ -471,7 +471,7 @@
   socklen_t sl = sizeof (sa);
 
   if (!getsockname (fd, (sockaddr *)&sa, &sl))
-    is_local = sa.sun_family == AF_LOCAL;
+    is_local = sa.sun_family == AF_UNIX;
 
   x_ev.start (fd, EVENT_READ);
   fcntl (fd, F_SETFD, FD_CLOEXEC);
@@ -555,6 +555,9 @@
               && xev.xproperty.atom == xa[XA_XIM_SERVERS])
             im_change_check ();
 #endif
+          if (xev.type == MappingNotify)
+            XRefreshKeyboardMapping (&xev.xmapping);
+
           for (int i = xw.size (); i--; )
             {
               if (!xw[i])
@@ -709,12 +712,9 @@
 
   if (screen->visual->c_class == TrueColor)
     {
-      c.pixel = (color.r * (screen->visual->red_mask   >> ctz (screen->visual->red_mask  ))
-                         / rgba::MAX_CC) << ctz (screen->visual->red_mask  )
-              | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
-                         / rgba::MAX_CC) << ctz (screen->visual->green_mask)
-              | (color.b * (screen->visual->blue_mask  >> ctz (screen->visual->blue_mask ))
-                         / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
+      c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask  )) << ctz (screen->visual->red_mask  ))
+              | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
+              | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
 
       return true;
     }
@@ -745,10 +745,22 @@
   else
     c.a = rgba::MAX_CC;
 
+  // parse the non-standard "#aarrggbb" format
+  if (name[0] == '#' && strlen (name) == 1+2+2+2+2 && 4 == sscanf (name+1, "%2hx%2hx%2hx%2hx%c", &c.a, &c.r, &c.g, &c.b, &eos))
+    {
+      if (c.r)
+        c.r = (c.r << 8) | 0x0ff;
+      if (c.g)
+        c.g = (c.g << 8) | 0x0ff;
+      if (c.b)
+        c.b = (c.b << 8) | 0x0ff;
+      if (c.a)
+        c.a = (c.a << 8) | 0x0ff;
+    }
   // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
-  if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
+  else if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
     {
-      XColor xc, xc_exact;
+      XColor xc;
 
       if (XParseColor (screen->dpy, screen->cmap, name, &xc))
         {
@@ -811,7 +823,7 @@
           
       got = alloc (screen, rgba (best->red, best->green, best->blue));
 
-      delete colors;
+      delete [] colors;
     }
 #endif