--- rxvt-unicode/src/init.C	2004/01/19 17:26:43	1.17
+++ rxvt-unicode/src/init.C	2004/01/28 23:40:50	1.19
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:        init.c
  *----------------------------------------------------------------------*
- * $Id: init.C,v 1.17 2004/01/19 17:26:43 pcg Exp $
+ * $Id: init.C,v 1.19 2004/01/28 23:40:50 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1992      John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
@@ -333,10 +333,11 @@
 
 const char *const xa_names[NUM_XA] =
   {
+    "TEXT",
     "COMPOUND_TEXT",
+    "UTF8_STRING",
     "MULTIPLE",
     "TARGETS",
-    "TEXT",
     "TIMESTAMP",
     "VT_SELECTION",
     "INCR",
@@ -1186,13 +1187,13 @@
 #ifdef PREFER_24BIT
   attributes.background_pixel = PixColors[Color_fg];
   attributes.border_pixel = PixColors[Color_border];
-  attributes.colormap = XCMAP;
+  attributes.colormap = Xcmap;
   TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay),
                                        szHint.x, szHint.y,
                                        szHint.width, szHint.height,
                                        TermWin.ext_bwidth,
-                                       XDEPTH, InputOutput,
-                                       XVISUAL,
+                                       Xdepth, InputOutput,
+                                       Xvisual,
                                        CWBackPixel | CWBorderPixel
                                        | CWColormap, &attributes);
 #else