--- rxvt-unicode/src/rxvttoolkit.C	2006/07/05 20:37:31	1.60
+++ rxvt-unicode/src/rxvttoolkit.C	2007/07/12 22:33:16	1.70
@@ -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])
@@ -581,14 +584,20 @@
 
 void rxvt_display::reg (xevent_watcher *w)
 {
-  xw.push_back (w);
-  w->active = xw.size ();
+  if (!w->active)
+    {
+      xw.push_back (w);
+      w->active = xw.size ();
+    }
 }
 
 void rxvt_display::unreg (xevent_watcher *w)
 {
   if (w->active)
-    xw[w->active - 1] = 0;
+    {
+      xw[w->active - 1] = 0;
+      w->active = 0;
+    }
 }
 
 void rxvt_display::set_selection_owner (rxvt_term *owner)
@@ -703,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;
     }
@@ -805,7 +811,7 @@
           
       got = alloc (screen, rgba (best->red, best->green, best->blue));
 
-      delete colors;
+      delete [] colors;
     }
 #endif