--- rxvt-unicode/src/rxvttoolkit.C	2006/07/05 19:22:15	1.58
+++ rxvt-unicode/src/rxvttoolkit.C	2007/06/08 20:04:12	1.65
@@ -264,10 +264,8 @@
 }
 
 void
-rxvt_screen::set (rxvt_display *disp, int bitdepth)
+rxvt_screen::select_visual (int bitdepth)
 {
-  set (disp);
-
 #if XFT
   XVisualInfo vinfo;
 
@@ -275,7 +273,7 @@
     {
       depth  = bitdepth;
       visual = vinfo.visual;
-      cmap   = XCreateColormap (dpy, disp->root, visual, AllocNone);
+      cmap   = XCreateColormap (dpy, display->root, visual, AllocNone);
     }
 #endif
 }
@@ -317,6 +315,7 @@
   XrmDatabase rdb1, database = 0;
 
   // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
+  // as opposed to "standard practise", we always read in ~/.Xdefaults
 
   // 6. System wide per application default file.
 
@@ -333,6 +332,14 @@
   // none
 
   // 4. User's defaults file.
+  if (homedir)
+    {
+      snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
+
+      if ((rdb1 = XrmGetFileDatabase (fname)))
+        XrmMergeDatabases (rdb1, &database);
+    }
+
   /* Get any Xserver defaults */
   if (refresh)
     {
@@ -358,6 +365,7 @@
        else
          {
            displayResource = 0;
+
            if (val)
              XFree(val);
          }
@@ -374,13 +382,6 @@
       if ((rdb1 = XrmGetStringDatabase (displayResource)))
         XrmMergeDatabases (rdb1, &database);
     }
-  else if (homedir)
-    {
-      snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
-
-      if ((rdb1 = XrmGetFileDatabase (fname)))
-        XrmMergeDatabases (rdb1, &database);
-    }
 
 #if !XLIB_ILLEGAL_ACCESS
   if (refresh && displayResource)
@@ -444,6 +445,11 @@
   screen = DefaultScreen     (dpy);
   root   = DefaultRootWindow (dpy);
 
+#ifdef HAVE_AFTERIMAGE
+  ::dpy = dpy; /* init global var from libAfter... */
+  asv = create_asvisual_for_id( dpy, screen, DefaultDepth(dpy,screen), XVisualIDFromVisual(DefaultVisual(dpy,screen)), None, NULL );
+#endif
+
   assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
   XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
 
@@ -580,14 +586,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)
@@ -702,12 +714,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;
     }
@@ -804,7 +813,7 @@
           
       got = alloc (screen, rgba (best->red, best->green, best->blue));
 
-      delete colors;
+      delete [] colors;
     }
 #endif