--- rxvt-unicode/src/rxvttoolkit.C	2004/12/29 19:59:46	1.10
+++ rxvt-unicode/src/rxvttoolkit.C	2005/07/13 00:51:25	1.15
@@ -84,7 +84,7 @@
 }
 
 template<class T>
-refcache<T>::~refcache ()
+void refcache<T>::clear ()
 {
   while (this->size ())
     put (*this->begin ());
@@ -145,7 +145,23 @@
 
 bool rxvt_display::init ()
 {
-  display = XOpenDisplay (id);
+#ifdef LOCAL_X_IS_UNIX
+  if (id[0] == ':')
+    {
+      val = rxvt_malloc (5 + strlen (id) + 1);
+      strcpy (val, "unix/");
+      strcat (val, id);
+      display = XOpenDisplay (val);
+      printf ("OD %s => %p\n", val, display);//D
+      free (val);
+    }
+  else
+#endif
+    display = 0;
+
+  if (!display)
+    display = XOpenDisplay (id);
+      printf ("O2 %s => %p\n", id, display);//D
 
   if (!display)
     return false;
@@ -170,6 +186,17 @@
     is_local = sa.sun_family == AF_LOCAL;
 #endif
 
+#ifdef POINTER_BLANK
+  XColor blackcolour;
+  blackcolour.red   = 0;
+  blackcolour.green = 0;
+  blackcolour.blue  = 0;
+  Font f = XLoadFont (display, "fixed");
+  blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ',
+                                     &blackcolour, &blackcolour);
+  XUnloadFont (display, f);
+#endif
+
 #ifdef PREFER_24BIT
   /*
    * If depth is not 24, look for a 24bit visual.
@@ -205,6 +232,9 @@
 rxvt_display::~rxvt_display ()
 {
   x_ev.stop ();
+#ifdef USE_XIM
+  xims.clear ();
+#endif
 
   if (display)
     XCloseDisplay (display);
@@ -219,7 +249,7 @@
 
 void rxvt_display::im_change_check ()
 {
-  // make sure we only call im_change_cb when a new input method
+  // try to only call im_change_cb when a new input method
   // registers, as xlib crashes due to a race otherwise.
   Atom actual_type, *atoms;
   int actual_format;