--- rxvt-unicode/src/rxvtcolor.C	2004/03/30 14:45:13	1.11
+++ rxvt-unicode/src/rxvtcolor.C	2004/05/30 19:12:42	1.15
@@ -1,3 +1,25 @@
+/*--------------------------------*-C-*---------------------------------*
+ * File:	rxvtcolor.C
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *----------------------------------------------------------------------*/
+
 #include "../config.h"
 #include <rxvt.h>
 #include <rxvtcolor.h>
@@ -35,7 +57,7 @@
 template<class T>
 T *refcache<T>::get (const char *id)
 {
-  for (T **i = begin (); i < end (); ++i)
+  for (T **i = this->begin (); i < this->end (); ++i)
     {
       if (!strcmp (id, (*i)->id))
         {
@@ -50,7 +72,7 @@
 
   if (obj && obj->init ())
     {
-      push_back (obj);
+      this->push_back (obj);
       return obj;
     }
   else
@@ -68,7 +90,7 @@
 
   if (!--obj->referenced)
     {
-      erase (find (begin (), end (), obj));
+      this->erase (find (this->begin (), this->end (), obj));
       delete obj;
     }
 }
@@ -76,8 +98,8 @@
 template<class T>
 refcache<T>::~refcache ()
 {
-  while (size ())
-    put (*begin ());
+  while (this->size ())
+    put (*this->begin ());
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -160,7 +182,7 @@
 
   int fd = XConnectionNumber (display);
   x_ev.start (fd, EVENT_READ);
-  fcntl (fd, F_SETFL, FD_CLOEXEC);
+  fcntl (fd, F_SETFD, FD_CLOEXEC);
 
   XSelectInput (display, root, PropertyChangeMask);
   xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0);
@@ -256,12 +278,18 @@
 
 rxvt_xim *rxvt_display::get_xim (const char *locale, const char *modifiers)
 {
-  // asprintf is a GNU and *BSD extension.. sorry...
   char *id;
+  int l, m;
+
+  l = strlen (locale);
+  m = strlen (modifiers);
 
-  if (asprintf (&id, "%s\n%s", locale, modifiers) < 0)
+  if (!(id = (char *)malloc (l + m + 2)))
     return 0;
 
+  memcpy (id, locale, l); id[l] = '\n';
+  memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
+
   rxvt_xim *xim = xims.get (id);
 
   free (id);
@@ -281,7 +309,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-template refcache<rxvt_display>;
+template class refcache<rxvt_display>;
 refcache<rxvt_display> displays;
 
 /////////////////////////////////////////////////////////////////////////////