--- rxvt-unicode/src/rxvtcolor.C	2004/03/29 21:02:11	1.10
+++ rxvt-unicode/src/rxvtcolor.C	2004/04/08 20:31:45	1.14
@@ -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>
@@ -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);
@@ -274,6 +302,11 @@
   xims.put (xim);
 }
 
+Atom rxvt_display::atom (const char *name)
+{
+  return XInternAtom (display, name, False);
+}
+
 /////////////////////////////////////////////////////////////////////////////
 
 template refcache<rxvt_display>;